diff --git a/.branchlet.json b/.branchlet.json
new file mode 100644
index 0000000000..d02cd60e20
--- /dev/null
+++ b/.branchlet.json
@@ -0,0 +1,36 @@
+{
+  "worktreeCopyPatterns": [
+    ".env*",
+    ".vscode/**",
+    ".auth/**",
+    ".claude/**",
+    "autogpt_platform/.env*",
+    "autogpt_platform/backend/.env*",
+    "autogpt_platform/frontend/.env*",
+    "autogpt_platform/frontend/.auth/**",
+    "autogpt_platform/db/docker/.env*"
+  ],
+  "worktreeCopyIgnores": [
+    "**/node_modules/**",
+    "**/dist/**",
+    "**/.git/**",
+    "**/Thumbs.db",
+    "**/.DS_Store",
+    "**/.next/**",
+    "**/__pycache__/**",
+    "**/.ruff_cache/**",
+    "**/.pytest_cache/**",
+    "**/*.pyc",
+    "**/playwright-report/**",
+    "**/logs/**",
+    "**/site/**"
+  ],
+  "worktreePathTemplate": "$BASE_PATH.worktree",
+  "postCreateCmd": [
+    "cd autogpt_platform/autogpt_libs && poetry install",
+    "cd autogpt_platform/backend && poetry install && poetry run prisma generate",
+    "cd autogpt_platform/frontend && pnpm install"
+  ],
+  "terminalCommand": "code .",
+  "deleteBranchWithWorktree": false
+}
diff --git a/.claude/skills/vercel-react-best-practices/AGENTS.md b/.claude/skills/vercel-react-best-practices/AGENTS.md
new file mode 100644
index 0000000000..280a6ae68d
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/AGENTS.md
@@ -0,0 +1,2249 @@
+# React Best Practices
+
+**Version 1.0.0**  
+Vercel Engineering  
+January 2026
+
+> **Note:**  
+> This document is mainly for agents and LLMs to follow when maintaining,  
+> generating, or refactoring React and Next.js codebases at Vercel. Humans  
+> may also find it useful, but guidance here is optimized for automation  
+> and consistency by AI-assisted workflows.
+
+---
+
+## Abstract
+
+Comprehensive performance optimization guide for React and Next.js applications, designed for AI agents and LLMs. Contains 40+ rules across 8 categories, prioritized by impact from critical (eliminating waterfalls, reducing bundle size) to incremental (advanced patterns). Each rule includes detailed explanations, real-world examples comparing incorrect vs. correct implementations, and specific impact metrics to guide automated refactoring and code generation.
+
+---
+
+## Table of Contents
+
+1. [Eliminating Waterfalls](#1-eliminating-waterfalls) — **CRITICAL**
+   - 1.1 [Defer Await Until Needed](#11-defer-await-until-needed)
+   - 1.2 [Dependency-Based Parallelization](#12-dependency-based-parallelization)
+   - 1.3 [Prevent Waterfall Chains in API Routes](#13-prevent-waterfall-chains-in-api-routes)
+   - 1.4 [Promise.all() for Independent Operations](#14-promiseall-for-independent-operations)
+   - 1.5 [Strategic Suspense Boundaries](#15-strategic-suspense-boundaries)
+2. [Bundle Size Optimization](#2-bundle-size-optimization) — **CRITICAL**
+   - 2.1 [Avoid Barrel File Imports](#21-avoid-barrel-file-imports)
+   - 2.2 [Conditional Module Loading](#22-conditional-module-loading)
+   - 2.3 [Defer Non-Critical Third-Party Libraries](#23-defer-non-critical-third-party-libraries)
+   - 2.4 [Dynamic Imports for Heavy Components](#24-dynamic-imports-for-heavy-components)
+   - 2.5 [Preload Based on User Intent](#25-preload-based-on-user-intent)
+3. [Server-Side Performance](#3-server-side-performance) — **HIGH**
+   - 3.1 [Cross-Request LRU Caching](#31-cross-request-lru-caching)
+   - 3.2 [Minimize Serialization at RSC Boundaries](#32-minimize-serialization-at-rsc-boundaries)
+   - 3.3 [Parallel Data Fetching with Component Composition](#33-parallel-data-fetching-with-component-composition)
+   - 3.4 [Per-Request Deduplication with React.cache()](#34-per-request-deduplication-with-reactcache)
+   - 3.5 [Use after() for Non-Blocking Operations](#35-use-after-for-non-blocking-operations)
+4. [Client-Side Data Fetching](#4-client-side-data-fetching) — **MEDIUM-HIGH**
+   - 4.1 [Deduplicate Global Event Listeners](#41-deduplicate-global-event-listeners)
+   - 4.2 [Use SWR for Automatic Deduplication](#42-use-swr-for-automatic-deduplication)
+5. [Re-render Optimization](#5-re-render-optimization) — **MEDIUM**
+   - 5.1 [Defer State Reads to Usage Point](#51-defer-state-reads-to-usage-point)
+   - 5.2 [Extract to Memoized Components](#52-extract-to-memoized-components)
+   - 5.3 [Narrow Effect Dependencies](#53-narrow-effect-dependencies)
+   - 5.4 [Subscribe to Derived State](#54-subscribe-to-derived-state)
+   - 5.5 [Use Functional setState Updates](#55-use-functional-setstate-updates)
+   - 5.6 [Use Lazy State Initialization](#56-use-lazy-state-initialization)
+   - 5.7 [Use Transitions for Non-Urgent Updates](#57-use-transitions-for-non-urgent-updates)
+6. [Rendering Performance](#6-rendering-performance) — **MEDIUM**
+   - 6.1 [Animate SVG Wrapper Instead of SVG Element](#61-animate-svg-wrapper-instead-of-svg-element)
+   - 6.2 [CSS content-visibility for Long Lists](#62-css-content-visibility-for-long-lists)
+   - 6.3 [Hoist Static JSX Elements](#63-hoist-static-jsx-elements)
+   - 6.4 [Optimize SVG Precision](#64-optimize-svg-precision)
+   - 6.5 [Prevent Hydration Mismatch Without Flickering](#65-prevent-hydration-mismatch-without-flickering)
+   - 6.6 [Use Activity Component for Show/Hide](#66-use-activity-component-for-showhide)
+   - 6.7 [Use Explicit Conditional Rendering](#67-use-explicit-conditional-rendering)
+7. [JavaScript Performance](#7-javascript-performance) — **LOW-MEDIUM**
+   - 7.1 [Batch DOM CSS Changes](#71-batch-dom-css-changes)
+   - 7.2 [Build Index Maps for Repeated Lookups](#72-build-index-maps-for-repeated-lookups)
+   - 7.3 [Cache Property Access in Loops](#73-cache-property-access-in-loops)
+   - 7.4 [Cache Repeated Function Calls](#74-cache-repeated-function-calls)
+   - 7.5 [Cache Storage API Calls](#75-cache-storage-api-calls)
+   - 7.6 [Combine Multiple Array Iterations](#76-combine-multiple-array-iterations)
+   - 7.7 [Early Length Check for Array Comparisons](#77-early-length-check-for-array-comparisons)
+   - 7.8 [Early Return from Functions](#78-early-return-from-functions)
+   - 7.9 [Hoist RegExp Creation](#79-hoist-regexp-creation)
+   - 7.10 [Use Loop for Min/Max Instead of Sort](#710-use-loop-for-minmax-instead-of-sort)
+   - 7.11 [Use Set/Map for O(1) Lookups](#711-use-setmap-for-o1-lookups)
+   - 7.12 [Use toSorted() Instead of sort() for Immutability](#712-use-tosorted-instead-of-sort-for-immutability)
+8. [Advanced Patterns](#8-advanced-patterns) — **LOW**
+   - 8.1 [Store Event Handlers in Refs](#81-store-event-handlers-in-refs)
+   - 8.2 [useLatest for Stable Callback Refs](#82-uselatest-for-stable-callback-refs)
+
+---
+
+## 1. Eliminating Waterfalls
+
+**Impact: CRITICAL**
+
+Waterfalls are the #1 performance killer. Each sequential await adds full network latency. Eliminating them yields the largest gains.
+
+### 1.1 Defer Await Until Needed
+
+**Impact: HIGH (avoids blocking unused code paths)**
+
+Move `await` operations into the branches where they're actually used to avoid blocking code paths that don't need them.
+
+**Incorrect: blocks both branches**
+
+```typescript
+async function handleRequest(userId: string, skipProcessing: boolean) {
+  const userData = await fetchUserData(userId)
+  
+  if (skipProcessing) {
+    // Returns immediately but still waited for userData
+    return { skipped: true }
+  }
+  
+  // Only this branch uses userData
+  return processUserData(userData)
+}
+```
+
+**Correct: only blocks when needed**
+
+```typescript
+async function handleRequest(userId: string, skipProcessing: boolean) {
+  if (skipProcessing) {
+    // Returns immediately without waiting
+    return { skipped: true }
+  }
+  
+  // Fetch only when needed
+  const userData = await fetchUserData(userId)
+  return processUserData(userData)
+}
+```
+
+**Another example: early return optimization**
+
+```typescript
+// Incorrect: always fetches permissions
+async function updateResource(resourceId: string, userId: string) {
+  const permissions = await fetchPermissions(userId)
+  const resource = await getResource(resourceId)
+  
+  if (!resource) {
+    return { error: 'Not found' }
+  }
+  
+  if (!permissions.canEdit) {
+    return { error: 'Forbidden' }
+  }
+  
+  return await updateResourceData(resource, permissions)
+}
+
+// Correct: fetches only when needed
+async function updateResource(resourceId: string, userId: string) {
+  const resource = await getResource(resourceId)
+  
+  if (!resource) {
+    return { error: 'Not found' }
+  }
+  
+  const permissions = await fetchPermissions(userId)
+  
+  if (!permissions.canEdit) {
+    return { error: 'Forbidden' }
+  }
+  
+  return await updateResourceData(resource, permissions)
+}
+```
+
+This optimization is especially valuable when the skipped branch is frequently taken, or when the deferred operation is expensive.
+
+### 1.2 Dependency-Based Parallelization
+
+**Impact: CRITICAL (2-10× improvement)**
+
+For operations with partial dependencies, use `better-all` to maximize parallelism. It automatically starts each task at the earliest possible moment.
+
+**Incorrect: profile waits for config unnecessarily**
+
+```typescript
+const [user, config] = await Promise.all([
+  fetchUser(),
+  fetchConfig()
+])
+const profile = await fetchProfile(user.id)
+```
+
+**Correct: config and profile run in parallel**
+
+```typescript
+import { all } from 'better-all'
+
+const { user, config, profile } = await all({
+  async user() { return fetchUser() },
+  async config() { return fetchConfig() },
+  async profile() {
+    return fetchProfile((await this.$.user).id)
+  }
+})
+```
+
+Reference: [https://github.com/shuding/better-all](https://github.com/shuding/better-all)
+
+### 1.3 Prevent Waterfall Chains in API Routes
+
+**Impact: CRITICAL (2-10× improvement)**
+
+In API routes and Server Actions, start independent operations immediately, even if you don't await them yet.
+
+**Incorrect: config waits for auth, data waits for both**
+
+```typescript
+export async function GET(request: Request) {
+  const session = await auth()
+  const config = await fetchConfig()
+  const data = await fetchData(session.user.id)
+  return Response.json({ data, config })
+}
+```
+
+**Correct: auth and config start immediately**
+
+```typescript
+export async function GET(request: Request) {
+  const sessionPromise = auth()
+  const configPromise = fetchConfig()
+  const session = await sessionPromise
+  const [config, data] = await Promise.all([
+    configPromise,
+    fetchData(session.user.id)
+  ])
+  return Response.json({ data, config })
+}
+```
+
+For operations with more complex dependency chains, use `better-all` to automatically maximize parallelism (see Dependency-Based Parallelization).
+
+### 1.4 Promise.all() for Independent Operations
+
+**Impact: CRITICAL (2-10× improvement)**
+
+When async operations have no interdependencies, execute them concurrently using `Promise.all()`.
+
+**Incorrect: sequential execution, 3 round trips**
+
+```typescript
+const user = await fetchUser()
+const posts = await fetchPosts()
+const comments = await fetchComments()
+```
+
+**Correct: parallel execution, 1 round trip**
+
+```typescript
+const [user, posts, comments] = await Promise.all([
+  fetchUser(),
+  fetchPosts(),
+  fetchComments()
+])
+```
+
+### 1.5 Strategic Suspense Boundaries
+
+**Impact: HIGH (faster initial paint)**
+
+Instead of awaiting data in async components before returning JSX, use Suspense boundaries to show the wrapper UI faster while data loads.
+
+**Incorrect: wrapper blocked by data fetching**
+
+```tsx
+async function Page() {
+  const data = await fetchData() // Blocks entire page
+  
+  return (
+    <div>
+      <div>Sidebar</div>
+      <div>Header</div>
+      <div>
+        <DataDisplay data={data} />
+      </div>
+      <div>Footer</div>
+    </div>
+  )
+}
+```
+
+The entire layout waits for data even though only the middle section needs it.
+
+**Correct: wrapper shows immediately, data streams in**
+
+```tsx
+function Page() {
+  return (
+    <div>
+      <div>Sidebar</div>
+      <div>Header</div>
+      <div>
+        <Suspense fallback={<Skeleton />}>
+          <DataDisplay />
+        </Suspense>
+      </div>
+      <div>Footer</div>
+    </div>
+  )
+}
+
+async function DataDisplay() {
+  const data = await fetchData() // Only blocks this component
+  return <div>{data.content}</div>
+}
+```
+
+Sidebar, Header, and Footer render immediately. Only DataDisplay waits for data.
+
+**Alternative: share promise across components**
+
+```tsx
+function Page() {
+  // Start fetch immediately, but don't await
+  const dataPromise = fetchData()
+  
+  return (
+    <div>
+      <div>Sidebar</div>
+      <div>Header</div>
+      <Suspense fallback={<Skeleton />}>
+        <DataDisplay dataPromise={dataPromise} />
+        <DataSummary dataPromise={dataPromise} />
+      </Suspense>
+      <div>Footer</div>
+    </div>
+  )
+}
+
+function DataDisplay({ dataPromise }: { dataPromise: Promise<Data> }) {
+  const data = use(dataPromise) // Unwraps the promise
+  return <div>{data.content}</div>
+}
+
+function DataSummary({ dataPromise }: { dataPromise: Promise<Data> }) {
+  const data = use(dataPromise) // Reuses the same promise
+  return <div>{data.summary}</div>
+}
+```
+
+Both components share the same promise, so only one fetch occurs. Layout renders immediately while both components wait together.
+
+**When NOT to use this pattern:**
+
+- Critical data needed for layout decisions (affects positioning)
+
+- SEO-critical content above the fold
+
+- Small, fast queries where suspense overhead isn't worth it
+
+- When you want to avoid layout shift (loading → content jump)
+
+**Trade-off:** Faster initial paint vs potential layout shift. Choose based on your UX priorities.
+
+---
+
+## 2. Bundle Size Optimization
+
+**Impact: CRITICAL**
+
+Reducing initial bundle size improves Time to Interactive and Largest Contentful Paint.
+
+### 2.1 Avoid Barrel File Imports
+
+**Impact: CRITICAL (200-800ms import cost, slow builds)**
+
+Import directly from source files instead of barrel files to avoid loading thousands of unused modules. **Barrel files** are entry points that re-export multiple modules (e.g., `index.js` that does `export * from './module'`).
+
+Popular icon and component libraries can have **up to 10,000 re-exports** in their entry file. For many React packages, **it takes 200-800ms just to import them**, affecting both development speed and production cold starts.
+
+**Why tree-shaking doesn't help:** When a library is marked as external (not bundled), the bundler can't optimize it. If you bundle it to enable tree-shaking, builds become substantially slower analyzing the entire module graph.
+
+**Incorrect: imports entire library**
+
+```tsx
+import { Check, X, Menu } from 'lucide-react'
+// Loads 1,583 modules, takes ~2.8s extra in dev
+// Runtime cost: 200-800ms on every cold start
+
+import { Button, TextField } from '@mui/material'
+// Loads 2,225 modules, takes ~4.2s extra in dev
+```
+
+**Correct: imports only what you need**
+
+```tsx
+import Check from 'lucide-react/dist/esm/icons/check'
+import X from 'lucide-react/dist/esm/icons/x'
+import Menu from 'lucide-react/dist/esm/icons/menu'
+// Loads only 3 modules (~2KB vs ~1MB)
+
+import Button from '@mui/material/Button'
+import TextField from '@mui/material/TextField'
+// Loads only what you use
+```
+
+**Alternative: Next.js 13.5+**
+
+```js
+// next.config.js - use optimizePackageImports
+module.exports = {
+  experimental: {
+    optimizePackageImports: ['lucide-react', '@mui/material']
+  }
+}
+
+// Then you can keep the ergonomic barrel imports:
+import { Check, X, Menu } from 'lucide-react'
+// Automatically transformed to direct imports at build time
+```
+
+Direct imports provide 15-70% faster dev boot, 28% faster builds, 40% faster cold starts, and significantly faster HMR.
+
+Libraries commonly affected: `lucide-react`, `@mui/material`, `@mui/icons-material`, `@tabler/icons-react`, `react-icons`, `@headlessui/react`, `@radix-ui/react-*`, `lodash`, `ramda`, `date-fns`, `rxjs`, `react-use`.
+
+Reference: [https://vercel.com/blog/how-we-optimized-package-imports-in-next-js](https://vercel.com/blog/how-we-optimized-package-imports-in-next-js)
+
+### 2.2 Conditional Module Loading
+
+**Impact: HIGH (loads large data only when needed)**
+
+Load large data or modules only when a feature is activated.
+
+**Example: lazy-load animation frames**
+
+```tsx
+function AnimationPlayer({ enabled }: { enabled: boolean }) {
+  const [frames, setFrames] = useState<Frame[] | null>(null)
+
+  useEffect(() => {
+    if (enabled && !frames && typeof window !== 'undefined') {
+      import('./animation-frames.js')
+        .then(mod => setFrames(mod.frames))
+        .catch(() => setEnabled(false))
+    }
+  }, [enabled, frames])
+
+  if (!frames) return <Skeleton />
+  return <Canvas frames={frames} />
+}
+```
+
+The `typeof window !== 'undefined'` check prevents bundling this module for SSR, optimizing server bundle size and build speed.
+
+### 2.3 Defer Non-Critical Third-Party Libraries
+
+**Impact: MEDIUM (loads after hydration)**
+
+Analytics, logging, and error tracking don't block user interaction. Load them after hydration.
+
+**Incorrect: blocks initial bundle**
+
+```tsx
+import { Analytics } from '@vercel/analytics/react'
+
+export default function RootLayout({ children }) {
+  return (
+    <html>
+      <body>
+        {children}
+        <Analytics />
+      </body>
+    </html>
+  )
+}
+```
+
+**Correct: loads after hydration**
+
+```tsx
+import dynamic from 'next/dynamic'
+
+const Analytics = dynamic(
+  () => import('@vercel/analytics/react').then(m => m.Analytics),
+  { ssr: false }
+)
+
+export default function RootLayout({ children }) {
+  return (
+    <html>
+      <body>
+        {children}
+        <Analytics />
+      </body>
+    </html>
+  )
+}
+```
+
+### 2.4 Dynamic Imports for Heavy Components
+
+**Impact: CRITICAL (directly affects TTI and LCP)**
+
+Use `next/dynamic` to lazy-load large components not needed on initial render.
+
+**Incorrect: Monaco bundles with main chunk ~300KB**
+
+```tsx
+import { MonacoEditor } from './monaco-editor'
+
+function CodePanel({ code }: { code: string }) {
+  return <MonacoEditor value={code} />
+}
+```
+
+**Correct: Monaco loads on demand**
+
+```tsx
+import dynamic from 'next/dynamic'
+
+const MonacoEditor = dynamic(
+  () => import('./monaco-editor').then(m => m.MonacoEditor),
+  { ssr: false }
+)
+
+function CodePanel({ code }: { code: string }) {
+  return <MonacoEditor value={code} />
+}
+```
+
+### 2.5 Preload Based on User Intent
+
+**Impact: MEDIUM (reduces perceived latency)**
+
+Preload heavy bundles before they're needed to reduce perceived latency.
+
+**Example: preload on hover/focus**
+
+```tsx
+function EditorButton({ onClick }: { onClick: () => void }) {
+  const preload = () => {
+    if (typeof window !== 'undefined') {
+      void import('./monaco-editor')
+    }
+  }
+
+  return (
+    <button
+      onMouseEnter={preload}
+      onFocus={preload}
+      onClick={onClick}
+    >
+      Open Editor
+    </button>
+  )
+}
+```
+
+**Example: preload when feature flag is enabled**
+
+```tsx
+function FlagsProvider({ children, flags }: Props) {
+  useEffect(() => {
+    if (flags.editorEnabled && typeof window !== 'undefined') {
+      void import('./monaco-editor').then(mod => mod.init())
+    }
+  }, [flags.editorEnabled])
+
+  return <FlagsContext.Provider value={flags}>
+    {children}
+  </FlagsContext.Provider>
+}
+```
+
+The `typeof window !== 'undefined'` check prevents bundling preloaded modules for SSR, optimizing server bundle size and build speed.
+
+---
+
+## 3. Server-Side Performance
+
+**Impact: HIGH**
+
+Optimizing server-side rendering and data fetching eliminates server-side waterfalls and reduces response times.
+
+### 3.1 Cross-Request LRU Caching
+
+**Impact: HIGH (caches across requests)**
+
+`React.cache()` only works within one request. For data shared across sequential requests (user clicks button A then button B), use an LRU cache.
+
+**Implementation:**
+
+```typescript
+import { LRUCache } from 'lru-cache'
+
+const cache = new LRUCache<string, any>({
+  max: 1000,
+  ttl: 5 * 60 * 1000  // 5 minutes
+})
+
+export async function getUser(id: string) {
+  const cached = cache.get(id)
+  if (cached) return cached
+
+  const user = await db.user.findUnique({ where: { id } })
+  cache.set(id, user)
+  return user
+}
+
+// Request 1: DB query, result cached
+// Request 2: cache hit, no DB query
+```
+
+Use when sequential user actions hit multiple endpoints needing the same data within seconds.
+
+**With Vercel's [Fluid Compute](https://vercel.com/docs/fluid-compute):** LRU caching is especially effective because multiple concurrent requests can share the same function instance and cache. This means the cache persists across requests without needing external storage like Redis.
+
+**In traditional serverless:** Each invocation runs in isolation, so consider Redis for cross-process caching.
+
+Reference: [https://github.com/isaacs/node-lru-cache](https://github.com/isaacs/node-lru-cache)
+
+### 3.2 Minimize Serialization at RSC Boundaries
+
+**Impact: HIGH (reduces data transfer size)**
+
+The React Server/Client boundary serializes all object properties into strings and embeds them in the HTML response and subsequent RSC requests. This serialized data directly impacts page weight and load time, so **size matters a lot**. Only pass fields that the client actually uses.
+
+**Incorrect: serializes all 50 fields**
+
+```tsx
+async function Page() {
+  const user = await fetchUser()  // 50 fields
+  return <Profile user={user} />
+}
+
+'use client'
+function Profile({ user }: { user: User }) {
+  return <div>{user.name}</div>  // uses 1 field
+}
+```
+
+**Correct: serializes only 1 field**
+
+```tsx
+async function Page() {
+  const user = await fetchUser()
+  return <Profile name={user.name} />
+}
+
+'use client'
+function Profile({ name }: { name: string }) {
+  return <div>{name}</div>
+}
+```
+
+### 3.3 Parallel Data Fetching with Component Composition
+
+**Impact: CRITICAL (eliminates server-side waterfalls)**
+
+React Server Components execute sequentially within a tree. Restructure with composition to parallelize data fetching.
+
+**Incorrect: Sidebar waits for Page's fetch to complete**
+
+```tsx
+export default async function Page() {
+  const header = await fetchHeader()
+  return (
+    <div>
+      <div>{header}</div>
+      <Sidebar />
+    </div>
+  )
+}
+
+async function Sidebar() {
+  const items = await fetchSidebarItems()
+  return <nav>{items.map(renderItem)}</nav>
+}
+```
+
+**Correct: both fetch simultaneously**
+
+```tsx
+async function Header() {
+  const data = await fetchHeader()
+  return <div>{data}</div>
+}
+
+async function Sidebar() {
+  const items = await fetchSidebarItems()
+  return <nav>{items.map(renderItem)}</nav>
+}
+
+export default function Page() {
+  return (
+    <div>
+      <Header />
+      <Sidebar />
+    </div>
+  )
+}
+```
+
+**Alternative with children prop:**
+
+```tsx
+async function Layout({ children }: { children: ReactNode }) {
+  const header = await fetchHeader()
+  return (
+    <div>
+      <div>{header}</div>
+      {children}
+    </div>
+  )
+}
+
+async function Sidebar() {
+  const items = await fetchSidebarItems()
+  return <nav>{items.map(renderItem)}</nav>
+}
+
+export default function Page() {
+  return (
+    <Layout>
+      <Sidebar />
+    </Layout>
+  )
+}
+```
+
+### 3.4 Per-Request Deduplication with React.cache()
+
+**Impact: MEDIUM (deduplicates within request)**
+
+Use `React.cache()` for server-side request deduplication. Authentication and database queries benefit most.
+
+**Usage:**
+
+```typescript
+import { cache } from 'react'
+
+export const getCurrentUser = cache(async () => {
+  const session = await auth()
+  if (!session?.user?.id) return null
+  return await db.user.findUnique({
+    where: { id: session.user.id }
+  })
+})
+```
+
+Within a single request, multiple calls to `getCurrentUser()` execute the query only once.
+
+### 3.5 Use after() for Non-Blocking Operations
+
+**Impact: MEDIUM (faster response times)**
+
+Use Next.js's `after()` to schedule work that should execute after a response is sent. This prevents logging, analytics, and other side effects from blocking the response.
+
+**Incorrect: blocks response**
+
+```tsx
+import { logUserAction } from '@/app/utils'
+
+export async function POST(request: Request) {
+  // Perform mutation
+  await updateDatabase(request)
+  
+  // Logging blocks the response
+  const userAgent = request.headers.get('user-agent') || 'unknown'
+  await logUserAction({ userAgent })
+  
+  return new Response(JSON.stringify({ status: 'success' }), {
+    status: 200,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+```
+
+**Correct: non-blocking**
+
+```tsx
+import { after } from 'next/server'
+import { headers, cookies } from 'next/headers'
+import { logUserAction } from '@/app/utils'
+
+export async function POST(request: Request) {
+  // Perform mutation
+  await updateDatabase(request)
+  
+  // Log after response is sent
+  after(async () => {
+    const userAgent = (await headers()).get('user-agent') || 'unknown'
+    const sessionCookie = (await cookies()).get('session-id')?.value || 'anonymous'
+    
+    logUserAction({ sessionCookie, userAgent })
+  })
+  
+  return new Response(JSON.stringify({ status: 'success' }), {
+    status: 200,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+```
+
+The response is sent immediately while logging happens in the background.
+
+**Common use cases:**
+
+- Analytics tracking
+
+- Audit logging
+
+- Sending notifications
+
+- Cache invalidation
+
+- Cleanup tasks
+
+**Important notes:**
+
+- `after()` runs even if the response fails or redirects
+
+- Works in Server Actions, Route Handlers, and Server Components
+
+Reference: [https://nextjs.org/docs/app/api-reference/functions/after](https://nextjs.org/docs/app/api-reference/functions/after)
+
+---
+
+## 4. Client-Side Data Fetching
+
+**Impact: MEDIUM-HIGH**
+
+Automatic deduplication and efficient data fetching patterns reduce redundant network requests.
+
+### 4.1 Deduplicate Global Event Listeners
+
+**Impact: LOW (single listener for N components)**
+
+Use `useSWRSubscription()` to share global event listeners across component instances.
+
+**Incorrect: N instances = N listeners**
+
+```tsx
+function useKeyboardShortcut(key: string, callback: () => void) {
+  useEffect(() => {
+    const handler = (e: KeyboardEvent) => {
+      if (e.metaKey && e.key === key) {
+        callback()
+      }
+    }
+    window.addEventListener('keydown', handler)
+    return () => window.removeEventListener('keydown', handler)
+  }, [key, callback])
+}
+```
+
+When using the `useKeyboardShortcut` hook multiple times, each instance will register a new listener.
+
+**Correct: N instances = 1 listener**
+
+```tsx
+import useSWRSubscription from 'swr/subscription'
+
+// Module-level Map to track callbacks per key
+const keyCallbacks = new Map<string, Set<() => void>>()
+
+function useKeyboardShortcut(key: string, callback: () => void) {
+  // Register this callback in the Map
+  useEffect(() => {
+    if (!keyCallbacks.has(key)) {
+      keyCallbacks.set(key, new Set())
+    }
+    keyCallbacks.get(key)!.add(callback)
+
+    return () => {
+      const set = keyCallbacks.get(key)
+      if (set) {
+        set.delete(callback)
+        if (set.size === 0) {
+          keyCallbacks.delete(key)
+        }
+      }
+    }
+  }, [key, callback])
+
+  useSWRSubscription('global-keydown', () => {
+    const handler = (e: KeyboardEvent) => {
+      if (e.metaKey && keyCallbacks.has(e.key)) {
+        keyCallbacks.get(e.key)!.forEach(cb => cb())
+      }
+    }
+    window.addEventListener('keydown', handler)
+    return () => window.removeEventListener('keydown', handler)
+  })
+}
+
+function Profile() {
+  // Multiple shortcuts will share the same listener
+  useKeyboardShortcut('p', () => { /* ... */ }) 
+  useKeyboardShortcut('k', () => { /* ... */ })
+  // ...
+}
+```
+
+### 4.2 Use SWR for Automatic Deduplication
+
+**Impact: MEDIUM-HIGH (automatic deduplication)**
+
+SWR enables request deduplication, caching, and revalidation across component instances.
+
+**Incorrect: no deduplication, each instance fetches**
+
+```tsx
+function UserList() {
+  const [users, setUsers] = useState([])
+  useEffect(() => {
+    fetch('/api/users')
+      .then(r => r.json())
+      .then(setUsers)
+  }, [])
+}
+```
+
+**Correct: multiple instances share one request**
+
+```tsx
+import useSWR from 'swr'
+
+function UserList() {
+  const { data: users } = useSWR('/api/users', fetcher)
+}
+```
+
+**For immutable data:**
+
+```tsx
+import { useImmutableSWR } from '@/lib/swr'
+
+function StaticContent() {
+  const { data } = useImmutableSWR('/api/config', fetcher)
+}
+```
+
+**For mutations:**
+
+```tsx
+import { useSWRMutation } from 'swr/mutation'
+
+function UpdateButton() {
+  const { trigger } = useSWRMutation('/api/user', updateUser)
+  return <button onClick={() => trigger()}>Update</button>
+}
+```
+
+Reference: [https://swr.vercel.app](https://swr.vercel.app)
+
+---
+
+## 5. Re-render Optimization
+
+**Impact: MEDIUM**
+
+Reducing unnecessary re-renders minimizes wasted computation and improves UI responsiveness.
+
+### 5.1 Defer State Reads to Usage Point
+
+**Impact: MEDIUM (avoids unnecessary subscriptions)**
+
+Don't subscribe to dynamic state (searchParams, localStorage) if you only read it inside callbacks.
+
+**Incorrect: subscribes to all searchParams changes**
+
+```tsx
+function ShareButton({ chatId }: { chatId: string }) {
+  const searchParams = useSearchParams()
+
+  const handleShare = () => {
+    const ref = searchParams.get('ref')
+    shareChat(chatId, { ref })
+  }
+
+  return <button onClick={handleShare}>Share</button>
+}
+```
+
+**Correct: reads on demand, no subscription**
+
+```tsx
+function ShareButton({ chatId }: { chatId: string }) {
+  const handleShare = () => {
+    const params = new URLSearchParams(window.location.search)
+    const ref = params.get('ref')
+    shareChat(chatId, { ref })
+  }
+
+  return <button onClick={handleShare}>Share</button>
+}
+```
+
+### 5.2 Extract to Memoized Components
+
+**Impact: MEDIUM (enables early returns)**
+
+Extract expensive work into memoized components to enable early returns before computation.
+
+**Incorrect: computes avatar even when loading**
+
+```tsx
+function Profile({ user, loading }: Props) {
+  const avatar = useMemo(() => {
+    const id = computeAvatarId(user)
+    return <Avatar id={id} />
+  }, [user])
+
+  if (loading) return <Skeleton />
+  return <div>{avatar}</div>
+}
+```
+
+**Correct: skips computation when loading**
+
+```tsx
+const UserAvatar = memo(function UserAvatar({ user }: { user: User }) {
+  const id = useMemo(() => computeAvatarId(user), [user])
+  return <Avatar id={id} />
+})
+
+function Profile({ user, loading }: Props) {
+  if (loading) return <Skeleton />
+  return (
+    <div>
+      <UserAvatar user={user} />
+    </div>
+  )
+}
+```
+
+**Note:** If your project has [React Compiler](https://react.dev/learn/react-compiler) enabled, manual memoization with `memo()` and `useMemo()` is not necessary. The compiler automatically optimizes re-renders.
+
+### 5.3 Narrow Effect Dependencies
+
+**Impact: LOW (minimizes effect re-runs)**
+
+Specify primitive dependencies instead of objects to minimize effect re-runs.
+
+**Incorrect: re-runs on any user field change**
+
+```tsx
+useEffect(() => {
+  console.log(user.id)
+}, [user])
+```
+
+**Correct: re-runs only when id changes**
+
+```tsx
+useEffect(() => {
+  console.log(user.id)
+}, [user.id])
+```
+
+**For derived state, compute outside effect:**
+
+```tsx
+// Incorrect: runs on width=767, 766, 765...
+useEffect(() => {
+  if (width < 768) {
+    enableMobileMode()
+  }
+}, [width])
+
+// Correct: runs only on boolean transition
+const isMobile = width < 768
+useEffect(() => {
+  if (isMobile) {
+    enableMobileMode()
+  }
+}, [isMobile])
+```
+
+### 5.4 Subscribe to Derived State
+
+**Impact: MEDIUM (reduces re-render frequency)**
+
+Subscribe to derived boolean state instead of continuous values to reduce re-render frequency.
+
+**Incorrect: re-renders on every pixel change**
+
+```tsx
+function Sidebar() {
+  const width = useWindowWidth()  // updates continuously
+  const isMobile = width < 768
+  return <nav className={isMobile ? 'mobile' : 'desktop'}>
+}
+```
+
+**Correct: re-renders only when boolean changes**
+
+```tsx
+function Sidebar() {
+  const isMobile = useMediaQuery('(max-width: 767px)')
+  return <nav className={isMobile ? 'mobile' : 'desktop'}>
+}
+```
+
+### 5.5 Use Functional setState Updates
+
+**Impact: MEDIUM (prevents stale closures and unnecessary callback recreations)**
+
+When updating state based on the current state value, use the functional update form of setState instead of directly referencing the state variable. This prevents stale closures, eliminates unnecessary dependencies, and creates stable callback references.
+
+**Incorrect: requires state as dependency**
+
+```tsx
+function TodoList() {
+  const [items, setItems] = useState(initialItems)
+  
+  // Callback must depend on items, recreated on every items change
+  const addItems = useCallback((newItems: Item[]) => {
+    setItems([...items, ...newItems])
+  }, [items])  // ❌ items dependency causes recreations
+  
+  // Risk of stale closure if dependency is forgotten
+  const removeItem = useCallback((id: string) => {
+    setItems(items.filter(item => item.id !== id))
+  }, [])  // ❌ Missing items dependency - will use stale items!
+  
+  return <ItemsEditor items={items} onAdd={addItems} onRemove={removeItem} />
+}
+```
+
+The first callback is recreated every time `items` changes, which can cause child components to re-render unnecessarily. The second callback has a stale closure bug—it will always reference the initial `items` value.
+
+**Correct: stable callbacks, no stale closures**
+
+```tsx
+function TodoList() {
+  const [items, setItems] = useState(initialItems)
+  
+  // Stable callback, never recreated
+  const addItems = useCallback((newItems: Item[]) => {
+    setItems(curr => [...curr, ...newItems])
+  }, [])  // ✅ No dependencies needed
+  
+  // Always uses latest state, no stale closure risk
+  const removeItem = useCallback((id: string) => {
+    setItems(curr => curr.filter(item => item.id !== id))
+  }, [])  // ✅ Safe and stable
+  
+  return <ItemsEditor items={items} onAdd={addItems} onRemove={removeItem} />
+}
+```
+
+**Benefits:**
+
+1. **Stable callback references** - Callbacks don't need to be recreated when state changes
+
+2. **No stale closures** - Always operates on the latest state value
+
+3. **Fewer dependencies** - Simplifies dependency arrays and reduces memory leaks
+
+4. **Prevents bugs** - Eliminates the most common source of React closure bugs
+
+**When to use functional updates:**
+
+- Any setState that depends on the current state value
+
+- Inside useCallback/useMemo when state is needed
+
+- Event handlers that reference state
+
+- Async operations that update state
+
+**When direct updates are fine:**
+
+- Setting state to a static value: `setCount(0)`
+
+- Setting state from props/arguments only: `setName(newName)`
+
+- State doesn't depend on previous value
+
+**Note:** If your project has [React Compiler](https://react.dev/learn/react-compiler) enabled, the compiler can automatically optimize some cases, but functional updates are still recommended for correctness and to prevent stale closure bugs.
+
+### 5.6 Use Lazy State Initialization
+
+**Impact: MEDIUM (wasted computation on every render)**
+
+Pass a function to `useState` for expensive initial values. Without the function form, the initializer runs on every render even though the value is only used once.
+
+**Incorrect: runs on every render**
+
+```tsx
+function FilteredList({ items }: { items: Item[] }) {
+  // buildSearchIndex() runs on EVERY render, even after initialization
+  const [searchIndex, setSearchIndex] = useState(buildSearchIndex(items))
+  const [query, setQuery] = useState('')
+  
+  // When query changes, buildSearchIndex runs again unnecessarily
+  return <SearchResults index={searchIndex} query={query} />
+}
+
+function UserProfile() {
+  // JSON.parse runs on every render
+  const [settings, setSettings] = useState(
+    JSON.parse(localStorage.getItem('settings') || '{}')
+  )
+  
+  return <SettingsForm settings={settings} onChange={setSettings} />
+}
+```
+
+**Correct: runs only once**
+
+```tsx
+function FilteredList({ items }: { items: Item[] }) {
+  // buildSearchIndex() runs ONLY on initial render
+  const [searchIndex, setSearchIndex] = useState(() => buildSearchIndex(items))
+  const [query, setQuery] = useState('')
+  
+  return <SearchResults index={searchIndex} query={query} />
+}
+
+function UserProfile() {
+  // JSON.parse runs only on initial render
+  const [settings, setSettings] = useState(() => {
+    const stored = localStorage.getItem('settings')
+    return stored ? JSON.parse(stored) : {}
+  })
+  
+  return <SettingsForm settings={settings} onChange={setSettings} />
+}
+```
+
+Use lazy initialization when computing initial values from localStorage/sessionStorage, building data structures (indexes, maps), reading from the DOM, or performing heavy transformations.
+
+For simple primitives (`useState(0)`), direct references (`useState(props.value)`), or cheap literals (`useState({})`), the function form is unnecessary.
+
+### 5.7 Use Transitions for Non-Urgent Updates
+
+**Impact: MEDIUM (maintains UI responsiveness)**
+
+Mark frequent, non-urgent state updates as transitions to maintain UI responsiveness.
+
+**Incorrect: blocks UI on every scroll**
+
+```tsx
+function ScrollTracker() {
+  const [scrollY, setScrollY] = useState(0)
+  useEffect(() => {
+    const handler = () => setScrollY(window.scrollY)
+    window.addEventListener('scroll', handler, { passive: true })
+    return () => window.removeEventListener('scroll', handler)
+  }, [])
+}
+```
+
+**Correct: non-blocking updates**
+
+```tsx
+import { startTransition } from 'react'
+
+function ScrollTracker() {
+  const [scrollY, setScrollY] = useState(0)
+  useEffect(() => {
+    const handler = () => {
+      startTransition(() => setScrollY(window.scrollY))
+    }
+    window.addEventListener('scroll', handler, { passive: true })
+    return () => window.removeEventListener('scroll', handler)
+  }, [])
+}
+```
+
+---
+
+## 6. Rendering Performance
+
+**Impact: MEDIUM**
+
+Optimizing the rendering process reduces the work the browser needs to do.
+
+### 6.1 Animate SVG Wrapper Instead of SVG Element
+
+**Impact: LOW (enables hardware acceleration)**
+
+Many browsers don't have hardware acceleration for CSS3 animations on SVG elements. Wrap SVG in a `<div>` and animate the wrapper instead.
+
+**Incorrect: animating SVG directly - no hardware acceleration**
+
+```tsx
+function LoadingSpinner() {
+  return (
+    <svg 
+      className="animate-spin"
+      width="24" 
+      height="24" 
+      viewBox="0 0 24 24"
+    >
+      <circle cx="12" cy="12" r="10" stroke="currentColor" />
+    </svg>
+  )
+}
+```
+
+**Correct: animating wrapper div - hardware accelerated**
+
+```tsx
+function LoadingSpinner() {
+  return (
+    <div className="animate-spin">
+      <svg 
+        width="24" 
+        height="24" 
+        viewBox="0 0 24 24"
+      >
+        <circle cx="12" cy="12" r="10" stroke="currentColor" />
+      </svg>
+    </div>
+  )
+}
+```
+
+This applies to all CSS transforms and transitions (`transform`, `opacity`, `translate`, `scale`, `rotate`). The wrapper div allows browsers to use GPU acceleration for smoother animations.
+
+### 6.2 CSS content-visibility for Long Lists
+
+**Impact: HIGH (faster initial render)**
+
+Apply `content-visibility: auto` to defer off-screen rendering.
+
+**CSS:**
+
+```css
+.message-item {
+  content-visibility: auto;
+  contain-intrinsic-size: 0 80px;
+}
+```
+
+**Example:**
+
+```tsx
+function MessageList({ messages }: { messages: Message[] }) {
+  return (
+    <div className="overflow-y-auto h-screen">
+      {messages.map(msg => (
+        <div key={msg.id} className="message-item">
+          <Avatar user={msg.author} />
+          <div>{msg.content}</div>
+        </div>
+      ))}
+    </div>
+  )
+}
+```
+
+For 1000 messages, browser skips layout/paint for ~990 off-screen items (10× faster initial render).
+
+### 6.3 Hoist Static JSX Elements
+
+**Impact: LOW (avoids re-creation)**
+
+Extract static JSX outside components to avoid re-creation.
+
+**Incorrect: recreates element every render**
+
+```tsx
+function LoadingSkeleton() {
+  return <div className="animate-pulse h-20 bg-gray-200" />
+}
+
+function Container() {
+  return (
+    <div>
+      {loading && <LoadingSkeleton />}
+    </div>
+  )
+}
+```
+
+**Correct: reuses same element**
+
+```tsx
+const loadingSkeleton = (
+  <div className="animate-pulse h-20 bg-gray-200" />
+)
+
+function Container() {
+  return (
+    <div>
+      {loading && loadingSkeleton}
+    </div>
+  )
+}
+```
+
+This is especially helpful for large and static SVG nodes, which can be expensive to recreate on every render.
+
+**Note:** If your project has [React Compiler](https://react.dev/learn/react-compiler) enabled, the compiler automatically hoists static JSX elements and optimizes component re-renders, making manual hoisting unnecessary.
+
+### 6.4 Optimize SVG Precision
+
+**Impact: LOW (reduces file size)**
+
+Reduce SVG coordinate precision to decrease file size. The optimal precision depends on the viewBox size, but in general reducing precision should be considered.
+
+**Incorrect: excessive precision**
+
+```svg
+<path d="M 10.293847 20.847362 L 30.938472 40.192837" />
+```
+
+**Correct: 1 decimal place**
+
+```svg
+<path d="M 10.3 20.8 L 30.9 40.2" />
+```
+
+**Automate with SVGO:**
+
+```bash
+npx svgo --precision=1 --multipass icon.svg
+```
+
+### 6.5 Prevent Hydration Mismatch Without Flickering
+
+**Impact: MEDIUM (avoids visual flicker and hydration errors)**
+
+When rendering content that depends on client-side storage (localStorage, cookies), avoid both SSR breakage and post-hydration flickering by injecting a synchronous script that updates the DOM before React hydrates.
+
+**Incorrect: breaks SSR**
+
+```tsx
+function ThemeWrapper({ children }: { children: ReactNode }) {
+  // localStorage is not available on server - throws error
+  const theme = localStorage.getItem('theme') || 'light'
+  
+  return (
+    <div className={theme}>
+      {children}
+    </div>
+  )
+}
+```
+
+Server-side rendering will fail because `localStorage` is undefined.
+
+**Incorrect: visual flickering**
+
+```tsx
+function ThemeWrapper({ children }: { children: ReactNode }) {
+  const [theme, setTheme] = useState('light')
+  
+  useEffect(() => {
+    // Runs after hydration - causes visible flash
+    const stored = localStorage.getItem('theme')
+    if (stored) {
+      setTheme(stored)
+    }
+  }, [])
+  
+  return (
+    <div className={theme}>
+      {children}
+    </div>
+  )
+}
+```
+
+Component first renders with default value (`light`), then updates after hydration, causing a visible flash of incorrect content.
+
+**Correct: no flicker, no hydration mismatch**
+
+```tsx
+function ThemeWrapper({ children }: { children: ReactNode }) {
+  return (
+    <>
+      <div id="theme-wrapper">
+        {children}
+      </div>
+      <script
+        dangerouslySetInnerHTML={{
+          __html: `
+            (function() {
+              try {
+                var theme = localStorage.getItem('theme') || 'light';
+                var el = document.getElementById('theme-wrapper');
+                if (el) el.className = theme;
+              } catch (e) {}
+            })();
+          `,
+        }}
+      />
+    </>
+  )
+}
+```
+
+The inline script executes synchronously before showing the element, ensuring the DOM already has the correct value. No flickering, no hydration mismatch.
+
+This pattern is especially useful for theme toggles, user preferences, authentication states, and any client-only data that should render immediately without flashing default values.
+
+### 6.6 Use Activity Component for Show/Hide
+
+**Impact: MEDIUM (preserves state/DOM)**
+
+Use React's `<Activity>` to preserve state/DOM for expensive components that frequently toggle visibility.
+
+**Usage:**
+
+```tsx
+import { Activity } from 'react'
+
+function Dropdown({ isOpen }: Props) {
+  return (
+    <Activity mode={isOpen ? 'visible' : 'hidden'}>
+      <ExpensiveMenu />
+    </Activity>
+  )
+}
+```
+
+Avoids expensive re-renders and state loss.
+
+### 6.7 Use Explicit Conditional Rendering
+
+**Impact: LOW (prevents rendering 0 or NaN)**
+
+Use explicit ternary operators (`? :`) instead of `&&` for conditional rendering when the condition can be `0`, `NaN`, or other falsy values that render.
+
+**Incorrect: renders "0" when count is 0**
+
+```tsx
+function Badge({ count }: { count: number }) {
+  return (
+    <div>
+      {count && <span className="badge">{count}</span>}
+    </div>
+  )
+}
+
+// When count = 0, renders: <div>0</div>
+// When count = 5, renders: <div><span class="badge">5</span></div>
+```
+
+**Correct: renders nothing when count is 0**
+
+```tsx
+function Badge({ count }: { count: number }) {
+  return (
+    <div>
+      {count > 0 ? <span className="badge">{count}</span> : null}
+    </div>
+  )
+}
+
+// When count = 0, renders: <div></div>
+// When count = 5, renders: <div><span class="badge">5</span></div>
+```
+
+---
+
+## 7. JavaScript Performance
+
+**Impact: LOW-MEDIUM**
+
+Micro-optimizations for hot paths can add up to meaningful improvements.
+
+### 7.1 Batch DOM CSS Changes
+
+**Impact: MEDIUM (reduces reflows/repaints)**
+
+Avoid changing styles one property at a time. Group multiple CSS changes together via classes or `cssText` to minimize browser reflows.
+
+**Incorrect: multiple reflows**
+
+```typescript
+function updateElementStyles(element: HTMLElement) {
+  // Each line triggers a reflow
+  element.style.width = '100px'
+  element.style.height = '200px'
+  element.style.backgroundColor = 'blue'
+  element.style.border = '1px solid black'
+}
+```
+
+**Correct: add class - single reflow**
+
+```typescript
+// CSS file
+.highlighted-box {
+  width: 100px;
+  height: 200px;
+  background-color: blue;
+  border: 1px solid black;
+}
+
+// JavaScript
+function updateElementStyles(element: HTMLElement) {
+  element.classList.add('highlighted-box')
+}
+```
+
+**Correct: change cssText - single reflow**
+
+```typescript
+function updateElementStyles(element: HTMLElement) {
+  element.style.cssText = `
+    width: 100px;
+    height: 200px;
+    background-color: blue;
+    border: 1px solid black;
+  `
+}
+```
+
+**React example:**
+
+```tsx
+// Incorrect: changing styles one by one
+function Box({ isHighlighted }: { isHighlighted: boolean }) {
+  const ref = useRef<HTMLDivElement>(null)
+  
+  useEffect(() => {
+    if (ref.current && isHighlighted) {
+      ref.current.style.width = '100px'
+      ref.current.style.height = '200px'
+      ref.current.style.backgroundColor = 'blue'
+    }
+  }, [isHighlighted])
+  
+  return <div ref={ref}>Content</div>
+}
+
+// Correct: toggle class
+function Box({ isHighlighted }: { isHighlighted: boolean }) {
+  return (
+    <div className={isHighlighted ? 'highlighted-box' : ''}>
+      Content
+    </div>
+  )
+}
+```
+
+Prefer CSS classes over inline styles when possible. Classes are cached by the browser and provide better separation of concerns.
+
+### 7.2 Build Index Maps for Repeated Lookups
+
+**Impact: LOW-MEDIUM (1M ops to 2K ops)**
+
+Multiple `.find()` calls by the same key should use a Map.
+
+**Incorrect (O(n) per lookup):**
+
+```typescript
+function processOrders(orders: Order[], users: User[]) {
+  return orders.map(order => ({
+    ...order,
+    user: users.find(u => u.id === order.userId)
+  }))
+}
+```
+
+**Correct (O(1) per lookup):**
+
+```typescript
+function processOrders(orders: Order[], users: User[]) {
+  const userById = new Map(users.map(u => [u.id, u]))
+
+  return orders.map(order => ({
+    ...order,
+    user: userById.get(order.userId)
+  }))
+}
+```
+
+Build map once (O(n)), then all lookups are O(1).
+
+For 1000 orders × 1000 users: 1M ops → 2K ops.
+
+### 7.3 Cache Property Access in Loops
+
+**Impact: LOW-MEDIUM (reduces lookups)**
+
+Cache object property lookups in hot paths.
+
+**Incorrect: 3 lookups × N iterations**
+
+```typescript
+for (let i = 0; i < arr.length; i++) {
+  process(obj.config.settings.value)
+}
+```
+
+**Correct: 1 lookup total**
+
+```typescript
+const value = obj.config.settings.value
+const len = arr.length
+for (let i = 0; i < len; i++) {
+  process(value)
+}
+```
+
+### 7.4 Cache Repeated Function Calls
+
+**Impact: MEDIUM (avoid redundant computation)**
+
+Use a module-level Map to cache function results when the same function is called repeatedly with the same inputs during render.
+
+**Incorrect: redundant computation**
+
+```typescript
+function ProjectList({ projects }: { projects: Project[] }) {
+  return (
+    <div>
+      {projects.map(project => {
+        // slugify() called 100+ times for same project names
+        const slug = slugify(project.name)
+        
+        return <ProjectCard key={project.id} slug={slug} />
+      })}
+    </div>
+  )
+}
+```
+
+**Correct: cached results**
+
+```typescript
+// Module-level cache
+const slugifyCache = new Map<string, string>()
+
+function cachedSlugify(text: string): string {
+  if (slugifyCache.has(text)) {
+    return slugifyCache.get(text)!
+  }
+  const result = slugify(text)
+  slugifyCache.set(text, result)
+  return result
+}
+
+function ProjectList({ projects }: { projects: Project[] }) {
+  return (
+    <div>
+      {projects.map(project => {
+        // Computed only once per unique project name
+        const slug = cachedSlugify(project.name)
+        
+        return <ProjectCard key={project.id} slug={slug} />
+      })}
+    </div>
+  )
+}
+```
+
+**Simpler pattern for single-value functions:**
+
+```typescript
+let isLoggedInCache: boolean | null = null
+
+function isLoggedIn(): boolean {
+  if (isLoggedInCache !== null) {
+    return isLoggedInCache
+  }
+  
+  isLoggedInCache = document.cookie.includes('auth=')
+  return isLoggedInCache
+}
+
+// Clear cache when auth changes
+function onAuthChange() {
+  isLoggedInCache = null
+}
+```
+
+Use a Map (not a hook) so it works everywhere: utilities, event handlers, not just React components.
+
+Reference: [https://vercel.com/blog/how-we-made-the-vercel-dashboard-twice-as-fast](https://vercel.com/blog/how-we-made-the-vercel-dashboard-twice-as-fast)
+
+### 7.5 Cache Storage API Calls
+
+**Impact: LOW-MEDIUM (reduces expensive I/O)**
+
+`localStorage`, `sessionStorage`, and `document.cookie` are synchronous and expensive. Cache reads in memory.
+
+**Incorrect: reads storage on every call**
+
+```typescript
+function getTheme() {
+  return localStorage.getItem('theme') ?? 'light'
+}
+// Called 10 times = 10 storage reads
+```
+
+**Correct: Map cache**
+
+```typescript
+const storageCache = new Map<string, string | null>()
+
+function getLocalStorage(key: string) {
+  if (!storageCache.has(key)) {
+    storageCache.set(key, localStorage.getItem(key))
+  }
+  return storageCache.get(key)
+}
+
+function setLocalStorage(key: string, value: string) {
+  localStorage.setItem(key, value)
+  storageCache.set(key, value)  // keep cache in sync
+}
+```
+
+Use a Map (not a hook) so it works everywhere: utilities, event handlers, not just React components.
+
+**Cookie caching:**
+
+```typescript
+let cookieCache: Record<string, string> | null = null
+
+function getCookie(name: string) {
+  if (!cookieCache) {
+    cookieCache = Object.fromEntries(
+      document.cookie.split('; ').map(c => c.split('='))
+    )
+  }
+  return cookieCache[name]
+}
+```
+
+**Important: invalidate on external changes**
+
+```typescript
+window.addEventListener('storage', (e) => {
+  if (e.key) storageCache.delete(e.key)
+})
+
+document.addEventListener('visibilitychange', () => {
+  if (document.visibilityState === 'visible') {
+    storageCache.clear()
+  }
+})
+```
+
+If storage can change externally (another tab, server-set cookies), invalidate cache:
+
+### 7.6 Combine Multiple Array Iterations
+
+**Impact: LOW-MEDIUM (reduces iterations)**
+
+Multiple `.filter()` or `.map()` calls iterate the array multiple times. Combine into one loop.
+
+**Incorrect: 3 iterations**
+
+```typescript
+const admins = users.filter(u => u.isAdmin)
+const testers = users.filter(u => u.isTester)
+const inactive = users.filter(u => !u.isActive)
+```
+
+**Correct: 1 iteration**
+
+```typescript
+const admins: User[] = []
+const testers: User[] = []
+const inactive: User[] = []
+
+for (const user of users) {
+  if (user.isAdmin) admins.push(user)
+  if (user.isTester) testers.push(user)
+  if (!user.isActive) inactive.push(user)
+}
+```
+
+### 7.7 Early Length Check for Array Comparisons
+
+**Impact: MEDIUM-HIGH (avoids expensive operations when lengths differ)**
+
+When comparing arrays with expensive operations (sorting, deep equality, serialization), check lengths first. If lengths differ, the arrays cannot be equal.
+
+In real-world applications, this optimization is especially valuable when the comparison runs in hot paths (event handlers, render loops).
+
+**Incorrect: always runs expensive comparison**
+
+```typescript
+function hasChanges(current: string[], original: string[]) {
+  // Always sorts and joins, even when lengths differ
+  return current.sort().join() !== original.sort().join()
+}
+```
+
+Two O(n log n) sorts run even when `current.length` is 5 and `original.length` is 100. There is also overhead of joining the arrays and comparing the strings.
+
+**Correct (O(1) length check first):**
+
+```typescript
+function hasChanges(current: string[], original: string[]) {
+  // Early return if lengths differ
+  if (current.length !== original.length) {
+    return true
+  }
+  // Only sort/join when lengths match
+  const currentSorted = current.toSorted()
+  const originalSorted = original.toSorted()
+  for (let i = 0; i < currentSorted.length; i++) {
+    if (currentSorted[i] !== originalSorted[i]) {
+      return true
+    }
+  }
+  return false
+}
+```
+
+This new approach is more efficient because:
+
+- It avoids the overhead of sorting and joining the arrays when lengths differ
+
+- It avoids consuming memory for the joined strings (especially important for large arrays)
+
+- It avoids mutating the original arrays
+
+- It returns early when a difference is found
+
+### 7.8 Early Return from Functions
+
+**Impact: LOW-MEDIUM (avoids unnecessary computation)**
+
+Return early when result is determined to skip unnecessary processing.
+
+**Incorrect: processes all items even after finding answer**
+
+```typescript
+function validateUsers(users: User[]) {
+  let hasError = false
+  let errorMessage = ''
+  
+  for (const user of users) {
+    if (!user.email) {
+      hasError = true
+      errorMessage = 'Email required'
+    }
+    if (!user.name) {
+      hasError = true
+      errorMessage = 'Name required'
+    }
+    // Continues checking all users even after error found
+  }
+  
+  return hasError ? { valid: false, error: errorMessage } : { valid: true }
+}
+```
+
+**Correct: returns immediately on first error**
+
+```typescript
+function validateUsers(users: User[]) {
+  for (const user of users) {
+    if (!user.email) {
+      return { valid: false, error: 'Email required' }
+    }
+    if (!user.name) {
+      return { valid: false, error: 'Name required' }
+    }
+  }
+
+  return { valid: true }
+}
+```
+
+### 7.9 Hoist RegExp Creation
+
+**Impact: LOW-MEDIUM (avoids recreation)**
+
+Don't create RegExp inside render. Hoist to module scope or memoize with `useMemo()`.
+
+**Incorrect: new RegExp every render**
+
+```tsx
+function Highlighter({ text, query }: Props) {
+  const regex = new RegExp(`(${query})`, 'gi')
+  const parts = text.split(regex)
+  return <>{parts.map((part, i) => ...)}</>
+}
+```
+
+**Correct: memoize or hoist**
+
+```tsx
+const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
+
+function Highlighter({ text, query }: Props) {
+  const regex = useMemo(
+    () => new RegExp(`(${escapeRegex(query)})`, 'gi'),
+    [query]
+  )
+  const parts = text.split(regex)
+  return <>{parts.map((part, i) => ...)}</>
+}
+```
+
+**Warning: global regex has mutable state**
+
+```typescript
+const regex = /foo/g
+regex.test('foo')  // true, lastIndex = 3
+regex.test('foo')  // false, lastIndex = 0
+```
+
+Global regex (`/g`) has mutable `lastIndex` state:
+
+### 7.10 Use Loop for Min/Max Instead of Sort
+
+**Impact: LOW (O(n) instead of O(n log n))**
+
+Finding the smallest or largest element only requires a single pass through the array. Sorting is wasteful and slower.
+
+**Incorrect (O(n log n) - sort to find latest):**
+
+```typescript
+interface Project {
+  id: string
+  name: string
+  updatedAt: number
+}
+
+function getLatestProject(projects: Project[]) {
+  const sorted = [...projects].sort((a, b) => b.updatedAt - a.updatedAt)
+  return sorted[0]
+}
+```
+
+Sorts the entire array just to find the maximum value.
+
+**Incorrect (O(n log n) - sort for oldest and newest):**
+
+```typescript
+function getOldestAndNewest(projects: Project[]) {
+  const sorted = [...projects].sort((a, b) => a.updatedAt - b.updatedAt)
+  return { oldest: sorted[0], newest: sorted[sorted.length - 1] }
+}
+```
+
+Still sorts unnecessarily when only min/max are needed.
+
+**Correct (O(n) - single loop):**
+
+```typescript
+function getLatestProject(projects: Project[]) {
+  if (projects.length === 0) return null
+  
+  let latest = projects[0]
+  
+  for (let i = 1; i < projects.length; i++) {
+    if (projects[i].updatedAt > latest.updatedAt) {
+      latest = projects[i]
+    }
+  }
+  
+  return latest
+}
+
+function getOldestAndNewest(projects: Project[]) {
+  if (projects.length === 0) return { oldest: null, newest: null }
+  
+  let oldest = projects[0]
+  let newest = projects[0]
+  
+  for (let i = 1; i < projects.length; i++) {
+    if (projects[i].updatedAt < oldest.updatedAt) oldest = projects[i]
+    if (projects[i].updatedAt > newest.updatedAt) newest = projects[i]
+  }
+  
+  return { oldest, newest }
+}
+```
+
+Single pass through the array, no copying, no sorting.
+
+**Alternative: Math.min/Math.max for small arrays**
+
+```typescript
+const numbers = [5, 2, 8, 1, 9]
+const min = Math.min(...numbers)
+const max = Math.max(...numbers)
+```
+
+This works for small arrays but can be slower for very large arrays due to spread operator limitations. Use the loop approach for reliability.
+
+### 7.11 Use Set/Map for O(1) Lookups
+
+**Impact: LOW-MEDIUM (O(n) to O(1))**
+
+Convert arrays to Set/Map for repeated membership checks.
+
+**Incorrect (O(n) per check):**
+
+```typescript
+const allowedIds = ['a', 'b', 'c', ...]
+items.filter(item => allowedIds.includes(item.id))
+```
+
+**Correct (O(1) per check):**
+
+```typescript
+const allowedIds = new Set(['a', 'b', 'c', ...])
+items.filter(item => allowedIds.has(item.id))
+```
+
+### 7.12 Use toSorted() Instead of sort() for Immutability
+
+**Impact: MEDIUM-HIGH (prevents mutation bugs in React state)**
+
+`.sort()` mutates the array in place, which can cause bugs with React state and props. Use `.toSorted()` to create a new sorted array without mutation.
+
+**Incorrect: mutates original array**
+
+```typescript
+function UserList({ users }: { users: User[] }) {
+  // Mutates the users prop array!
+  const sorted = useMemo(
+    () => users.sort((a, b) => a.name.localeCompare(b.name)),
+    [users]
+  )
+  return <div>{sorted.map(renderUser)}</div>
+}
+```
+
+**Correct: creates new array**
+
+```typescript
+function UserList({ users }: { users: User[] }) {
+  // Creates new sorted array, original unchanged
+  const sorted = useMemo(
+    () => users.toSorted((a, b) => a.name.localeCompare(b.name)),
+    [users]
+  )
+  return <div>{sorted.map(renderUser)}</div>
+}
+```
+
+**Why this matters in React:**
+
+1. Props/state mutations break React's immutability model - React expects props and state to be treated as read-only
+
+2. Causes stale closure bugs - Mutating arrays inside closures (callbacks, effects) can lead to unexpected behavior
+
+**Browser support: fallback for older browsers**
+
+```typescript
+// Fallback for older browsers
+const sorted = [...items].sort((a, b) => a.value - b.value)
+```
+
+`.toSorted()` is available in all modern browsers (Chrome 110+, Safari 16+, Firefox 115+, Node.js 20+). For older environments, use spread operator:
+
+**Other immutable array methods:**
+
+- `.toSorted()` - immutable sort
+
+- `.toReversed()` - immutable reverse
+
+- `.toSpliced()` - immutable splice
+
+- `.with()` - immutable element replacement
+
+---
+
+## 8. Advanced Patterns
+
+**Impact: LOW**
+
+Advanced patterns for specific cases that require careful implementation.
+
+### 8.1 Store Event Handlers in Refs
+
+**Impact: LOW (stable subscriptions)**
+
+Store callbacks in refs when used in effects that shouldn't re-subscribe on callback changes.
+
+**Incorrect: re-subscribes on every render**
+
+```tsx
+function useWindowEvent(event: string, handler: () => void) {
+  useEffect(() => {
+    window.addEventListener(event, handler)
+    return () => window.removeEventListener(event, handler)
+  }, [event, handler])
+}
+```
+
+**Correct: stable subscription**
+
+```tsx
+import { useEffectEvent } from 'react'
+
+function useWindowEvent(event: string, handler: () => void) {
+  const onEvent = useEffectEvent(handler)
+
+  useEffect(() => {
+    window.addEventListener(event, onEvent)
+    return () => window.removeEventListener(event, onEvent)
+  }, [event])
+}
+```
+
+**Alternative: use `useEffectEvent` if you're on latest React:**
+
+`useEffectEvent` provides a cleaner API for the same pattern: it creates a stable function reference that always calls the latest version of the handler.
+
+### 8.2 useLatest for Stable Callback Refs
+
+**Impact: LOW (prevents effect re-runs)**
+
+Access latest values in callbacks without adding them to dependency arrays. Prevents effect re-runs while avoiding stale closures.
+
+**Implementation:**
+
+```typescript
+function useLatest<T>(value: T) {
+  const ref = useRef(value)
+  useEffect(() => {
+    ref.current = value
+  }, [value])
+  return ref
+}
+```
+
+**Incorrect: effect re-runs on every callback change**
+
+```tsx
+function SearchInput({ onSearch }: { onSearch: (q: string) => void }) {
+  const [query, setQuery] = useState('')
+
+  useEffect(() => {
+    const timeout = setTimeout(() => onSearch(query), 300)
+    return () => clearTimeout(timeout)
+  }, [query, onSearch])
+}
+```
+
+**Correct: stable effect, fresh callback**
+
+```tsx
+function SearchInput({ onSearch }: { onSearch: (q: string) => void }) {
+  const [query, setQuery] = useState('')
+  const onSearchRef = useLatest(onSearch)
+
+  useEffect(() => {
+    const timeout = setTimeout(() => onSearchRef.current(query), 300)
+    return () => clearTimeout(timeout)
+  }, [query])
+}
+```
+
+---
+
+## References
+
+1. [https://react.dev](https://react.dev)
+2. [https://nextjs.org](https://nextjs.org)
+3. [https://swr.vercel.app](https://swr.vercel.app)
+4. [https://github.com/shuding/better-all](https://github.com/shuding/better-all)
+5. [https://github.com/isaacs/node-lru-cache](https://github.com/isaacs/node-lru-cache)
+6. [https://vercel.com/blog/how-we-optimized-package-imports-in-next-js](https://vercel.com/blog/how-we-optimized-package-imports-in-next-js)
+7. [https://vercel.com/blog/how-we-made-the-vercel-dashboard-twice-as-fast](https://vercel.com/blog/how-we-made-the-vercel-dashboard-twice-as-fast)
diff --git a/.claude/skills/vercel-react-best-practices/SKILL.md b/.claude/skills/vercel-react-best-practices/SKILL.md
new file mode 100644
index 0000000000..b064716f60
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/SKILL.md
@@ -0,0 +1,125 @@
+---
+name: vercel-react-best-practices
+description: React and Next.js performance optimization guidelines from Vercel Engineering. This skill should be used when writing, reviewing, or refactoring React/Next.js code to ensure optimal performance patterns. Triggers on tasks involving React components, Next.js pages, data fetching, bundle optimization, or performance improvements.
+license: MIT
+metadata:
+  author: vercel
+  version: "1.0.0"
+---
+
+# Vercel React Best Practices
+
+Comprehensive performance optimization guide for React and Next.js applications, maintained by Vercel. Contains 45 rules across 8 categories, prioritized by impact to guide automated refactoring and code generation.
+
+## When to Apply
+
+Reference these guidelines when:
+- Writing new React components or Next.js pages
+- Implementing data fetching (client or server-side)
+- Reviewing code for performance issues
+- Refactoring existing React/Next.js code
+- Optimizing bundle size or load times
+
+## Rule Categories by Priority
+
+| Priority | Category | Impact | Prefix |
+|----------|----------|--------|--------|
+| 1 | Eliminating Waterfalls | CRITICAL | `async-` |
+| 2 | Bundle Size Optimization | CRITICAL | `bundle-` |
+| 3 | Server-Side Performance | HIGH | `server-` |
+| 4 | Client-Side Data Fetching | MEDIUM-HIGH | `client-` |
+| 5 | Re-render Optimization | MEDIUM | `rerender-` |
+| 6 | Rendering Performance | MEDIUM | `rendering-` |
+| 7 | JavaScript Performance | LOW-MEDIUM | `js-` |
+| 8 | Advanced Patterns | LOW | `advanced-` |
+
+## Quick Reference
+
+### 1. Eliminating Waterfalls (CRITICAL)
+
+- `async-defer-await` - Move await into branches where actually used
+- `async-parallel` - Use Promise.all() for independent operations
+- `async-dependencies` - Use better-all for partial dependencies
+- `async-api-routes` - Start promises early, await late in API routes
+- `async-suspense-boundaries` - Use Suspense to stream content
+
+### 2. Bundle Size Optimization (CRITICAL)
+
+- `bundle-barrel-imports` - Import directly, avoid barrel files
+- `bundle-dynamic-imports` - Use next/dynamic for heavy components
+- `bundle-defer-third-party` - Load analytics/logging after hydration
+- `bundle-conditional` - Load modules only when feature is activated
+- `bundle-preload` - Preload on hover/focus for perceived speed
+
+### 3. Server-Side Performance (HIGH)
+
+- `server-cache-react` - Use React.cache() for per-request deduplication
+- `server-cache-lru` - Use LRU cache for cross-request caching
+- `server-serialization` - Minimize data passed to client components
+- `server-parallel-fetching` - Restructure components to parallelize fetches
+- `server-after-nonblocking` - Use after() for non-blocking operations
+
+### 4. Client-Side Data Fetching (MEDIUM-HIGH)
+
+- `client-swr-dedup` - Use SWR for automatic request deduplication
+- `client-event-listeners` - Deduplicate global event listeners
+
+### 5. Re-render Optimization (MEDIUM)
+
+- `rerender-defer-reads` - Don't subscribe to state only used in callbacks
+- `rerender-memo` - Extract expensive work into memoized components
+- `rerender-dependencies` - Use primitive dependencies in effects
+- `rerender-derived-state` - Subscribe to derived booleans, not raw values
+- `rerender-functional-setstate` - Use functional setState for stable callbacks
+- `rerender-lazy-state-init` - Pass function to useState for expensive values
+- `rerender-transitions` - Use startTransition for non-urgent updates
+
+### 6. Rendering Performance (MEDIUM)
+
+- `rendering-animate-svg-wrapper` - Animate div wrapper, not SVG element
+- `rendering-content-visibility` - Use content-visibility for long lists
+- `rendering-hoist-jsx` - Extract static JSX outside components
+- `rendering-svg-precision` - Reduce SVG coordinate precision
+- `rendering-hydration-no-flicker` - Use inline script for client-only data
+- `rendering-activity` - Use Activity component for show/hide
+- `rendering-conditional-render` - Use ternary, not && for conditionals
+
+### 7. JavaScript Performance (LOW-MEDIUM)
+
+- `js-batch-dom-css` - Group CSS changes via classes or cssText
+- `js-index-maps` - Build Map for repeated lookups
+- `js-cache-property-access` - Cache object properties in loops
+- `js-cache-function-results` - Cache function results in module-level Map
+- `js-cache-storage` - Cache localStorage/sessionStorage reads
+- `js-combine-iterations` - Combine multiple filter/map into one loop
+- `js-length-check-first` - Check array length before expensive comparison
+- `js-early-exit` - Return early from functions
+- `js-hoist-regexp` - Hoist RegExp creation outside loops
+- `js-min-max-loop` - Use loop for min/max instead of sort
+- `js-set-map-lookups` - Use Set/Map for O(1) lookups
+- `js-tosorted-immutable` - Use toSorted() for immutability
+
+### 8. Advanced Patterns (LOW)
+
+- `advanced-event-handler-refs` - Store event handlers in refs
+- `advanced-use-latest` - useLatest for stable callback refs
+
+## How to Use
+
+Read individual rule files for detailed explanations and code examples:
+
+```
+rules/async-parallel.md
+rules/bundle-barrel-imports.md
+rules/_sections.md
+```
+
+Each rule file contains:
+- Brief explanation of why it matters
+- Incorrect code example with explanation
+- Correct code example with explanation
+- Additional context and references
+
+## Full Compiled Document
+
+For the complete guide with all rules expanded: `AGENTS.md`
diff --git a/.claude/skills/vercel-react-best-practices/rules/advanced-event-handler-refs.md b/.claude/skills/vercel-react-best-practices/rules/advanced-event-handler-refs.md
new file mode 100644
index 0000000000..3a45152057
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/advanced-event-handler-refs.md
@@ -0,0 +1,55 @@
+---
+title: Store Event Handlers in Refs
+impact: LOW
+impactDescription: stable subscriptions
+tags: advanced, hooks, refs, event-handlers, optimization
+---
+
+## Store Event Handlers in Refs
+
+Store callbacks in refs when used in effects that shouldn't re-subscribe on callback changes.
+
+**Incorrect (re-subscribes on every render):**
+
+```tsx
+function useWindowEvent(event: string, handler: () => void) {
+  useEffect(() => {
+    window.addEventListener(event, handler)
+    return () => window.removeEventListener(event, handler)
+  }, [event, handler])
+}
+```
+
+**Correct (stable subscription):**
+
+```tsx
+function useWindowEvent(event: string, handler: () => void) {
+  const handlerRef = useRef(handler)
+  useEffect(() => {
+    handlerRef.current = handler
+  }, [handler])
+
+  useEffect(() => {
+    const listener = () => handlerRef.current()
+    window.addEventListener(event, listener)
+    return () => window.removeEventListener(event, listener)
+  }, [event])
+}
+```
+
+**Alternative: use `useEffectEvent` if you're on latest React:**
+
+```tsx
+import { useEffectEvent } from 'react'
+
+function useWindowEvent(event: string, handler: () => void) {
+  const onEvent = useEffectEvent(handler)
+
+  useEffect(() => {
+    window.addEventListener(event, onEvent)
+    return () => window.removeEventListener(event, onEvent)
+  }, [event])
+}
+```
+
+`useEffectEvent` provides a cleaner API for the same pattern: it creates a stable function reference that always calls the latest version of the handler.
diff --git a/.claude/skills/vercel-react-best-practices/rules/advanced-use-latest.md b/.claude/skills/vercel-react-best-practices/rules/advanced-use-latest.md
new file mode 100644
index 0000000000..3facdf2cca
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/advanced-use-latest.md
@@ -0,0 +1,49 @@
+---
+title: useLatest for Stable Callback Refs
+impact: LOW
+impactDescription: prevents effect re-runs
+tags: advanced, hooks, useLatest, refs, optimization
+---
+
+## useLatest for Stable Callback Refs
+
+Access latest values in callbacks without adding them to dependency arrays. Prevents effect re-runs while avoiding stale closures.
+
+**Implementation:**
+
+```typescript
+function useLatest<T>(value: T) {
+  const ref = useRef(value)
+  useEffect(() => {
+    ref.current = value
+  }, [value])
+  return ref
+}
+```
+
+**Incorrect (effect re-runs on every callback change):**
+
+```tsx
+function SearchInput({ onSearch }: { onSearch: (q: string) => void }) {
+  const [query, setQuery] = useState('')
+
+  useEffect(() => {
+    const timeout = setTimeout(() => onSearch(query), 300)
+    return () => clearTimeout(timeout)
+  }, [query, onSearch])
+}
+```
+
+**Correct (stable effect, fresh callback):**
+
+```tsx
+function SearchInput({ onSearch }: { onSearch: (q: string) => void }) {
+  const [query, setQuery] = useState('')
+  const onSearchRef = useLatest(onSearch)
+
+  useEffect(() => {
+    const timeout = setTimeout(() => onSearchRef.current(query), 300)
+    return () => clearTimeout(timeout)
+  }, [query])
+}
+```
diff --git a/.claude/skills/vercel-react-best-practices/rules/async-api-routes.md b/.claude/skills/vercel-react-best-practices/rules/async-api-routes.md
new file mode 100644
index 0000000000..6feda1ef0a
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/async-api-routes.md
@@ -0,0 +1,38 @@
+---
+title: Prevent Waterfall Chains in API Routes
+impact: CRITICAL
+impactDescription: 2-10× improvement
+tags: api-routes, server-actions, waterfalls, parallelization
+---
+
+## Prevent Waterfall Chains in API Routes
+
+In API routes and Server Actions, start independent operations immediately, even if you don't await them yet.
+
+**Incorrect (config waits for auth, data waits for both):**
+
+```typescript
+export async function GET(request: Request) {
+  const session = await auth()
+  const config = await fetchConfig()
+  const data = await fetchData(session.user.id)
+  return Response.json({ data, config })
+}
+```
+
+**Correct (auth and config start immediately):**
+
+```typescript
+export async function GET(request: Request) {
+  const sessionPromise = auth()
+  const configPromise = fetchConfig()
+  const session = await sessionPromise
+  const [config, data] = await Promise.all([
+    configPromise,
+    fetchData(session.user.id)
+  ])
+  return Response.json({ data, config })
+}
+```
+
+For operations with more complex dependency chains, use `better-all` to automatically maximize parallelism (see Dependency-Based Parallelization).
diff --git a/.claude/skills/vercel-react-best-practices/rules/async-defer-await.md b/.claude/skills/vercel-react-best-practices/rules/async-defer-await.md
new file mode 100644
index 0000000000..ea7082a362
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/async-defer-await.md
@@ -0,0 +1,80 @@
+---
+title: Defer Await Until Needed
+impact: HIGH
+impactDescription: avoids blocking unused code paths
+tags: async, await, conditional, optimization
+---
+
+## Defer Await Until Needed
+
+Move `await` operations into the branches where they're actually used to avoid blocking code paths that don't need them.
+
+**Incorrect (blocks both branches):**
+
+```typescript
+async function handleRequest(userId: string, skipProcessing: boolean) {
+  const userData = await fetchUserData(userId)
+  
+  if (skipProcessing) {
+    // Returns immediately but still waited for userData
+    return { skipped: true }
+  }
+  
+  // Only this branch uses userData
+  return processUserData(userData)
+}
+```
+
+**Correct (only blocks when needed):**
+
+```typescript
+async function handleRequest(userId: string, skipProcessing: boolean) {
+  if (skipProcessing) {
+    // Returns immediately without waiting
+    return { skipped: true }
+  }
+  
+  // Fetch only when needed
+  const userData = await fetchUserData(userId)
+  return processUserData(userData)
+}
+```
+
+**Another example (early return optimization):**
+
+```typescript
+// Incorrect: always fetches permissions
+async function updateResource(resourceId: string, userId: string) {
+  const permissions = await fetchPermissions(userId)
+  const resource = await getResource(resourceId)
+  
+  if (!resource) {
+    return { error: 'Not found' }
+  }
+  
+  if (!permissions.canEdit) {
+    return { error: 'Forbidden' }
+  }
+  
+  return await updateResourceData(resource, permissions)
+}
+
+// Correct: fetches only when needed
+async function updateResource(resourceId: string, userId: string) {
+  const resource = await getResource(resourceId)
+  
+  if (!resource) {
+    return { error: 'Not found' }
+  }
+  
+  const permissions = await fetchPermissions(userId)
+  
+  if (!permissions.canEdit) {
+    return { error: 'Forbidden' }
+  }
+  
+  return await updateResourceData(resource, permissions)
+}
+```
+
+This optimization is especially valuable when the skipped branch is frequently taken, or when the deferred operation is expensive.
diff --git a/.claude/skills/vercel-react-best-practices/rules/async-dependencies.md b/.claude/skills/vercel-react-best-practices/rules/async-dependencies.md
new file mode 100644
index 0000000000..fb90d861ac
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/async-dependencies.md
@@ -0,0 +1,36 @@
+---
+title: Dependency-Based Parallelization
+impact: CRITICAL
+impactDescription: 2-10× improvement
+tags: async, parallelization, dependencies, better-all
+---
+
+## Dependency-Based Parallelization
+
+For operations with partial dependencies, use `better-all` to maximize parallelism. It automatically starts each task at the earliest possible moment.
+
+**Incorrect (profile waits for config unnecessarily):**
+
+```typescript
+const [user, config] = await Promise.all([
+  fetchUser(),
+  fetchConfig()
+])
+const profile = await fetchProfile(user.id)
+```
+
+**Correct (config and profile run in parallel):**
+
+```typescript
+import { all } from 'better-all'
+
+const { user, config, profile } = await all({
+  async user() { return fetchUser() },
+  async config() { return fetchConfig() },
+  async profile() {
+    return fetchProfile((await this.$.user).id)
+  }
+})
+```
+
+Reference: [https://github.com/shuding/better-all](https://github.com/shuding/better-all)
diff --git a/.claude/skills/vercel-react-best-practices/rules/async-parallel.md b/.claude/skills/vercel-react-best-practices/rules/async-parallel.md
new file mode 100644
index 0000000000..64133f6c31
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/async-parallel.md
@@ -0,0 +1,28 @@
+---
+title: Promise.all() for Independent Operations
+impact: CRITICAL
+impactDescription: 2-10× improvement
+tags: async, parallelization, promises, waterfalls
+---
+
+## Promise.all() for Independent Operations
+
+When async operations have no interdependencies, execute them concurrently using `Promise.all()`.
+
+**Incorrect (sequential execution, 3 round trips):**
+
+```typescript
+const user = await fetchUser()
+const posts = await fetchPosts()
+const comments = await fetchComments()
+```
+
+**Correct (parallel execution, 1 round trip):**
+
+```typescript
+const [user, posts, comments] = await Promise.all([
+  fetchUser(),
+  fetchPosts(),
+  fetchComments()
+])
+```
diff --git a/.claude/skills/vercel-react-best-practices/rules/async-suspense-boundaries.md b/.claude/skills/vercel-react-best-practices/rules/async-suspense-boundaries.md
new file mode 100644
index 0000000000..1fbc05b04e
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/async-suspense-boundaries.md
@@ -0,0 +1,99 @@
+---
+title: Strategic Suspense Boundaries
+impact: HIGH
+impactDescription: faster initial paint
+tags: async, suspense, streaming, layout-shift
+---
+
+## Strategic Suspense Boundaries
+
+Instead of awaiting data in async components before returning JSX, use Suspense boundaries to show the wrapper UI faster while data loads.
+
+**Incorrect (wrapper blocked by data fetching):**
+
+```tsx
+async function Page() {
+  const data = await fetchData() // Blocks entire page
+  
+  return (
+    <div>
+      <div>Sidebar</div>
+      <div>Header</div>
+      <div>
+        <DataDisplay data={data} />
+      </div>
+      <div>Footer</div>
+    </div>
+  )
+}
+```
+
+The entire layout waits for data even though only the middle section needs it.
+
+**Correct (wrapper shows immediately, data streams in):**
+
+```tsx
+function Page() {
+  return (
+    <div>
+      <div>Sidebar</div>
+      <div>Header</div>
+      <div>
+        <Suspense fallback={<Skeleton />}>
+          <DataDisplay />
+        </Suspense>
+      </div>
+      <div>Footer</div>
+    </div>
+  )
+}
+
+async function DataDisplay() {
+  const data = await fetchData() // Only blocks this component
+  return <div>{data.content}</div>
+}
+```
+
+Sidebar, Header, and Footer render immediately. Only DataDisplay waits for data.
+
+**Alternative (share promise across components):**
+
+```tsx
+function Page() {
+  // Start fetch immediately, but don't await
+  const dataPromise = fetchData()
+  
+  return (
+    <div>
+      <div>Sidebar</div>
+      <div>Header</div>
+      <Suspense fallback={<Skeleton />}>
+        <DataDisplay dataPromise={dataPromise} />
+        <DataSummary dataPromise={dataPromise} />
+      </Suspense>
+      <div>Footer</div>
+    </div>
+  )
+}
+
+function DataDisplay({ dataPromise }: { dataPromise: Promise<Data> }) {
+  const data = use(dataPromise) // Unwraps the promise
+  return <div>{data.content}</div>
+}
+
+function DataSummary({ dataPromise }: { dataPromise: Promise<Data> }) {
+  const data = use(dataPromise) // Reuses the same promise
+  return <div>{data.summary}</div>
+}
+```
+
+Both components share the same promise, so only one fetch occurs. Layout renders immediately while both components wait together.
+
+**When NOT to use this pattern:**
+
+- Critical data needed for layout decisions (affects positioning)
+- SEO-critical content above the fold
+- Small, fast queries where suspense overhead isn't worth it
+- When you want to avoid layout shift (loading → content jump)
+
+**Trade-off:** Faster initial paint vs potential layout shift. Choose based on your UX priorities.
diff --git a/.claude/skills/vercel-react-best-practices/rules/bundle-barrel-imports.md b/.claude/skills/vercel-react-best-practices/rules/bundle-barrel-imports.md
new file mode 100644
index 0000000000..ee48f3273c
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/bundle-barrel-imports.md
@@ -0,0 +1,59 @@
+---
+title: Avoid Barrel File Imports
+impact: CRITICAL
+impactDescription: 200-800ms import cost, slow builds
+tags: bundle, imports, tree-shaking, barrel-files, performance
+---
+
+## Avoid Barrel File Imports
+
+Import directly from source files instead of barrel files to avoid loading thousands of unused modules. **Barrel files** are entry points that re-export multiple modules (e.g., `index.js` that does `export * from './module'`).
+
+Popular icon and component libraries can have **up to 10,000 re-exports** in their entry file. For many React packages, **it takes 200-800ms just to import them**, affecting both development speed and production cold starts.
+
+**Why tree-shaking doesn't help:** When a library is marked as external (not bundled), the bundler can't optimize it. If you bundle it to enable tree-shaking, builds become substantially slower analyzing the entire module graph.
+
+**Incorrect (imports entire library):**
+
+```tsx
+import { Check, X, Menu } from 'lucide-react'
+// Loads 1,583 modules, takes ~2.8s extra in dev
+// Runtime cost: 200-800ms on every cold start
+
+import { Button, TextField } from '@mui/material'
+// Loads 2,225 modules, takes ~4.2s extra in dev
+```
+
+**Correct (imports only what you need):**
+
+```tsx
+import Check from 'lucide-react/dist/esm/icons/check'
+import X from 'lucide-react/dist/esm/icons/x'
+import Menu from 'lucide-react/dist/esm/icons/menu'
+// Loads only 3 modules (~2KB vs ~1MB)
+
+import Button from '@mui/material/Button'
+import TextField from '@mui/material/TextField'
+// Loads only what you use
+```
+
+**Alternative (Next.js 13.5+):**
+
+```js
+// next.config.js - use optimizePackageImports
+module.exports = {
+  experimental: {
+    optimizePackageImports: ['lucide-react', '@mui/material']
+  }
+}
+
+// Then you can keep the ergonomic barrel imports:
+import { Check, X, Menu } from 'lucide-react'
+// Automatically transformed to direct imports at build time
+```
+
+Direct imports provide 15-70% faster dev boot, 28% faster builds, 40% faster cold starts, and significantly faster HMR.
+
+Libraries commonly affected: `lucide-react`, `@mui/material`, `@mui/icons-material`, `@tabler/icons-react`, `react-icons`, `@headlessui/react`, `@radix-ui/react-*`, `lodash`, `ramda`, `date-fns`, `rxjs`, `react-use`.
+
+Reference: [How we optimized package imports in Next.js](https://vercel.com/blog/how-we-optimized-package-imports-in-next-js)
diff --git a/.claude/skills/vercel-react-best-practices/rules/bundle-conditional.md b/.claude/skills/vercel-react-best-practices/rules/bundle-conditional.md
new file mode 100644
index 0000000000..40bd6f9826
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/bundle-conditional.md
@@ -0,0 +1,31 @@
+---
+title: Conditional Module Loading
+impact: HIGH
+impactDescription: loads large data only when needed
+tags: bundle, conditional-loading, lazy-loading
+---
+
+## Conditional Module Loading
+
+Load large data or modules only when a feature is activated.
+
+**Example (lazy-load animation frames):**
+
+```tsx
+function AnimationPlayer({ enabled }: { enabled: boolean }) {
+  const [frames, setFrames] = useState<Frame[] | null>(null)
+
+  useEffect(() => {
+    if (enabled && !frames && typeof window !== 'undefined') {
+      import('./animation-frames.js')
+        .then(mod => setFrames(mod.frames))
+        .catch(() => setEnabled(false))
+    }
+  }, [enabled, frames])
+
+  if (!frames) return <Skeleton />
+  return <Canvas frames={frames} />
+}
+```
+
+The `typeof window !== 'undefined'` check prevents bundling this module for SSR, optimizing server bundle size and build speed.
diff --git a/.claude/skills/vercel-react-best-practices/rules/bundle-defer-third-party.md b/.claude/skills/vercel-react-best-practices/rules/bundle-defer-third-party.md
new file mode 100644
index 0000000000..db041d1510
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/bundle-defer-third-party.md
@@ -0,0 +1,49 @@
+---
+title: Defer Non-Critical Third-Party Libraries
+impact: MEDIUM
+impactDescription: loads after hydration
+tags: bundle, third-party, analytics, defer
+---
+
+## Defer Non-Critical Third-Party Libraries
+
+Analytics, logging, and error tracking don't block user interaction. Load them after hydration.
+
+**Incorrect (blocks initial bundle):**
+
+```tsx
+import { Analytics } from '@vercel/analytics/react'
+
+export default function RootLayout({ children }) {
+  return (
+    <html>
+      <body>
+        {children}
+        <Analytics />
+      </body>
+    </html>
+  )
+}
+```
+
+**Correct (loads after hydration):**
+
+```tsx
+import dynamic from 'next/dynamic'
+
+const Analytics = dynamic(
+  () => import('@vercel/analytics/react').then(m => m.Analytics),
+  { ssr: false }
+)
+
+export default function RootLayout({ children }) {
+  return (
+    <html>
+      <body>
+        {children}
+        <Analytics />
+      </body>
+    </html>
+  )
+}
+```
diff --git a/.claude/skills/vercel-react-best-practices/rules/bundle-dynamic-imports.md b/.claude/skills/vercel-react-best-practices/rules/bundle-dynamic-imports.md
new file mode 100644
index 0000000000..60b62695e7
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/bundle-dynamic-imports.md
@@ -0,0 +1,35 @@
+---
+title: Dynamic Imports for Heavy Components
+impact: CRITICAL
+impactDescription: directly affects TTI and LCP
+tags: bundle, dynamic-import, code-splitting, next-dynamic
+---
+
+## Dynamic Imports for Heavy Components
+
+Use `next/dynamic` to lazy-load large components not needed on initial render.
+
+**Incorrect (Monaco bundles with main chunk ~300KB):**
+
+```tsx
+import { MonacoEditor } from './monaco-editor'
+
+function CodePanel({ code }: { code: string }) {
+  return <MonacoEditor value={code} />
+}
+```
+
+**Correct (Monaco loads on demand):**
+
+```tsx
+import dynamic from 'next/dynamic'
+
+const MonacoEditor = dynamic(
+  () => import('./monaco-editor').then(m => m.MonacoEditor),
+  { ssr: false }
+)
+
+function CodePanel({ code }: { code: string }) {
+  return <MonacoEditor value={code} />
+}
+```
diff --git a/.claude/skills/vercel-react-best-practices/rules/bundle-preload.md b/.claude/skills/vercel-react-best-practices/rules/bundle-preload.md
new file mode 100644
index 0000000000..7000504065
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/bundle-preload.md
@@ -0,0 +1,50 @@
+---
+title: Preload Based on User Intent
+impact: MEDIUM
+impactDescription: reduces perceived latency
+tags: bundle, preload, user-intent, hover
+---
+
+## Preload Based on User Intent
+
+Preload heavy bundles before they're needed to reduce perceived latency.
+
+**Example (preload on hover/focus):**
+
+```tsx
+function EditorButton({ onClick }: { onClick: () => void }) {
+  const preload = () => {
+    if (typeof window !== 'undefined') {
+      void import('./monaco-editor')
+    }
+  }
+
+  return (
+    <button
+      onMouseEnter={preload}
+      onFocus={preload}
+      onClick={onClick}
+    >
+      Open Editor
+    </button>
+  )
+}
+```
+
+**Example (preload when feature flag is enabled):**
+
+```tsx
+function FlagsProvider({ children, flags }: Props) {
+  useEffect(() => {
+    if (flags.editorEnabled && typeof window !== 'undefined') {
+      void import('./monaco-editor').then(mod => mod.init())
+    }
+  }, [flags.editorEnabled])
+
+  return <FlagsContext.Provider value={flags}>
+    {children}
+  </FlagsContext.Provider>
+}
+```
+
+The `typeof window !== 'undefined'` check prevents bundling preloaded modules for SSR, optimizing server bundle size and build speed.
diff --git a/.claude/skills/vercel-react-best-practices/rules/client-event-listeners.md b/.claude/skills/vercel-react-best-practices/rules/client-event-listeners.md
new file mode 100644
index 0000000000..aad4ae9160
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/client-event-listeners.md
@@ -0,0 +1,74 @@
+---
+title: Deduplicate Global Event Listeners
+impact: LOW
+impactDescription: single listener for N components
+tags: client, swr, event-listeners, subscription
+---
+
+## Deduplicate Global Event Listeners
+
+Use `useSWRSubscription()` to share global event listeners across component instances.
+
+**Incorrect (N instances = N listeners):**
+
+```tsx
+function useKeyboardShortcut(key: string, callback: () => void) {
+  useEffect(() => {
+    const handler = (e: KeyboardEvent) => {
+      if (e.metaKey && e.key === key) {
+        callback()
+      }
+    }
+    window.addEventListener('keydown', handler)
+    return () => window.removeEventListener('keydown', handler)
+  }, [key, callback])
+}
+```
+
+When using the `useKeyboardShortcut` hook multiple times, each instance will register a new listener.
+
+**Correct (N instances = 1 listener):**
+
+```tsx
+import useSWRSubscription from 'swr/subscription'
+
+// Module-level Map to track callbacks per key
+const keyCallbacks = new Map<string, Set<() => void>>()
+
+function useKeyboardShortcut(key: string, callback: () => void) {
+  // Register this callback in the Map
+  useEffect(() => {
+    if (!keyCallbacks.has(key)) {
+      keyCallbacks.set(key, new Set())
+    }
+    keyCallbacks.get(key)!.add(callback)
+
+    return () => {
+      const set = keyCallbacks.get(key)
+      if (set) {
+        set.delete(callback)
+        if (set.size === 0) {
+          keyCallbacks.delete(key)
+        }
+      }
+    }
+  }, [key, callback])
+
+  useSWRSubscription('global-keydown', () => {
+    const handler = (e: KeyboardEvent) => {
+      if (e.metaKey && keyCallbacks.has(e.key)) {
+        keyCallbacks.get(e.key)!.forEach(cb => cb())
+      }
+    }
+    window.addEventListener('keydown', handler)
+    return () => window.removeEventListener('keydown', handler)
+  })
+}
+
+function Profile() {
+  // Multiple shortcuts will share the same listener
+  useKeyboardShortcut('p', () => { /* ... */ }) 
+  useKeyboardShortcut('k', () => { /* ... */ })
+  // ...
+}
+```
diff --git a/.claude/skills/vercel-react-best-practices/rules/client-swr-dedup.md b/.claude/skills/vercel-react-best-practices/rules/client-swr-dedup.md
new file mode 100644
index 0000000000..2a430f27fd
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/client-swr-dedup.md
@@ -0,0 +1,56 @@
+---
+title: Use SWR for Automatic Deduplication
+impact: MEDIUM-HIGH
+impactDescription: automatic deduplication
+tags: client, swr, deduplication, data-fetching
+---
+
+## Use SWR for Automatic Deduplication
+
+SWR enables request deduplication, caching, and revalidation across component instances.
+
+**Incorrect (no deduplication, each instance fetches):**
+
+```tsx
+function UserList() {
+  const [users, setUsers] = useState([])
+  useEffect(() => {
+    fetch('/api/users')
+      .then(r => r.json())
+      .then(setUsers)
+  }, [])
+}
+```
+
+**Correct (multiple instances share one request):**
+
+```tsx
+import useSWR from 'swr'
+
+function UserList() {
+  const { data: users } = useSWR('/api/users', fetcher)
+}
+```
+
+**For immutable data:**
+
+```tsx
+import { useImmutableSWR } from '@/lib/swr'
+
+function StaticContent() {
+  const { data } = useImmutableSWR('/api/config', fetcher)
+}
+```
+
+**For mutations:**
+
+```tsx
+import { useSWRMutation } from 'swr/mutation'
+
+function UpdateButton() {
+  const { trigger } = useSWRMutation('/api/user', updateUser)
+  return <button onClick={() => trigger()}>Update</button>
+}
+```
+
+Reference: [https://swr.vercel.app](https://swr.vercel.app)
diff --git a/.claude/skills/vercel-react-best-practices/rules/js-batch-dom-css.md b/.claude/skills/vercel-react-best-practices/rules/js-batch-dom-css.md
new file mode 100644
index 0000000000..92a3b639b9
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/js-batch-dom-css.md
@@ -0,0 +1,82 @@
+---
+title: Batch DOM CSS Changes
+impact: MEDIUM
+impactDescription: reduces reflows/repaints
+tags: javascript, dom, css, performance, reflow
+---
+
+## Batch DOM CSS Changes
+
+Avoid changing styles one property at a time. Group multiple CSS changes together via classes or `cssText` to minimize browser reflows.
+
+**Incorrect (multiple reflows):**
+
+```typescript
+function updateElementStyles(element: HTMLElement) {
+  // Each line triggers a reflow
+  element.style.width = '100px'
+  element.style.height = '200px'
+  element.style.backgroundColor = 'blue'
+  element.style.border = '1px solid black'
+}
+```
+
+**Correct (add class - single reflow):**
+
+```typescript
+// CSS file
+.highlighted-box {
+  width: 100px;
+  height: 200px;
+  background-color: blue;
+  border: 1px solid black;
+}
+
+// JavaScript
+function updateElementStyles(element: HTMLElement) {
+  element.classList.add('highlighted-box')
+}
+```
+
+**Correct (change cssText - single reflow):**
+
+```typescript
+function updateElementStyles(element: HTMLElement) {
+  element.style.cssText = `
+    width: 100px;
+    height: 200px;
+    background-color: blue;
+    border: 1px solid black;
+  `
+}
+```
+
+**React example:**
+
+```tsx
+// Incorrect: changing styles one by one
+function Box({ isHighlighted }: { isHighlighted: boolean }) {
+  const ref = useRef<HTMLDivElement>(null)
+  
+  useEffect(() => {
+    if (ref.current && isHighlighted) {
+      ref.current.style.width = '100px'
+      ref.current.style.height = '200px'
+      ref.current.style.backgroundColor = 'blue'
+    }
+  }, [isHighlighted])
+  
+  return <div ref={ref}>Content</div>
+}
+
+// Correct: toggle class
+function Box({ isHighlighted }: { isHighlighted: boolean }) {
+  return (
+    <div className={isHighlighted ? 'highlighted-box' : ''}>
+      Content
+    </div>
+  )
+}
+```
+
+Prefer CSS classes over inline styles when possible. Classes are cached by the browser and provide better separation of concerns.
diff --git a/.claude/skills/vercel-react-best-practices/rules/js-cache-function-results.md b/.claude/skills/vercel-react-best-practices/rules/js-cache-function-results.md
new file mode 100644
index 0000000000..180f8ac8ff
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/js-cache-function-results.md
@@ -0,0 +1,80 @@
+---
+title: Cache Repeated Function Calls
+impact: MEDIUM
+impactDescription: avoid redundant computation
+tags: javascript, cache, memoization, performance
+---
+
+## Cache Repeated Function Calls
+
+Use a module-level Map to cache function results when the same function is called repeatedly with the same inputs during render.
+
+**Incorrect (redundant computation):**
+
+```typescript
+function ProjectList({ projects }: { projects: Project[] }) {
+  return (
+    <div>
+      {projects.map(project => {
+        // slugify() called 100+ times for same project names
+        const slug = slugify(project.name)
+        
+        return <ProjectCard key={project.id} slug={slug} />
+      })}
+    </div>
+  )
+}
+```
+
+**Correct (cached results):**
+
+```typescript
+// Module-level cache
+const slugifyCache = new Map<string, string>()
+
+function cachedSlugify(text: string): string {
+  if (slugifyCache.has(text)) {
+    return slugifyCache.get(text)!
+  }
+  const result = slugify(text)
+  slugifyCache.set(text, result)
+  return result
+}
+
+function ProjectList({ projects }: { projects: Project[] }) {
+  return (
+    <div>
+      {projects.map(project => {
+        // Computed only once per unique project name
+        const slug = cachedSlugify(project.name)
+        
+        return <ProjectCard key={project.id} slug={slug} />
+      })}
+    </div>
+  )
+}
+```
+
+**Simpler pattern for single-value functions:**
+
+```typescript
+let isLoggedInCache: boolean | null = null
+
+function isLoggedIn(): boolean {
+  if (isLoggedInCache !== null) {
+    return isLoggedInCache
+  }
+  
+  isLoggedInCache = document.cookie.includes('auth=')
+  return isLoggedInCache
+}
+
+// Clear cache when auth changes
+function onAuthChange() {
+  isLoggedInCache = null
+}
+```
+
+Use a Map (not a hook) so it works everywhere: utilities, event handlers, not just React components.
+
+Reference: [How we made the Vercel Dashboard twice as fast](https://vercel.com/blog/how-we-made-the-vercel-dashboard-twice-as-fast)
diff --git a/.claude/skills/vercel-react-best-practices/rules/js-cache-property-access.md b/.claude/skills/vercel-react-best-practices/rules/js-cache-property-access.md
new file mode 100644
index 0000000000..39eec9061b
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/js-cache-property-access.md
@@ -0,0 +1,28 @@
+---
+title: Cache Property Access in Loops
+impact: LOW-MEDIUM
+impactDescription: reduces lookups
+tags: javascript, loops, optimization, caching
+---
+
+## Cache Property Access in Loops
+
+Cache object property lookups in hot paths.
+
+**Incorrect (3 lookups × N iterations):**
+
+```typescript
+for (let i = 0; i < arr.length; i++) {
+  process(obj.config.settings.value)
+}
+```
+
+**Correct (1 lookup total):**
+
+```typescript
+const value = obj.config.settings.value
+const len = arr.length
+for (let i = 0; i < len; i++) {
+  process(value)
+}
+```
diff --git a/.claude/skills/vercel-react-best-practices/rules/js-cache-storage.md b/.claude/skills/vercel-react-best-practices/rules/js-cache-storage.md
new file mode 100644
index 0000000000..aa4a30c081
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/js-cache-storage.md
@@ -0,0 +1,70 @@
+---
+title: Cache Storage API Calls
+impact: LOW-MEDIUM
+impactDescription: reduces expensive I/O
+tags: javascript, localStorage, storage, caching, performance
+---
+
+## Cache Storage API Calls
+
+`localStorage`, `sessionStorage`, and `document.cookie` are synchronous and expensive. Cache reads in memory.
+
+**Incorrect (reads storage on every call):**
+
+```typescript
+function getTheme() {
+  return localStorage.getItem('theme') ?? 'light'
+}
+// Called 10 times = 10 storage reads
+```
+
+**Correct (Map cache):**
+
+```typescript
+const storageCache = new Map<string, string | null>()
+
+function getLocalStorage(key: string) {
+  if (!storageCache.has(key)) {
+    storageCache.set(key, localStorage.getItem(key))
+  }
+  return storageCache.get(key)
+}
+
+function setLocalStorage(key: string, value: string) {
+  localStorage.setItem(key, value)
+  storageCache.set(key, value)  // keep cache in sync
+}
+```
+
+Use a Map (not a hook) so it works everywhere: utilities, event handlers, not just React components.
+
+**Cookie caching:**
+
+```typescript
+let cookieCache: Record<string, string> | null = null
+
+function getCookie(name: string) {
+  if (!cookieCache) {
+    cookieCache = Object.fromEntries(
+      document.cookie.split('; ').map(c => c.split('='))
+    )
+  }
+  return cookieCache[name]
+}
+```
+
+**Important (invalidate on external changes):**
+
+If storage can change externally (another tab, server-set cookies), invalidate cache:
+
+```typescript
+window.addEventListener('storage', (e) => {
+  if (e.key) storageCache.delete(e.key)
+})
+
+document.addEventListener('visibilitychange', () => {
+  if (document.visibilityState === 'visible') {
+    storageCache.clear()
+  }
+})
+```
diff --git a/.claude/skills/vercel-react-best-practices/rules/js-combine-iterations.md b/.claude/skills/vercel-react-best-practices/rules/js-combine-iterations.md
new file mode 100644
index 0000000000..044d017ec3
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/js-combine-iterations.md
@@ -0,0 +1,32 @@
+---
+title: Combine Multiple Array Iterations
+impact: LOW-MEDIUM
+impactDescription: reduces iterations
+tags: javascript, arrays, loops, performance
+---
+
+## Combine Multiple Array Iterations
+
+Multiple `.filter()` or `.map()` calls iterate the array multiple times. Combine into one loop.
+
+**Incorrect (3 iterations):**
+
+```typescript
+const admins = users.filter(u => u.isAdmin)
+const testers = users.filter(u => u.isTester)
+const inactive = users.filter(u => !u.isActive)
+```
+
+**Correct (1 iteration):**
+
+```typescript
+const admins: User[] = []
+const testers: User[] = []
+const inactive: User[] = []
+
+for (const user of users) {
+  if (user.isAdmin) admins.push(user)
+  if (user.isTester) testers.push(user)
+  if (!user.isActive) inactive.push(user)
+}
+```
diff --git a/.claude/skills/vercel-react-best-practices/rules/js-early-exit.md b/.claude/skills/vercel-react-best-practices/rules/js-early-exit.md
new file mode 100644
index 0000000000..f46cb89c6c
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/js-early-exit.md
@@ -0,0 +1,50 @@
+---
+title: Early Return from Functions
+impact: LOW-MEDIUM
+impactDescription: avoids unnecessary computation
+tags: javascript, functions, optimization, early-return
+---
+
+## Early Return from Functions
+
+Return early when result is determined to skip unnecessary processing.
+
+**Incorrect (processes all items even after finding answer):**
+
+```typescript
+function validateUsers(users: User[]) {
+  let hasError = false
+  let errorMessage = ''
+  
+  for (const user of users) {
+    if (!user.email) {
+      hasError = true
+      errorMessage = 'Email required'
+    }
+    if (!user.name) {
+      hasError = true
+      errorMessage = 'Name required'
+    }
+    // Continues checking all users even after error found
+  }
+  
+  return hasError ? { valid: false, error: errorMessage } : { valid: true }
+}
+```
+
+**Correct (returns immediately on first error):**
+
+```typescript
+function validateUsers(users: User[]) {
+  for (const user of users) {
+    if (!user.email) {
+      return { valid: false, error: 'Email required' }
+    }
+    if (!user.name) {
+      return { valid: false, error: 'Name required' }
+    }
+  }
+
+  return { valid: true }
+}
+```
diff --git a/.claude/skills/vercel-react-best-practices/rules/js-hoist-regexp.md b/.claude/skills/vercel-react-best-practices/rules/js-hoist-regexp.md
new file mode 100644
index 0000000000..dae3fefdc0
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/js-hoist-regexp.md
@@ -0,0 +1,45 @@
+---
+title: Hoist RegExp Creation
+impact: LOW-MEDIUM
+impactDescription: avoids recreation
+tags: javascript, regexp, optimization, memoization
+---
+
+## Hoist RegExp Creation
+
+Don't create RegExp inside render. Hoist to module scope or memoize with `useMemo()`.
+
+**Incorrect (new RegExp every render):**
+
+```tsx
+function Highlighter({ text, query }: Props) {
+  const regex = new RegExp(`(${query})`, 'gi')
+  const parts = text.split(regex)
+  return <>{parts.map((part, i) => ...)}</>
+}
+```
+
+**Correct (memoize or hoist):**
+
+```tsx
+const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
+
+function Highlighter({ text, query }: Props) {
+  const regex = useMemo(
+    () => new RegExp(`(${escapeRegex(query)})`, 'gi'),
+    [query]
+  )
+  const parts = text.split(regex)
+  return <>{parts.map((part, i) => ...)}</>
+}
+```
+
+**Warning (global regex has mutable state):**
+
+Global regex (`/g`) has mutable `lastIndex` state:
+
+```typescript
+const regex = /foo/g
+regex.test('foo')  // true, lastIndex = 3
+regex.test('foo')  // false, lastIndex = 0
+```
diff --git a/.claude/skills/vercel-react-best-practices/rules/js-index-maps.md b/.claude/skills/vercel-react-best-practices/rules/js-index-maps.md
new file mode 100644
index 0000000000..9d357a00b1
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/js-index-maps.md
@@ -0,0 +1,37 @@
+---
+title: Build Index Maps for Repeated Lookups
+impact: LOW-MEDIUM
+impactDescription: 1M ops to 2K ops
+tags: javascript, map, indexing, optimization, performance
+---
+
+## Build Index Maps for Repeated Lookups
+
+Multiple `.find()` calls by the same key should use a Map.
+
+**Incorrect (O(n) per lookup):**
+
+```typescript
+function processOrders(orders: Order[], users: User[]) {
+  return orders.map(order => ({
+    ...order,
+    user: users.find(u => u.id === order.userId)
+  }))
+}
+```
+
+**Correct (O(1) per lookup):**
+
+```typescript
+function processOrders(orders: Order[], users: User[]) {
+  const userById = new Map(users.map(u => [u.id, u]))
+
+  return orders.map(order => ({
+    ...order,
+    user: userById.get(order.userId)
+  }))
+}
+```
+
+Build map once (O(n)), then all lookups are O(1).
+For 1000 orders × 1000 users: 1M ops → 2K ops.
diff --git a/.claude/skills/vercel-react-best-practices/rules/js-length-check-first.md b/.claude/skills/vercel-react-best-practices/rules/js-length-check-first.md
new file mode 100644
index 0000000000..6c38625f98
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/js-length-check-first.md
@@ -0,0 +1,49 @@
+---
+title: Early Length Check for Array Comparisons
+impact: MEDIUM-HIGH
+impactDescription: avoids expensive operations when lengths differ
+tags: javascript, arrays, performance, optimization, comparison
+---
+
+## Early Length Check for Array Comparisons
+
+When comparing arrays with expensive operations (sorting, deep equality, serialization), check lengths first. If lengths differ, the arrays cannot be equal.
+
+In real-world applications, this optimization is especially valuable when the comparison runs in hot paths (event handlers, render loops).
+
+**Incorrect (always runs expensive comparison):**
+
+```typescript
+function hasChanges(current: string[], original: string[]) {
+  // Always sorts and joins, even when lengths differ
+  return current.sort().join() !== original.sort().join()
+}
+```
+
+Two O(n log n) sorts run even when `current.length` is 5 and `original.length` is 100. There is also overhead of joining the arrays and comparing the strings.
+
+**Correct (O(1) length check first):**
+
+```typescript
+function hasChanges(current: string[], original: string[]) {
+  // Early return if lengths differ
+  if (current.length !== original.length) {
+    return true
+  }
+  // Only sort/join when lengths match
+  const currentSorted = current.toSorted()
+  const originalSorted = original.toSorted()
+  for (let i = 0; i < currentSorted.length; i++) {
+    if (currentSorted[i] !== originalSorted[i]) {
+      return true
+    }
+  }
+  return false
+}
+```
+
+This new approach is more efficient because:
+- It avoids the overhead of sorting and joining the arrays when lengths differ
+- It avoids consuming memory for the joined strings (especially important for large arrays)
+- It avoids mutating the original arrays
+- It returns early when a difference is found
diff --git a/.claude/skills/vercel-react-best-practices/rules/js-min-max-loop.md b/.claude/skills/vercel-react-best-practices/rules/js-min-max-loop.md
new file mode 100644
index 0000000000..02caec56a5
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/js-min-max-loop.md
@@ -0,0 +1,82 @@
+---
+title: Use Loop for Min/Max Instead of Sort
+impact: LOW
+impactDescription: O(n) instead of O(n log n)
+tags: javascript, arrays, performance, sorting, algorithms
+---
+
+## Use Loop for Min/Max Instead of Sort
+
+Finding the smallest or largest element only requires a single pass through the array. Sorting is wasteful and slower.
+
+**Incorrect (O(n log n) - sort to find latest):**
+
+```typescript
+interface Project {
+  id: string
+  name: string
+  updatedAt: number
+}
+
+function getLatestProject(projects: Project[]) {
+  const sorted = [...projects].sort((a, b) => b.updatedAt - a.updatedAt)
+  return sorted[0]
+}
+```
+
+Sorts the entire array just to find the maximum value.
+
+**Incorrect (O(n log n) - sort for oldest and newest):**
+
+```typescript
+function getOldestAndNewest(projects: Project[]) {
+  const sorted = [...projects].sort((a, b) => a.updatedAt - b.updatedAt)
+  return { oldest: sorted[0], newest: sorted[sorted.length - 1] }
+}
+```
+
+Still sorts unnecessarily when only min/max are needed.
+
+**Correct (O(n) - single loop):**
+
+```typescript
+function getLatestProject(projects: Project[]) {
+  if (projects.length === 0) return null
+  
+  let latest = projects[0]
+  
+  for (let i = 1; i < projects.length; i++) {
+    if (projects[i].updatedAt > latest.updatedAt) {
+      latest = projects[i]
+    }
+  }
+  
+  return latest
+}
+
+function getOldestAndNewest(projects: Project[]) {
+  if (projects.length === 0) return { oldest: null, newest: null }
+  
+  let oldest = projects[0]
+  let newest = projects[0]
+  
+  for (let i = 1; i < projects.length; i++) {
+    if (projects[i].updatedAt < oldest.updatedAt) oldest = projects[i]
+    if (projects[i].updatedAt > newest.updatedAt) newest = projects[i]
+  }
+  
+  return { oldest, newest }
+}
+```
+
+Single pass through the array, no copying, no sorting.
+
+**Alternative (Math.min/Math.max for small arrays):**
+
+```typescript
+const numbers = [5, 2, 8, 1, 9]
+const min = Math.min(...numbers)
+const max = Math.max(...numbers)
+```
+
+This works for small arrays but can be slower for very large arrays due to spread operator limitations. Use the loop approach for reliability.
diff --git a/.claude/skills/vercel-react-best-practices/rules/js-set-map-lookups.md b/.claude/skills/vercel-react-best-practices/rules/js-set-map-lookups.md
new file mode 100644
index 0000000000..680a4892ee
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/js-set-map-lookups.md
@@ -0,0 +1,24 @@
+---
+title: Use Set/Map for O(1) Lookups
+impact: LOW-MEDIUM
+impactDescription: O(n) to O(1)
+tags: javascript, set, map, data-structures, performance
+---
+
+## Use Set/Map for O(1) Lookups
+
+Convert arrays to Set/Map for repeated membership checks.
+
+**Incorrect (O(n) per check):**
+
+```typescript
+const allowedIds = ['a', 'b', 'c', ...]
+items.filter(item => allowedIds.includes(item.id))
+```
+
+**Correct (O(1) per check):**
+
+```typescript
+const allowedIds = new Set(['a', 'b', 'c', ...])
+items.filter(item => allowedIds.has(item.id))
+```
diff --git a/.claude/skills/vercel-react-best-practices/rules/js-tosorted-immutable.md b/.claude/skills/vercel-react-best-practices/rules/js-tosorted-immutable.md
new file mode 100644
index 0000000000..eae8b3f8ae
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/js-tosorted-immutable.md
@@ -0,0 +1,57 @@
+---
+title: Use toSorted() Instead of sort() for Immutability
+impact: MEDIUM-HIGH
+impactDescription: prevents mutation bugs in React state
+tags: javascript, arrays, immutability, react, state, mutation
+---
+
+## Use toSorted() Instead of sort() for Immutability
+
+`.sort()` mutates the array in place, which can cause bugs with React state and props. Use `.toSorted()` to create a new sorted array without mutation.
+
+**Incorrect (mutates original array):**
+
+```typescript
+function UserList({ users }: { users: User[] }) {
+  // Mutates the users prop array!
+  const sorted = useMemo(
+    () => users.sort((a, b) => a.name.localeCompare(b.name)),
+    [users]
+  )
+  return <div>{sorted.map(renderUser)}</div>
+}
+```
+
+**Correct (creates new array):**
+
+```typescript
+function UserList({ users }: { users: User[] }) {
+  // Creates new sorted array, original unchanged
+  const sorted = useMemo(
+    () => users.toSorted((a, b) => a.name.localeCompare(b.name)),
+    [users]
+  )
+  return <div>{sorted.map(renderUser)}</div>
+}
+```
+
+**Why this matters in React:**
+
+1. Props/state mutations break React's immutability model - React expects props and state to be treated as read-only
+2. Causes stale closure bugs - Mutating arrays inside closures (callbacks, effects) can lead to unexpected behavior
+
+**Browser support (fallback for older browsers):**
+
+`.toSorted()` is available in all modern browsers (Chrome 110+, Safari 16+, Firefox 115+, Node.js 20+). For older environments, use spread operator:
+
+```typescript
+// Fallback for older browsers
+const sorted = [...items].sort((a, b) => a.value - b.value)
+```
+
+**Other immutable array methods:**
+
+- `.toSorted()` - immutable sort
+- `.toReversed()` - immutable reverse
+- `.toSpliced()` - immutable splice
+- `.with()` - immutable element replacement
diff --git a/.claude/skills/vercel-react-best-practices/rules/rendering-activity.md b/.claude/skills/vercel-react-best-practices/rules/rendering-activity.md
new file mode 100644
index 0000000000..c957a490b7
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/rendering-activity.md
@@ -0,0 +1,26 @@
+---
+title: Use Activity Component for Show/Hide
+impact: MEDIUM
+impactDescription: preserves state/DOM
+tags: rendering, activity, visibility, state-preservation
+---
+
+## Use Activity Component for Show/Hide
+
+Use React's `<Activity>` to preserve state/DOM for expensive components that frequently toggle visibility.
+
+**Usage:**
+
+```tsx
+import { Activity } from 'react'
+
+function Dropdown({ isOpen }: Props) {
+  return (
+    <Activity mode={isOpen ? 'visible' : 'hidden'}>
+      <ExpensiveMenu />
+    </Activity>
+  )
+}
+```
+
+Avoids expensive re-renders and state loss.
diff --git a/.claude/skills/vercel-react-best-practices/rules/rendering-animate-svg-wrapper.md b/.claude/skills/vercel-react-best-practices/rules/rendering-animate-svg-wrapper.md
new file mode 100644
index 0000000000..646744cbe5
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/rendering-animate-svg-wrapper.md
@@ -0,0 +1,47 @@
+---
+title: Animate SVG Wrapper Instead of SVG Element
+impact: LOW
+impactDescription: enables hardware acceleration
+tags: rendering, svg, css, animation, performance
+---
+
+## Animate SVG Wrapper Instead of SVG Element
+
+Many browsers don't have hardware acceleration for CSS3 animations on SVG elements. Wrap SVG in a `<div>` and animate the wrapper instead.
+
+**Incorrect (animating SVG directly - no hardware acceleration):**
+
+```tsx
+function LoadingSpinner() {
+  return (
+    <svg 
+      className="animate-spin"
+      width="24" 
+      height="24" 
+      viewBox="0 0 24 24"
+    >
+      <circle cx="12" cy="12" r="10" stroke="currentColor" />
+    </svg>
+  )
+}
+```
+
+**Correct (animating wrapper div - hardware accelerated):**
+
+```tsx
+function LoadingSpinner() {
+  return (
+    <div className="animate-spin">
+      <svg 
+        width="24" 
+        height="24" 
+        viewBox="0 0 24 24"
+      >
+        <circle cx="12" cy="12" r="10" stroke="currentColor" />
+      </svg>
+    </div>
+  )
+}
+```
+
+This applies to all CSS transforms and transitions (`transform`, `opacity`, `translate`, `scale`, `rotate`). The wrapper div allows browsers to use GPU acceleration for smoother animations.
diff --git a/.claude/skills/vercel-react-best-practices/rules/rendering-conditional-render.md b/.claude/skills/vercel-react-best-practices/rules/rendering-conditional-render.md
new file mode 100644
index 0000000000..7e866f5852
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/rendering-conditional-render.md
@@ -0,0 +1,40 @@
+---
+title: Use Explicit Conditional Rendering
+impact: LOW
+impactDescription: prevents rendering 0 or NaN
+tags: rendering, conditional, jsx, falsy-values
+---
+
+## Use Explicit Conditional Rendering
+
+Use explicit ternary operators (`? :`) instead of `&&` for conditional rendering when the condition can be `0`, `NaN`, or other falsy values that render.
+
+**Incorrect (renders "0" when count is 0):**
+
+```tsx
+function Badge({ count }: { count: number }) {
+  return (
+    <div>
+      {count && <span className="badge">{count}</span>}
+    </div>
+  )
+}
+
+// When count = 0, renders: <div>0</div>
+// When count = 5, renders: <div><span class="badge">5</span></div>
+```
+
+**Correct (renders nothing when count is 0):**
+
+```tsx
+function Badge({ count }: { count: number }) {
+  return (
+    <div>
+      {count > 0 ? <span className="badge">{count}</span> : null}
+    </div>
+  )
+}
+
+// When count = 0, renders: <div></div>
+// When count = 5, renders: <div><span class="badge">5</span></div>
+```
diff --git a/.claude/skills/vercel-react-best-practices/rules/rendering-content-visibility.md b/.claude/skills/vercel-react-best-practices/rules/rendering-content-visibility.md
new file mode 100644
index 0000000000..aa6656362b
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/rendering-content-visibility.md
@@ -0,0 +1,38 @@
+---
+title: CSS content-visibility for Long Lists
+impact: HIGH
+impactDescription: faster initial render
+tags: rendering, css, content-visibility, long-lists
+---
+
+## CSS content-visibility for Long Lists
+
+Apply `content-visibility: auto` to defer off-screen rendering.
+
+**CSS:**
+
+```css
+.message-item {
+  content-visibility: auto;
+  contain-intrinsic-size: 0 80px;
+}
+```
+
+**Example:**
+
+```tsx
+function MessageList({ messages }: { messages: Message[] }) {
+  return (
+    <div className="overflow-y-auto h-screen">
+      {messages.map(msg => (
+        <div key={msg.id} className="message-item">
+          <Avatar user={msg.author} />
+          <div>{msg.content}</div>
+        </div>
+      ))}
+    </div>
+  )
+}
+```
+
+For 1000 messages, browser skips layout/paint for ~990 off-screen items (10× faster initial render).
diff --git a/.claude/skills/vercel-react-best-practices/rules/rendering-hoist-jsx.md b/.claude/skills/vercel-react-best-practices/rules/rendering-hoist-jsx.md
new file mode 100644
index 0000000000..32d2f3fcea
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/rendering-hoist-jsx.md
@@ -0,0 +1,46 @@
+---
+title: Hoist Static JSX Elements
+impact: LOW
+impactDescription: avoids re-creation
+tags: rendering, jsx, static, optimization
+---
+
+## Hoist Static JSX Elements
+
+Extract static JSX outside components to avoid re-creation.
+
+**Incorrect (recreates element every render):**
+
+```tsx
+function LoadingSkeleton() {
+  return <div className="animate-pulse h-20 bg-gray-200" />
+}
+
+function Container() {
+  return (
+    <div>
+      {loading && <LoadingSkeleton />}
+    </div>
+  )
+}
+```
+
+**Correct (reuses same element):**
+
+```tsx
+const loadingSkeleton = (
+  <div className="animate-pulse h-20 bg-gray-200" />
+)
+
+function Container() {
+  return (
+    <div>
+      {loading && loadingSkeleton}
+    </div>
+  )
+}
+```
+
+This is especially helpful for large and static SVG nodes, which can be expensive to recreate on every render.
+
+**Note:** If your project has [React Compiler](https://react.dev/learn/react-compiler) enabled, the compiler automatically hoists static JSX elements and optimizes component re-renders, making manual hoisting unnecessary.
diff --git a/.claude/skills/vercel-react-best-practices/rules/rendering-hydration-no-flicker.md b/.claude/skills/vercel-react-best-practices/rules/rendering-hydration-no-flicker.md
new file mode 100644
index 0000000000..5cf0e79b69
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/rendering-hydration-no-flicker.md
@@ -0,0 +1,82 @@
+---
+title: Prevent Hydration Mismatch Without Flickering
+impact: MEDIUM
+impactDescription: avoids visual flicker and hydration errors
+tags: rendering, ssr, hydration, localStorage, flicker
+---
+
+## Prevent Hydration Mismatch Without Flickering
+
+When rendering content that depends on client-side storage (localStorage, cookies), avoid both SSR breakage and post-hydration flickering by injecting a synchronous script that updates the DOM before React hydrates.
+
+**Incorrect (breaks SSR):**
+
+```tsx
+function ThemeWrapper({ children }: { children: ReactNode }) {
+  // localStorage is not available on server - throws error
+  const theme = localStorage.getItem('theme') || 'light'
+  
+  return (
+    <div className={theme}>
+      {children}
+    </div>
+  )
+}
+```
+
+Server-side rendering will fail because `localStorage` is undefined.
+
+**Incorrect (visual flickering):**
+
+```tsx
+function ThemeWrapper({ children }: { children: ReactNode }) {
+  const [theme, setTheme] = useState('light')
+  
+  useEffect(() => {
+    // Runs after hydration - causes visible flash
+    const stored = localStorage.getItem('theme')
+    if (stored) {
+      setTheme(stored)
+    }
+  }, [])
+  
+  return (
+    <div className={theme}>
+      {children}
+    </div>
+  )
+}
+```
+
+Component first renders with default value (`light`), then updates after hydration, causing a visible flash of incorrect content.
+
+**Correct (no flicker, no hydration mismatch):**
+
+```tsx
+function ThemeWrapper({ children }: { children: ReactNode }) {
+  return (
+    <>
+      <div id="theme-wrapper">
+        {children}
+      </div>
+      <script
+        dangerouslySetInnerHTML={{
+          __html: `
+            (function() {
+              try {
+                var theme = localStorage.getItem('theme') || 'light';
+                var el = document.getElementById('theme-wrapper');
+                if (el) el.className = theme;
+              } catch (e) {}
+            })();
+          `,
+        }}
+      />
+    </>
+  )
+}
+```
+
+The inline script executes synchronously before showing the element, ensuring the DOM already has the correct value. No flickering, no hydration mismatch.
+
+This pattern is especially useful for theme toggles, user preferences, authentication states, and any client-only data that should render immediately without flashing default values.
diff --git a/.claude/skills/vercel-react-best-practices/rules/rendering-svg-precision.md b/.claude/skills/vercel-react-best-practices/rules/rendering-svg-precision.md
new file mode 100644
index 0000000000..6d77128603
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/rendering-svg-precision.md
@@ -0,0 +1,28 @@
+---
+title: Optimize SVG Precision
+impact: LOW
+impactDescription: reduces file size
+tags: rendering, svg, optimization, svgo
+---
+
+## Optimize SVG Precision
+
+Reduce SVG coordinate precision to decrease file size. The optimal precision depends on the viewBox size, but in general reducing precision should be considered.
+
+**Incorrect (excessive precision):**
+
+```svg
+<path d="M 10.293847 20.847362 L 30.938472 40.192837" />
+```
+
+**Correct (1 decimal place):**
+
+```svg
+<path d="M 10.3 20.8 L 30.9 40.2" />
+```
+
+**Automate with SVGO:**
+
+```bash
+npx svgo --precision=1 --multipass icon.svg
+```
diff --git a/.claude/skills/vercel-react-best-practices/rules/rerender-defer-reads.md b/.claude/skills/vercel-react-best-practices/rules/rerender-defer-reads.md
new file mode 100644
index 0000000000..e867c95f02
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/rerender-defer-reads.md
@@ -0,0 +1,39 @@
+---
+title: Defer State Reads to Usage Point
+impact: MEDIUM
+impactDescription: avoids unnecessary subscriptions
+tags: rerender, searchParams, localStorage, optimization
+---
+
+## Defer State Reads to Usage Point
+
+Don't subscribe to dynamic state (searchParams, localStorage) if you only read it inside callbacks.
+
+**Incorrect (subscribes to all searchParams changes):**
+
+```tsx
+function ShareButton({ chatId }: { chatId: string }) {
+  const searchParams = useSearchParams()
+
+  const handleShare = () => {
+    const ref = searchParams.get('ref')
+    shareChat(chatId, { ref })
+  }
+
+  return <button onClick={handleShare}>Share</button>
+}
+```
+
+**Correct (reads on demand, no subscription):**
+
+```tsx
+function ShareButton({ chatId }: { chatId: string }) {
+  const handleShare = () => {
+    const params = new URLSearchParams(window.location.search)
+    const ref = params.get('ref')
+    shareChat(chatId, { ref })
+  }
+
+  return <button onClick={handleShare}>Share</button>
+}
+```
diff --git a/.claude/skills/vercel-react-best-practices/rules/rerender-dependencies.md b/.claude/skills/vercel-react-best-practices/rules/rerender-dependencies.md
new file mode 100644
index 0000000000..47a4d92685
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/rerender-dependencies.md
@@ -0,0 +1,45 @@
+---
+title: Narrow Effect Dependencies
+impact: LOW
+impactDescription: minimizes effect re-runs
+tags: rerender, useEffect, dependencies, optimization
+---
+
+## Narrow Effect Dependencies
+
+Specify primitive dependencies instead of objects to minimize effect re-runs.
+
+**Incorrect (re-runs on any user field change):**
+
+```tsx
+useEffect(() => {
+  console.log(user.id)
+}, [user])
+```
+
+**Correct (re-runs only when id changes):**
+
+```tsx
+useEffect(() => {
+  console.log(user.id)
+}, [user.id])
+```
+
+**For derived state, compute outside effect:**
+
+```tsx
+// Incorrect: runs on width=767, 766, 765...
+useEffect(() => {
+  if (width < 768) {
+    enableMobileMode()
+  }
+}, [width])
+
+// Correct: runs only on boolean transition
+const isMobile = width < 768
+useEffect(() => {
+  if (isMobile) {
+    enableMobileMode()
+  }
+}, [isMobile])
+```
diff --git a/.claude/skills/vercel-react-best-practices/rules/rerender-derived-state.md b/.claude/skills/vercel-react-best-practices/rules/rerender-derived-state.md
new file mode 100644
index 0000000000..a15177caad
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/rerender-derived-state.md
@@ -0,0 +1,29 @@
+---
+title: Subscribe to Derived State
+impact: MEDIUM
+impactDescription: reduces re-render frequency
+tags: rerender, derived-state, media-query, optimization
+---
+
+## Subscribe to Derived State
+
+Subscribe to derived boolean state instead of continuous values to reduce re-render frequency.
+
+**Incorrect (re-renders on every pixel change):**
+
+```tsx
+function Sidebar() {
+  const width = useWindowWidth()  // updates continuously
+  const isMobile = width < 768
+  return <nav className={isMobile ? 'mobile' : 'desktop'}>
+}
+```
+
+**Correct (re-renders only when boolean changes):**
+
+```tsx
+function Sidebar() {
+  const isMobile = useMediaQuery('(max-width: 767px)')
+  return <nav className={isMobile ? 'mobile' : 'desktop'}>
+}
+```
diff --git a/.claude/skills/vercel-react-best-practices/rules/rerender-functional-setstate.md b/.claude/skills/vercel-react-best-practices/rules/rerender-functional-setstate.md
new file mode 100644
index 0000000000..b004ef45e3
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/rerender-functional-setstate.md
@@ -0,0 +1,74 @@
+---
+title: Use Functional setState Updates
+impact: MEDIUM
+impactDescription: prevents stale closures and unnecessary callback recreations
+tags: react, hooks, useState, useCallback, callbacks, closures
+---
+
+## Use Functional setState Updates
+
+When updating state based on the current state value, use the functional update form of setState instead of directly referencing the state variable. This prevents stale closures, eliminates unnecessary dependencies, and creates stable callback references.
+
+**Incorrect (requires state as dependency):**
+
+```tsx
+function TodoList() {
+  const [items, setItems] = useState(initialItems)
+  
+  // Callback must depend on items, recreated on every items change
+  const addItems = useCallback((newItems: Item[]) => {
+    setItems([...items, ...newItems])
+  }, [items])  // ❌ items dependency causes recreations
+  
+  // Risk of stale closure if dependency is forgotten
+  const removeItem = useCallback((id: string) => {
+    setItems(items.filter(item => item.id !== id))
+  }, [])  // ❌ Missing items dependency - will use stale items!
+  
+  return <ItemsEditor items={items} onAdd={addItems} onRemove={removeItem} />
+}
+```
+
+The first callback is recreated every time `items` changes, which can cause child components to re-render unnecessarily. The second callback has a stale closure bug—it will always reference the initial `items` value.
+
+**Correct (stable callbacks, no stale closures):**
+
+```tsx
+function TodoList() {
+  const [items, setItems] = useState(initialItems)
+  
+  // Stable callback, never recreated
+  const addItems = useCallback((newItems: Item[]) => {
+    setItems(curr => [...curr, ...newItems])
+  }, [])  // ✅ No dependencies needed
+  
+  // Always uses latest state, no stale closure risk
+  const removeItem = useCallback((id: string) => {
+    setItems(curr => curr.filter(item => item.id !== id))
+  }, [])  // ✅ Safe and stable
+  
+  return <ItemsEditor items={items} onAdd={addItems} onRemove={removeItem} />
+}
+```
+
+**Benefits:**
+
+1. **Stable callback references** - Callbacks don't need to be recreated when state changes
+2. **No stale closures** - Always operates on the latest state value
+3. **Fewer dependencies** - Simplifies dependency arrays and reduces memory leaks
+4. **Prevents bugs** - Eliminates the most common source of React closure bugs
+
+**When to use functional updates:**
+
+- Any setState that depends on the current state value
+- Inside useCallback/useMemo when state is needed
+- Event handlers that reference state
+- Async operations that update state
+
+**When direct updates are fine:**
+
+- Setting state to a static value: `setCount(0)`
+- Setting state from props/arguments only: `setName(newName)`
+- State doesn't depend on previous value
+
+**Note:** If your project has [React Compiler](https://react.dev/learn/react-compiler) enabled, the compiler can automatically optimize some cases, but functional updates are still recommended for correctness and to prevent stale closure bugs.
diff --git a/.claude/skills/vercel-react-best-practices/rules/rerender-lazy-state-init.md b/.claude/skills/vercel-react-best-practices/rules/rerender-lazy-state-init.md
new file mode 100644
index 0000000000..4ecb350fba
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/rerender-lazy-state-init.md
@@ -0,0 +1,58 @@
+---
+title: Use Lazy State Initialization
+impact: MEDIUM
+impactDescription: wasted computation on every render
+tags: react, hooks, useState, performance, initialization
+---
+
+## Use Lazy State Initialization
+
+Pass a function to `useState` for expensive initial values. Without the function form, the initializer runs on every render even though the value is only used once.
+
+**Incorrect (runs on every render):**
+
+```tsx
+function FilteredList({ items }: { items: Item[] }) {
+  // buildSearchIndex() runs on EVERY render, even after initialization
+  const [searchIndex, setSearchIndex] = useState(buildSearchIndex(items))
+  const [query, setQuery] = useState('')
+  
+  // When query changes, buildSearchIndex runs again unnecessarily
+  return <SearchResults index={searchIndex} query={query} />
+}
+
+function UserProfile() {
+  // JSON.parse runs on every render
+  const [settings, setSettings] = useState(
+    JSON.parse(localStorage.getItem('settings') || '{}')
+  )
+  
+  return <SettingsForm settings={settings} onChange={setSettings} />
+}
+```
+
+**Correct (runs only once):**
+
+```tsx
+function FilteredList({ items }: { items: Item[] }) {
+  // buildSearchIndex() runs ONLY on initial render
+  const [searchIndex, setSearchIndex] = useState(() => buildSearchIndex(items))
+  const [query, setQuery] = useState('')
+  
+  return <SearchResults index={searchIndex} query={query} />
+}
+
+function UserProfile() {
+  // JSON.parse runs only on initial render
+  const [settings, setSettings] = useState(() => {
+    const stored = localStorage.getItem('settings')
+    return stored ? JSON.parse(stored) : {}
+  })
+  
+  return <SettingsForm settings={settings} onChange={setSettings} />
+}
+```
+
+Use lazy initialization when computing initial values from localStorage/sessionStorage, building data structures (indexes, maps), reading from the DOM, or performing heavy transformations.
+
+For simple primitives (`useState(0)`), direct references (`useState(props.value)`), or cheap literals (`useState({})`), the function form is unnecessary.
diff --git a/.claude/skills/vercel-react-best-practices/rules/rerender-memo.md b/.claude/skills/vercel-react-best-practices/rules/rerender-memo.md
new file mode 100644
index 0000000000..f8982ab612
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/rerender-memo.md
@@ -0,0 +1,44 @@
+---
+title: Extract to Memoized Components
+impact: MEDIUM
+impactDescription: enables early returns
+tags: rerender, memo, useMemo, optimization
+---
+
+## Extract to Memoized Components
+
+Extract expensive work into memoized components to enable early returns before computation.
+
+**Incorrect (computes avatar even when loading):**
+
+```tsx
+function Profile({ user, loading }: Props) {
+  const avatar = useMemo(() => {
+    const id = computeAvatarId(user)
+    return <Avatar id={id} />
+  }, [user])
+
+  if (loading) return <Skeleton />
+  return <div>{avatar}</div>
+}
+```
+
+**Correct (skips computation when loading):**
+
+```tsx
+const UserAvatar = memo(function UserAvatar({ user }: { user: User }) {
+  const id = useMemo(() => computeAvatarId(user), [user])
+  return <Avatar id={id} />
+})
+
+function Profile({ user, loading }: Props) {
+  if (loading) return <Skeleton />
+  return (
+    <div>
+      <UserAvatar user={user} />
+    </div>
+  )
+}
+```
+
+**Note:** If your project has [React Compiler](https://react.dev/learn/react-compiler) enabled, manual memoization with `memo()` and `useMemo()` is not necessary. The compiler automatically optimizes re-renders.
diff --git a/.claude/skills/vercel-react-best-practices/rules/rerender-transitions.md b/.claude/skills/vercel-react-best-practices/rules/rerender-transitions.md
new file mode 100644
index 0000000000..d99f43f764
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/rerender-transitions.md
@@ -0,0 +1,40 @@
+---
+title: Use Transitions for Non-Urgent Updates
+impact: MEDIUM
+impactDescription: maintains UI responsiveness
+tags: rerender, transitions, startTransition, performance
+---
+
+## Use Transitions for Non-Urgent Updates
+
+Mark frequent, non-urgent state updates as transitions to maintain UI responsiveness.
+
+**Incorrect (blocks UI on every scroll):**
+
+```tsx
+function ScrollTracker() {
+  const [scrollY, setScrollY] = useState(0)
+  useEffect(() => {
+    const handler = () => setScrollY(window.scrollY)
+    window.addEventListener('scroll', handler, { passive: true })
+    return () => window.removeEventListener('scroll', handler)
+  }, [])
+}
+```
+
+**Correct (non-blocking updates):**
+
+```tsx
+import { startTransition } from 'react'
+
+function ScrollTracker() {
+  const [scrollY, setScrollY] = useState(0)
+  useEffect(() => {
+    const handler = () => {
+      startTransition(() => setScrollY(window.scrollY))
+    }
+    window.addEventListener('scroll', handler, { passive: true })
+    return () => window.removeEventListener('scroll', handler)
+  }, [])
+}
+```
diff --git a/.claude/skills/vercel-react-best-practices/rules/server-after-nonblocking.md b/.claude/skills/vercel-react-best-practices/rules/server-after-nonblocking.md
new file mode 100644
index 0000000000..e8f5b260f5
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/server-after-nonblocking.md
@@ -0,0 +1,73 @@
+---
+title: Use after() for Non-Blocking Operations
+impact: MEDIUM
+impactDescription: faster response times
+tags: server, async, logging, analytics, side-effects
+---
+
+## Use after() for Non-Blocking Operations
+
+Use Next.js's `after()` to schedule work that should execute after a response is sent. This prevents logging, analytics, and other side effects from blocking the response.
+
+**Incorrect (blocks response):**
+
+```tsx
+import { logUserAction } from '@/app/utils'
+
+export async function POST(request: Request) {
+  // Perform mutation
+  await updateDatabase(request)
+  
+  // Logging blocks the response
+  const userAgent = request.headers.get('user-agent') || 'unknown'
+  await logUserAction({ userAgent })
+  
+  return new Response(JSON.stringify({ status: 'success' }), {
+    status: 200,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+```
+
+**Correct (non-blocking):**
+
+```tsx
+import { after } from 'next/server'
+import { headers, cookies } from 'next/headers'
+import { logUserAction } from '@/app/utils'
+
+export async function POST(request: Request) {
+  // Perform mutation
+  await updateDatabase(request)
+  
+  // Log after response is sent
+  after(async () => {
+    const userAgent = (await headers()).get('user-agent') || 'unknown'
+    const sessionCookie = (await cookies()).get('session-id')?.value || 'anonymous'
+    
+    logUserAction({ sessionCookie, userAgent })
+  })
+  
+  return new Response(JSON.stringify({ status: 'success' }), {
+    status: 200,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+```
+
+The response is sent immediately while logging happens in the background.
+
+**Common use cases:**
+
+- Analytics tracking
+- Audit logging
+- Sending notifications
+- Cache invalidation
+- Cleanup tasks
+
+**Important notes:**
+
+- `after()` runs even if the response fails or redirects
+- Works in Server Actions, Route Handlers, and Server Components
+
+Reference: [https://nextjs.org/docs/app/api-reference/functions/after](https://nextjs.org/docs/app/api-reference/functions/after)
diff --git a/.claude/skills/vercel-react-best-practices/rules/server-cache-lru.md b/.claude/skills/vercel-react-best-practices/rules/server-cache-lru.md
new file mode 100644
index 0000000000..ef6938aa53
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/server-cache-lru.md
@@ -0,0 +1,41 @@
+---
+title: Cross-Request LRU Caching
+impact: HIGH
+impactDescription: caches across requests
+tags: server, cache, lru, cross-request
+---
+
+## Cross-Request LRU Caching
+
+`React.cache()` only works within one request. For data shared across sequential requests (user clicks button A then button B), use an LRU cache.
+
+**Implementation:**
+
+```typescript
+import { LRUCache } from 'lru-cache'
+
+const cache = new LRUCache<string, any>({
+  max: 1000,
+  ttl: 5 * 60 * 1000  // 5 minutes
+})
+
+export async function getUser(id: string) {
+  const cached = cache.get(id)
+  if (cached) return cached
+
+  const user = await db.user.findUnique({ where: { id } })
+  cache.set(id, user)
+  return user
+}
+
+// Request 1: DB query, result cached
+// Request 2: cache hit, no DB query
+```
+
+Use when sequential user actions hit multiple endpoints needing the same data within seconds.
+
+**With Vercel's [Fluid Compute](https://vercel.com/docs/fluid-compute):** LRU caching is especially effective because multiple concurrent requests can share the same function instance and cache. This means the cache persists across requests without needing external storage like Redis.
+
+**In traditional serverless:** Each invocation runs in isolation, so consider Redis for cross-process caching.
+
+Reference: [https://github.com/isaacs/node-lru-cache](https://github.com/isaacs/node-lru-cache)
diff --git a/.claude/skills/vercel-react-best-practices/rules/server-cache-react.md b/.claude/skills/vercel-react-best-practices/rules/server-cache-react.md
new file mode 100644
index 0000000000..fa49e0e87a
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/server-cache-react.md
@@ -0,0 +1,26 @@
+---
+title: Per-Request Deduplication with React.cache()
+impact: MEDIUM
+impactDescription: deduplicates within request
+tags: server, cache, react-cache, deduplication
+---
+
+## Per-Request Deduplication with React.cache()
+
+Use `React.cache()` for server-side request deduplication. Authentication and database queries benefit most.
+
+**Usage:**
+
+```typescript
+import { cache } from 'react'
+
+export const getCurrentUser = cache(async () => {
+  const session = await auth()
+  if (!session?.user?.id) return null
+  return await db.user.findUnique({
+    where: { id: session.user.id }
+  })
+})
+```
+
+Within a single request, multiple calls to `getCurrentUser()` execute the query only once.
diff --git a/.claude/skills/vercel-react-best-practices/rules/server-parallel-fetching.md b/.claude/skills/vercel-react-best-practices/rules/server-parallel-fetching.md
new file mode 100644
index 0000000000..5261f08408
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/server-parallel-fetching.md
@@ -0,0 +1,79 @@
+---
+title: Parallel Data Fetching with Component Composition
+impact: CRITICAL
+impactDescription: eliminates server-side waterfalls
+tags: server, rsc, parallel-fetching, composition
+---
+
+## Parallel Data Fetching with Component Composition
+
+React Server Components execute sequentially within a tree. Restructure with composition to parallelize data fetching.
+
+**Incorrect (Sidebar waits for Page's fetch to complete):**
+
+```tsx
+export default async function Page() {
+  const header = await fetchHeader()
+  return (
+    <div>
+      <div>{header}</div>
+      <Sidebar />
+    </div>
+  )
+}
+
+async function Sidebar() {
+  const items = await fetchSidebarItems()
+  return <nav>{items.map(renderItem)}</nav>
+}
+```
+
+**Correct (both fetch simultaneously):**
+
+```tsx
+async function Header() {
+  const data = await fetchHeader()
+  return <div>{data}</div>
+}
+
+async function Sidebar() {
+  const items = await fetchSidebarItems()
+  return <nav>{items.map(renderItem)}</nav>
+}
+
+export default function Page() {
+  return (
+    <div>
+      <Header />
+      <Sidebar />
+    </div>
+  )
+}
+```
+
+**Alternative with children prop:**
+
+```tsx
+async function Layout({ children }: { children: ReactNode }) {
+  const header = await fetchHeader()
+  return (
+    <div>
+      <div>{header}</div>
+      {children}
+    </div>
+  )
+}
+
+async function Sidebar() {
+  const items = await fetchSidebarItems()
+  return <nav>{items.map(renderItem)}</nav>
+}
+
+export default function Page() {
+  return (
+    <Layout>
+      <Sidebar />
+    </Layout>
+  )
+}
+```
diff --git a/.claude/skills/vercel-react-best-practices/rules/server-serialization.md b/.claude/skills/vercel-react-best-practices/rules/server-serialization.md
new file mode 100644
index 0000000000..39c5c4164c
--- /dev/null
+++ b/.claude/skills/vercel-react-best-practices/rules/server-serialization.md
@@ -0,0 +1,38 @@
+---
+title: Minimize Serialization at RSC Boundaries
+impact: HIGH
+impactDescription: reduces data transfer size
+tags: server, rsc, serialization, props
+---
+
+## Minimize Serialization at RSC Boundaries
+
+The React Server/Client boundary serializes all object properties into strings and embeds them in the HTML response and subsequent RSC requests. This serialized data directly impacts page weight and load time, so **size matters a lot**. Only pass fields that the client actually uses.
+
+**Incorrect (serializes all 50 fields):**
+
+```tsx
+async function Page() {
+  const user = await fetchUser()  // 50 fields
+  return <Profile user={user} />
+}
+
+'use client'
+function Profile({ user }: { user: User }) {
+  return <div>{user.name}</div>  // uses 1 field
+}
+```
+
+**Correct (serializes only 1 field):**
+
+```tsx
+async function Page() {
+  const user = await fetchUser()
+  return <Profile name={user.name} />
+}
+
+'use client'
+function Profile({ name }: { name: string }) {
+  return <div>{name}</div>
+}
+```
diff --git a/.dockerignore b/.dockerignore
index 94bf1742f1..9b744e7f9b 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,6 +1,9 @@
 # Ignore everything by default, selectively add things to context
 *
 
+# Documentation (for embeddings/search)
+!docs/
+
 # Platform - Libs
 !autogpt_platform/autogpt_libs/autogpt_libs/
 !autogpt_platform/autogpt_libs/pyproject.toml
@@ -16,6 +19,7 @@
 !autogpt_platform/backend/poetry.lock
 !autogpt_platform/backend/README.md
 !autogpt_platform/backend/.env
+!autogpt_platform/backend/gen_prisma_types_stub.py
 
 # Platform - Market
 !autogpt_platform/market/market/
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index 870e6b4b0a..3c72eaae18 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -160,7 +160,7 @@ pnpm storybook                      # Start component development server
 
 **Backend Entry Points:**
 
-- `backend/backend/server/server.py` - FastAPI application setup
+- `backend/backend/api/rest_api.py` - FastAPI application setup
 - `backend/backend/data/` - Database models and user management
 - `backend/blocks/` - Agent execution blocks and logic
 
@@ -219,7 +219,7 @@ Agents are built using a visual block-based system where each block performs a s
 
 ### API Development
 
-1. Update routes in `/backend/backend/server/routers/`
+1. Update routes in `/backend/backend/api/features/`
 2. Add/update Pydantic models in same directory
 3. Write tests alongside route files
 4. For `data/*.py` changes, validate user ID checks
@@ -285,7 +285,7 @@ Agents are built using a visual block-based system where each block performs a s
 
 ### Security Guidelines
 
-**Cache Protection Middleware** (`/backend/backend/server/middleware/security.py`):
+**Cache Protection Middleware** (`/backend/backend/api/middleware/security.py`):
 
 - Default: Disables caching for ALL endpoints with `Cache-Control: no-store, no-cache, must-revalidate, private`
 - Uses allow list approach for cacheable paths (static assets, health checks, public pages)
diff --git a/.github/workflows/claude-ci-failure-auto-fix.yml b/.github/workflows/claude-ci-failure-auto-fix.yml
index b20f6cd2b3..e39c6676ce 100644
--- a/.github/workflows/claude-ci-failure-auto-fix.yml
+++ b/.github/workflows/claude-ci-failure-auto-fix.yml
@@ -93,5 +93,5 @@ jobs:
 
             Error logs:
             ${{ toJSON(fromJSON(steps.failure_details.outputs.result).errorLogs) }}
-          anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
+          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
           claude_args: "--allowedTools 'Edit,MultiEdit,Write,Read,Glob,Grep,LS,Bash(git:*),Bash(bun:*),Bash(npm:*),Bash(npx:*),Bash(gh:*)'"
diff --git a/.github/workflows/claude-dependabot.yml b/.github/workflows/claude-dependabot.yml
index 20b6f1d28e..ff6935dc2d 100644
--- a/.github/workflows/claude-dependabot.yml
+++ b/.github/workflows/claude-dependabot.yml
@@ -7,7 +7,7 @@
 # - Provide actionable recommendations for the development team
 #
 # Triggered on: Dependabot PRs (opened, synchronize)
-# Requirements: ANTHROPIC_API_KEY secret must be configured
+# Requirements: CLAUDE_CODE_OAUTH_TOKEN secret must be configured
 
 name: Claude Dependabot PR Review
 
@@ -74,7 +74,7 @@ jobs:
 
       - name: Generate Prisma Client
         working-directory: autogpt_platform/backend
-        run: poetry run prisma generate
+        run: poetry run prisma generate && poetry run gen-prisma-stub
 
       # Frontend Node.js/pnpm setup (mirrors platform-frontend-ci.yml)
       - name: Set up Node.js
@@ -308,7 +308,7 @@ jobs:
         id: claude_review
         uses: anthropics/claude-code-action@v1
         with:
-          anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
+          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
           claude_args: |
             --allowedTools "Bash(npm:*),Bash(pnpm:*),Bash(poetry:*),Bash(git:*),Edit,Replace,NotebookEditCell,mcp__github_inline_comment__create_inline_comment,Bash(gh pr comment:*), Bash(gh pr diff:*), Bash(gh pr view:*)"
           prompt: |
diff --git a/.github/workflows/claude.yml b/.github/workflows/claude.yml
index 3f5e8c22ec..8c45f930dc 100644
--- a/.github/workflows/claude.yml
+++ b/.github/workflows/claude.yml
@@ -90,7 +90,7 @@ jobs:
 
       - name: Generate Prisma Client
         working-directory: autogpt_platform/backend
-        run: poetry run prisma generate
+        run: poetry run prisma generate && poetry run gen-prisma-stub
 
       # Frontend Node.js/pnpm setup (mirrors platform-frontend-ci.yml)
       - name: Set up Node.js
@@ -323,7 +323,7 @@ jobs:
         id: claude
         uses: anthropics/claude-code-action@v1
         with:
-          anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
+          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
           claude_args: |
             --allowedTools "Bash(npm:*),Bash(pnpm:*),Bash(poetry:*),Bash(git:*),Edit,Replace,NotebookEditCell,mcp__github_inline_comment__create_inline_comment,Bash(gh pr comment:*), Bash(gh pr diff:*), Bash(gh pr view:*), Bash(gh pr edit:*)"
             --model opus
diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml
index 13ef01cc44..aac8befee0 100644
--- a/.github/workflows/copilot-setup-steps.yml
+++ b/.github/workflows/copilot-setup-steps.yml
@@ -72,7 +72,7 @@ jobs:
 
       - name: Generate Prisma Client
         working-directory: autogpt_platform/backend
-        run: poetry run prisma generate
+        run: poetry run prisma generate && poetry run gen-prisma-stub
 
       # Frontend Node.js/pnpm setup (mirrors platform-frontend-ci.yml)
       - name: Set up Node.js
@@ -108,6 +108,16 @@ jobs:
       #   run: pnpm playwright install --with-deps chromium
 
       # Docker setup for development environment
+      - name: Free up disk space
+        run: |
+          # Remove large unused tools to free disk space for Docker builds
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /usr/local/lib/android
+          sudo rm -rf /opt/ghc
+          sudo rm -rf /opt/hostedtoolcache/CodeQL
+          sudo docker system prune -af
+          df -h
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
diff --git a/.github/workflows/docs-block-sync.yml b/.github/workflows/docs-block-sync.yml
new file mode 100644
index 0000000000..b1fc986ea7
--- /dev/null
+++ b/.github/workflows/docs-block-sync.yml
@@ -0,0 +1,78 @@
+name: Block Documentation Sync Check
+
+on:
+  push:
+    branches: [master, dev]
+    paths:
+      - "autogpt_platform/backend/backend/blocks/**"
+      - "docs/integrations/**"
+      - "autogpt_platform/backend/scripts/generate_block_docs.py"
+      - ".github/workflows/docs-block-sync.yml"
+  pull_request:
+    branches: [master, dev]
+    paths:
+      - "autogpt_platform/backend/backend/blocks/**"
+      - "docs/integrations/**"
+      - "autogpt_platform/backend/scripts/generate_block_docs.py"
+      - ".github/workflows/docs-block-sync.yml"
+
+jobs:
+  check-docs-sync:
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Set up Python dependency cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/pypoetry
+          key: poetry-${{ runner.os }}-${{ hashFiles('autogpt_platform/backend/poetry.lock') }}
+          restore-keys: |
+            poetry-${{ runner.os }}-
+
+      - name: Install Poetry
+        run: |
+          cd autogpt_platform/backend
+          HEAD_POETRY_VERSION=$(python3 ../../.github/workflows/scripts/get_package_version_from_lockfile.py poetry)
+          echo "Found Poetry version ${HEAD_POETRY_VERSION} in backend/poetry.lock"
+          curl -sSL https://install.python-poetry.org | POETRY_VERSION=$HEAD_POETRY_VERSION python3 -
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+      - name: Install dependencies
+        working-directory: autogpt_platform/backend
+        run: |
+          poetry install --only main
+          poetry run prisma generate
+
+      - name: Check block documentation is in sync
+        working-directory: autogpt_platform/backend
+        run: |
+          echo "Checking if block documentation is in sync with code..."
+          poetry run python scripts/generate_block_docs.py --check
+
+      - name: Show diff if out of sync
+        if: failure()
+        working-directory: autogpt_platform/backend
+        run: |
+          echo "::error::Block documentation is out of sync with code!"
+          echo ""
+          echo "To fix this, run the following command locally:"
+          echo "  cd autogpt_platform/backend && poetry run python scripts/generate_block_docs.py"
+          echo ""
+          echo "Then commit the updated documentation files."
+          echo ""
+          echo "Regenerating docs to show diff..."
+          poetry run python scripts/generate_block_docs.py
+          echo ""
+          echo "Changes detected:"
+          git diff ../../docs/integrations/ || true
diff --git a/.github/workflows/docs-claude-review.yml b/.github/workflows/docs-claude-review.yml
new file mode 100644
index 0000000000..511c2efcd5
--- /dev/null
+++ b/.github/workflows/docs-claude-review.yml
@@ -0,0 +1,95 @@
+name: Claude Block Docs Review
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+    paths:
+      - "docs/integrations/**"
+      - "autogpt_platform/backend/backend/blocks/**"
+
+jobs:
+  claude-review:
+    # Only run for PRs from members/collaborators
+    if: |
+      github.event.pull_request.author_association == 'OWNER' ||
+      github.event.pull_request.author_association == 'MEMBER' ||
+      github.event.pull_request.author_association == 'COLLABORATOR'
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    permissions:
+      contents: read
+      pull-requests: write
+      id-token: write
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Set up Python dependency cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/pypoetry
+          key: poetry-${{ runner.os }}-${{ hashFiles('autogpt_platform/backend/poetry.lock') }}
+          restore-keys: |
+            poetry-${{ runner.os }}-
+
+      - name: Install Poetry
+        run: |
+          cd autogpt_platform/backend
+          HEAD_POETRY_VERSION=$(python3 ../../.github/workflows/scripts/get_package_version_from_lockfile.py poetry)
+          curl -sSL https://install.python-poetry.org | POETRY_VERSION=$HEAD_POETRY_VERSION python3 -
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+      - name: Install dependencies
+        working-directory: autogpt_platform/backend
+        run: |
+          poetry install --only main
+          poetry run prisma generate
+
+      - name: Run Claude Code Review
+        uses: anthropics/claude-code-action@v1
+        with:
+          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
+          claude_args: |
+            --allowedTools "Read,Glob,Grep,Bash(gh pr comment:*),Bash(gh pr diff:*),Bash(gh pr view:*)"
+          prompt: |
+            You are reviewing a PR that modifies block documentation or block code for AutoGPT.
+
+            ## Your Task
+            Review the changes in this PR and provide constructive feedback. Focus on:
+
+            1. **Documentation Accuracy**: For any block code changes, verify that:
+               - Input/output tables in docs match the actual block schemas
+               - Description text accurately reflects what the block does
+               - Any new blocks have corresponding documentation
+
+            2. **Manual Content Quality**: Check manual sections (marked with `<!-- MANUAL: -->` markers):
+               - "How it works" sections should have clear technical explanations
+               - "Possible use case" sections should have practical, real-world examples
+               - Content should be helpful for users trying to understand the blocks
+
+            3. **Template Compliance**: Ensure docs follow the standard template:
+               - What it is (brief intro)
+               - What it does (description)
+               - How it works (technical explanation)
+               - Inputs table
+               - Outputs table
+               - Possible use case
+
+            4. **Cross-references**: Check that links and anchors are correct
+
+            ## Review Process
+            1. First, get the PR diff to see what changed: `gh pr diff ${{ github.event.pull_request.number }}`
+            2. Read any modified block files to understand the implementation
+            3. Read corresponding documentation files to verify accuracy
+            4. Provide your feedback as a PR comment
+
+            Be constructive and specific. If everything looks good, say so!
+            If there are issues, explain what's wrong and suggest how to fix it.
diff --git a/.github/workflows/docs-enhance.yml b/.github/workflows/docs-enhance.yml
new file mode 100644
index 0000000000..db750e78ae
--- /dev/null
+++ b/.github/workflows/docs-enhance.yml
@@ -0,0 +1,194 @@
+name: Enhance Block Documentation
+
+on:
+  workflow_dispatch:
+    inputs:
+      block_pattern:
+        description: 'Block file pattern to enhance (e.g., "google/*.md" or "*" for all blocks)'
+        required: true
+        default: '*'
+        type: string
+      dry_run:
+        description: 'Dry run mode - show proposed changes without committing'
+        type: boolean
+        default: true
+      max_blocks:
+        description: 'Maximum number of blocks to process (0 for unlimited)'
+        type: number
+        default: 10
+
+jobs:
+  enhance-docs:
+    runs-on: ubuntu-latest
+    timeout-minutes: 45
+    permissions:
+      contents: write
+      pull-requests: write
+      id-token: write
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Set up Python dependency cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/pypoetry
+          key: poetry-${{ runner.os }}-${{ hashFiles('autogpt_platform/backend/poetry.lock') }}
+          restore-keys: |
+            poetry-${{ runner.os }}-
+
+      - name: Install Poetry
+        run: |
+          cd autogpt_platform/backend
+          HEAD_POETRY_VERSION=$(python3 ../../.github/workflows/scripts/get_package_version_from_lockfile.py poetry)
+          curl -sSL https://install.python-poetry.org | POETRY_VERSION=$HEAD_POETRY_VERSION python3 -
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+      - name: Install dependencies
+        working-directory: autogpt_platform/backend
+        run: |
+          poetry install --only main
+          poetry run prisma generate
+
+      - name: Run Claude Enhancement
+        uses: anthropics/claude-code-action@v1
+        with:
+          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
+          claude_args: |
+            --allowedTools "Read,Edit,Glob,Grep,Write,Bash(git:*),Bash(gh:*),Bash(find:*),Bash(ls:*)"
+          prompt: |
+            You are enhancing block documentation for AutoGPT. Your task is to improve the MANUAL sections
+            of block documentation files by reading the actual block implementations and writing helpful content.
+
+            ## Configuration
+            - Block pattern: ${{ inputs.block_pattern }}
+            - Dry run: ${{ inputs.dry_run }}
+            - Max blocks to process: ${{ inputs.max_blocks }}
+
+            ## Your Task
+
+            1. **Find Documentation Files**
+               Find block documentation files matching the pattern in `docs/integrations/`
+               Pattern: ${{ inputs.block_pattern }}
+
+               Use: `find docs/integrations -name "*.md" -type f`
+
+            2. **For Each Documentation File** (up to ${{ inputs.max_blocks }} files):
+
+               a. Read the documentation file
+
+               b. Identify which block(s) it documents (look for the block class name)
+
+               c. Find and read the corresponding block implementation in `autogpt_platform/backend/backend/blocks/`
+
+               d. Improve the MANUAL sections:
+
+                  **"How it works" section** (within `<!-- MANUAL: how_it_works -->` markers):
+                  - Explain the technical flow of the block
+                  - Describe what APIs or services it connects to
+                  - Note any important configuration or prerequisites
+                  - Keep it concise but informative (2-4 paragraphs)
+
+                  **"Possible use case" section** (within `<!-- MANUAL: use_case -->` markers):
+                  - Provide 2-3 practical, real-world examples
+                  - Make them specific and actionable
+                  - Show how this block could be used in an automation workflow
+
+            3. **Important Rules**
+               - ONLY modify content within `<!-- MANUAL: -->` and `<!-- END MANUAL -->` markers
+               - Do NOT modify auto-generated sections (inputs/outputs tables, descriptions)
+               - Keep content accurate based on the actual block implementation
+               - Write for users who may not be technical experts
+
+            4. **Output**
+               ${{ inputs.dry_run == true && 'DRY RUN MODE: Show proposed changes for each file but do NOT actually edit the files. Describe what you would change.' || 'LIVE MODE: Actually edit the files to improve the documentation.' }}
+
+            ## Example Improvements
+
+            **Before (How it works):**
+            ```
+            _Add technical explanation here._
+            ```
+
+            **After (How it works):**
+            ```
+            This block connects to the GitHub API to retrieve issue information. When executed,
+            it authenticates using your GitHub credentials and fetches issue details including
+            title, body, labels, and assignees.
+
+            The block requires a valid GitHub OAuth connection with repository access permissions.
+            It supports both public and private repositories you have access to.
+            ```
+
+            **Before (Possible use case):**
+            ```
+            _Add practical use case examples here._
+            ```
+
+            **After (Possible use case):**
+            ```
+            **Customer Support Automation**: Monitor a GitHub repository for new issues with
+            the "bug" label, then automatically create a ticket in your support system and
+            notify the on-call engineer via Slack.
+
+            **Release Notes Generation**: When a new release is published, gather all closed
+            issues since the last release and generate a summary for your changelog.
+            ```
+
+            Begin by finding and listing the documentation files to process.
+
+      - name: Create PR with enhanced documentation
+        if: ${{ inputs.dry_run == false }}
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          # Check if there are changes
+          if git diff --quiet docs/integrations/; then
+            echo "No changes to commit"
+            exit 0
+          fi
+
+          # Configure git
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+          # Create branch and commit
+          BRANCH_NAME="docs/enhance-blocks-$(date +%Y%m%d-%H%M%S)"
+          git checkout -b "$BRANCH_NAME"
+          git add docs/integrations/
+          git commit -m "docs: enhance block documentation with LLM-generated content
+
+          Pattern: ${{ inputs.block_pattern }}
+          Max blocks: ${{ inputs.max_blocks }}
+
+          🤖 Generated with [Claude Code](https://claude.com/claude-code)
+
+          Co-Authored-By: Claude <noreply@anthropic.com>"
+
+          # Push and create PR
+          git push -u origin "$BRANCH_NAME"
+          gh pr create \
+            --title "docs: LLM-enhanced block documentation" \
+            --body "## Summary
+          This PR contains LLM-enhanced documentation for block files matching pattern: \`${{ inputs.block_pattern }}\`
+
+          The following manual sections were improved:
+          - **How it works**: Technical explanations based on block implementations
+          - **Possible use case**: Practical, real-world examples
+
+          ## Review Checklist
+          - [ ] Content is accurate based on block implementations
+          - [ ] Examples are practical and helpful
+          - [ ] No auto-generated sections were modified
+
+          ---
+          🤖 Generated with [Claude Code](https://claude.com/claude-code)" \
+            --base dev
diff --git a/.github/workflows/platform-backend-ci.yml b/.github/workflows/platform-backend-ci.yml
index f962382fa5..f66cce8a37 100644
--- a/.github/workflows/platform-backend-ci.yml
+++ b/.github/workflows/platform-backend-ci.yml
@@ -134,7 +134,7 @@ jobs:
         run: poetry install
 
       - name: Generate Prisma Client
-        run: poetry run prisma generate
+        run: poetry run prisma generate && poetry run gen-prisma-stub
 
       - id: supabase
         name: Start Supabase
@@ -176,7 +176,7 @@ jobs:
           }
 
       - name: Run Database Migrations
-        run: poetry run prisma migrate dev --name updates
+        run: poetry run prisma migrate deploy
         env:
           DATABASE_URL: ${{ steps.supabase.outputs.DB_URL }}
           DIRECT_URL: ${{ steps.supabase.outputs.DB_URL }}
diff --git a/.github/workflows/platform-frontend-ci.yml b/.github/workflows/platform-frontend-ci.yml
index 2154fe1385..499bb03170 100644
--- a/.github/workflows/platform-frontend-ci.yml
+++ b/.github/workflows/platform-frontend-ci.yml
@@ -11,6 +11,7 @@ on:
       - ".github/workflows/platform-frontend-ci.yml"
       - "autogpt_platform/frontend/**"
   merge_group:
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name == 'merge_group' && format('merge-queue-{0}', github.ref) || format('{0}-{1}', github.ref, github.event.pull_request.number || github.sha) }}
@@ -127,7 +128,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           exitOnceUploaded: true
 
-  test:
+  e2e_test:
     runs-on: big-boi
     needs: setup
     strategy:
@@ -151,6 +152,14 @@ jobs:
         run: |
           cp ../.env.default ../.env
 
+      - name: Copy backend .env and set OpenAI API key
+        run: |
+          cp ../backend/.env.default ../backend/.env
+          echo "OPENAI_INTERNAL_API_KEY=${{ secrets.OPENAI_API_KEY }}" >> ../backend/.env
+        env:
+          # Used by E2E test data script to generate embeddings for approved store agents
+          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -226,14 +235,62 @@ jobs:
 
       - name: Run Playwright tests
         run: pnpm test:no-build
+        continue-on-error: false
 
-      - name: Upload Playwright artifacts
-        if: failure()
+      - name: Upload Playwright report
+        if: always()
         uses: actions/upload-artifact@v4
         with:
           name: playwright-report
           path: playwright-report
+          if-no-files-found: ignore
+          retention-days: 3
+
+      - name: Upload Playwright test results
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: playwright-test-results
+          path: test-results
+          if-no-files-found: ignore
+          retention-days: 3
 
       - name: Print Final Docker Compose logs
         if: always()
         run: docker compose -f ../docker-compose.yml logs
+
+  integration_test:
+    runs-on: ubuntu-latest
+    needs: setup
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "22.18.0"
+
+      - name: Enable corepack
+        run: corepack enable
+
+      - name: Restore dependencies cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.pnpm-store
+          key: ${{ needs.setup.outputs.cache-key }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-${{ hashFiles('autogpt_platform/frontend/pnpm-lock.yaml') }}
+            ${{ runner.os }}-pnpm-
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Generate API client
+        run: pnpm generate:api
+
+      - name: Run Integration Tests
+        run: pnpm test:unit
diff --git a/.gitignore b/.gitignore
index dfce8ba810..012a0b5227 100644
--- a/.gitignore
+++ b/.gitignore
@@ -178,4 +178,6 @@ autogpt_platform/backend/settings.py
 *.ign.*
 .test-contents
 .claude/settings.local.json
+CLAUDE.local.md
 /autogpt_platform/backend/logs
+.next
\ No newline at end of file
diff --git a/AGENTS.md b/AGENTS.md
index d31bc92f8c..202c4c6e02 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -16,6 +16,34 @@ See `docs/content/platform/getting-started.md` for setup instructions.
 - Format Python code with `poetry run format`.
 - Format frontend code using `pnpm format`.
 
+## Frontend guidelines:
+
+See `/frontend/CONTRIBUTING.md` for complete patterns. Quick reference:
+
+1. **Pages**: Create in `src/app/(platform)/feature-name/page.tsx`
+   - Add `usePageName.ts` hook for logic
+   - Put sub-components in local `components/` folder
+2. **Components**: Structure as `ComponentName/ComponentName.tsx` + `useComponentName.ts` + `helpers.ts`
+   - Use design system components from `src/components/` (atoms, molecules, organisms)
+   - Never use `src/components/__legacy__/*`
+3. **Data fetching**: Use generated API hooks from `@/app/api/__generated__/endpoints/`
+   - Regenerate with `pnpm generate:api`
+   - Pattern: `use{Method}{Version}{OperationName}`
+4. **Styling**: Tailwind CSS only, use design tokens, Phosphor Icons only
+5. **Testing**: Add Storybook stories for new components, Playwright for E2E
+6. **Code conventions**: Function declarations (not arrow functions) for components/handlers
+
+- Component props should be `interface Props { ... }` (not exported) unless the interface needs to be used outside the component
+- Separate render logic from business logic (component.tsx + useComponent.ts + helpers.ts)
+- Colocate state when possible and avoid creating large components, use sub-components ( local `/components` folder next to the parent component ) when sensible
+- Avoid large hooks, abstract logic into `helpers.ts` files when sensible
+- Use function declarations for components, arrow functions only for callbacks
+- No barrel files or `index.ts` re-exports
+- Avoid comments at all times unless the code is very complex
+- Do not use `useCallback` or `useMemo` unless asked to optimise a given function
+- Do not type hook returns, let Typescript infer as much as possible
+- Never type with `any`, if not types available use `unknown`
+
 ## Testing
 
 - Backend: `poetry run test` (runs pytest with a docker based postgres + prisma).
@@ -23,22 +51,8 @@ See `docs/content/platform/getting-started.md` for setup instructions.
 
 Always run the relevant linters and tests before committing.
 Use conventional commit messages for all commits (e.g. `feat(backend): add API`).
-  Types:
-    - feat
-    - fix
-    - refactor
-    - ci
-    - dx (developer experience)
-  Scopes:
-    - platform
-      - platform/library
-      - platform/marketplace
-      - backend
-        - backend/executor
-      - frontend
-        - frontend/library
-        - frontend/marketplace
-      - blocks
+Types: - feat - fix - refactor - ci - dx (developer experience)
+Scopes: - platform - platform/library - platform/marketplace - backend - backend/executor - frontend - frontend/library - frontend/marketplace - blocks
 
 ## Pull requests
 
diff --git a/README.md b/README.md
index 3572fe318b..349d8818ef 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ Before proceeding with the installation, ensure your system meets the following
 ### Updated Setup Instructions:
 We've moved to a fully maintained and regularly updated documentation site.
 
-👉 [Follow the official self-hosting guide here](https://docs.agpt.co/platform/getting-started/)
+👉 [Follow the official self-hosting guide here](https://agpt.co/docs/platform/getting-started/getting-started)
 
 
 This tutorial assumes you have Docker, VSCode, git and npm installed.
diff --git a/autogpt_platform/CLAUDE.md b/autogpt_platform/CLAUDE.md
index df1f3314aa..62adbdaefa 100644
--- a/autogpt_platform/CLAUDE.md
+++ b/autogpt_platform/CLAUDE.md
@@ -6,152 +6,30 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 
 AutoGPT Platform is a monorepo containing:
 
-- **Backend** (`/backend`): Python FastAPI server with async support
-- **Frontend** (`/frontend`): Next.js React application
-- **Shared Libraries** (`/autogpt_libs`): Common Python utilities
+- **Backend** (`backend`): Python FastAPI server with async support
+- **Frontend** (`frontend`): Next.js React application
+- **Shared Libraries** (`autogpt_libs`): Common Python utilities
 
-## Essential Commands
+## Component Documentation
 
-### Backend Development
+- **Backend**: See @backend/CLAUDE.md for backend-specific commands, architecture, and development tasks
+- **Frontend**: See @frontend/CLAUDE.md for frontend-specific commands, architecture, and development patterns
 
-```bash
-# Install dependencies
-cd backend && poetry install
-
-# Run database migrations
-poetry run prisma migrate dev
-
-# Start all services (database, redis, rabbitmq, clamav)
-docker compose up -d
-
-# Run the backend server
-poetry run serve
-
-# Run tests
-poetry run test
-
-# Run specific test
-poetry run pytest path/to/test_file.py::test_function_name
-
-# Run block tests (tests that validate all blocks work correctly)
-poetry run pytest backend/blocks/test/test_block.py -xvs
-
-# Run tests for a specific block (e.g., GetCurrentTimeBlock)
-poetry run pytest 'backend/blocks/test/test_block.py::test_available_blocks[GetCurrentTimeBlock]' -xvs
-
-# Lint and format
-# prefer format if you want to just "fix" it and only get the errors that can't be autofixed
-poetry run format  # Black + isort
-poetry run lint    # ruff
-```
-
-More details can be found in TESTING.md
-
-#### Creating/Updating Snapshots
-
-When you first write a test or when the expected output changes:
-
-```bash
-poetry run pytest path/to/test.py --snapshot-update
-```
-
-⚠️ **Important**: Always review snapshot changes before committing! Use `git diff` to verify the changes are expected.
-
-### Frontend Development
-
-```bash
-# Install dependencies
-cd frontend && pnpm i
-
-# Generate API client from OpenAPI spec
-pnpm generate:api
-
-# Start development server
-pnpm dev
-
-# Run E2E tests
-pnpm test
-
-# Run Storybook for component development
-pnpm storybook
-
-# Build production
-pnpm build
-
-# Format and lint
-pnpm format
-
-# Type checking
-pnpm types
-```
-
-**📖 Complete Guide**: See `/frontend/CONTRIBUTING.md` and `/frontend/.cursorrules` for comprehensive frontend patterns.
-
-**Key Frontend Conventions:**
-
-- Separate render logic from data/behavior in components
-- Use generated API hooks from `@/app/api/__generated__/endpoints/`
-- Use function declarations (not arrow functions) for components/handlers
-- Use design system components from `src/components/` (atoms, molecules, organisms)
-- Only use Phosphor Icons
-- Never use `src/components/__legacy__/*` or deprecated `BackendAPI`
-
-## Architecture Overview
-
-### Backend Architecture
-
-- **API Layer**: FastAPI with REST and WebSocket endpoints
-- **Database**: PostgreSQL with Prisma ORM, includes pgvector for embeddings
-- **Queue System**: RabbitMQ for async task processing
-- **Execution Engine**: Separate executor service processes agent workflows
-- **Authentication**: JWT-based with Supabase integration
-- **Security**: Cache protection middleware prevents sensitive data caching in browsers/proxies
-
-### Frontend Architecture
-
-- **Framework**: Next.js 15 App Router (client-first approach)
-- **Data Fetching**: Type-safe generated API hooks via Orval + React Query
-- **State Management**: React Query for server state, co-located UI state in components/hooks
-- **Component Structure**: Separate render logic (`.tsx`) from business logic (`use*.ts` hooks)
-- **Workflow Builder**: Visual graph editor using @xyflow/react
-- **UI Components**: shadcn/ui (Radix UI primitives) with Tailwind CSS styling
-- **Icons**: Phosphor Icons only
-- **Feature Flags**: LaunchDarkly integration
-- **Error Handling**: ErrorCard for render errors, toast for mutations, Sentry for exceptions
-- **Testing**: Playwright for E2E, Storybook for component development
-
-### Key Concepts
+## Key Concepts
 
 1. **Agent Graphs**: Workflow definitions stored as JSON, executed by the backend
-2. **Blocks**: Reusable components in `/backend/blocks/` that perform specific tasks
+2. **Blocks**: Reusable components in `backend/backend/blocks/` that perform specific tasks
 3. **Integrations**: OAuth and API connections stored per user
 4. **Store**: Marketplace for sharing agent templates
 5. **Virus Scanning**: ClamAV integration for file upload security
 
-### Testing Approach
-
-- Backend uses pytest with snapshot testing for API responses
-- Test files are colocated with source files (`*_test.py`)
-- Frontend uses Playwright for E2E tests
-- Component testing via Storybook
-
-### Database Schema
-
-Key models (defined in `/backend/schema.prisma`):
-
-- `User`: Authentication and profile data
-- `AgentGraph`: Workflow definitions with version control
-- `AgentGraphExecution`: Execution history and results
-- `AgentNode`: Individual nodes in a workflow
-- `StoreListing`: Marketplace listings for sharing agents
-
 ### Environment Configuration
 
 #### Configuration Files
 
-- **Backend**: `/backend/.env.default` (defaults) → `/backend/.env` (user overrides)
-- **Frontend**: `/frontend/.env.default` (defaults) → `/frontend/.env` (user overrides)
-- **Platform**: `/.env.default` (Supabase/shared defaults) → `/.env` (user overrides)
+- **Backend**: `backend/.env.default` (defaults) → `backend/.env` (user overrides)
+- **Frontend**: `frontend/.env.default` (defaults) → `frontend/.env` (user overrides)
+- **Platform**: `.env.default` (Supabase/shared defaults) → `.env` (user overrides)
 
 #### Docker Environment Loading Order
 
@@ -167,75 +45,12 @@ Key models (defined in `/backend/schema.prisma`):
 - Backend/Frontend services use YAML anchors for consistent configuration
 - Supabase services (`db/docker/docker-compose.yml`) follow the same pattern
 
-### Common Development Tasks
-
-**Adding a new block:**
-
-Follow the comprehensive [Block SDK Guide](../../../docs/content/platform/block-sdk-guide.md) which covers:
-
-- Provider configuration with `ProviderBuilder`
-- Block schema definition
-- Authentication (API keys, OAuth, webhooks)
-- Testing and validation
-- File organization
-
-Quick steps:
-
-1. Create new file in `/backend/backend/blocks/`
-2. Configure provider using `ProviderBuilder` in `_config.py`
-3. Inherit from `Block` base class
-4. Define input/output schemas using `BlockSchema`
-5. Implement async `run` method
-6. Generate unique block ID using `uuid.uuid4()`
-7. Test with `poetry run pytest backend/blocks/test/test_block.py`
-
-Note: when making many new blocks analyze the interfaces for each of these blocks and picture if they would go well together in a graph based editor or would they struggle to connect productively?
-ex: do the inputs and outputs tie well together?
-
-If you get any pushback or hit complex block conditions check the new_blocks guide in the docs.
-
-**Modifying the API:**
-
-1. Update route in `/backend/backend/server/routers/`
-2. Add/update Pydantic models in same directory
-3. Write tests alongside the route file
-4. Run `poetry run test` to verify
-
-**Frontend feature development:**
-
-See `/frontend/CONTRIBUTING.md` for complete patterns. Quick reference:
-
-1. **Pages**: Create in `src/app/(platform)/feature-name/page.tsx`
-   - Add `usePageName.ts` hook for logic
-   - Put sub-components in local `components/` folder
-2. **Components**: Structure as `ComponentName/ComponentName.tsx` + `useComponentName.ts` + `helpers.ts`
-   - Use design system components from `src/components/` (atoms, molecules, organisms)
-   - Never use `src/components/__legacy__/*`
-3. **Data fetching**: Use generated API hooks from `@/app/api/__generated__/endpoints/`
-   - Regenerate with `pnpm generate:api`
-   - Pattern: `use{Method}{Version}{OperationName}`
-4. **Styling**: Tailwind CSS only, use design tokens, Phosphor Icons only
-5. **Testing**: Add Storybook stories for new components, Playwright for E2E
-6. **Code conventions**: Function declarations (not arrow functions) for components/handlers
-
-### Security Implementation
-
-**Cache Protection Middleware:**
-
-- Located in `/backend/backend/server/middleware/security.py`
-- Default behavior: Disables caching for ALL endpoints with `Cache-Control: no-store, no-cache, must-revalidate, private`
-- Uses an allow list approach - only explicitly permitted paths can be cached
-- Cacheable paths include: static assets (`/static/*`, `/_next/static/*`), health checks, public store pages, documentation
-- Prevents sensitive data (auth tokens, API keys, user data) from being cached by browsers/proxies
-- To allow caching for a new endpoint, add it to `CACHEABLE_PATHS` in the middleware
-- Applied to both main API server and external API applications
-
 ### Creating Pull Requests
 
-- Create the PR aginst the `dev` branch of the repository.
-- Ensure the branch name is descriptive (e.g., `feature/add-new-block`)/
-- Use conventional commit messages (see below)/
-- Fill out the .github/PULL_REQUEST_TEMPLATE.md template as the PR description/
+- Create the PR against the `dev` branch of the repository.
+- Ensure the branch name is descriptive (e.g., `feature/add-new-block`)
+- Use conventional commit messages (see below)
+- Fill out the .github/PULL_REQUEST_TEMPLATE.md template as the PR description
 - Run the github pre-commit hooks to ensure code quality.
 
 ### Reviewing/Revising Pull Requests
diff --git a/autogpt_platform/Makefile b/autogpt_platform/Makefile
index d99fee49d7..d53be570bc 100644
--- a/autogpt_platform/Makefile
+++ b/autogpt_platform/Makefile
@@ -6,12 +6,14 @@ start-core:
 
 # Stop core services
 stop-core:
-	docker compose stop deps
+	docker compose stop 
 
 reset-db:
+	docker compose stop db
 	rm -rf db/docker/volumes/db/data
 	cd backend && poetry run prisma migrate deploy
 	cd backend && poetry run prisma generate
+	cd backend && poetry run gen-prisma-stub
 	
 # View logs for core services
 logs-core:
@@ -33,6 +35,7 @@ init-env:
 migrate:
 	cd backend && poetry run prisma migrate deploy
 	cd backend && poetry run prisma generate
+	cd backend && poetry run gen-prisma-stub
 
 run-backend:
 	cd backend && poetry run app
@@ -58,4 +61,4 @@ help:
 	@echo "  run-backend - Run the backend FastAPI server"
 	@echo "  run-frontend - Run the frontend Next.js development server"
 	@echo "  test-data - Run the test data creator"
-	@echo "  load-store-agents - Load store agents from agents/ folder into test database"
\ No newline at end of file
+	@echo "  load-store-agents - Load store agents from agents/ folder into test database"
diff --git a/autogpt_platform/backend/.env.default b/autogpt_platform/backend/.env.default
index a0004633ca..b393f13017 100644
--- a/autogpt_platform/backend/.env.default
+++ b/autogpt_platform/backend/.env.default
@@ -58,6 +58,13 @@ V0_API_KEY=
 OPEN_ROUTER_API_KEY=
 NVIDIA_API_KEY=
 
+# Langfuse Prompt Management
+# Used for managing the CoPilot system prompt externally
+# Get credentials from https://cloud.langfuse.com or your self-hosted instance
+LANGFUSE_PUBLIC_KEY=
+LANGFUSE_SECRET_KEY=
+LANGFUSE_HOST=https://cloud.langfuse.com
+
 # OAuth Credentials
 # For the OAuth callback URL, use <your_frontend_url>/auth/integrations/oauth_callback,
 # e.g. http://localhost:3000/auth/integrations/oauth_callback
@@ -171,5 +178,10 @@ AYRSHARE_JWT_KEY=
 SMARTLEAD_API_KEY=
 ZEROBOUNCE_API_KEY=
 
+# PostHog Analytics
+# Get API key from https://posthog.com - Project Settings > Project API Key
+POSTHOG_API_KEY=
+POSTHOG_HOST=https://eu.i.posthog.com
+
 # Other Services
 AUTOMOD_API_KEY=
diff --git a/autogpt_platform/backend/.gitignore b/autogpt_platform/backend/.gitignore
index 95b59cf676..9224c07d9e 100644
--- a/autogpt_platform/backend/.gitignore
+++ b/autogpt_platform/backend/.gitignore
@@ -18,3 +18,4 @@ load-tests/results/
 load-tests/*.json
 load-tests/*.log
 load-tests/node_modules/*
+migrations/*/rollback*.sql
diff --git a/autogpt_platform/backend/CLAUDE.md b/autogpt_platform/backend/CLAUDE.md
new file mode 100644
index 0000000000..53d52bb4d3
--- /dev/null
+++ b/autogpt_platform/backend/CLAUDE.md
@@ -0,0 +1,170 @@
+# CLAUDE.md - Backend
+
+This file provides guidance to Claude Code when working with the backend.
+
+## Essential Commands
+
+To run something with Python package dependencies you MUST use `poetry run ...`.
+
+```bash
+# Install dependencies
+poetry install
+
+# Run database migrations
+poetry run prisma migrate dev
+
+# Start all services (database, redis, rabbitmq, clamav)
+docker compose up -d
+
+# Run the backend as a whole
+poetry run app
+
+# Run tests
+poetry run test
+
+# Run specific test
+poetry run pytest path/to/test_file.py::test_function_name
+
+# Run block tests (tests that validate all blocks work correctly)
+poetry run pytest backend/blocks/test/test_block.py -xvs
+
+# Run tests for a specific block (e.g., GetCurrentTimeBlock)
+poetry run pytest 'backend/blocks/test/test_block.py::test_available_blocks[GetCurrentTimeBlock]' -xvs
+
+# Lint and format
+# prefer format if you want to just "fix" it and only get the errors that can't be autofixed
+poetry run format  # Black + isort
+poetry run lint    # ruff
+```
+
+More details can be found in @TESTING.md
+
+### Creating/Updating Snapshots
+
+When you first write a test or when the expected output changes:
+
+```bash
+poetry run pytest path/to/test.py --snapshot-update
+```
+
+⚠️ **Important**: Always review snapshot changes before committing! Use `git diff` to verify the changes are expected.
+
+## Architecture
+
+- **API Layer**: FastAPI with REST and WebSocket endpoints
+- **Database**: PostgreSQL with Prisma ORM, includes pgvector for embeddings
+- **Queue System**: RabbitMQ for async task processing
+- **Execution Engine**: Separate executor service processes agent workflows
+- **Authentication**: JWT-based with Supabase integration
+- **Security**: Cache protection middleware prevents sensitive data caching in browsers/proxies
+
+## Testing Approach
+
+- Uses pytest with snapshot testing for API responses
+- Test files are colocated with source files (`*_test.py`)
+
+## Database Schema
+
+Key models (defined in `schema.prisma`):
+
+- `User`: Authentication and profile data
+- `AgentGraph`: Workflow definitions with version control
+- `AgentGraphExecution`: Execution history and results
+- `AgentNode`: Individual nodes in a workflow
+- `StoreListing`: Marketplace listings for sharing agents
+
+## Environment Configuration
+
+- **Backend**: `.env.default` (defaults) → `.env` (user overrides)
+
+## Common Development Tasks
+
+### Adding a new block
+
+Follow the comprehensive [Block SDK Guide](@../../docs/content/platform/block-sdk-guide.md) which covers:
+
+- Provider configuration with `ProviderBuilder`
+- Block schema definition
+- Authentication (API keys, OAuth, webhooks)
+- Testing and validation
+- File organization
+
+Quick steps:
+
+1. Create new file in `backend/blocks/`
+2. Configure provider using `ProviderBuilder` in `_config.py`
+3. Inherit from `Block` base class
+4. Define input/output schemas using `BlockSchema`
+5. Implement async `run` method
+6. Generate unique block ID using `uuid.uuid4()`
+7. Test with `poetry run pytest backend/blocks/test/test_block.py`
+
+Note: when making many new blocks analyze the interfaces for each of these blocks and picture if they would go well together in a graph-based editor or would they struggle to connect productively?
+ex: do the inputs and outputs tie well together?
+
+If you get any pushback or hit complex block conditions check the new_blocks guide in the docs.
+
+#### Handling files in blocks with `store_media_file()`
+
+When blocks need to work with files (images, videos, documents), use `store_media_file()` from `backend.util.file`. The `return_format` parameter determines what you get back:
+
+| Format | Use When | Returns |
+|--------|----------|---------|
+| `"for_local_processing"` | Processing with local tools (ffmpeg, MoviePy, PIL) | Local file path (e.g., `"image.png"`) |
+| `"for_external_api"` | Sending content to external APIs (Replicate, OpenAI) | Data URI (e.g., `"data:image/png;base64,..."`) |
+| `"for_block_output"` | Returning output from your block | Smart: `workspace://` in CoPilot, data URI in graphs |
+
+**Examples:**
+
+```python
+# INPUT: Need to process file locally with ffmpeg
+local_path = await store_media_file(
+    file=input_data.video,
+    execution_context=execution_context,
+    return_format="for_local_processing",
+)
+# local_path = "video.mp4" - use with Path/ffmpeg/etc
+
+# INPUT: Need to send to external API like Replicate
+image_b64 = await store_media_file(
+    file=input_data.image,
+    execution_context=execution_context,
+    return_format="for_external_api",
+)
+# image_b64 = "data:image/png;base64,iVBORw0..." - send to API
+
+# OUTPUT: Returning result from block
+result_url = await store_media_file(
+    file=generated_image_url,
+    execution_context=execution_context,
+    return_format="for_block_output",
+)
+yield "image_url", result_url
+# In CoPilot: result_url = "workspace://abc123"
+# In graphs:  result_url = "data:image/png;base64,..."
+```
+
+**Key points:**
+
+- `for_block_output` is the ONLY format that auto-adapts to execution context
+- Always use `for_block_output` for block outputs unless you have a specific reason not to
+- Never hardcode workspace checks - let `for_block_output` handle it
+
+### Modifying the API
+
+1. Update route in `backend/api/features/`
+2. Add/update Pydantic models in same directory
+3. Write tests alongside the route file
+4. Run `poetry run test` to verify
+
+## Security Implementation
+
+### Cache Protection Middleware
+
+- Located in `backend/api/middleware/security.py`
+- Default behavior: Disables caching for ALL endpoints with `Cache-Control: no-store, no-cache, must-revalidate, private`
+- Uses an allow list approach - only explicitly permitted paths can be cached
+- Cacheable paths include: static assets (`static/*`, `_next/static/*`), health checks, public store pages, documentation
+- Prevents sensitive data (auth tokens, API keys, user data) from being cached by browsers/proxies
+- To allow caching for a new endpoint, add it to `CACHEABLE_PATHS` in the middleware
+- Applied to both main API server and external API applications
diff --git a/autogpt_platform/backend/Dockerfile b/autogpt_platform/backend/Dockerfile
index 7f51bad3a1..103226d079 100644
--- a/autogpt_platform/backend/Dockerfile
+++ b/autogpt_platform/backend/Dockerfile
@@ -48,7 +48,8 @@ RUN poetry install --no-ansi --no-root
 # Generate Prisma client
 COPY autogpt_platform/backend/schema.prisma ./
 COPY autogpt_platform/backend/backend/data/partial_types.py ./backend/data/partial_types.py
-RUN poetry run prisma generate
+COPY autogpt_platform/backend/gen_prisma_types_stub.py ./
+RUN poetry run prisma generate && poetry run gen-prisma-stub
 
 FROM debian:13-slim AS server_dependencies
 
@@ -99,6 +100,7 @@ COPY autogpt_platform/backend/migrations /app/autogpt_platform/backend/migration
 FROM server_dependencies AS server
 
 COPY autogpt_platform/backend /app/autogpt_platform/backend
+COPY docs /app/docs
 RUN poetry install --no-ansi --only-root
 
 ENV PORT=8000
diff --git a/autogpt_platform/backend/TESTING.md b/autogpt_platform/backend/TESTING.md
index a3a5db68ef..2e09144485 100644
--- a/autogpt_platform/backend/TESTING.md
+++ b/autogpt_platform/backend/TESTING.md
@@ -138,7 +138,7 @@ If the test doesn't need the `user_id` specifically, mocking is not necessary as
 
 #### Using Global Auth Fixtures
 
-Two global auth fixtures are provided by `backend/server/conftest.py`:
+Two global auth fixtures are provided by `backend/api/conftest.py`:
 
 - `mock_jwt_user` - Regular user with `test_user_id` ("test-user-id")
 - `mock_jwt_admin` - Admin user with `admin_user_id` ("admin-user-id")
diff --git a/autogpt_platform/backend/backend/api/external/v1/routes.py b/autogpt_platform/backend/backend/api/external/v1/routes.py
index 58e15dc6a3..00933c1899 100644
--- a/autogpt_platform/backend/backend/api/external/v1/routes.py
+++ b/autogpt_platform/backend/backend/api/external/v1/routes.py
@@ -86,6 +86,8 @@ async def execute_graph_block(
     obj = backend.data.block.get_block(block_id)
     if not obj:
         raise HTTPException(status_code=404, detail=f"Block #{block_id} not found.")
+    if obj.disabled:
+        raise HTTPException(status_code=403, detail=f"Block #{block_id} is disabled.")
 
     output = defaultdict(list)
     async for name, data in obj.execute(data):
diff --git a/autogpt_platform/backend/backend/api/external/v1/tools.py b/autogpt_platform/backend/backend/api/external/v1/tools.py
index 9e362fb32c..07734dd0c9 100644
--- a/autogpt_platform/backend/backend/api/external/v1/tools.py
+++ b/autogpt_platform/backend/backend/api/external/v1/tools.py
@@ -70,7 +70,7 @@ class RunAgentRequest(BaseModel):
     )
 
 
-def _create_ephemeral_session(user_id: str | None) -> ChatSession:
+def _create_ephemeral_session(user_id: str) -> ChatSession:
     """Create an ephemeral session for stateless API requests."""
     return ChatSession.new(user_id)
 
diff --git a/autogpt_platform/backend/backend/api/features/admin/execution_analytics_routes.py b/autogpt_platform/backend/backend/api/features/admin/execution_analytics_routes.py
index 00f0bda884..45912dae67 100644
--- a/autogpt_platform/backend/backend/api/features/admin/execution_analytics_routes.py
+++ b/autogpt_platform/backend/backend/api/features/admin/execution_analytics_routes.py
@@ -28,6 +28,7 @@ from backend.executor.manager import get_db_async_client
 from backend.util.settings import Settings
 
 logger = logging.getLogger(__name__)
+settings = Settings()
 
 
 class ExecutionAnalyticsRequest(BaseModel):
@@ -63,6 +64,8 @@ class ExecutionAnalyticsResult(BaseModel):
     score: Optional[float]
     status: str  # "success", "failed", "skipped"
     error_message: Optional[str] = None
+    started_at: Optional[datetime] = None
+    ended_at: Optional[datetime] = None
 
 
 class ExecutionAnalyticsResponse(BaseModel):
@@ -224,11 +227,6 @@ async def generate_execution_analytics(
     )
 
     try:
-        # Validate model configuration
-        settings = Settings()
-        if not settings.secrets.openai_internal_api_key:
-            raise HTTPException(status_code=500, detail="OpenAI API key not configured")
-
         # Get database client
         db_client = get_db_async_client()
 
@@ -320,6 +318,8 @@ async def generate_execution_analytics(
                     ),
                     status="skipped",
                     error_message=None,  # Not an error - just already processed
+                    started_at=execution.started_at,
+                    ended_at=execution.ended_at,
                 )
             )
 
@@ -349,6 +349,9 @@ async def _process_batch(
 ) -> list[ExecutionAnalyticsResult]:
     """Process a batch of executions concurrently."""
 
+    if not settings.secrets.openai_internal_api_key:
+        raise HTTPException(status_code=500, detail="OpenAI API key not configured")
+
     async def process_single_execution(execution) -> ExecutionAnalyticsResult:
         try:
             # Generate activity status and score using the specified model
@@ -387,6 +390,8 @@ async def _process_batch(
                     score=None,
                     status="skipped",
                     error_message="Activity generation returned None",
+                    started_at=execution.started_at,
+                    ended_at=execution.ended_at,
                 )
 
             # Update the execution stats
@@ -416,6 +421,8 @@ async def _process_batch(
                 summary_text=activity_response["activity_status"],
                 score=activity_response["correctness_score"],
                 status="success",
+                started_at=execution.started_at,
+                ended_at=execution.ended_at,
             )
 
         except Exception as e:
@@ -429,6 +436,8 @@ async def _process_batch(
                 score=None,
                 status="failed",
                 error_message=str(e),
+                started_at=execution.started_at,
+                ended_at=execution.ended_at,
             )
 
     # Process all executions in the batch concurrently
diff --git a/autogpt_platform/backend/backend/api/features/builder/routes.py b/autogpt_platform/backend/backend/api/features/builder/routes.py
index 7fe9cab189..15b922178d 100644
--- a/autogpt_platform/backend/backend/api/features/builder/routes.py
+++ b/autogpt_platform/backend/backend/api/features/builder/routes.py
@@ -17,7 +17,7 @@ router = fastapi.APIRouter(
 )
 
 
-# Taken from backend/server/v2/store/db.py
+# Taken from backend/api/features/store/db.py
 def sanitize_query(query: str | None) -> str | None:
     if query is None:
         return query
diff --git a/autogpt_platform/backend/backend/api/features/chat/completion_consumer.py b/autogpt_platform/backend/backend/api/features/chat/completion_consumer.py
new file mode 100644
index 0000000000..f447d46bd7
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/chat/completion_consumer.py
@@ -0,0 +1,368 @@
+"""Redis Streams consumer for operation completion messages.
+
+This module provides a consumer (ChatCompletionConsumer) that listens for
+completion notifications (OperationCompleteMessage) from external services
+(like Agent Generator) and triggers the appropriate stream registry and
+chat service updates via process_operation_success/process_operation_failure.
+
+Why Redis Streams instead of RabbitMQ?
+--------------------------------------
+While the project typically uses RabbitMQ for async task queues (e.g., execution
+queue), Redis Streams was chosen for chat completion notifications because:
+
+1. **Unified Infrastructure**: The SSE reconnection feature already uses Redis
+   Streams (via stream_registry) for message persistence and replay. Using Redis
+   Streams for completion notifications keeps all chat streaming infrastructure
+   in one system, simplifying operations and reducing cross-system coordination.
+
+2. **Message Replay**: Redis Streams support XREAD with arbitrary message IDs,
+   allowing consumers to replay missed messages after reconnection. This aligns
+   with the SSE reconnection pattern where clients can resume from last_message_id.
+
+3. **Consumer Groups with XAUTOCLAIM**: Redis consumer groups provide automatic
+   load balancing across pods with explicit message claiming (XAUTOCLAIM) for
+   recovering from dead consumers - ideal for the completion callback pattern.
+
+4. **Lower Latency**: For real-time SSE updates, Redis (already in-memory for
+   stream_registry) provides lower latency than an additional RabbitMQ hop.
+
+5. **Atomicity with Task State**: Completion processing often needs to update
+   task metadata stored in Redis. Keeping both in Redis enables simpler
+   transactional semantics without distributed coordination.
+
+The consumer uses Redis Streams with consumer groups for reliable message
+processing across multiple platform pods, with XAUTOCLAIM for reclaiming
+stale pending messages from dead consumers.
+"""
+
+import asyncio
+import logging
+import os
+import uuid
+from typing import Any
+
+import orjson
+from prisma import Prisma
+from pydantic import BaseModel
+from redis.exceptions import ResponseError
+
+from backend.data.redis_client import get_redis_async
+
+from . import stream_registry
+from .completion_handler import process_operation_failure, process_operation_success
+from .config import ChatConfig
+
+logger = logging.getLogger(__name__)
+config = ChatConfig()
+
+
+class OperationCompleteMessage(BaseModel):
+    """Message format for operation completion notifications."""
+
+    operation_id: str
+    task_id: str
+    success: bool
+    result: dict | str | None = None
+    error: str | None = None
+
+
+class ChatCompletionConsumer:
+    """Consumer for chat operation completion messages from Redis Streams.
+
+    This consumer initializes its own Prisma client in start() to ensure
+    database operations work correctly within this async context.
+
+    Uses Redis consumer groups to allow multiple platform pods to consume
+    messages reliably with automatic redelivery on failure.
+    """
+
+    def __init__(self):
+        self._consumer_task: asyncio.Task | None = None
+        self._running = False
+        self._prisma: Prisma | None = None
+        self._consumer_name = f"consumer-{uuid.uuid4().hex[:8]}"
+
+    async def start(self) -> None:
+        """Start the completion consumer."""
+        if self._running:
+            logger.warning("Completion consumer already running")
+            return
+
+        # Create consumer group if it doesn't exist
+        try:
+            redis = await get_redis_async()
+            await redis.xgroup_create(
+                config.stream_completion_name,
+                config.stream_consumer_group,
+                id="0",
+                mkstream=True,
+            )
+            logger.info(
+                f"Created consumer group '{config.stream_consumer_group}' "
+                f"on stream '{config.stream_completion_name}'"
+            )
+        except ResponseError as e:
+            if "BUSYGROUP" in str(e):
+                logger.debug(
+                    f"Consumer group '{config.stream_consumer_group}' already exists"
+                )
+            else:
+                raise
+
+        self._running = True
+        self._consumer_task = asyncio.create_task(self._consume_messages())
+        logger.info(
+            f"Chat completion consumer started (consumer: {self._consumer_name})"
+        )
+
+    async def _ensure_prisma(self) -> Prisma:
+        """Lazily initialize Prisma client on first use."""
+        if self._prisma is None:
+            database_url = os.getenv("DATABASE_URL", "postgresql://localhost:5432")
+            self._prisma = Prisma(datasource={"url": database_url})
+            await self._prisma.connect()
+            logger.info("[COMPLETION] Consumer Prisma client connected (lazy init)")
+        return self._prisma
+
+    async def stop(self) -> None:
+        """Stop the completion consumer."""
+        self._running = False
+
+        if self._consumer_task:
+            self._consumer_task.cancel()
+            try:
+                await self._consumer_task
+            except asyncio.CancelledError:
+                pass
+            self._consumer_task = None
+
+        if self._prisma:
+            await self._prisma.disconnect()
+            self._prisma = None
+            logger.info("[COMPLETION] Consumer Prisma client disconnected")
+
+        logger.info("Chat completion consumer stopped")
+
+    async def _consume_messages(self) -> None:
+        """Main message consumption loop with retry logic."""
+        max_retries = 10
+        retry_delay = 5  # seconds
+        retry_count = 0
+        block_timeout = 5000  # milliseconds
+
+        while self._running and retry_count < max_retries:
+            try:
+                redis = await get_redis_async()
+
+                # Reset retry count on successful connection
+                retry_count = 0
+
+                while self._running:
+                    # First, claim any stale pending messages from dead consumers
+                    # Redis does NOT auto-redeliver pending messages; we must explicitly
+                    # claim them using XAUTOCLAIM
+                    try:
+                        claimed_result = await redis.xautoclaim(
+                            name=config.stream_completion_name,
+                            groupname=config.stream_consumer_group,
+                            consumername=self._consumer_name,
+                            min_idle_time=config.stream_claim_min_idle_ms,
+                            start_id="0-0",
+                            count=10,
+                        )
+                        # xautoclaim returns: (next_start_id, [(id, data), ...], [deleted_ids])
+                        if claimed_result and len(claimed_result) >= 2:
+                            claimed_entries = claimed_result[1]
+                            if claimed_entries:
+                                logger.info(
+                                    f"Claimed {len(claimed_entries)} stale pending messages"
+                                )
+                                for entry_id, data in claimed_entries:
+                                    if not self._running:
+                                        return
+                                    await self._process_entry(redis, entry_id, data)
+                    except Exception as e:
+                        logger.warning(f"XAUTOCLAIM failed (non-fatal): {e}")
+
+                    # Read new messages from the stream
+                    messages = await redis.xreadgroup(
+                        groupname=config.stream_consumer_group,
+                        consumername=self._consumer_name,
+                        streams={config.stream_completion_name: ">"},
+                        block=block_timeout,
+                        count=10,
+                    )
+
+                    if not messages:
+                        continue
+
+                    for stream_name, entries in messages:
+                        for entry_id, data in entries:
+                            if not self._running:
+                                return
+                            await self._process_entry(redis, entry_id, data)
+
+            except asyncio.CancelledError:
+                logger.info("Consumer cancelled")
+                return
+            except Exception as e:
+                retry_count += 1
+                logger.error(
+                    f"Consumer error (retry {retry_count}/{max_retries}): {e}",
+                    exc_info=True,
+                )
+                if self._running and retry_count < max_retries:
+                    await asyncio.sleep(retry_delay)
+                else:
+                    logger.error("Max retries reached, stopping consumer")
+                    return
+
+    async def _process_entry(
+        self, redis: Any, entry_id: str, data: dict[str, Any]
+    ) -> None:
+        """Process a single stream entry and acknowledge it on success.
+
+        Args:
+            redis: Redis client connection
+            entry_id: The stream entry ID
+            data: The entry data dict
+        """
+        try:
+            # Handle the message
+            message_data = data.get("data")
+            if message_data:
+                await self._handle_message(
+                    message_data.encode()
+                    if isinstance(message_data, str)
+                    else message_data
+                )
+
+            # Acknowledge the message after successful processing
+            await redis.xack(
+                config.stream_completion_name,
+                config.stream_consumer_group,
+                entry_id,
+            )
+        except Exception as e:
+            logger.error(
+                f"Error processing completion message {entry_id}: {e}",
+                exc_info=True,
+            )
+            # Message remains in pending state and will be claimed by
+            # XAUTOCLAIM after min_idle_time expires
+
+    async def _handle_message(self, body: bytes) -> None:
+        """Handle a completion message using our own Prisma client."""
+        try:
+            data = orjson.loads(body)
+            message = OperationCompleteMessage(**data)
+        except Exception as e:
+            logger.error(f"Failed to parse completion message: {e}")
+            return
+
+        logger.info(
+            f"[COMPLETION] Received completion for operation {message.operation_id} "
+            f"(task_id={message.task_id}, success={message.success})"
+        )
+
+        # Find task in registry
+        task = await stream_registry.find_task_by_operation_id(message.operation_id)
+        if task is None:
+            task = await stream_registry.get_task(message.task_id)
+
+        if task is None:
+            logger.warning(
+                f"[COMPLETION] Task not found for operation {message.operation_id} "
+                f"(task_id={message.task_id})"
+            )
+            return
+
+        logger.info(
+            f"[COMPLETION] Found task: task_id={task.task_id}, "
+            f"session_id={task.session_id}, tool_call_id={task.tool_call_id}"
+        )
+
+        # Guard against empty task fields
+        if not task.task_id or not task.session_id or not task.tool_call_id:
+            logger.error(
+                f"[COMPLETION] Task has empty critical fields! "
+                f"task_id={task.task_id!r}, session_id={task.session_id!r}, "
+                f"tool_call_id={task.tool_call_id!r}"
+            )
+            return
+
+        if message.success:
+            await self._handle_success(task, message)
+        else:
+            await self._handle_failure(task, message)
+
+    async def _handle_success(
+        self,
+        task: stream_registry.ActiveTask,
+        message: OperationCompleteMessage,
+    ) -> None:
+        """Handle successful operation completion."""
+        prisma = await self._ensure_prisma()
+        await process_operation_success(task, message.result, prisma)
+
+    async def _handle_failure(
+        self,
+        task: stream_registry.ActiveTask,
+        message: OperationCompleteMessage,
+    ) -> None:
+        """Handle failed operation completion."""
+        prisma = await self._ensure_prisma()
+        await process_operation_failure(task, message.error, prisma)
+
+
+# Module-level consumer instance
+_consumer: ChatCompletionConsumer | None = None
+
+
+async def start_completion_consumer() -> None:
+    """Start the global completion consumer."""
+    global _consumer
+    if _consumer is None:
+        _consumer = ChatCompletionConsumer()
+    await _consumer.start()
+
+
+async def stop_completion_consumer() -> None:
+    """Stop the global completion consumer."""
+    global _consumer
+    if _consumer:
+        await _consumer.stop()
+        _consumer = None
+
+
+async def publish_operation_complete(
+    operation_id: str,
+    task_id: str,
+    success: bool,
+    result: dict | str | None = None,
+    error: str | None = None,
+) -> None:
+    """Publish an operation completion message to Redis Streams.
+
+    Args:
+        operation_id: The operation ID that completed.
+        task_id: The task ID associated with the operation.
+        success: Whether the operation succeeded.
+        result: The result data (for success).
+        error: The error message (for failure).
+    """
+    message = OperationCompleteMessage(
+        operation_id=operation_id,
+        task_id=task_id,
+        success=success,
+        result=result,
+        error=error,
+    )
+
+    redis = await get_redis_async()
+    await redis.xadd(
+        config.stream_completion_name,
+        {"data": message.model_dump_json()},
+        maxlen=config.stream_max_length,
+    )
+    logger.info(f"Published completion for operation {operation_id}")
diff --git a/autogpt_platform/backend/backend/api/features/chat/completion_handler.py b/autogpt_platform/backend/backend/api/features/chat/completion_handler.py
new file mode 100644
index 0000000000..905fa2ddba
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/chat/completion_handler.py
@@ -0,0 +1,344 @@
+"""Shared completion handling for operation success and failure.
+
+This module provides common logic for handling operation completion from both:
+- The Redis Streams consumer (completion_consumer.py)
+- The HTTP webhook endpoint (routes.py)
+"""
+
+import logging
+from typing import Any
+
+import orjson
+from prisma import Prisma
+
+from . import service as chat_service
+from . import stream_registry
+from .response_model import StreamError, StreamToolOutputAvailable
+from .tools.models import ErrorResponse
+
+logger = logging.getLogger(__name__)
+
+# Tools that produce agent_json that needs to be saved to library
+AGENT_GENERATION_TOOLS = {"create_agent", "edit_agent"}
+
+# Keys that should be stripped from agent_json when returning in error responses
+SENSITIVE_KEYS = frozenset(
+    {
+        "api_key",
+        "apikey",
+        "api_secret",
+        "password",
+        "secret",
+        "credentials",
+        "credential",
+        "token",
+        "access_token",
+        "refresh_token",
+        "private_key",
+        "privatekey",
+        "auth",
+        "authorization",
+    }
+)
+
+
+def _sanitize_agent_json(obj: Any) -> Any:
+    """Recursively sanitize agent_json by removing sensitive keys.
+
+    Args:
+        obj: The object to sanitize (dict, list, or primitive)
+
+    Returns:
+        Sanitized copy with sensitive keys removed/redacted
+    """
+    if isinstance(obj, dict):
+        return {
+            k: "[REDACTED]" if k.lower() in SENSITIVE_KEYS else _sanitize_agent_json(v)
+            for k, v in obj.items()
+        }
+    elif isinstance(obj, list):
+        return [_sanitize_agent_json(item) for item in obj]
+    else:
+        return obj
+
+
+class ToolMessageUpdateError(Exception):
+    """Raised when updating a tool message in the database fails."""
+
+    pass
+
+
+async def _update_tool_message(
+    session_id: str,
+    tool_call_id: str,
+    content: str,
+    prisma_client: Prisma | None,
+) -> None:
+    """Update tool message in database.
+
+    Args:
+        session_id: The session ID
+        tool_call_id: The tool call ID to update
+        content: The new content for the message
+        prisma_client: Optional Prisma client. If None, uses chat_service.
+
+    Raises:
+        ToolMessageUpdateError: If the database update fails. The caller should
+            handle this to avoid marking the task as completed with inconsistent state.
+    """
+    try:
+        if prisma_client:
+            # Use provided Prisma client (for consumer with its own connection)
+            updated_count = await prisma_client.chatmessage.update_many(
+                where={
+                    "sessionId": session_id,
+                    "toolCallId": tool_call_id,
+                },
+                data={"content": content},
+            )
+            # Check if any rows were updated - 0 means message not found
+            if updated_count == 0:
+                raise ToolMessageUpdateError(
+                    f"No message found with tool_call_id={tool_call_id} in session {session_id}"
+                )
+        else:
+            # Use service function (for webhook endpoint)
+            await chat_service._update_pending_operation(
+                session_id=session_id,
+                tool_call_id=tool_call_id,
+                result=content,
+            )
+    except ToolMessageUpdateError:
+        raise
+    except Exception as e:
+        logger.error(f"[COMPLETION] Failed to update tool message: {e}", exc_info=True)
+        raise ToolMessageUpdateError(
+            f"Failed to update tool message for tool_call_id={tool_call_id}: {e}"
+        ) from e
+
+
+def serialize_result(result: dict | list | str | int | float | bool | None) -> str:
+    """Serialize result to JSON string with sensible defaults.
+
+    Args:
+        result: The result to serialize. Can be a dict, list, string,
+            number, boolean, or None.
+
+    Returns:
+        JSON string representation of the result. Returns '{"status": "completed"}'
+        only when result is explicitly None.
+    """
+    if isinstance(result, str):
+        return result
+    if result is None:
+        return '{"status": "completed"}'
+    return orjson.dumps(result).decode("utf-8")
+
+
+async def _save_agent_from_result(
+    result: dict[str, Any],
+    user_id: str | None,
+    tool_name: str,
+) -> dict[str, Any]:
+    """Save agent to library if result contains agent_json.
+
+    Args:
+        result: The result dict that may contain agent_json
+        user_id: The user ID to save the agent for
+        tool_name: The tool name (create_agent or edit_agent)
+
+    Returns:
+        Updated result dict with saved agent details, or original result if no agent_json
+    """
+    if not user_id:
+        logger.warning("[COMPLETION] Cannot save agent: no user_id in task")
+        return result
+
+    agent_json = result.get("agent_json")
+    if not agent_json:
+        logger.warning(
+            f"[COMPLETION] {tool_name} completed but no agent_json in result"
+        )
+        return result
+
+    try:
+        from .tools.agent_generator import save_agent_to_library
+
+        is_update = tool_name == "edit_agent"
+        created_graph, library_agent = await save_agent_to_library(
+            agent_json, user_id, is_update=is_update
+        )
+
+        logger.info(
+            f"[COMPLETION] Saved agent '{created_graph.name}' to library "
+            f"(graph_id={created_graph.id}, library_agent_id={library_agent.id})"
+        )
+
+        # Return a response similar to AgentSavedResponse
+        return {
+            "type": "agent_saved",
+            "message": f"Agent '{created_graph.name}' has been saved to your library!",
+            "agent_id": created_graph.id,
+            "agent_name": created_graph.name,
+            "library_agent_id": library_agent.id,
+            "library_agent_link": f"/library/agents/{library_agent.id}",
+            "agent_page_link": f"/build?flowID={created_graph.id}",
+        }
+    except Exception as e:
+        logger.error(
+            f"[COMPLETION] Failed to save agent to library: {e}",
+            exc_info=True,
+        )
+        # Return error but don't fail the whole operation
+        # Sanitize agent_json to remove sensitive keys before returning
+        return {
+            "type": "error",
+            "message": f"Agent was generated but failed to save: {str(e)}",
+            "error": str(e),
+            "agent_json": _sanitize_agent_json(agent_json),
+        }
+
+
+async def process_operation_success(
+    task: stream_registry.ActiveTask,
+    result: dict | str | None,
+    prisma_client: Prisma | None = None,
+) -> None:
+    """Handle successful operation completion.
+
+    Publishes the result to the stream registry, updates the database,
+    generates LLM continuation, and marks the task as completed.
+
+    Args:
+        task: The active task that completed
+        result: The result data from the operation
+        prisma_client: Optional Prisma client for database operations.
+            If None, uses chat_service._update_pending_operation instead.
+
+    Raises:
+        ToolMessageUpdateError: If the database update fails. The task will be
+            marked as failed instead of completed to avoid inconsistent state.
+    """
+    # For agent generation tools, save the agent to library
+    if task.tool_name in AGENT_GENERATION_TOOLS and isinstance(result, dict):
+        result = await _save_agent_from_result(result, task.user_id, task.tool_name)
+
+    # Serialize result for output (only substitute default when result is exactly None)
+    result_output = result if result is not None else {"status": "completed"}
+    output_str = (
+        result_output
+        if isinstance(result_output, str)
+        else orjson.dumps(result_output).decode("utf-8")
+    )
+
+    # Publish result to stream registry
+    await stream_registry.publish_chunk(
+        task.task_id,
+        StreamToolOutputAvailable(
+            toolCallId=task.tool_call_id,
+            toolName=task.tool_name,
+            output=output_str,
+            success=True,
+        ),
+    )
+
+    # Update pending operation in database
+    # If this fails, we must not continue to mark the task as completed
+    result_str = serialize_result(result)
+    try:
+        await _update_tool_message(
+            session_id=task.session_id,
+            tool_call_id=task.tool_call_id,
+            content=result_str,
+            prisma_client=prisma_client,
+        )
+    except ToolMessageUpdateError:
+        # DB update failed - mark task as failed to avoid inconsistent state
+        logger.error(
+            f"[COMPLETION] DB update failed for task {task.task_id}, "
+            "marking as failed instead of completed"
+        )
+        await stream_registry.publish_chunk(
+            task.task_id,
+            StreamError(errorText="Failed to save operation result to database"),
+        )
+        await stream_registry.mark_task_completed(task.task_id, status="failed")
+        raise
+
+    # Generate LLM continuation with streaming
+    try:
+        await chat_service._generate_llm_continuation_with_streaming(
+            session_id=task.session_id,
+            user_id=task.user_id,
+            task_id=task.task_id,
+        )
+    except Exception as e:
+        logger.error(
+            f"[COMPLETION] Failed to generate LLM continuation: {e}",
+            exc_info=True,
+        )
+
+    # Mark task as completed and release Redis lock
+    await stream_registry.mark_task_completed(task.task_id, status="completed")
+    try:
+        await chat_service._mark_operation_completed(task.tool_call_id)
+    except Exception as e:
+        logger.error(f"[COMPLETION] Failed to mark operation completed: {e}")
+
+    logger.info(
+        f"[COMPLETION] Successfully processed completion for task {task.task_id}"
+    )
+
+
+async def process_operation_failure(
+    task: stream_registry.ActiveTask,
+    error: str | None,
+    prisma_client: Prisma | None = None,
+) -> None:
+    """Handle failed operation completion.
+
+    Publishes the error to the stream registry, updates the database with
+    the error response, and marks the task as failed.
+
+    Args:
+        task: The active task that failed
+        error: The error message from the operation
+        prisma_client: Optional Prisma client for database operations.
+            If None, uses chat_service._update_pending_operation instead.
+    """
+    error_msg = error or "Operation failed"
+
+    # Publish error to stream registry
+    await stream_registry.publish_chunk(
+        task.task_id,
+        StreamError(errorText=error_msg),
+    )
+
+    # Update pending operation with error
+    # If this fails, we still continue to mark the task as failed
+    error_response = ErrorResponse(
+        message=error_msg,
+        error=error,
+    )
+    try:
+        await _update_tool_message(
+            session_id=task.session_id,
+            tool_call_id=task.tool_call_id,
+            content=error_response.model_dump_json(),
+            prisma_client=prisma_client,
+        )
+    except ToolMessageUpdateError:
+        # DB update failed - log but continue with cleanup
+        logger.error(
+            f"[COMPLETION] DB update failed while processing failure for task {task.task_id}, "
+            "continuing with cleanup"
+        )
+
+    # Mark task as failed and release Redis lock
+    await stream_registry.mark_task_completed(task.task_id, status="failed")
+    try:
+        await chat_service._mark_operation_completed(task.tool_call_id)
+    except Exception as e:
+        logger.error(f"[COMPLETION] Failed to mark operation completed: {e}")
+
+    logger.info(f"[COMPLETION] Processed failure for task {task.task_id}: {error_msg}")
diff --git a/autogpt_platform/backend/backend/api/features/chat/config.py b/autogpt_platform/backend/backend/api/features/chat/config.py
index 5b8f16298e..2e8dbf5413 100644
--- a/autogpt_platform/backend/backend/api/features/chat/config.py
+++ b/autogpt_platform/backend/backend/api/features/chat/config.py
@@ -1,7 +1,6 @@
 """Configuration management for chat system."""
 
 import os
-from pathlib import Path
 
 from pydantic import Field, field_validator
 from pydantic_settings import BaseSettings
@@ -12,7 +11,11 @@ class ChatConfig(BaseSettings):
 
     # OpenAI API Configuration
     model: str = Field(
-        default="qwen/qwen3-235b-a22b-2507", description="Default model to use"
+        default="anthropic/claude-opus-4.5", description="Default model to use"
+    )
+    title_model: str = Field(
+        default="openai/gpt-4o-mini",
+        description="Model to use for generating session titles (should be fast/cheap)",
     )
     api_key: str | None = Field(default=None, description="OpenAI API key")
     base_url: str | None = Field(
@@ -23,12 +26,6 @@ class ChatConfig(BaseSettings):
     # Session TTL Configuration - 12 hours
     session_ttl: int = Field(default=43200, description="Session TTL in seconds")
 
-    # System Prompt Configuration
-    system_prompt_path: str = Field(
-        default="prompts/chat_system.md",
-        description="Path to system prompt file relative to chat module",
-    )
-
     # Streaming Configuration
     max_context_messages: int = Field(
         default=50, ge=1, le=200, description="Maximum context messages"
@@ -36,9 +33,64 @@ class ChatConfig(BaseSettings):
 
     stream_timeout: int = Field(default=300, description="Stream timeout in seconds")
     max_retries: int = Field(default=3, description="Maximum number of retries")
-    max_agent_runs: int = Field(default=3, description="Maximum number of agent runs")
+    max_agent_runs: int = Field(default=30, description="Maximum number of agent runs")
     max_agent_schedules: int = Field(
-        default=3, description="Maximum number of agent schedules"
+        default=30, description="Maximum number of agent schedules"
+    )
+
+    # Long-running operation configuration
+    long_running_operation_ttl: int = Field(
+        default=600,
+        description="TTL in seconds for long-running operation tracking in Redis (safety net if pod dies)",
+    )
+
+    # Stream registry configuration for SSE reconnection
+    stream_ttl: int = Field(
+        default=3600,
+        description="TTL in seconds for stream data in Redis (1 hour)",
+    )
+    stream_max_length: int = Field(
+        default=10000,
+        description="Maximum number of messages to store per stream",
+    )
+
+    # Redis Streams configuration for completion consumer
+    stream_completion_name: str = Field(
+        default="chat:completions",
+        description="Redis Stream name for operation completions",
+    )
+    stream_consumer_group: str = Field(
+        default="chat_consumers",
+        description="Consumer group name for completion stream",
+    )
+    stream_claim_min_idle_ms: int = Field(
+        default=60000,
+        description="Minimum idle time in milliseconds before claiming pending messages from dead consumers",
+    )
+
+    # Redis key prefixes for stream registry
+    task_meta_prefix: str = Field(
+        default="chat:task:meta:",
+        description="Prefix for task metadata hash keys",
+    )
+    task_stream_prefix: str = Field(
+        default="chat:stream:",
+        description="Prefix for task message stream keys",
+    )
+    task_op_prefix: str = Field(
+        default="chat:task:op:",
+        description="Prefix for operation ID to task ID mapping keys",
+    )
+    internal_api_key: str | None = Field(
+        default=None,
+        description="API key for internal webhook callbacks (env: CHAT_INTERNAL_API_KEY)",
+    )
+
+    # Langfuse Prompt Management Configuration
+    # Note: Langfuse credentials are in Settings().secrets (settings.py)
+    langfuse_prompt_name: str = Field(
+        default="CoPilot Prompt",
+        description="Name of the prompt in Langfuse to fetch",
     )
 
     @field_validator("api_key", mode="before")
@@ -72,43 +124,19 @@ class ChatConfig(BaseSettings):
                 v = "https://openrouter.ai/api/v1"
         return v
 
-    def get_system_prompt(self, **template_vars) -> str:
-        """Load and render the system prompt from file.
+    @field_validator("internal_api_key", mode="before")
+    @classmethod
+    def get_internal_api_key(cls, v):
+        """Get internal API key from environment if not provided."""
+        if v is None:
+            v = os.getenv("CHAT_INTERNAL_API_KEY")
+        return v
 
-        Args:
-            **template_vars: Variables to substitute in the template
-
-        Returns:
-            Rendered system prompt string
-
-        """
-        # Get the path relative to this module
-        module_dir = Path(__file__).parent
-        prompt_path = module_dir / self.system_prompt_path
-
-        # Check for .j2 extension first (Jinja2 template)
-        j2_path = Path(str(prompt_path) + ".j2")
-        if j2_path.exists():
-            try:
-                from jinja2 import Template
-
-                template = Template(j2_path.read_text())
-                return template.render(**template_vars)
-            except ImportError:
-                # Jinja2 not installed, fall back to reading as plain text
-                return j2_path.read_text()
-
-        # Check for markdown file
-        if prompt_path.exists():
-            content = prompt_path.read_text()
-
-            # Simple variable substitution if Jinja2 is not available
-            for key, value in template_vars.items():
-                placeholder = f"{{{key}}}"
-                content = content.replace(placeholder, str(value))
-
-            return content
-        raise FileNotFoundError(f"System prompt file not found: {prompt_path}")
+    # Prompt paths for different contexts
+    PROMPT_PATHS: dict[str, str] = {
+        "default": "prompts/chat_system.md",
+        "onboarding": "prompts/onboarding_system.md",
+    }
 
     class Config:
         """Pydantic config."""
diff --git a/autogpt_platform/backend/backend/api/features/chat/db.py b/autogpt_platform/backend/backend/api/features/chat/db.py
new file mode 100644
index 0000000000..d34b4e5b07
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/chat/db.py
@@ -0,0 +1,291 @@
+"""Database operations for chat sessions."""
+
+import asyncio
+import logging
+from datetime import UTC, datetime
+from typing import Any, cast
+
+from prisma.models import ChatMessage as PrismaChatMessage
+from prisma.models import ChatSession as PrismaChatSession
+from prisma.types import (
+    ChatMessageCreateInput,
+    ChatSessionCreateInput,
+    ChatSessionUpdateInput,
+    ChatSessionWhereInput,
+)
+
+from backend.data.db import transaction
+from backend.util.json import SafeJson
+
+logger = logging.getLogger(__name__)
+
+
+async def get_chat_session(session_id: str) -> PrismaChatSession | None:
+    """Get a chat session by ID from the database."""
+    session = await PrismaChatSession.prisma().find_unique(
+        where={"id": session_id},
+        include={"Messages": True},
+    )
+    if session and session.Messages:
+        # Sort messages by sequence in Python - Prisma Python client doesn't support
+        # order_by in include clauses (unlike Prisma JS), so we sort after fetching
+        session.Messages.sort(key=lambda m: m.sequence)
+    return session
+
+
+async def create_chat_session(
+    session_id: str,
+    user_id: str,
+) -> PrismaChatSession:
+    """Create a new chat session in the database."""
+    data = ChatSessionCreateInput(
+        id=session_id,
+        userId=user_id,
+        credentials=SafeJson({}),
+        successfulAgentRuns=SafeJson({}),
+        successfulAgentSchedules=SafeJson({}),
+    )
+    return await PrismaChatSession.prisma().create(
+        data=data,
+        include={"Messages": True},
+    )
+
+
+async def update_chat_session(
+    session_id: str,
+    credentials: dict[str, Any] | None = None,
+    successful_agent_runs: dict[str, Any] | None = None,
+    successful_agent_schedules: dict[str, Any] | None = None,
+    total_prompt_tokens: int | None = None,
+    total_completion_tokens: int | None = None,
+    title: str | None = None,
+) -> PrismaChatSession | None:
+    """Update a chat session's metadata."""
+    data: ChatSessionUpdateInput = {"updatedAt": datetime.now(UTC)}
+
+    if credentials is not None:
+        data["credentials"] = SafeJson(credentials)
+    if successful_agent_runs is not None:
+        data["successfulAgentRuns"] = SafeJson(successful_agent_runs)
+    if successful_agent_schedules is not None:
+        data["successfulAgentSchedules"] = SafeJson(successful_agent_schedules)
+    if total_prompt_tokens is not None:
+        data["totalPromptTokens"] = total_prompt_tokens
+    if total_completion_tokens is not None:
+        data["totalCompletionTokens"] = total_completion_tokens
+    if title is not None:
+        data["title"] = title
+
+    session = await PrismaChatSession.prisma().update(
+        where={"id": session_id},
+        data=data,
+        include={"Messages": True},
+    )
+    if session and session.Messages:
+        # Sort in Python - Prisma Python doesn't support order_by in include clauses
+        session.Messages.sort(key=lambda m: m.sequence)
+    return session
+
+
+async def add_chat_message(
+    session_id: str,
+    role: str,
+    sequence: int,
+    content: str | None = None,
+    name: str | None = None,
+    tool_call_id: str | None = None,
+    refusal: str | None = None,
+    tool_calls: list[dict[str, Any]] | None = None,
+    function_call: dict[str, Any] | None = None,
+) -> PrismaChatMessage:
+    """Add a message to a chat session."""
+    # Build input dict dynamically rather than using ChatMessageCreateInput directly
+    # because Prisma's TypedDict validation rejects optional fields set to None.
+    # We only include fields that have values, then cast at the end.
+    data: dict[str, Any] = {
+        "Session": {"connect": {"id": session_id}},
+        "role": role,
+        "sequence": sequence,
+    }
+
+    # Add optional string fields
+    if content is not None:
+        data["content"] = content
+    if name is not None:
+        data["name"] = name
+    if tool_call_id is not None:
+        data["toolCallId"] = tool_call_id
+    if refusal is not None:
+        data["refusal"] = refusal
+
+    # Add optional JSON fields only when they have values
+    if tool_calls is not None:
+        data["toolCalls"] = SafeJson(tool_calls)
+    if function_call is not None:
+        data["functionCall"] = SafeJson(function_call)
+
+    # Run message create and session timestamp update in parallel for lower latency
+    _, message = await asyncio.gather(
+        PrismaChatSession.prisma().update(
+            where={"id": session_id},
+            data={"updatedAt": datetime.now(UTC)},
+        ),
+        PrismaChatMessage.prisma().create(data=cast(ChatMessageCreateInput, data)),
+    )
+    return message
+
+
+async def add_chat_messages_batch(
+    session_id: str,
+    messages: list[dict[str, Any]],
+    start_sequence: int,
+) -> list[PrismaChatMessage]:
+    """Add multiple messages to a chat session in a batch.
+
+    Uses a transaction for atomicity - if any message creation fails,
+    the entire batch is rolled back.
+    """
+    if not messages:
+        return []
+
+    created_messages = []
+
+    async with transaction() as tx:
+        for i, msg in enumerate(messages):
+            # Build input dict dynamically rather than using ChatMessageCreateInput
+            # directly because Prisma's TypedDict validation rejects optional fields
+            # set to None. We only include fields that have values, then cast.
+            data: dict[str, Any] = {
+                "Session": {"connect": {"id": session_id}},
+                "role": msg["role"],
+                "sequence": start_sequence + i,
+            }
+
+            # Add optional string fields
+            if msg.get("content") is not None:
+                data["content"] = msg["content"]
+            if msg.get("name") is not None:
+                data["name"] = msg["name"]
+            if msg.get("tool_call_id") is not None:
+                data["toolCallId"] = msg["tool_call_id"]
+            if msg.get("refusal") is not None:
+                data["refusal"] = msg["refusal"]
+
+            # Add optional JSON fields only when they have values
+            if msg.get("tool_calls") is not None:
+                data["toolCalls"] = SafeJson(msg["tool_calls"])
+            if msg.get("function_call") is not None:
+                data["functionCall"] = SafeJson(msg["function_call"])
+
+            created = await PrismaChatMessage.prisma(tx).create(
+                data=cast(ChatMessageCreateInput, data)
+            )
+            created_messages.append(created)
+
+        # Update session's updatedAt timestamp within the same transaction.
+        # Note: Token usage (total_prompt_tokens, total_completion_tokens) is updated
+        # separately via update_chat_session() after streaming completes.
+        await PrismaChatSession.prisma(tx).update(
+            where={"id": session_id},
+            data={"updatedAt": datetime.now(UTC)},
+        )
+
+    return created_messages
+
+
+async def get_user_chat_sessions(
+    user_id: str,
+    limit: int = 50,
+    offset: int = 0,
+) -> list[PrismaChatSession]:
+    """Get chat sessions for a user, ordered by most recent."""
+    return await PrismaChatSession.prisma().find_many(
+        where={"userId": user_id},
+        order={"updatedAt": "desc"},
+        take=limit,
+        skip=offset,
+    )
+
+
+async def get_user_session_count(user_id: str) -> int:
+    """Get the total number of chat sessions for a user."""
+    return await PrismaChatSession.prisma().count(where={"userId": user_id})
+
+
+async def delete_chat_session(session_id: str, user_id: str | None = None) -> bool:
+    """Delete a chat session and all its messages.
+
+    Args:
+        session_id: The session ID to delete.
+        user_id: If provided, validates that the session belongs to this user
+            before deletion. This prevents unauthorized deletion of other
+            users' sessions.
+
+    Returns:
+        True if deleted successfully, False otherwise.
+    """
+    try:
+        # Build typed where clause with optional user_id validation
+        where_clause: ChatSessionWhereInput = {"id": session_id}
+        if user_id is not None:
+            where_clause["userId"] = user_id
+
+        result = await PrismaChatSession.prisma().delete_many(where=where_clause)
+        if result == 0:
+            logger.warning(
+                f"No session deleted for {session_id} "
+                f"(user_id validation: {user_id is not None})"
+            )
+            return False
+        return True
+    except Exception as e:
+        logger.error(f"Failed to delete chat session {session_id}: {e}")
+        return False
+
+
+async def get_chat_session_message_count(session_id: str) -> int:
+    """Get the number of messages in a chat session."""
+    count = await PrismaChatMessage.prisma().count(where={"sessionId": session_id})
+    return count
+
+
+async def update_tool_message_content(
+    session_id: str,
+    tool_call_id: str,
+    new_content: str,
+) -> bool:
+    """Update the content of a tool message in chat history.
+
+    Used by background tasks to update pending operation messages with final results.
+
+    Args:
+        session_id: The chat session ID.
+        tool_call_id: The tool call ID to find the message.
+        new_content: The new content to set.
+
+    Returns:
+        True if a message was updated, False otherwise.
+    """
+    try:
+        result = await PrismaChatMessage.prisma().update_many(
+            where={
+                "sessionId": session_id,
+                "toolCallId": tool_call_id,
+            },
+            data={
+                "content": new_content,
+            },
+        )
+        if result == 0:
+            logger.warning(
+                f"No message found to update for session {session_id}, "
+                f"tool_call_id {tool_call_id}"
+            )
+            return False
+        return True
+    except Exception as e:
+        logger.error(
+            f"Failed to update tool message for session {session_id}, "
+            f"tool_call_id {tool_call_id}: {e}"
+        )
+        return False
diff --git a/autogpt_platform/backend/backend/api/features/chat/model.py b/autogpt_platform/backend/backend/api/features/chat/model.py
index b8aea5a334..7318ef88d7 100644
--- a/autogpt_platform/backend/backend/api/features/chat/model.py
+++ b/autogpt_platform/backend/backend/api/features/chat/model.py
@@ -1,6 +1,9 @@
+import asyncio
 import logging
 import uuid
 from datetime import UTC, datetime
+from typing import Any
+from weakref import WeakValueDictionary
 
 from openai.types.chat import (
     ChatCompletionAssistantMessageParam,
@@ -16,17 +19,63 @@ from openai.types.chat.chat_completion_message_tool_call_param import (
     ChatCompletionMessageToolCallParam,
     Function,
 )
+from prisma.models import ChatMessage as PrismaChatMessage
+from prisma.models import ChatSession as PrismaChatSession
 from pydantic import BaseModel
 
 from backend.data.redis_client import get_redis_async
-from backend.util.exceptions import RedisError
+from backend.util import json
+from backend.util.exceptions import DatabaseError, RedisError
 
+from . import db as chat_db
 from .config import ChatConfig
 
 logger = logging.getLogger(__name__)
 config = ChatConfig()
 
 
+def _parse_json_field(value: str | dict | list | None, default: Any = None) -> Any:
+    """Parse a JSON field that may be stored as string or already parsed."""
+    if value is None:
+        return default
+    if isinstance(value, str):
+        return json.loads(value)
+    return value
+
+
+# Redis cache key prefix for chat sessions
+CHAT_SESSION_CACHE_PREFIX = "chat:session:"
+
+
+def _get_session_cache_key(session_id: str) -> str:
+    """Get the Redis cache key for a chat session."""
+    return f"{CHAT_SESSION_CACHE_PREFIX}{session_id}"
+
+
+# Session-level locks to prevent race conditions during concurrent upserts.
+# Uses WeakValueDictionary to automatically garbage collect locks when no longer referenced,
+# preventing unbounded memory growth while maintaining lock semantics for active sessions.
+# Invalidation: Locks are auto-removed by GC when no coroutine holds a reference (after
+# async with lock: completes). Explicit cleanup also occurs in delete_chat_session().
+_session_locks: WeakValueDictionary[str, asyncio.Lock] = WeakValueDictionary()
+_session_locks_mutex = asyncio.Lock()
+
+
+async def _get_session_lock(session_id: str) -> asyncio.Lock:
+    """Get or create a lock for a specific session to prevent concurrent upserts.
+
+    Uses WeakValueDictionary for automatic cleanup: locks are garbage collected
+    when no coroutine holds a reference to them, preventing memory leaks from
+    unbounded growth of session locks.
+    """
+    async with _session_locks_mutex:
+        lock = _session_locks.get(session_id)
+        if lock is None:
+            lock = asyncio.Lock()
+            _session_locks[session_id] = lock
+        return lock
+
+
 class ChatMessage(BaseModel):
     role: str
     content: str | None = None
@@ -45,7 +94,8 @@ class Usage(BaseModel):
 
 class ChatSession(BaseModel):
     session_id: str
-    user_id: str | None
+    user_id: str
+    title: str | None = None
     messages: list[ChatMessage]
     usage: list[Usage]
     credentials: dict[str, dict] = {}  # Map of provider -> credential metadata
@@ -55,10 +105,11 @@ class ChatSession(BaseModel):
     successful_agent_schedules: dict[str, int] = {}
 
     @staticmethod
-    def new(user_id: str | None) -> "ChatSession":
+    def new(user_id: str) -> "ChatSession":
         return ChatSession(
             session_id=str(uuid.uuid4()),
             user_id=user_id,
+            title=None,
             messages=[],
             usage=[],
             credentials={},
@@ -66,6 +117,61 @@ class ChatSession(BaseModel):
             updated_at=datetime.now(UTC),
         )
 
+    @staticmethod
+    def from_db(
+        prisma_session: PrismaChatSession,
+        prisma_messages: list[PrismaChatMessage] | None = None,
+    ) -> "ChatSession":
+        """Convert Prisma models to Pydantic ChatSession."""
+        messages = []
+        if prisma_messages:
+            for msg in prisma_messages:
+                messages.append(
+                    ChatMessage(
+                        role=msg.role,
+                        content=msg.content,
+                        name=msg.name,
+                        tool_call_id=msg.toolCallId,
+                        refusal=msg.refusal,
+                        tool_calls=_parse_json_field(msg.toolCalls),
+                        function_call=_parse_json_field(msg.functionCall),
+                    )
+                )
+
+        # Parse JSON fields from Prisma
+        credentials = _parse_json_field(prisma_session.credentials, default={})
+        successful_agent_runs = _parse_json_field(
+            prisma_session.successfulAgentRuns, default={}
+        )
+        successful_agent_schedules = _parse_json_field(
+            prisma_session.successfulAgentSchedules, default={}
+        )
+
+        # Calculate usage from token counts
+        usage = []
+        if prisma_session.totalPromptTokens or prisma_session.totalCompletionTokens:
+            usage.append(
+                Usage(
+                    prompt_tokens=prisma_session.totalPromptTokens or 0,
+                    completion_tokens=prisma_session.totalCompletionTokens or 0,
+                    total_tokens=(prisma_session.totalPromptTokens or 0)
+                    + (prisma_session.totalCompletionTokens or 0),
+                )
+            )
+
+        return ChatSession(
+            session_id=prisma_session.id,
+            user_id=prisma_session.userId,
+            title=prisma_session.title,
+            messages=messages,
+            usage=usage,
+            credentials=credentials,
+            started_at=prisma_session.createdAt,
+            updated_at=prisma_session.updatedAt,
+            successful_agent_runs=successful_agent_runs,
+            successful_agent_schedules=successful_agent_schedules,
+        )
+
     def to_openai_messages(self) -> list[ChatCompletionMessageParam]:
         messages = []
         for message in self.messages:
@@ -155,50 +261,357 @@ class ChatSession(BaseModel):
         return messages
 
 
-async def get_chat_session(
-    session_id: str,
-    user_id: str | None,
-) -> ChatSession | None:
-    """Get a chat session by ID."""
-    redis_key = f"chat:session:{session_id}"
+async def _get_session_from_cache(session_id: str) -> ChatSession | None:
+    """Get a chat session from Redis cache."""
+    redis_key = _get_session_cache_key(session_id)
     async_redis = await get_redis_async()
-
     raw_session: bytes | None = await async_redis.get(redis_key)
 
     if raw_session is None:
-        logger.warning(f"Session {session_id} not found in Redis")
         return None
 
     try:
         session = ChatSession.model_validate_json(raw_session)
+        logger.info(
+            f"Loading session {session_id} from cache: "
+            f"message_count={len(session.messages)}, "
+            f"roles={[m.role for m in session.messages]}"
+        )
+        return session
     except Exception as e:
         logger.error(f"Failed to deserialize session {session_id}: {e}", exc_info=True)
         raise RedisError(f"Corrupted session data for {session_id}") from e
 
-    if session.user_id is not None and session.user_id != user_id:
+
+async def _cache_session(session: ChatSession) -> None:
+    """Cache a chat session in Redis."""
+    redis_key = _get_session_cache_key(session.session_id)
+    async_redis = await get_redis_async()
+    await async_redis.setex(redis_key, config.session_ttl, session.model_dump_json())
+
+
+async def cache_chat_session(session: ChatSession) -> None:
+    """Cache a chat session without persisting to the database."""
+    await _cache_session(session)
+
+
+async def invalidate_session_cache(session_id: str) -> None:
+    """Invalidate a chat session from Redis cache.
+
+    Used by background tasks to ensure fresh data is loaded on next access.
+    This is best-effort - Redis failures are logged but don't fail the operation.
+    """
+    try:
+        redis_key = _get_session_cache_key(session_id)
+        async_redis = await get_redis_async()
+        await async_redis.delete(redis_key)
+    except Exception as e:
+        # Best-effort: log but don't fail - cache will expire naturally
+        logger.warning(f"Failed to invalidate session cache for {session_id}: {e}")
+
+
+async def _get_session_from_db(session_id: str) -> ChatSession | None:
+    """Get a chat session from the database."""
+    prisma_session = await chat_db.get_chat_session(session_id)
+    if not prisma_session:
+        return None
+
+    messages = prisma_session.Messages
+    logger.info(
+        f"Loading session {session_id} from DB: "
+        f"has_messages={messages is not None}, "
+        f"message_count={len(messages) if messages else 0}, "
+        f"roles={[m.role for m in messages] if messages else []}"
+    )
+
+    return ChatSession.from_db(prisma_session, messages)
+
+
+async def _save_session_to_db(
+    session: ChatSession, existing_message_count: int
+) -> None:
+    """Save or update a chat session in the database."""
+    # Check if session exists in DB
+    existing = await chat_db.get_chat_session(session.session_id)
+
+    if not existing:
+        # Create new session
+        await chat_db.create_chat_session(
+            session_id=session.session_id,
+            user_id=session.user_id,
+        )
+        existing_message_count = 0
+
+    # Calculate total tokens from usage
+    total_prompt = sum(u.prompt_tokens for u in session.usage)
+    total_completion = sum(u.completion_tokens for u in session.usage)
+
+    # Update session metadata
+    await chat_db.update_chat_session(
+        session_id=session.session_id,
+        credentials=session.credentials,
+        successful_agent_runs=session.successful_agent_runs,
+        successful_agent_schedules=session.successful_agent_schedules,
+        total_prompt_tokens=total_prompt,
+        total_completion_tokens=total_completion,
+    )
+
+    # Add new messages (only those after existing count)
+    new_messages = session.messages[existing_message_count:]
+    if new_messages:
+        messages_data = []
+        for msg in new_messages:
+            messages_data.append(
+                {
+                    "role": msg.role,
+                    "content": msg.content,
+                    "name": msg.name,
+                    "tool_call_id": msg.tool_call_id,
+                    "refusal": msg.refusal,
+                    "tool_calls": msg.tool_calls,
+                    "function_call": msg.function_call,
+                }
+            )
+        logger.info(
+            f"Saving {len(new_messages)} new messages to DB for session {session.session_id}: "
+            f"roles={[m['role'] for m in messages_data]}, "
+            f"start_sequence={existing_message_count}"
+        )
+        await chat_db.add_chat_messages_batch(
+            session_id=session.session_id,
+            messages=messages_data,
+            start_sequence=existing_message_count,
+        )
+
+
+async def get_chat_session(
+    session_id: str,
+    user_id: str | None = None,
+) -> ChatSession | None:
+    """Get a chat session by ID.
+
+    Checks Redis cache first, falls back to database if not found.
+    Caches database results back to Redis.
+
+    Args:
+        session_id: The session ID to fetch.
+        user_id: If provided, validates that the session belongs to this user.
+            If None, ownership is not validated (admin/system access).
+    """
+    # Try cache first
+    try:
+        session = await _get_session_from_cache(session_id)
+        if session:
+            # Verify user ownership if user_id was provided for validation
+            if user_id is not None and session.user_id != user_id:
+                logger.warning(
+                    f"Session {session_id} user id mismatch: {session.user_id} != {user_id}"
+                )
+                return None
+            return session
+    except RedisError:
+        logger.warning(f"Cache error for session {session_id}, trying database")
+    except Exception as e:
+        logger.warning(f"Unexpected cache error for session {session_id}: {e}")
+
+    # Fall back to database
+    logger.info(f"Session {session_id} not in cache, checking database")
+    session = await _get_session_from_db(session_id)
+
+    if session is None:
+        logger.warning(f"Session {session_id} not found in cache or database")
+        return None
+
+    # Verify user ownership if user_id was provided for validation
+    if user_id is not None and session.user_id != user_id:
         logger.warning(
             f"Session {session_id} user id mismatch: {session.user_id} != {user_id}"
         )
         return None
 
+    # Cache the session from DB
+    try:
+        await _cache_session(session)
+        logger.info(f"Cached session {session_id} from database")
+    except Exception as e:
+        logger.warning(f"Failed to cache session {session_id}: {e}")
+
     return session
 
 
 async def upsert_chat_session(
     session: ChatSession,
 ) -> ChatSession:
-    """Update a chat session with the given messages."""
+    """Update a chat session in both cache and database.
 
-    redis_key = f"chat:session:{session.session_id}"
+    Uses session-level locking to prevent race conditions when concurrent
+    operations (e.g., background title update and main stream handler)
+    attempt to upsert the same session simultaneously.
 
-    async_redis = await get_redis_async()
-    resp = await async_redis.setex(
-        redis_key, config.session_ttl, session.model_dump_json()
-    )
+    Raises:
+        DatabaseError: If the database write fails. The cache is still updated
+            as a best-effort optimization, but the error is propagated to ensure
+            callers are aware of the persistence failure.
+        RedisError: If the cache write fails (after successful DB write).
+    """
+    # Acquire session-specific lock to prevent concurrent upserts
+    lock = await _get_session_lock(session.session_id)
 
-    if not resp:
-        raise RedisError(
-            f"Failed to persist chat session {session.session_id} to Redis: {resp}"
+    async with lock:
+        # Get existing message count from DB for incremental saves
+        existing_message_count = await chat_db.get_chat_session_message_count(
+            session.session_id
         )
 
+        db_error: Exception | None = None
+
+        # Save to database (primary storage)
+        try:
+            await _save_session_to_db(session, existing_message_count)
+        except Exception as e:
+            logger.error(
+                f"Failed to save session {session.session_id} to database: {e}"
+            )
+            db_error = e
+
+        # Save to cache (best-effort, even if DB failed)
+        try:
+            await _cache_session(session)
+        except Exception as e:
+            # If DB succeeded but cache failed, raise cache error
+            if db_error is None:
+                raise RedisError(
+                    f"Failed to persist chat session {session.session_id} to Redis: {e}"
+                ) from e
+            # If both failed, log cache error but raise DB error (more critical)
+            logger.warning(
+                f"Cache write also failed for session {session.session_id}: {e}"
+            )
+
+        # Propagate DB error after attempting cache (prevents data loss)
+        if db_error is not None:
+            raise DatabaseError(
+                f"Failed to persist chat session {session.session_id} to database"
+            ) from db_error
+
+        return session
+
+
+async def create_chat_session(user_id: str) -> ChatSession:
+    """Create a new chat session and persist it.
+
+    Raises:
+        DatabaseError: If the database write fails. We fail fast to ensure
+            callers never receive a non-persisted session that only exists
+            in cache (which would be lost when the cache expires).
+    """
+    session = ChatSession.new(user_id)
+
+    # Create in database first - fail fast if this fails
+    try:
+        await chat_db.create_chat_session(
+            session_id=session.session_id,
+            user_id=user_id,
+        )
+    except Exception as e:
+        logger.error(f"Failed to create session {session.session_id} in database: {e}")
+        raise DatabaseError(
+            f"Failed to create chat session {session.session_id} in database"
+        ) from e
+
+    # Cache the session (best-effort optimization, DB is source of truth)
+    try:
+        await _cache_session(session)
+    except Exception as e:
+        logger.warning(f"Failed to cache new session {session.session_id}: {e}")
+
     return session
+
+
+async def get_user_sessions(
+    user_id: str,
+    limit: int = 50,
+    offset: int = 0,
+) -> tuple[list[ChatSession], int]:
+    """Get chat sessions for a user from the database with total count.
+
+    Returns:
+        A tuple of (sessions, total_count) where total_count is the overall
+        number of sessions for the user (not just the current page).
+    """
+    prisma_sessions = await chat_db.get_user_chat_sessions(user_id, limit, offset)
+    total_count = await chat_db.get_user_session_count(user_id)
+
+    sessions = []
+    for prisma_session in prisma_sessions:
+        # Convert without messages for listing (lighter weight)
+        sessions.append(ChatSession.from_db(prisma_session, None))
+
+    return sessions, total_count
+
+
+async def delete_chat_session(session_id: str, user_id: str | None = None) -> bool:
+    """Delete a chat session from both cache and database.
+
+    Args:
+        session_id: The session ID to delete.
+        user_id: If provided, validates that the session belongs to this user
+            before deletion. This prevents unauthorized deletion.
+
+    Returns:
+        True if deleted successfully, False otherwise.
+    """
+    # Delete from database first (with optional user_id validation)
+    # This confirms ownership before invalidating cache
+    deleted = await chat_db.delete_chat_session(session_id, user_id)
+
+    if not deleted:
+        return False
+
+    # Only invalidate cache and clean up lock after DB confirms deletion
+    try:
+        redis_key = _get_session_cache_key(session_id)
+        async_redis = await get_redis_async()
+        await async_redis.delete(redis_key)
+    except Exception as e:
+        logger.warning(f"Failed to delete session {session_id} from cache: {e}")
+
+    # Clean up session lock (belt-and-suspenders with WeakValueDictionary)
+    async with _session_locks_mutex:
+        _session_locks.pop(session_id, None)
+
+    return True
+
+
+async def update_session_title(session_id: str, title: str) -> bool:
+    """Update only the title of a chat session.
+
+    This is a lightweight operation that doesn't touch messages, avoiding
+    race conditions with concurrent message updates. Use this for background
+    title generation instead of upsert_chat_session.
+
+    Args:
+        session_id: The session ID to update.
+        title: The new title to set.
+
+    Returns:
+        True if updated successfully, False otherwise.
+    """
+    try:
+        result = await chat_db.update_chat_session(session_id=session_id, title=title)
+        if result is None:
+            logger.warning(f"Session {session_id} not found for title update")
+            return False
+
+        # Invalidate cache so next fetch gets updated title
+        try:
+            redis_key = _get_session_cache_key(session_id)
+            async_redis = await get_redis_async()
+            await async_redis.delete(redis_key)
+        except Exception as e:
+            logger.warning(f"Failed to invalidate cache for session {session_id}: {e}")
+
+        return True
+    except Exception as e:
+        logger.error(f"Failed to update title for session {session_id}: {e}")
+        return False
diff --git a/autogpt_platform/backend/backend/api/features/chat/model_test.py b/autogpt_platform/backend/backend/api/features/chat/model_test.py
index b7f4c8a493..c230b00f9c 100644
--- a/autogpt_platform/backend/backend/api/features/chat/model_test.py
+++ b/autogpt_platform/backend/backend/api/features/chat/model_test.py
@@ -43,9 +43,9 @@ async def test_chatsession_serialization_deserialization():
 
 
 @pytest.mark.asyncio(loop_scope="session")
-async def test_chatsession_redis_storage():
+async def test_chatsession_redis_storage(setup_test_user, test_user_id):
 
-    s = ChatSession.new(user_id=None)
+    s = ChatSession.new(user_id=test_user_id)
     s.messages = messages
 
     s = await upsert_chat_session(s)
@@ -59,12 +59,61 @@ async def test_chatsession_redis_storage():
 
 
 @pytest.mark.asyncio(loop_scope="session")
-async def test_chatsession_redis_storage_user_id_mismatch():
+async def test_chatsession_redis_storage_user_id_mismatch(
+    setup_test_user, test_user_id
+):
 
-    s = ChatSession.new(user_id="abc123")
+    s = ChatSession.new(user_id=test_user_id)
     s.messages = messages
     s = await upsert_chat_session(s)
 
-    s2 = await get_chat_session(s.session_id, None)
+    s2 = await get_chat_session(s.session_id, "different_user_id")
 
     assert s2 is None
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_chatsession_db_storage(setup_test_user, test_user_id):
+    """Test that messages are correctly saved to and loaded from DB (not cache)."""
+    from backend.data.redis_client import get_redis_async
+
+    # Create session with messages including assistant message
+    s = ChatSession.new(user_id=test_user_id)
+    s.messages = messages  # Contains user, assistant, and tool messages
+    assert s.session_id is not None, "Session id is not set"
+    # Upsert to save to both cache and DB
+    s = await upsert_chat_session(s)
+
+    # Clear the Redis cache to force DB load
+    redis_key = f"chat:session:{s.session_id}"
+    async_redis = await get_redis_async()
+    await async_redis.delete(redis_key)
+
+    # Load from DB (cache was cleared)
+    s2 = await get_chat_session(
+        session_id=s.session_id,
+        user_id=s.user_id,
+    )
+
+    assert s2 is not None, "Session not found after loading from DB"
+    assert len(s2.messages) == len(
+        s.messages
+    ), f"Message count mismatch: expected {len(s.messages)}, got {len(s2.messages)}"
+
+    # Verify all roles are present
+    roles = [m.role for m in s2.messages]
+    assert "user" in roles, f"User message missing. Roles found: {roles}"
+    assert "assistant" in roles, f"Assistant message missing. Roles found: {roles}"
+    assert "tool" in roles, f"Tool message missing. Roles found: {roles}"
+
+    # Verify message content
+    for orig, loaded in zip(s.messages, s2.messages):
+        assert orig.role == loaded.role, f"Role mismatch: {orig.role} != {loaded.role}"
+        assert (
+            orig.content == loaded.content
+        ), f"Content mismatch for {orig.role}: {orig.content} != {loaded.content}"
+        if orig.tool_calls:
+            assert (
+                loaded.tool_calls is not None
+            ), f"Tool calls missing for {orig.role} message"
+            assert len(orig.tool_calls) == len(loaded.tool_calls)
diff --git a/autogpt_platform/backend/backend/api/features/chat/prompts/chat_system.md b/autogpt_platform/backend/backend/api/features/chat/prompts/chat_system.md
deleted file mode 100644
index a660ca805e..0000000000
--- a/autogpt_platform/backend/backend/api/features/chat/prompts/chat_system.md
+++ /dev/null
@@ -1,104 +0,0 @@
-You are Otto, an AI Co-Pilot and Forward Deployed Engineer for AutoGPT, an AI Business Automation tool. Your mission is to help users quickly find and set up AutoGPT agents to solve their business problems.
-
-Here are the functions available to you:
-
-<functions>
-1. **find_agent** - Search for agents that solve the user's problem
-2. **run_agent** - Run or schedule an agent (automatically handles setup)
-</functions>
-
-## HOW run_agent WORKS
-
-The `run_agent` tool automatically handles the entire setup flow:
-
-1. **First call** (no inputs) → Returns available inputs so user can decide what values to use
-2. **Credentials check** → If missing, UI automatically prompts user to add them (you don't need to mention this)
-3. **Execution** → Runs when you provide `inputs` OR set `use_defaults=true`
-
-Parameters:
-- `username_agent_slug` (required): Agent identifier like "creator/agent-name"
-- `inputs`: Object with input values for the agent
-- `use_defaults`: Set to `true` to run with default values (only after user confirms)
-- `schedule_name` + `cron`: For scheduled execution
-
-## WORKFLOW
-
-1. **find_agent** - Search for agents that solve the user's problem
-2. **run_agent** (first call, no inputs) - Get available inputs for the agent
-3. **Ask user** what values they want to use OR if they want to use defaults
-4. **run_agent** (second call) - Either with `inputs={...}` or `use_defaults=true`
-
-## YOUR APPROACH
-
-**Step 1: Understand the Problem**
-- Ask maximum 1-2 targeted questions
-- Focus on: What business problem are they solving?
-- Move quickly to searching for solutions
-
-**Step 2: Find Agents**
-- Use `find_agent` immediately with relevant keywords
-- Suggest the best option from search results
-- Explain briefly how it solves their problem
-
-**Step 3: Get Agent Inputs**
-- Call `run_agent(username_agent_slug="creator/agent-name")` without inputs
-- This returns the available inputs (required and optional)
-- Present these to the user and ask what values they want
-
-**Step 4: Run with User's Choice**
-- If user provides values: `run_agent(username_agent_slug="...", inputs={...})`
-- If user says "use defaults": `run_agent(username_agent_slug="...", use_defaults=true)`
-- On success, share the agent link with the user
-
-**For Scheduled Execution:**
-- Add `schedule_name` and `cron` parameters
-- Example: `run_agent(username_agent_slug="...", inputs={...}, schedule_name="Daily Report", cron="0 9 * * *")`
-
-## FUNCTION CALL FORMAT
-
-To call a function, use this exact format:
-`<function_call>function_name(parameter="value")</function_call>`
-
-Examples:
-- `<function_call>find_agent(query="social media automation")</function_call>`
-- `<function_call>run_agent(username_agent_slug="creator/agent-name")</function_call>` (get inputs)
-- `<function_call>run_agent(username_agent_slug="creator/agent-name", inputs={"topic": "AI news"})</function_call>`
-- `<function_call>run_agent(username_agent_slug="creator/agent-name", use_defaults=true)</function_call>`
-
-## KEY RULES
-
-**What You DON'T Do:**
-- Don't help with login (frontend handles this)
-- Don't mention or explain credentials to the user (frontend handles this automatically)
-- Don't run agents without first showing available inputs to the user
-- Don't use `use_defaults=true` without user explicitly confirming
-- Don't write responses longer than 3 sentences
-
-**What You DO:**
-- Always call run_agent first without inputs to see what's available
-- Ask user what values they want OR if they want to use defaults
-- Keep all responses to maximum 3 sentences
-- Include the agent link in your response after successful execution
-
-**Error Handling:**
-- Authentication needed → "Please sign in via the interface"
-- Credentials missing → The UI handles this automatically. Focus on asking the user about input values instead.
-
-## RESPONSE STRUCTURE
-
-Before responding, wrap your analysis in <thinking> tags to systematically plan your approach:
-- Extract the key business problem or request from the user's message
-- Determine what function call (if any) you need to make next
-- Plan your response to stay under the 3-sentence maximum
-
-Example interaction:
-```
-User: "Run the AI news agent for me"
-Otto: <function_call>run_agent(username_agent_slug="autogpt/ai-news")</function_call>
-[Tool returns: Agent accepts inputs - Required: topic. Optional: num_articles (default: 5)]
-Otto: The AI News agent needs a topic. What topic would you like news about, or should I use the defaults?
-User: "Use defaults"
-Otto: <function_call>run_agent(username_agent_slug="autogpt/ai-news", use_defaults=true)</function_call>
-```
-
-KEEP ANSWERS TO 3 SENTENCES
diff --git a/autogpt_platform/backend/backend/api/features/chat/response_model.py b/autogpt_platform/backend/backend/api/features/chat/response_model.py
index 2d38820bd5..f627a42fcc 100644
--- a/autogpt_platform/backend/backend/api/features/chat/response_model.py
+++ b/autogpt_platform/backend/backend/api/features/chat/response_model.py
@@ -1,3 +1,10 @@
+"""
+Response models for Vercel AI SDK UI Stream Protocol.
+
+This module implements the AI SDK UI Stream Protocol (v1) for streaming chat responses.
+See: https://ai-sdk.dev/docs/ai-sdk-ui/stream-protocol
+"""
+
 from enum import Enum
 from typing import Any
 
@@ -5,97 +12,155 @@ from pydantic import BaseModel, Field
 
 
 class ResponseType(str, Enum):
-    """Types of streaming responses."""
+    """Types of streaming responses following AI SDK protocol."""
 
-    TEXT_CHUNK = "text_chunk"
-    TEXT_ENDED = "text_ended"
-    TOOL_CALL = "tool_call"
-    TOOL_CALL_START = "tool_call_start"
-    TOOL_RESPONSE = "tool_response"
+    # Message lifecycle
+    START = "start"
+    FINISH = "finish"
+
+    # Text streaming
+    TEXT_START = "text-start"
+    TEXT_DELTA = "text-delta"
+    TEXT_END = "text-end"
+
+    # Tool interaction
+    TOOL_INPUT_START = "tool-input-start"
+    TOOL_INPUT_AVAILABLE = "tool-input-available"
+    TOOL_OUTPUT_AVAILABLE = "tool-output-available"
+
+    # Other
     ERROR = "error"
     USAGE = "usage"
-    STREAM_END = "stream_end"
+    HEARTBEAT = "heartbeat"
 
 
 class StreamBaseResponse(BaseModel):
     """Base response model for all streaming responses."""
 
     type: ResponseType
-    timestamp: str | None = None
 
     def to_sse(self) -> str:
         """Convert to SSE format."""
         return f"data: {self.model_dump_json()}\n\n"
 
 
-class StreamTextChunk(StreamBaseResponse):
-    """Streaming text content from the assistant."""
-
-    type: ResponseType = ResponseType.TEXT_CHUNK
-    content: str = Field(..., description="Text content chunk")
+# ========== Message Lifecycle ==========
 
 
-class StreamToolCallStart(StreamBaseResponse):
-    """Tool call started notification."""
+class StreamStart(StreamBaseResponse):
+    """Start of a new message."""
 
-    type: ResponseType = ResponseType.TOOL_CALL_START
-    tool_name: str = Field(..., description="Name of the tool that was executed")
-    tool_id: str = Field(..., description="Unique tool call ID")
-
-
-class StreamToolCall(StreamBaseResponse):
-    """Tool invocation notification."""
-
-    type: ResponseType = ResponseType.TOOL_CALL
-    tool_id: str = Field(..., description="Unique tool call ID")
-    tool_name: str = Field(..., description="Name of the tool being called")
-    arguments: dict[str, Any] = Field(
-        default_factory=dict, description="Tool arguments"
+    type: ResponseType = ResponseType.START
+    messageId: str = Field(..., description="Unique message ID")
+    taskId: str | None = Field(
+        default=None,
+        description="Task ID for SSE reconnection. Clients can reconnect using GET /tasks/{taskId}/stream",
     )
 
 
-class StreamToolExecutionResult(StreamBaseResponse):
+class StreamFinish(StreamBaseResponse):
+    """End of message/stream."""
+
+    type: ResponseType = ResponseType.FINISH
+
+
+# ========== Text Streaming ==========
+
+
+class StreamTextStart(StreamBaseResponse):
+    """Start of a text block."""
+
+    type: ResponseType = ResponseType.TEXT_START
+    id: str = Field(..., description="Text block ID")
+
+
+class StreamTextDelta(StreamBaseResponse):
+    """Streaming text content delta."""
+
+    type: ResponseType = ResponseType.TEXT_DELTA
+    id: str = Field(..., description="Text block ID")
+    delta: str = Field(..., description="Text content delta")
+
+
+class StreamTextEnd(StreamBaseResponse):
+    """End of a text block."""
+
+    type: ResponseType = ResponseType.TEXT_END
+    id: str = Field(..., description="Text block ID")
+
+
+# ========== Tool Interaction ==========
+
+
+class StreamToolInputStart(StreamBaseResponse):
+    """Tool call started notification."""
+
+    type: ResponseType = ResponseType.TOOL_INPUT_START
+    toolCallId: str = Field(..., description="Unique tool call ID")
+    toolName: str = Field(..., description="Name of the tool being called")
+
+
+class StreamToolInputAvailable(StreamBaseResponse):
+    """Tool input is ready for execution."""
+
+    type: ResponseType = ResponseType.TOOL_INPUT_AVAILABLE
+    toolCallId: str = Field(..., description="Unique tool call ID")
+    toolName: str = Field(..., description="Name of the tool being called")
+    input: dict[str, Any] = Field(
+        default_factory=dict, description="Tool input arguments"
+    )
+
+
+class StreamToolOutputAvailable(StreamBaseResponse):
     """Tool execution result."""
 
-    type: ResponseType = ResponseType.TOOL_RESPONSE
-    tool_id: str = Field(..., description="Tool call ID this responds to")
-    tool_name: str = Field(..., description="Name of the tool that was executed")
-    result: str | dict[str, Any] = Field(..., description="Tool execution result")
+    type: ResponseType = ResponseType.TOOL_OUTPUT_AVAILABLE
+    toolCallId: str = Field(..., description="Tool call ID this responds to")
+    output: str | dict[str, Any] = Field(..., description="Tool execution output")
+    # Additional fields for internal use (not part of AI SDK spec but useful)
+    toolName: str | None = Field(
+        default=None, description="Name of the tool that was executed"
+    )
     success: bool = Field(
         default=True, description="Whether the tool execution succeeded"
     )
 
 
+# ========== Other ==========
+
+
 class StreamUsage(StreamBaseResponse):
     """Token usage statistics."""
 
     type: ResponseType = ResponseType.USAGE
-    prompt_tokens: int
-    completion_tokens: int
-    total_tokens: int
+    promptTokens: int = Field(..., description="Number of prompt tokens")
+    completionTokens: int = Field(..., description="Number of completion tokens")
+    totalTokens: int = Field(..., description="Total number of tokens")
 
 
 class StreamError(StreamBaseResponse):
     """Error response."""
 
     type: ResponseType = ResponseType.ERROR
-    message: str = Field(..., description="Error message")
+    errorText: str = Field(..., description="Error message text")
     code: str | None = Field(default=None, description="Error code")
     details: dict[str, Any] | None = Field(
         default=None, description="Additional error details"
     )
 
 
-class StreamTextEnded(StreamBaseResponse):
-    """Text streaming completed marker."""
+class StreamHeartbeat(StreamBaseResponse):
+    """Heartbeat to keep SSE connection alive during long-running operations.
 
-    type: ResponseType = ResponseType.TEXT_ENDED
+    Uses SSE comment format (: comment) which is ignored by clients but keeps
+    the connection alive through proxies and load balancers.
+    """
 
-
-class StreamEnd(StreamBaseResponse):
-    """End of stream marker."""
-
-    type: ResponseType = ResponseType.STREAM_END
-    summary: dict[str, Any] | None = Field(
-        default=None, description="Stream summary statistics"
+    type: ResponseType = ResponseType.HEARTBEAT
+    toolCallId: str | None = Field(
+        default=None, description="Tool call ID if heartbeat is for a specific tool"
     )
+
+    def to_sse(self) -> str:
+        """Convert to SSE comment format to keep connection alive."""
+        return ": heartbeat\n\n"
diff --git a/autogpt_platform/backend/backend/api/features/chat/routes.py b/autogpt_platform/backend/backend/api/features/chat/routes.py
index 667335d048..3e731d86ac 100644
--- a/autogpt_platform/backend/backend/api/features/chat/routes.py
+++ b/autogpt_platform/backend/backend/api/features/chat/routes.py
@@ -1,24 +1,41 @@
 """Chat API routes for chat session management and streaming via SSE."""
 
 import logging
+import uuid as uuid_module
 from collections.abc import AsyncGenerator
 from typing import Annotated
 
 from autogpt_libs import auth
-from fastapi import APIRouter, Depends, Query, Security
+from fastapi import APIRouter, Depends, Header, HTTPException, Query, Security
 from fastapi.responses import StreamingResponse
 from pydantic import BaseModel
 
 from backend.util.exceptions import NotFoundError
 
 from . import service as chat_service
+from . import stream_registry
+from .completion_handler import process_operation_failure, process_operation_success
 from .config import ChatConfig
+from .model import ChatSession, create_chat_session, get_chat_session, get_user_sessions
+from .response_model import StreamFinish, StreamHeartbeat, StreamStart
 
 config = ChatConfig()
 
 
 logger = logging.getLogger(__name__)
 
+
+async def _validate_and_get_session(
+    session_id: str,
+    user_id: str | None,
+) -> ChatSession:
+    """Validate session exists and belongs to user."""
+    session = await get_chat_session(session_id, user_id)
+    if not session:
+        raise NotFoundError(f"Session {session_id} not found.")
+    return session
+
+
 router = APIRouter(
     tags=["chat"],
 )
@@ -26,6 +43,14 @@ router = APIRouter(
 # ========== Request/Response Models ==========
 
 
+class StreamChatRequest(BaseModel):
+    """Request model for streaming chat with optional context."""
+
+    message: str
+    is_user_message: bool = True
+    context: dict[str, str] | None = None  # {url: str, content: str}
+
+
 class CreateSessionResponse(BaseModel):
     """Response model containing information on a newly created chat session."""
 
@@ -34,6 +59,15 @@ class CreateSessionResponse(BaseModel):
     user_id: str | None
 
 
+class ActiveStreamInfo(BaseModel):
+    """Information about an active stream for reconnection."""
+
+    task_id: str
+    last_message_id: str  # Redis Stream message ID for resumption
+    operation_id: str  # Operation ID for completion tracking
+    tool_name: str  # Name of the tool being executed
+
+
 class SessionDetailResponse(BaseModel):
     """Response model providing complete details for a chat session, including messages."""
 
@@ -42,24 +76,88 @@ class SessionDetailResponse(BaseModel):
     updated_at: str
     user_id: str | None
     messages: list[dict]
+    active_stream: ActiveStreamInfo | None = None  # Present if stream is still active
+
+
+class SessionSummaryResponse(BaseModel):
+    """Response model for a session summary (without messages)."""
+
+    id: str
+    created_at: str
+    updated_at: str
+    title: str | None = None
+
+
+class ListSessionsResponse(BaseModel):
+    """Response model for listing chat sessions."""
+
+    sessions: list[SessionSummaryResponse]
+    total: int
+
+
+class OperationCompleteRequest(BaseModel):
+    """Request model for external completion webhook."""
+
+    success: bool
+    result: dict | str | None = None
+    error: str | None = None
 
 
 # ========== Routes ==========
 
 
+@router.get(
+    "/sessions",
+    dependencies=[Security(auth.requires_user)],
+)
+async def list_sessions(
+    user_id: Annotated[str, Security(auth.get_user_id)],
+    limit: int = Query(default=50, ge=1, le=100),
+    offset: int = Query(default=0, ge=0),
+) -> ListSessionsResponse:
+    """
+    List chat sessions for the authenticated user.
+
+    Returns a paginated list of chat sessions belonging to the current user,
+    ordered by most recently updated.
+
+    Args:
+        user_id: The authenticated user's ID.
+        limit: Maximum number of sessions to return (1-100).
+        offset: Number of sessions to skip for pagination.
+
+    Returns:
+        ListSessionsResponse: List of session summaries and total count.
+    """
+    sessions, total_count = await get_user_sessions(user_id, limit, offset)
+
+    return ListSessionsResponse(
+        sessions=[
+            SessionSummaryResponse(
+                id=session.session_id,
+                created_at=session.started_at.isoformat(),
+                updated_at=session.updated_at.isoformat(),
+                title=session.title,
+            )
+            for session in sessions
+        ],
+        total=total_count,
+    )
+
+
 @router.post(
     "/sessions",
 )
 async def create_session(
-    user_id: Annotated[str | None, Depends(auth.get_user_id)],
+    user_id: Annotated[str, Depends(auth.get_user_id)],
 ) -> CreateSessionResponse:
     """
     Create a new chat session.
 
-    Initiates a new chat session for either an authenticated or anonymous user.
+    Initiates a new chat session for the authenticated user.
 
     Args:
-        user_id: The optional authenticated user ID parsed from the JWT. If missing, creates an anonymous session.
+        user_id: The authenticated user ID parsed from the JWT (required).
 
     Returns:
         CreateSessionResponse: Details of the created session.
@@ -67,15 +165,15 @@ async def create_session(
     """
     logger.info(
         f"Creating session with user_id: "
-        f"...{user_id[-8:] if user_id and len(user_id) > 8 else '<redacted>'}"
+        f"...{user_id[-8:] if len(user_id) > 8 else '<redacted>'}"
     )
 
-    session = await chat_service.create_chat_session(user_id)
+    session = await create_chat_session(user_id)
 
     return CreateSessionResponse(
         id=session.session_id,
         created_at=session.started_at.isoformat(),
-        user_id=session.user_id or None,
+        user_id=session.user_id,
     )
 
 
@@ -90,38 +188,200 @@ async def get_session(
     Retrieve the details of a specific chat session.
 
     Looks up a chat session by ID for the given user (if authenticated) and returns all session data including messages.
+    If there's an active stream for this session, returns the task_id for reconnection.
 
     Args:
         session_id: The unique identifier for the desired chat session.
         user_id: The optional authenticated user ID, or None for anonymous access.
 
     Returns:
-        SessionDetailResponse: Details for the requested session; raises NotFoundError if not found.
+        SessionDetailResponse: Details for the requested session, including active_stream info if applicable.
 
     """
-    session = await chat_service.get_session(session_id, user_id)
+    session = await get_chat_session(session_id, user_id)
     if not session:
-        raise NotFoundError(f"Session {session_id} not found")
+        raise NotFoundError(f"Session {session_id} not found.")
+
+    messages = [message.model_dump() for message in session.messages]
+
+    # Check if there's an active stream for this session
+    active_stream_info = None
+    active_task, last_message_id = await stream_registry.get_active_task_for_session(
+        session_id, user_id
+    )
+    if active_task:
+        # Filter out the in-progress assistant message from the session response.
+        # The client will receive the complete assistant response through the SSE
+        # stream replay instead, preventing duplicate content.
+        if messages and messages[-1].get("role") == "assistant":
+            messages = messages[:-1]
+
+        # Use "0-0" as last_message_id to replay the stream from the beginning.
+        # Since we filtered out the cached assistant message, the client needs
+        # the full stream to reconstruct the response.
+        active_stream_info = ActiveStreamInfo(
+            task_id=active_task.task_id,
+            last_message_id="0-0",
+            operation_id=active_task.operation_id,
+            tool_name=active_task.tool_name,
+        )
+
     return SessionDetailResponse(
         id=session.session_id,
         created_at=session.started_at.isoformat(),
         updated_at=session.updated_at.isoformat(),
         user_id=session.user_id or None,
-        messages=[message.model_dump() for message in session.messages],
+        messages=messages,
+        active_stream=active_stream_info,
+    )
+
+
+@router.post(
+    "/sessions/{session_id}/stream",
+)
+async def stream_chat_post(
+    session_id: str,
+    request: StreamChatRequest,
+    user_id: str | None = Depends(auth.get_user_id),
+):
+    """
+    Stream chat responses for a session (POST with context support).
+
+    Streams the AI/completion responses in real time over Server-Sent Events (SSE), including:
+      - Text fragments as they are generated
+      - Tool call UI elements (if invoked)
+      - Tool execution results
+
+    The AI generation runs in a background task that continues even if the client disconnects.
+    All chunks are written to Redis for reconnection support. If the client disconnects,
+    they can reconnect using GET /tasks/{task_id}/stream to resume from where they left off.
+
+    Args:
+        session_id: The chat session identifier to associate with the streamed messages.
+        request: Request body containing message, is_user_message, and optional context.
+        user_id: Optional authenticated user ID.
+    Returns:
+        StreamingResponse: SSE-formatted response chunks. First chunk is a "start" event
+        containing the task_id for reconnection.
+
+    """
+    import asyncio
+
+    session = await _validate_and_get_session(session_id, user_id)
+
+    # Create a task in the stream registry for reconnection support
+    task_id = str(uuid_module.uuid4())
+    operation_id = str(uuid_module.uuid4())
+    await stream_registry.create_task(
+        task_id=task_id,
+        session_id=session_id,
+        user_id=user_id,
+        tool_call_id="chat_stream",  # Not a tool call, but needed for the model
+        tool_name="chat",
+        operation_id=operation_id,
+    )
+
+    # Background task that runs the AI generation independently of SSE connection
+    async def run_ai_generation():
+        try:
+            # Emit a start event with task_id for reconnection
+            start_chunk = StreamStart(messageId=task_id, taskId=task_id)
+            await stream_registry.publish_chunk(task_id, start_chunk)
+
+            async for chunk in chat_service.stream_chat_completion(
+                session_id,
+                request.message,
+                is_user_message=request.is_user_message,
+                user_id=user_id,
+                session=session,  # Pass pre-fetched session to avoid double-fetch
+                context=request.context,
+            ):
+                # Write to Redis (subscribers will receive via XREAD)
+                await stream_registry.publish_chunk(task_id, chunk)
+
+            # Mark task as completed
+            await stream_registry.mark_task_completed(task_id, "completed")
+        except Exception as e:
+            logger.error(
+                f"Error in background AI generation for session {session_id}: {e}"
+            )
+            await stream_registry.mark_task_completed(task_id, "failed")
+
+    # Start the AI generation in a background task
+    bg_task = asyncio.create_task(run_ai_generation())
+    await stream_registry.set_task_asyncio_task(task_id, bg_task)
+
+    # SSE endpoint that subscribes to the task's stream
+    async def event_generator() -> AsyncGenerator[str, None]:
+        subscriber_queue = None
+        try:
+            # Subscribe to the task stream (this replays existing messages + live updates)
+            subscriber_queue = await stream_registry.subscribe_to_task(
+                task_id=task_id,
+                user_id=user_id,
+                last_message_id="0-0",  # Get all messages from the beginning
+            )
+
+            if subscriber_queue is None:
+                yield StreamFinish().to_sse()
+                yield "data: [DONE]\n\n"
+                return
+
+            # Read from the subscriber queue and yield to SSE
+            while True:
+                try:
+                    chunk = await asyncio.wait_for(subscriber_queue.get(), timeout=30.0)
+                    yield chunk.to_sse()
+
+                    # Check for finish signal
+                    if isinstance(chunk, StreamFinish):
+                        break
+                except asyncio.TimeoutError:
+                    # Send heartbeat to keep connection alive
+                    yield StreamHeartbeat().to_sse()
+
+        except GeneratorExit:
+            pass  # Client disconnected - background task continues
+        except Exception as e:
+            logger.error(f"Error in SSE stream for task {task_id}: {e}")
+        finally:
+            # Unsubscribe when client disconnects or stream ends to prevent resource leak
+            if subscriber_queue is not None:
+                try:
+                    await stream_registry.unsubscribe_from_task(
+                        task_id, subscriber_queue
+                    )
+                except Exception as unsub_err:
+                    logger.error(
+                        f"Error unsubscribing from task {task_id}: {unsub_err}",
+                        exc_info=True,
+                    )
+            # AI SDK protocol termination - always yield even if unsubscribe fails
+            yield "data: [DONE]\n\n"
+
+    return StreamingResponse(
+        event_generator(),
+        media_type="text/event-stream",
+        headers={
+            "Cache-Control": "no-cache",
+            "Connection": "keep-alive",
+            "X-Accel-Buffering": "no",  # Disable nginx buffering
+            "x-vercel-ai-ui-message-stream": "v1",  # AI SDK protocol header
+        },
     )
 
 
 @router.get(
     "/sessions/{session_id}/stream",
 )
-async def stream_chat(
+async def stream_chat_get(
     session_id: str,
     message: Annotated[str, Query(min_length=1, max_length=10000)],
     user_id: str | None = Depends(auth.get_user_id),
     is_user_message: bool = Query(default=True),
 ):
     """
-    Stream chat responses for a session.
+    Stream chat responses for a session (GET - legacy endpoint).
 
     Streams the AI/completion responses in real time over Server-Sent Events (SSE), including:
       - Text fragments as they are generated
@@ -137,16 +397,11 @@ async def stream_chat(
         StreamingResponse: SSE-formatted response chunks.
 
     """
-    # Validate session exists before starting the stream
-    # This prevents errors after the response has already started
-    session = await chat_service.get_session(session_id, user_id)
-
-    if not session:
-        raise NotFoundError(f"Session {session_id} not found. ")
-    if session.user_id is None and user_id is not None:
-        session = await chat_service.assign_user_to_session(session_id, user_id)
+    session = await _validate_and_get_session(session_id, user_id)
 
     async def event_generator() -> AsyncGenerator[str, None]:
+        chunk_count = 0
+        first_chunk_type: str | None = None
         async for chunk in chat_service.stream_chat_completion(
             session_id,
             message,
@@ -154,7 +409,28 @@ async def stream_chat(
             user_id=user_id,
             session=session,  # Pass pre-fetched session to avoid double-fetch
         ):
+            if chunk_count < 3:
+                logger.info(
+                    "Chat stream chunk",
+                    extra={
+                        "session_id": session_id,
+                        "chunk_type": str(chunk.type),
+                    },
+                )
+            if not first_chunk_type:
+                first_chunk_type = str(chunk.type)
+            chunk_count += 1
             yield chunk.to_sse()
+        logger.info(
+            "Chat stream completed",
+            extra={
+                "session_id": session_id,
+                "chunk_count": chunk_count,
+                "first_chunk_type": first_chunk_type,
+            },
+        )
+        # AI SDK protocol termination
+        yield "data: [DONE]\n\n"
 
     return StreamingResponse(
         event_generator(),
@@ -163,6 +439,7 @@ async def stream_chat(
             "Cache-Control": "no-cache",
             "Connection": "keep-alive",
             "X-Accel-Buffering": "no",  # Disable nginx buffering
+            "x-vercel-ai-ui-message-stream": "v1",  # AI SDK protocol header
         },
     )
 
@@ -193,6 +470,251 @@ async def session_assign_user(
     return {"status": "ok"}
 
 
+# ========== Task Streaming (SSE Reconnection) ==========
+
+
+@router.get(
+    "/tasks/{task_id}/stream",
+)
+async def stream_task(
+    task_id: str,
+    user_id: str | None = Depends(auth.get_user_id),
+    last_message_id: str = Query(
+        default="0-0",
+        description="Last Redis Stream message ID received (e.g., '1706540123456-0'). Use '0-0' for full replay.",
+    ),
+):
+    """
+    Reconnect to a long-running task's SSE stream.
+
+    When a long-running operation (like agent generation) starts, the client
+    receives a task_id. If the connection drops, the client can reconnect
+    using this endpoint to resume receiving updates.
+
+    Args:
+        task_id: The task ID from the operation_started response.
+        user_id: Authenticated user ID for ownership validation.
+        last_message_id: Last Redis Stream message ID received ("0-0" for full replay).
+
+    Returns:
+        StreamingResponse: SSE-formatted response chunks starting after last_message_id.
+
+    Raises:
+        HTTPException: 404 if task not found, 410 if task expired, 403 if access denied.
+    """
+    # Check task existence and expiry before subscribing
+    task, error_code = await stream_registry.get_task_with_expiry_info(task_id)
+
+    if error_code == "TASK_EXPIRED":
+        raise HTTPException(
+            status_code=410,
+            detail={
+                "code": "TASK_EXPIRED",
+                "message": "This operation has expired. Please try again.",
+            },
+        )
+
+    if error_code == "TASK_NOT_FOUND":
+        raise HTTPException(
+            status_code=404,
+            detail={
+                "code": "TASK_NOT_FOUND",
+                "message": f"Task {task_id} not found.",
+            },
+        )
+
+    # Validate ownership if task has an owner
+    if task and task.user_id and user_id != task.user_id:
+        raise HTTPException(
+            status_code=403,
+            detail={
+                "code": "ACCESS_DENIED",
+                "message": "You do not have access to this task.",
+            },
+        )
+
+    # Get subscriber queue from stream registry
+    subscriber_queue = await stream_registry.subscribe_to_task(
+        task_id=task_id,
+        user_id=user_id,
+        last_message_id=last_message_id,
+    )
+
+    if subscriber_queue is None:
+        raise HTTPException(
+            status_code=404,
+            detail={
+                "code": "TASK_NOT_FOUND",
+                "message": f"Task {task_id} not found or access denied.",
+            },
+        )
+
+    async def event_generator() -> AsyncGenerator[str, None]:
+        import asyncio
+
+        heartbeat_interval = 15.0  # Send heartbeat every 15 seconds
+        try:
+            while True:
+                try:
+                    # Wait for next chunk with timeout for heartbeats
+                    chunk = await asyncio.wait_for(
+                        subscriber_queue.get(), timeout=heartbeat_interval
+                    )
+                    yield chunk.to_sse()
+
+                    # Check for finish signal
+                    if isinstance(chunk, StreamFinish):
+                        break
+                except asyncio.TimeoutError:
+                    # Send heartbeat to keep connection alive
+                    yield StreamHeartbeat().to_sse()
+        except Exception as e:
+            logger.error(f"Error in task stream {task_id}: {e}", exc_info=True)
+        finally:
+            # Unsubscribe when client disconnects or stream ends
+            try:
+                await stream_registry.unsubscribe_from_task(task_id, subscriber_queue)
+            except Exception as unsub_err:
+                logger.error(
+                    f"Error unsubscribing from task {task_id}: {unsub_err}",
+                    exc_info=True,
+                )
+            # AI SDK protocol termination - always yield even if unsubscribe fails
+            yield "data: [DONE]\n\n"
+
+    return StreamingResponse(
+        event_generator(),
+        media_type="text/event-stream",
+        headers={
+            "Cache-Control": "no-cache",
+            "Connection": "keep-alive",
+            "X-Accel-Buffering": "no",
+            "x-vercel-ai-ui-message-stream": "v1",
+        },
+    )
+
+
+@router.get(
+    "/tasks/{task_id}",
+)
+async def get_task_status(
+    task_id: str,
+    user_id: str | None = Depends(auth.get_user_id),
+) -> dict:
+    """
+    Get the status of a long-running task.
+
+    Args:
+        task_id: The task ID to check.
+        user_id: Authenticated user ID for ownership validation.
+
+    Returns:
+        dict: Task status including task_id, status, tool_name, and operation_id.
+
+    Raises:
+        NotFoundError: If task_id is not found or user doesn't have access.
+    """
+    task = await stream_registry.get_task(task_id)
+
+    if task is None:
+        raise NotFoundError(f"Task {task_id} not found.")
+
+    # Validate ownership - if task has an owner, requester must match
+    if task.user_id and user_id != task.user_id:
+        raise NotFoundError(f"Task {task_id} not found.")
+
+    return {
+        "task_id": task.task_id,
+        "session_id": task.session_id,
+        "status": task.status,
+        "tool_name": task.tool_name,
+        "operation_id": task.operation_id,
+        "created_at": task.created_at.isoformat(),
+    }
+
+
+# ========== External Completion Webhook ==========
+
+
+@router.post(
+    "/operations/{operation_id}/complete",
+    status_code=200,
+)
+async def complete_operation(
+    operation_id: str,
+    request: OperationCompleteRequest,
+    x_api_key: str | None = Header(default=None),
+) -> dict:
+    """
+    External completion webhook for long-running operations.
+
+    Called by Agent Generator (or other services) when an operation completes.
+    This triggers the stream registry to publish completion and continue LLM generation.
+
+    Args:
+        operation_id: The operation ID to complete.
+        request: Completion payload with success status and result/error.
+        x_api_key: Internal API key for authentication.
+
+    Returns:
+        dict: Status of the completion.
+
+    Raises:
+        HTTPException: If API key is invalid or operation not found.
+    """
+    # Validate internal API key - reject if not configured or invalid
+    if not config.internal_api_key:
+        logger.error(
+            "Operation complete webhook rejected: CHAT_INTERNAL_API_KEY not configured"
+        )
+        raise HTTPException(
+            status_code=503,
+            detail="Webhook not available: internal API key not configured",
+        )
+    if x_api_key != config.internal_api_key:
+        raise HTTPException(status_code=401, detail="Invalid API key")
+
+    # Find task by operation_id
+    task = await stream_registry.find_task_by_operation_id(operation_id)
+    if task is None:
+        raise HTTPException(
+            status_code=404,
+            detail=f"Operation {operation_id} not found",
+        )
+
+    logger.info(
+        f"Received completion webhook for operation {operation_id} "
+        f"(task_id={task.task_id}, success={request.success})"
+    )
+
+    if request.success:
+        await process_operation_success(task, request.result)
+    else:
+        await process_operation_failure(task, request.error)
+
+    return {"status": "ok", "task_id": task.task_id}
+
+
+# ========== Configuration ==========
+
+
+@router.get("/config/ttl", status_code=200)
+async def get_ttl_config() -> dict:
+    """
+    Get the stream TTL configuration.
+
+    Returns the Time-To-Live settings for chat streams, which determines
+    how long clients can reconnect to an active stream.
+
+    Returns:
+        dict: TTL configuration with seconds and milliseconds values.
+    """
+    return {
+        "stream_ttl_seconds": config.stream_ttl,
+        "stream_ttl_ms": config.stream_ttl * 1000,
+    }
+
+
 # ========== Health Check ==========
 
 
@@ -201,16 +723,28 @@ async def health_check() -> dict:
     """
     Health check endpoint for the chat service.
 
-    Performs a full cycle test of session creation, assignment, and retrieval. Should always return healthy
+    Performs a full cycle test of session creation and retrieval. Should always return healthy
     if the service and data layer are operational.
 
     Returns:
         dict: A status dictionary indicating health, service name, and API version.
 
     """
-    session = await chat_service.create_chat_session(None)
-    await chat_service.assign_user_to_session(session.session_id, "test_user")
-    await chat_service.get_session(session.session_id, "test_user")
+    from backend.data.user import get_or_create_user
+
+    # Ensure health check user exists (required for FK constraint)
+    health_check_user_id = "health-check-user"
+    await get_or_create_user(
+        {
+            "sub": health_check_user_id,
+            "email": "health-check@system.local",
+            "user_metadata": {"name": "Health Check User"},
+        }
+    )
+
+    # Create and retrieve session to verify full data layer
+    session = await create_chat_session(health_check_user_id)
+    await get_chat_session(session.session_id, health_check_user_id)
 
     return {
         "status": "healthy",
diff --git a/autogpt_platform/backend/backend/api/features/chat/service.py b/autogpt_platform/backend/backend/api/features/chat/service.py
index 2d96d4abcd..218575085b 100644
--- a/autogpt_platform/backend/backend/api/features/chat/service.py
+++ b/autogpt_platform/backend/backend/api/features/chat/service.py
@@ -1,60 +1,321 @@
+import asyncio
 import logging
+import time
+from asyncio import CancelledError
 from collections.abc import AsyncGenerator
-from datetime import UTC, datetime
-from typing import Any
+from typing import TYPE_CHECKING, Any, cast
+
+import openai
+
+if TYPE_CHECKING:
+    from backend.util.prompt import CompressResult
 
 import orjson
-from openai import AsyncOpenAI
-from openai.types.chat import ChatCompletionChunk, ChatCompletionToolParam
+from langfuse import get_client
+from openai import (
+    APIConnectionError,
+    APIError,
+    APIStatusError,
+    PermissionDeniedError,
+    RateLimitError,
+)
+from openai.types.chat import (
+    ChatCompletionChunk,
+    ChatCompletionMessageParam,
+    ChatCompletionStreamOptionsParam,
+    ChatCompletionSystemMessageParam,
+    ChatCompletionToolParam,
+)
 
+from backend.data.redis_client import get_redis_async
+from backend.data.understanding import (
+    format_understanding_for_prompt,
+    get_business_understanding,
+)
 from backend.util.exceptions import NotFoundError
+from backend.util.settings import Settings
 
+from . import db as chat_db
+from . import stream_registry
 from .config import ChatConfig
 from .model import (
     ChatMessage,
     ChatSession,
     Usage,
+    cache_chat_session,
     get_chat_session,
+    invalidate_session_cache,
+    update_session_title,
     upsert_chat_session,
 )
 from .response_model import (
     StreamBaseResponse,
-    StreamEnd,
     StreamError,
-    StreamTextChunk,
-    StreamTextEnded,
-    StreamToolCall,
-    StreamToolCallStart,
-    StreamToolExecutionResult,
+    StreamFinish,
+    StreamHeartbeat,
+    StreamStart,
+    StreamTextDelta,
+    StreamTextEnd,
+    StreamTextStart,
+    StreamToolInputAvailable,
+    StreamToolInputStart,
+    StreamToolOutputAvailable,
     StreamUsage,
 )
-from .tools import execute_tool, tools
+from .tools import execute_tool, get_tool, tools
+from .tools.models import (
+    ErrorResponse,
+    OperationInProgressResponse,
+    OperationPendingResponse,
+    OperationStartedResponse,
+)
+from .tracking import track_user_message
 
 logger = logging.getLogger(__name__)
 
 config = ChatConfig()
-client = AsyncOpenAI(api_key=config.api_key, base_url=config.base_url)
+settings = Settings()
+client = openai.AsyncOpenAI(api_key=config.api_key, base_url=config.base_url)
 
 
-async def create_chat_session(
+langfuse = get_client()
+
+# Redis key prefix for tracking running long-running operations
+# Used for idempotency across Kubernetes pods - prevents duplicate executions on browser refresh
+RUNNING_OPERATION_PREFIX = "chat:running_operation:"
+
+# Default system prompt used when Langfuse is not configured
+# This is a snapshot of the "CoPilot Prompt" from Langfuse (version 11)
+DEFAULT_SYSTEM_PROMPT = """You are **Otto**, an AI Co-Pilot for AutoGPT and a Forward-Deployed Automation Engineer serving small business owners. Your mission is to help users automate business tasks with AI by delivering tangible value through working automations—not through documentation or lengthy explanations.
+
+Here is everything you know about the current user from previous interactions:
+
+<users_information>
+{users_information}
+</users_information>
+
+## YOUR CORE MANDATE
+
+You are action-oriented. Your success is measured by:
+- **Value Delivery**: Does the user think "wow, that was amazing" or "what was the point"?
+- **Demonstrable Proof**: Show working automations, not descriptions of what's possible
+- **Time Saved**: Focus on tangible efficiency gains
+- **Quality Output**: Deliver results that meet or exceed expectations
+
+## YOUR WORKFLOW
+
+Adapt flexibly to the conversation context. Not every interaction requires all stages:
+
+1. **Explore & Understand**: Learn about the user's business, tasks, and goals. Use `add_understanding` to capture important context that will improve future conversations.
+
+2. **Assess Automation Potential**: Help the user understand whether and how AI can automate their task.
+
+3. **Prepare for AI**: Provide brief, actionable guidance on prerequisites (data, access, etc.).
+
+4. **Discover or Create Agents**:
+   - **Always check the user's library first** with `find_library_agent` (these may be customized to their needs)
+   - Search the marketplace with `find_agent` for pre-built automations
+   - Find reusable components with `find_block`
+   - Create custom solutions with `create_agent` if nothing suitable exists
+   - Modify existing library agents with `edit_agent`
+
+5. **Execute**: Run automations immediately, schedule them, or set up webhooks using `run_agent`. Test specific components with `run_block`.
+
+6. **Show Results**: Display outputs using `agent_output`.
+
+## AVAILABLE TOOLS
+
+**Understanding & Discovery:**
+- `add_understanding`: Create a memory about the user's business or use cases for future sessions
+- `search_docs`: Search platform documentation for specific technical information
+- `get_doc_page`: Retrieve full text of a specific documentation page
+
+**Agent Discovery:**
+- `find_library_agent`: Search the user's existing agents (CHECK HERE FIRST—these may be customized)
+- `find_agent`: Search the marketplace for pre-built automations
+- `find_block`: Find pre-written code units that perform specific tasks (agents are built from blocks)
+
+**Agent Creation & Editing:**
+- `create_agent`: Create a new automation agent
+- `edit_agent`: Modify an agent in the user's library
+
+**Execution & Output:**
+- `run_agent`: Run an agent now, schedule it, or set up a webhook trigger
+- `run_block`: Test or run a specific block independently
+- `agent_output`: View results from previous agent runs
+
+## BEHAVIORAL GUIDELINES
+
+**Be Concise:**
+- Target 2-5 short lines maximum
+- Make every word count—no repetition or filler
+- Use lightweight structure for scannability (bullets, numbered lists, short prompts)
+- Avoid jargon (blocks, slugs, cron) unless the user asks
+
+**Be Proactive:**
+- Suggest next steps before being asked
+- Anticipate needs based on conversation context and user information
+- Look for opportunities to expand scope when relevant
+- Reveal capabilities through action, not explanation
+
+**Use Tools Effectively:**
+- Select the right tool for each task
+- **Always check `find_library_agent` before searching the marketplace**
+- Use `add_understanding` to capture valuable business context
+- When tool calls fail, try alternative approaches
+
+## CRITICAL REMINDER
+
+You are NOT a chatbot. You are NOT documentation. You are a partner who helps busy business owners get value quickly by showing proof through working automations. Bias toward action over explanation."""
+
+# Module-level set to hold strong references to background tasks.
+# This prevents asyncio from garbage collecting tasks before they complete.
+# Tasks are automatically removed on completion via done_callback.
+_background_tasks: set[asyncio.Task] = set()
+
+
+async def _mark_operation_started(tool_call_id: str) -> bool:
+    """Mark a long-running operation as started (Redis-based).
+
+    Returns True if successfully marked (operation was not already running),
+    False if operation was already running (lost race condition).
+    Raises exception if Redis is unavailable (fail-closed).
+    """
+    redis = await get_redis_async()
+    key = f"{RUNNING_OPERATION_PREFIX}{tool_call_id}"
+    # SETNX with TTL - atomic "set if not exists"
+    result = await redis.set(key, "1", ex=config.long_running_operation_ttl, nx=True)
+    return result is not None
+
+
+async def _mark_operation_completed(tool_call_id: str) -> None:
+    """Mark a long-running operation as completed (remove Redis key).
+
+    This is best-effort - if Redis fails, the TTL will eventually clean up.
+    """
+    try:
+        redis = await get_redis_async()
+        key = f"{RUNNING_OPERATION_PREFIX}{tool_call_id}"
+        await redis.delete(key)
+    except Exception as e:
+        # Non-critical: TTL will clean up eventually
+        logger.warning(f"Failed to delete running operation key {tool_call_id}: {e}")
+
+
+def _is_langfuse_configured() -> bool:
+    """Check if Langfuse credentials are configured."""
+    return bool(
+        settings.secrets.langfuse_public_key and settings.secrets.langfuse_secret_key
+    )
+
+
+async def _get_system_prompt_template(context: str) -> str:
+    """Get the system prompt, trying Langfuse first with fallback to default.
+
+    Args:
+        context: The user context/information to compile into the prompt.
+
+    Returns:
+        The compiled system prompt string.
+    """
+    if _is_langfuse_configured():
+        try:
+            # cache_ttl_seconds=0 disables SDK caching to always get the latest prompt
+            # Use asyncio.to_thread to avoid blocking the event loop
+            prompt = await asyncio.to_thread(
+                langfuse.get_prompt, config.langfuse_prompt_name, cache_ttl_seconds=0
+            )
+            return prompt.compile(users_information=context)
+        except Exception as e:
+            logger.warning(f"Failed to fetch prompt from Langfuse, using default: {e}")
+
+    # Fallback to default prompt
+    return DEFAULT_SYSTEM_PROMPT.format(users_information=context)
+
+
+async def _build_system_prompt(user_id: str | None) -> tuple[str, Any]:
+    """Build the full system prompt including business understanding if available.
+
+    Args:
+        user_id: The user ID for fetching business understanding
+                     If "default" and this is the user's first session, will use "onboarding" instead.
+
+    Returns:
+        Tuple of (compiled prompt string, business understanding object)
+    """
+    # If user is authenticated, try to fetch their business understanding
+    understanding = None
+    if user_id:
+        try:
+            understanding = await get_business_understanding(user_id)
+        except Exception as e:
+            logger.warning(f"Failed to fetch business understanding: {e}")
+            understanding = None
+
+    if understanding:
+        context = format_understanding_for_prompt(understanding)
+    else:
+        context = "This is the first time you are meeting the user. Greet them and introduce them to the platform"
+
+    compiled = await _get_system_prompt_template(context)
+    return compiled, understanding
+
+
+async def _generate_session_title(
+    message: str,
     user_id: str | None = None,
-) -> ChatSession:
-    """
-    Create a new chat session and persist it to the database.
-    """
-    session = ChatSession.new(user_id)
-    # Persist the session immediately so it can be used for streaming
-    return await upsert_chat_session(session)
+    session_id: str | None = None,
+) -> str | None:
+    """Generate a concise title for a chat session based on the first message.
 
+    Args:
+        message: The first user message in the session
+        user_id: User ID for OpenRouter tracing (optional)
+        session_id: Session ID for OpenRouter tracing (optional)
 
-async def get_session(
-    session_id: str,
-    user_id: str | None = None,
-) -> ChatSession | None:
+    Returns:
+        A short title (3-6 words) or None if generation fails
     """
-    Get a chat session by ID.
-    """
-    return await get_chat_session(session_id, user_id)
+    try:
+        # Build extra_body for OpenRouter tracing and PostHog analytics
+        extra_body: dict[str, Any] = {}
+        if user_id:
+            extra_body["user"] = user_id[:128]  # OpenRouter limit
+            extra_body["posthogDistinctId"] = user_id
+        if session_id:
+            extra_body["session_id"] = session_id[:128]  # OpenRouter limit
+        extra_body["posthogProperties"] = {
+            "environment": settings.config.app_env.value,
+        }
+
+        response = await client.chat.completions.create(
+            model=config.title_model,
+            messages=[
+                {
+                    "role": "system",
+                    "content": (
+                        "Generate a very short title (3-6 words) for a chat conversation "
+                        "based on the user's first message. The title should capture the "
+                        "main topic or intent. Return ONLY the title, no quotes or punctuation."
+                    ),
+                },
+                {"role": "user", "content": message[:500]},  # Limit input length
+            ],
+            max_tokens=20,
+            extra_body=extra_body,
+        )
+        title = response.choices[0].message.content
+        if title:
+            # Clean up the title
+            title = title.strip().strip("\"'")
+            # Limit length
+            if len(title) > 50:
+                title = title[:47] + "..."
+            return title
+        return None
+    except Exception as e:
+        logger.warning(f"Failed to generate session title: {e}")
+        return None
 
 
 async def assign_user_to_session(
@@ -74,10 +335,12 @@ async def assign_user_to_session(
 async def stream_chat_completion(
     session_id: str,
     message: str | None = None,
+    tool_call_response: str | None = None,
     is_user_message: bool = True,
     user_id: str | None = None,
     retry_count: int = 0,
     session: ChatSession | None = None,
+    context: dict[str, str] | None = None,  # {url: str, content: str}
 ) -> AsyncGenerator[StreamBaseResponse, None]:
     """Main entry point for streaming chat completions with database handling.
 
@@ -131,8 +394,13 @@ async def stream_chat_completion(
             f"new message_count={len(session.messages)}"
         )
 
-    if len(session.messages) > config.max_context_messages:
-        raise ValueError(f"Max messages exceeded: {config.max_context_messages}")
+        # Track user message in PostHog
+        if is_user_message:
+            track_user_message(
+                user_id=user_id,
+                session_id=session_id,
+                message_length=len(message),
+            )
 
     logger.info(
         f"Upserting session: {session.session_id} with user id {session.user_id}, "
@@ -141,86 +409,239 @@ async def stream_chat_completion(
     session = await upsert_chat_session(session)
     assert session, "Session not found"
 
+    # Generate title for new sessions on first user message (non-blocking)
+    # Check: is_user_message, no title yet, and this is the first user message
+    if is_user_message and message and not session.title:
+        user_messages = [m for m in session.messages if m.role == "user"]
+        if len(user_messages) == 1:
+            # First user message - generate title in background
+            import asyncio
+
+            # Capture only the values we need (not the session object) to avoid
+            # stale data issues when the main flow modifies the session
+            captured_session_id = session_id
+            captured_message = message
+            captured_user_id = user_id
+
+            async def _update_title():
+                try:
+                    title = await _generate_session_title(
+                        captured_message,
+                        user_id=captured_user_id,
+                        session_id=captured_session_id,
+                    )
+                    if title:
+                        # Use dedicated title update function that doesn't
+                        # touch messages, avoiding race conditions
+                        await update_session_title(captured_session_id, title)
+                        logger.info(
+                            f"Generated title for session {captured_session_id}: {title}"
+                        )
+                except Exception as e:
+                    logger.warning(f"Failed to update session title: {e}")
+
+            # Fire and forget - don't block the chat response
+            asyncio.create_task(_update_title())
+
+    # Build system prompt with business understanding
+    system_prompt, understanding = await _build_system_prompt(user_id)
+
+    # Initialize variables for streaming
     assistant_response = ChatMessage(
         role="assistant",
         content="",
     )
+    accumulated_tool_calls: list[dict[str, Any]] = []
+    has_saved_assistant_message = False
+    has_appended_streaming_message = False
+    last_cache_time = 0.0
+    last_cache_content_len = 0
 
     has_yielded_end = False
     has_yielded_error = False
     has_done_tool_call = False
+    has_long_running_tool_call = False  # Track if we had a long-running tool call
     has_received_text = False
     text_streaming_ended = False
     tool_response_messages: list[ChatMessage] = []
-    accumulated_tool_calls: list[dict[str, Any]] = []
     should_retry = False
 
+    # Generate unique IDs for AI SDK protocol
+    import uuid as uuid_module
+
+    message_id = str(uuid_module.uuid4())
+    text_block_id = str(uuid_module.uuid4())
+
+    # Yield message start
+    yield StreamStart(messageId=message_id)
+
     try:
         async for chunk in _stream_chat_chunks(
             session=session,
             tools=tools,
+            system_prompt=system_prompt,
+            text_block_id=text_block_id,
         ):
-
-            if isinstance(chunk, StreamTextChunk):
-                content = chunk.content or ""
+            if isinstance(chunk, StreamTextStart):
+                # Emit text-start before first text delta
+                if not has_received_text:
+                    yield chunk
+            elif isinstance(chunk, StreamTextDelta):
+                delta = chunk.delta or ""
                 assert assistant_response.content is not None
-                assistant_response.content += content
+                assistant_response.content += delta
                 has_received_text = True
+                if not has_appended_streaming_message:
+                    session.messages.append(assistant_response)
+                    has_appended_streaming_message = True
+                current_time = time.monotonic()
+                content_len = len(assistant_response.content)
+                if (
+                    current_time - last_cache_time >= 1.0
+                    and content_len > last_cache_content_len
+                ):
+                    try:
+                        await cache_chat_session(session)
+                    except Exception as e:
+                        logger.warning(
+                            f"Failed to cache partial session {session.session_id}: {e}"
+                        )
+                    last_cache_time = current_time
+                    last_cache_content_len = content_len
                 yield chunk
-            elif isinstance(chunk, StreamToolCallStart):
-                # Emit text_ended before first tool call, but only if we've received text
+            elif isinstance(chunk, StreamTextEnd):
+                # Emit text-end after text completes
                 if has_received_text and not text_streaming_ended:
-                    yield StreamTextEnded()
+                    text_streaming_ended = True
+                    yield chunk
+            elif isinstance(chunk, StreamToolInputStart):
+                # Emit text-end before first tool call, but only if we've received text
+                if has_received_text and not text_streaming_ended:
+                    yield StreamTextEnd(id=text_block_id)
                     text_streaming_ended = True
                 yield chunk
-            elif isinstance(chunk, StreamToolCall):
+            elif isinstance(chunk, StreamToolInputAvailable):
                 # Accumulate tool calls in OpenAI format
                 accumulated_tool_calls.append(
                     {
-                        "id": chunk.tool_id,
+                        "id": chunk.toolCallId,
                         "type": "function",
                         "function": {
-                            "name": chunk.tool_name,
-                            "arguments": orjson.dumps(chunk.arguments).decode("utf-8"),
+                            "name": chunk.toolName,
+                            "arguments": orjson.dumps(chunk.input).decode("utf-8"),
                         },
                     }
                 )
-            elif isinstance(chunk, StreamToolExecutionResult):
+                yield chunk
+            elif isinstance(chunk, StreamToolOutputAvailable):
                 result_content = (
-                    chunk.result
-                    if isinstance(chunk.result, str)
-                    else orjson.dumps(chunk.result).decode("utf-8")
+                    chunk.output
+                    if isinstance(chunk.output, str)
+                    else orjson.dumps(chunk.output).decode("utf-8")
                 )
-                tool_response_messages.append(
-                    ChatMessage(
-                        role="tool",
-                        content=result_content,
-                        tool_call_id=chunk.tool_id,
+                # Skip saving long-running operation responses - messages already saved in _yield_tool_call
+                # Use JSON parsing instead of substring matching to avoid false positives
+                is_long_running_response = False
+                try:
+                    parsed = orjson.loads(result_content)
+                    if isinstance(parsed, dict) and parsed.get("type") in (
+                        "operation_started",
+                        "operation_in_progress",
+                    ):
+                        is_long_running_response = True
+                except (orjson.JSONDecodeError, TypeError):
+                    pass  # Not JSON or not a dict - treat as regular response
+                if is_long_running_response:
+                    # Remove from accumulated_tool_calls since assistant message was already saved
+                    accumulated_tool_calls[:] = [
+                        tc
+                        for tc in accumulated_tool_calls
+                        if tc["id"] != chunk.toolCallId
+                    ]
+                    has_long_running_tool_call = True
+                else:
+                    tool_response_messages.append(
+                        ChatMessage(
+                            role="tool",
+                            content=result_content,
+                            tool_call_id=chunk.toolCallId,
+                        )
                     )
-                )
                 has_done_tool_call = True
                 # Track if any tool execution failed
                 if not chunk.success:
                     logger.warning(
-                        f"Tool {chunk.tool_name} (ID: {chunk.tool_id}) execution failed"
+                        f"Tool {chunk.toolName} (ID: {chunk.toolCallId}) execution failed"
                     )
                 yield chunk
-            elif isinstance(chunk, StreamEnd):
+            elif isinstance(chunk, StreamFinish):
                 if not has_done_tool_call:
+                    # Emit text-end before finish if we received text but haven't closed it
+                    if has_received_text and not text_streaming_ended:
+                        yield StreamTextEnd(id=text_block_id)
+                        text_streaming_ended = True
+
+                    # Save assistant message before yielding finish to ensure it's persisted
+                    # even if client disconnects immediately after receiving StreamFinish
+                    if not has_saved_assistant_message:
+                        messages_to_save_early: list[ChatMessage] = []
+                        if accumulated_tool_calls:
+                            assistant_response.tool_calls = accumulated_tool_calls
+                        if not has_appended_streaming_message and (
+                            assistant_response.content or assistant_response.tool_calls
+                        ):
+                            messages_to_save_early.append(assistant_response)
+                        messages_to_save_early.extend(tool_response_messages)
+
+                        if messages_to_save_early:
+                            session.messages.extend(messages_to_save_early)
+                            logger.info(
+                                f"Saving assistant message before StreamFinish: "
+                                f"content_len={len(assistant_response.content or '')}, "
+                                f"tool_calls={len(assistant_response.tool_calls or [])}, "
+                                f"tool_responses={len(tool_response_messages)}"
+                            )
+                        if messages_to_save_early or has_appended_streaming_message:
+                            await upsert_chat_session(session)
+                            has_saved_assistant_message = True
+
                     has_yielded_end = True
                     yield chunk
             elif isinstance(chunk, StreamError):
                 has_yielded_error = True
+                yield chunk
             elif isinstance(chunk, StreamUsage):
                 session.usage.append(
                     Usage(
-                        prompt_tokens=chunk.prompt_tokens,
-                        completion_tokens=chunk.completion_tokens,
-                        total_tokens=chunk.total_tokens,
+                        prompt_tokens=chunk.promptTokens,
+                        completion_tokens=chunk.completionTokens,
+                        total_tokens=chunk.totalTokens,
                     )
                 )
             else:
                 logger.error(f"Unknown chunk type: {type(chunk)}", exc_info=True)
+
+    except CancelledError:
+        if not has_saved_assistant_message:
+            if accumulated_tool_calls:
+                assistant_response.tool_calls = accumulated_tool_calls
+            if assistant_response.content:
+                assistant_response.content = (
+                    f"{assistant_response.content}\n\n[interrupted]"
+                )
+            else:
+                assistant_response.content = "[interrupted]"
+            if not has_appended_streaming_message:
+                session.messages.append(assistant_response)
+            if tool_response_messages:
+                session.messages.extend(tool_response_messages)
+            try:
+                await upsert_chat_session(session)
+            except Exception as e:
+                logger.warning(
+                    f"Failed to save interrupted session {session.session_id}: {e}"
+                )
+        raise
     except Exception as e:
         logger.error(f"Error during stream: {e!s}", exc_info=True)
 
@@ -240,14 +661,19 @@ async def stream_chat_completion(
             # Add assistant message if it has content or tool calls
             if accumulated_tool_calls:
                 assistant_response.tool_calls = accumulated_tool_calls
-            if assistant_response.content or assistant_response.tool_calls:
+            if not has_appended_streaming_message and (
+                assistant_response.content or assistant_response.tool_calls
+            ):
                 messages_to_save.append(assistant_response)
 
             # Add tool response messages after assistant message
             messages_to_save.extend(tool_response_messages)
 
-            session.messages.extend(messages_to_save)
-            await upsert_chat_session(session)
+            if not has_saved_assistant_message:
+                if messages_to_save:
+                    session.messages.extend(messages_to_save)
+                if messages_to_save or has_appended_streaming_message:
+                    await upsert_chat_session(session)
 
             if not has_yielded_error:
                 error_message = str(e)
@@ -258,15 +684,10 @@ async def stream_chat_completion(
                         f"Max retries ({config.max_retries}) exceeded: {error_message}"
                     )
 
-                error_response = StreamError(
-                    message=error_message,
-                    timestamp=datetime.now(UTC).isoformat(),
-                )
+                error_response = StreamError(errorText=error_message)
                 yield error_response
             if not has_yielded_end:
-                yield StreamEnd(
-                    timestamp=datetime.now(UTC).isoformat(),
-                )
+                yield StreamFinish()
             return
 
     # Handle retry outside of exception handler to avoid nesting
@@ -279,44 +700,67 @@ async def stream_chat_completion(
             user_id=user_id,
             retry_count=retry_count + 1,
             session=session,
+            context=context,
         ):
             yield chunk
         return  # Exit after retry to avoid double-saving in finally block
 
     # Normal completion path - save session and handle tool call continuation
-    logger.info(
-        f"Normal completion path: session={session.session_id}, "
-        f"current message_count={len(session.messages)}"
-    )
-
-    # Build the messages list in the correct order
-    messages_to_save: list[ChatMessage] = []
-
-    # Add assistant message with tool_calls if any
-    if accumulated_tool_calls:
-        assistant_response.tool_calls = accumulated_tool_calls
+    # Only save if we haven't already saved when StreamFinish was received
+    if not has_saved_assistant_message:
         logger.info(
-            f"Added {len(accumulated_tool_calls)} tool calls to assistant message"
-        )
-    if assistant_response.content or assistant_response.tool_calls:
-        messages_to_save.append(assistant_response)
-        logger.info(
-            f"Saving assistant message with content_len={len(assistant_response.content or '')}, tool_calls={len(assistant_response.tool_calls or [])}"
+            f"Normal completion path: session={session.session_id}, "
+            f"current message_count={len(session.messages)}"
         )
 
-    # Add tool response messages after assistant message
-    messages_to_save.extend(tool_response_messages)
-    logger.info(
-        f"Saving {len(tool_response_messages)} tool response messages, "
-        f"total_to_save={len(messages_to_save)}"
-    )
+        # Build the messages list in the correct order
+        messages_to_save: list[ChatMessage] = []
 
-    session.messages.extend(messages_to_save)
-    logger.info(f"Extended session messages, new message_count={len(session.messages)}")
-    await upsert_chat_session(session)
+        # Add assistant message with tool_calls if any
+        if accumulated_tool_calls:
+            assistant_response.tool_calls = accumulated_tool_calls
+            logger.info(
+                f"Added {len(accumulated_tool_calls)} tool calls to assistant message"
+            )
+        if not has_appended_streaming_message and (
+            assistant_response.content or assistant_response.tool_calls
+        ):
+            messages_to_save.append(assistant_response)
+            logger.info(
+                f"Saving assistant message with content_len={len(assistant_response.content or '')}, tool_calls={len(assistant_response.tool_calls or [])}"
+            )
+
+        # Add tool response messages after assistant message
+        messages_to_save.extend(tool_response_messages)
+        logger.info(
+            f"Saving {len(tool_response_messages)} tool response messages, "
+            f"total_to_save={len(messages_to_save)}"
+        )
+
+        if messages_to_save:
+            session.messages.extend(messages_to_save)
+            logger.info(
+                f"Extended session messages, new message_count={len(session.messages)}"
+            )
+        # Save if there are regular (non-long-running) tool responses or streaming message.
+        # Long-running tools save their own state, but we still need to save regular tools
+        # that may be in the same response.
+        has_regular_tool_responses = len(tool_response_messages) > 0
+        if has_regular_tool_responses or (
+            not has_long_running_tool_call
+            and (messages_to_save or has_appended_streaming_message)
+        ):
+            await upsert_chat_session(session)
+    else:
+        logger.info(
+            "Assistant message already saved when StreamFinish was received, "
+            "skipping duplicate save"
+        )
 
     # If we did a tool call, stream the chat completion again to get the next response
-    if has_done_tool_call:
+    # Skip only if ALL tools were long-running (they handle their own completion)
+    has_regular_tools = len(tool_response_messages) > 0
+    if has_done_tool_call and (has_regular_tools or not has_long_running_tool_call):
         logger.info(
             "Tool call executed, streaming chat completion again to get assistant response"
         )
@@ -324,23 +768,113 @@ async def stream_chat_completion(
             session_id=session.session_id,
             user_id=user_id,
             session=session,  # Pass session object to avoid Redis refetch
+            context=context,
+            tool_call_response=str(tool_response_messages),
         ):
             yield chunk
 
 
+# Retry configuration for OpenAI API calls
+MAX_RETRIES = 3
+BASE_DELAY_SECONDS = 1.0
+MAX_DELAY_SECONDS = 30.0
+
+
+def _is_retryable_error(error: Exception) -> bool:
+    """Determine if an error is retryable."""
+    if isinstance(error, RateLimitError):
+        return True
+    if isinstance(error, APIConnectionError):
+        return True
+    if isinstance(error, APIStatusError):
+        # APIStatusError has a response with status_code
+        # Retry on 5xx status codes (server errors)
+        if error.response.status_code >= 500:
+            return True
+    if isinstance(error, APIError):
+        # Retry on overloaded errors or 500 errors (may not have status code)
+        error_message = str(error).lower()
+        if "overloaded" in error_message or "internal server error" in error_message:
+            return True
+    return False
+
+
+def _is_region_blocked_error(error: Exception) -> bool:
+    if isinstance(error, PermissionDeniedError):
+        return "not available in your region" in str(error).lower()
+    return "not available in your region" in str(error).lower()
+
+
+async def _manage_context_window(
+    messages: list,
+    model: str,
+    api_key: str | None = None,
+    base_url: str | None = None,
+) -> "CompressResult":
+    """
+    Manage context window using the unified compress_context function.
+
+    This is a thin wrapper that creates an OpenAI client for summarization
+    and delegates to the shared compression logic in prompt.py.
+
+    Args:
+        messages: List of messages in OpenAI format
+        model: Model name for token counting and summarization
+        api_key: API key for summarization calls
+        base_url: Base URL for summarization calls
+
+    Returns:
+        CompressResult with compacted messages and metadata
+    """
+    import openai
+
+    from backend.util.prompt import compress_context
+
+    # Convert messages to dict format
+    messages_dict = []
+    for msg in messages:
+        if isinstance(msg, dict):
+            msg_dict = {k: v for k, v in msg.items() if v is not None}
+        else:
+            msg_dict = dict(msg)
+        messages_dict.append(msg_dict)
+
+    # Only create client if api_key is provided (enables summarization)
+    # Use context manager to avoid socket leaks
+    if api_key:
+        async with openai.AsyncOpenAI(
+            api_key=api_key, base_url=base_url, timeout=30.0
+        ) as client:
+            return await compress_context(
+                messages=messages_dict,
+                model=model,
+                client=client,
+            )
+    else:
+        # No API key - use truncation-only mode
+        return await compress_context(
+            messages=messages_dict,
+            model=model,
+            client=None,
+        )
+
+
 async def _stream_chat_chunks(
     session: ChatSession,
     tools: list[ChatCompletionToolParam],
+    system_prompt: str | None = None,
+    text_block_id: str | None = None,
 ) -> AsyncGenerator[StreamBaseResponse, None]:
     """
     Pure streaming function for OpenAI chat completions with tool calling.
 
     This function is database-agnostic and focuses only on streaming logic.
+    Implements exponential backoff retry for transient API errors.
 
     Args:
-        messages: Conversation context as ChatCompletionMessageParam list
-        session_id: Session ID
-        user_id: User ID for tool execution
+        session: Chat session with conversation history
+        tools: Available tools for the model
+        system_prompt: System prompt to prepend to messages
 
     Yields:
         SSE formatted JSON response objects
@@ -350,140 +884,242 @@ async def _stream_chat_chunks(
 
     logger.info("Starting pure chat stream")
 
+    messages = session.to_openai_messages()
+    if system_prompt:
+        system_message = ChatCompletionSystemMessageParam(
+            role="system",
+            content=system_prompt,
+        )
+        messages = [system_message] + messages
+
+    # Apply context window management
+    context_result = await _manage_context_window(
+        messages=messages,
+        model=model,
+        api_key=config.api_key,
+        base_url=config.base_url,
+    )
+
+    if context_result.error:
+        if "System prompt dropped" in context_result.error:
+            # Warning only - continue with reduced context
+            yield StreamError(
+                errorText=(
+                    "Warning: System prompt dropped due to size constraints. "
+                    "Assistant behavior may be affected."
+                )
+            )
+        else:
+            # Any other error - abort to prevent failed LLM calls
+            yield StreamError(
+                errorText=(
+                    f"Context window management failed: {context_result.error}. "
+                    "Please start a new conversation."
+                )
+            )
+            yield StreamFinish()
+            return
+
+    messages = context_result.messages
+    if context_result.was_compacted:
+        logger.info(
+            f"Context compacted for streaming: {context_result.token_count} tokens"
+        )
+
     # Loop to handle tool calls and continue conversation
     while True:
-        try:
-            logger.info("Creating OpenAI chat completion stream...")
+        retry_count = 0
+        last_error: Exception | None = None
 
-            # Create the stream with proper types
-            stream = await client.chat.completions.create(
-                model=model,
-                messages=session.to_openai_messages(),
-                tools=tools,
-                tool_choice="auto",
-                stream=True,
-            )
+        while retry_count <= MAX_RETRIES:
+            try:
+                logger.info(
+                    f"Creating OpenAI chat completion stream..."
+                    f"{f' (retry {retry_count}/{MAX_RETRIES})' if retry_count > 0 else ''}"
+                )
 
-            # Variables to accumulate tool calls
-            tool_calls: list[dict[str, Any]] = []
-            active_tool_call_idx: int | None = None
-            finish_reason: str | None = None
-            # Track which tool call indices have had their start event emitted
-            emitted_start_for_idx: set[int] = set()
+                # Build extra_body for OpenRouter tracing and PostHog analytics
+                extra_body: dict[str, Any] = {
+                    "posthogProperties": {
+                        "environment": settings.config.app_env.value,
+                    },
+                }
+                if session.user_id:
+                    extra_body["user"] = session.user_id[:128]  # OpenRouter limit
+                    extra_body["posthogDistinctId"] = session.user_id
+                if session.session_id:
+                    extra_body["session_id"] = session.session_id[
+                        :128
+                    ]  # OpenRouter limit
 
-            # Process the stream
-            chunk: ChatCompletionChunk
-            async for chunk in stream:
-                if chunk.usage:
-                    yield StreamUsage(
-                        prompt_tokens=chunk.usage.prompt_tokens,
-                        completion_tokens=chunk.usage.completion_tokens,
-                        total_tokens=chunk.usage.total_tokens,
-                    )
+                stream = await client.chat.completions.create(
+                    model=model,
+                    messages=cast(list[ChatCompletionMessageParam], messages),
+                    tools=tools,
+                    tool_choice="auto",
+                    stream=True,
+                    stream_options=ChatCompletionStreamOptionsParam(include_usage=True),
+                    extra_body=extra_body,
+                )
 
-                if chunk.choices:
-                    choice = chunk.choices[0]
-                    delta = choice.delta
+                # Variables to accumulate tool calls
+                tool_calls: list[dict[str, Any]] = []
+                active_tool_call_idx: int | None = None
+                finish_reason: str | None = None
+                # Track which tool call indices have had their start event emitted
+                emitted_start_for_idx: set[int] = set()
 
-                    # Capture finish reason
-                    if choice.finish_reason:
-                        finish_reason = choice.finish_reason
-                        logger.info(f"Finish reason: {finish_reason}")
+                # Track if we've started the text block
+                text_started = False
 
-                    # Handle content streaming
-                    if delta.content:
-                        # Stream the text chunk
-                        text_response = StreamTextChunk(
-                            content=delta.content,
-                            timestamp=datetime.now(UTC).isoformat(),
+                # Process the stream
+                chunk: ChatCompletionChunk
+                async for chunk in stream:
+                    if chunk.usage:
+                        yield StreamUsage(
+                            promptTokens=chunk.usage.prompt_tokens,
+                            completionTokens=chunk.usage.completion_tokens,
+                            totalTokens=chunk.usage.total_tokens,
                         )
-                        yield text_response
 
-                    # Handle tool calls
-                    if delta.tool_calls:
-                        for tc_chunk in delta.tool_calls:
-                            idx = tc_chunk.index
+                    if chunk.choices:
+                        choice = chunk.choices[0]
+                        delta = choice.delta
 
-                            # Update active tool call index if needed
-                            if (
-                                active_tool_call_idx is None
-                                or active_tool_call_idx != idx
-                            ):
-                                active_tool_call_idx = idx
+                        # Capture finish reason
+                        if choice.finish_reason:
+                            finish_reason = choice.finish_reason
+                            logger.info(f"Finish reason: {finish_reason}")
 
-                            # Ensure we have a tool call object at this index
-                            while len(tool_calls) <= idx:
-                                tool_calls.append(
-                                    {
-                                        "id": "",
-                                        "type": "function",
-                                        "function": {
-                                            "name": "",
-                                            "arguments": "",
+                        # Handle content streaming
+                        if delta.content:
+                            # Emit text-start on first text content
+                            if not text_started and text_block_id:
+                                yield StreamTextStart(id=text_block_id)
+                                text_started = True
+                            # Stream the text delta
+                            text_response = StreamTextDelta(
+                                id=text_block_id or "",
+                                delta=delta.content,
+                            )
+                            yield text_response
+
+                        # Handle tool calls
+                        if delta.tool_calls:
+                            for tc_chunk in delta.tool_calls:
+                                idx = tc_chunk.index
+
+                                # Update active tool call index if needed
+                                if (
+                                    active_tool_call_idx is None
+                                    or active_tool_call_idx != idx
+                                ):
+                                    active_tool_call_idx = idx
+
+                                # Ensure we have a tool call object at this index
+                                while len(tool_calls) <= idx:
+                                    tool_calls.append(
+                                        {
+                                            "id": "",
+                                            "type": "function",
+                                            "function": {
+                                                "name": "",
+                                                "arguments": "",
+                                            },
                                         },
-                                    },
-                                )
+                                    )
 
-                            # Accumulate the tool call data
-                            if tc_chunk.id:
-                                tool_calls[idx]["id"] = tc_chunk.id
-                            if tc_chunk.function:
-                                if tc_chunk.function.name:
-                                    tool_calls[idx]["function"][
-                                        "name"
-                                    ] = tc_chunk.function.name
-                                if tc_chunk.function.arguments:
-                                    tool_calls[idx]["function"][
-                                        "arguments"
-                                    ] += tc_chunk.function.arguments
+                                # Accumulate the tool call data
+                                if tc_chunk.id:
+                                    tool_calls[idx]["id"] = tc_chunk.id
+                                if tc_chunk.function:
+                                    if tc_chunk.function.name:
+                                        tool_calls[idx]["function"][
+                                            "name"
+                                        ] = tc_chunk.function.name
+                                    if tc_chunk.function.arguments:
+                                        tool_calls[idx]["function"][
+                                            "arguments"
+                                        ] += tc_chunk.function.arguments
 
-                            # Emit StreamToolCallStart only after we have the tool call ID
-                            if (
-                                idx not in emitted_start_for_idx
-                                and tool_calls[idx]["id"]
-                                and tool_calls[idx]["function"]["name"]
-                            ):
-                                yield StreamToolCallStart(
-                                    tool_id=tool_calls[idx]["id"],
-                                    tool_name=tool_calls[idx]["function"]["name"],
-                                    timestamp=datetime.now(UTC).isoformat(),
-                                )
-                                emitted_start_for_idx.add(idx)
-            logger.info(f"Stream complete. Finish reason: {finish_reason}")
+                                # Emit StreamToolInputStart only after we have the tool call ID
+                                if (
+                                    idx not in emitted_start_for_idx
+                                    and tool_calls[idx]["id"]
+                                    and tool_calls[idx]["function"]["name"]
+                                ):
+                                    yield StreamToolInputStart(
+                                        toolCallId=tool_calls[idx]["id"],
+                                        toolName=tool_calls[idx]["function"]["name"],
+                                    )
+                                    emitted_start_for_idx.add(idx)
+                logger.info(f"Stream complete. Finish reason: {finish_reason}")
 
-            # Yield all accumulated tool calls after the stream is complete
-            # This ensures all tool call arguments have been fully received
-            for idx, tool_call in enumerate(tool_calls):
-                try:
-                    async for tc in _yield_tool_call(tool_calls, idx, session):
-                        yield tc
-                except (orjson.JSONDecodeError, KeyError, TypeError) as e:
+                # Yield all accumulated tool calls after the stream is complete
+                # This ensures all tool call arguments have been fully received
+                for idx, tool_call in enumerate(tool_calls):
+                    try:
+                        async for tc in _yield_tool_call(tool_calls, idx, session):
+                            yield tc
+                    except (orjson.JSONDecodeError, KeyError, TypeError) as e:
+                        logger.error(
+                            f"Failed to parse tool call {idx}: {e}",
+                            exc_info=True,
+                            extra={"tool_call": tool_call},
+                        )
+                        yield StreamError(
+                            errorText=f"Invalid tool call arguments for tool {tool_call.get('function', {}).get('name', 'unknown')}: {e}",
+                        )
+                        # Re-raise to trigger retry logic in the parent function
+                        raise
+
+                yield StreamFinish()
+                return
+            except Exception as e:
+                last_error = e
+                if _is_retryable_error(e) and retry_count < MAX_RETRIES:
+                    retry_count += 1
+                    # Calculate delay with exponential backoff
+                    delay = min(
+                        BASE_DELAY_SECONDS * (2 ** (retry_count - 1)),
+                        MAX_DELAY_SECONDS,
+                    )
+                    logger.warning(
+                        f"Retryable error in stream: {e!s}. "
+                        f"Retrying in {delay:.1f}s (attempt {retry_count}/{MAX_RETRIES})"
+                    )
+                    await asyncio.sleep(delay)
+                    continue  # Retry the stream
+                else:
+                    # Non-retryable error or max retries exceeded
                     logger.error(
-                        f"Failed to parse tool call {idx}: {e}",
+                        f"Error in stream (not retrying): {e!s}",
                         exc_info=True,
-                        extra={"tool_call": tool_call},
                     )
-                    yield StreamError(
-                        message=f"Invalid tool call arguments for tool {tool_call.get('function', {}).get('name', 'unknown')}: {e}",
-                        timestamp=datetime.now(UTC).isoformat(),
+                    error_code = None
+                    error_text = str(e)
+                    if _is_region_blocked_error(e):
+                        error_code = "MODEL_NOT_AVAILABLE_REGION"
+                        error_text = (
+                            "This model is not available in your region. "
+                            "Please connect via VPN and try again."
+                        )
+                    error_response = StreamError(
+                        errorText=error_text,
+                        code=error_code,
                     )
-                    # Re-raise to trigger retry logic in the parent function
-                    raise
+                    yield error_response
+                    yield StreamFinish()
+                    return
 
-            yield StreamEnd(
-                timestamp=datetime.now(UTC).isoformat(),
-            )
-            return
-        except Exception as e:
-            logger.error(f"Error in stream: {e!s}", exc_info=True)
-            error_response = StreamError(
-                message=str(e),
-                timestamp=datetime.now(UTC).isoformat(),
-            )
-            yield error_response
-            yield StreamEnd(
-                timestamp=datetime.now(UTC).isoformat(),
+        # If we exit the retry loop without returning, it means we exhausted retries
+        if last_error:
+            logger.error(
+                f"Max retries ({MAX_RETRIES}) exceeded. Last error: {last_error!s}",
+                exc_info=True,
             )
+            yield StreamError(errorText=f"Max retries exceeded: {last_error!s}")
+            yield StreamFinish()
             return
 
 
@@ -495,44 +1131,746 @@ async def _yield_tool_call(
     """
     Yield a tool call and its execution result.
 
+    For tools marked with `is_long_running=True` (like agent generation), spawns a
+    background task so the operation survives SSE disconnections. For other tools,
+    yields heartbeat events every 15 seconds to keep the SSE connection alive.
+
     Raises:
         orjson.JSONDecodeError: If tool call arguments cannot be parsed as JSON
         KeyError: If expected tool call fields are missing
         TypeError: If tool call structure is invalid
     """
-    logger.info(f"Yielding tool call: {tool_calls[yield_idx]}")
+    import uuid as uuid_module
 
-    # Parse tool call arguments - exceptions will propagate to caller
-    arguments = orjson.loads(tool_calls[yield_idx]["function"]["arguments"])
+    tool_name = tool_calls[yield_idx]["function"]["name"]
+    tool_call_id = tool_calls[yield_idx]["id"]
 
-    yield StreamToolCall(
-        tool_id=tool_calls[yield_idx]["id"],
-        tool_name=tool_calls[yield_idx]["function"]["name"],
-        arguments=arguments,
-        timestamp=datetime.now(UTC).isoformat(),
+    # Parse tool call arguments - handle empty arguments gracefully
+    raw_arguments = tool_calls[yield_idx]["function"]["arguments"]
+    if raw_arguments:
+        arguments = orjson.loads(raw_arguments)
+    else:
+        arguments = {}
+
+    yield StreamToolInputAvailable(
+        toolCallId=tool_call_id,
+        toolName=tool_name,
+        input=arguments,
     )
 
-    tool_execution_response: StreamToolExecutionResult = await execute_tool(
-        tool_name=tool_calls[yield_idx]["function"]["name"],
-        parameters=arguments,
-        tool_call_id=tool_calls[yield_idx]["id"],
-        user_id=session.user_id,
-        session=session,
+    # Check if this tool is long-running (survives SSE disconnection)
+    tool = get_tool(tool_name)
+    if tool and tool.is_long_running:
+        # Atomic check-and-set: returns False if operation already running (lost race)
+        if not await _mark_operation_started(tool_call_id):
+            logger.info(
+                f"Tool call {tool_call_id} already in progress, returning status"
+            )
+            # Build dynamic message based on tool name
+            if tool_name == "create_agent":
+                in_progress_msg = "Agent creation already in progress. Please wait..."
+            elif tool_name == "edit_agent":
+                in_progress_msg = "Agent edit already in progress. Please wait..."
+            else:
+                in_progress_msg = f"{tool_name} already in progress. Please wait..."
+
+            yield StreamToolOutputAvailable(
+                toolCallId=tool_call_id,
+                toolName=tool_name,
+                output=OperationInProgressResponse(
+                    message=in_progress_msg,
+                    tool_call_id=tool_call_id,
+                ).model_dump_json(),
+                success=True,
+            )
+            return
+
+        # Generate operation ID and task ID
+        operation_id = str(uuid_module.uuid4())
+        task_id = str(uuid_module.uuid4())
+
+        # Build a user-friendly message based on tool and arguments
+        if tool_name == "create_agent":
+            agent_desc = arguments.get("description", "")
+            # Truncate long descriptions for the message
+            desc_preview = (
+                (agent_desc[:100] + "...") if len(agent_desc) > 100 else agent_desc
+            )
+            pending_msg = (
+                f"Creating your agent: {desc_preview}"
+                if desc_preview
+                else "Creating agent... This may take a few minutes."
+            )
+            started_msg = (
+                "Agent creation started. You can close this tab - "
+                "check your library in a few minutes."
+            )
+        elif tool_name == "edit_agent":
+            changes = arguments.get("changes", "")
+            changes_preview = (changes[:100] + "...") if len(changes) > 100 else changes
+            pending_msg = (
+                f"Editing agent: {changes_preview}"
+                if changes_preview
+                else "Editing agent... This may take a few minutes."
+            )
+            started_msg = (
+                "Agent edit started. You can close this tab - "
+                "check your library in a few minutes."
+            )
+        else:
+            pending_msg = f"Running {tool_name}... This may take a few minutes."
+            started_msg = (
+                f"{tool_name} started. You can close this tab - "
+                "check back in a few minutes."
+            )
+
+        # Track appended messages for rollback on failure
+        assistant_message: ChatMessage | None = None
+        pending_message: ChatMessage | None = None
+
+        # Wrap session save and task creation in try-except to release lock on failure
+        try:
+            # Create task in stream registry for SSE reconnection support
+            await stream_registry.create_task(
+                task_id=task_id,
+                session_id=session.session_id,
+                user_id=session.user_id,
+                tool_call_id=tool_call_id,
+                tool_name=tool_name,
+                operation_id=operation_id,
+            )
+
+            # Save assistant message with tool_call FIRST (required by LLM)
+            assistant_message = ChatMessage(
+                role="assistant",
+                content="",
+                tool_calls=[tool_calls[yield_idx]],
+            )
+            session.messages.append(assistant_message)
+
+            # Then save pending tool result
+            pending_message = ChatMessage(
+                role="tool",
+                content=OperationPendingResponse(
+                    message=pending_msg,
+                    operation_id=operation_id,
+                    tool_name=tool_name,
+                ).model_dump_json(),
+                tool_call_id=tool_call_id,
+            )
+            session.messages.append(pending_message)
+            await upsert_chat_session(session)
+            logger.info(
+                f"Saved pending operation {operation_id} (task_id={task_id}) "
+                f"for tool {tool_name} in session {session.session_id}"
+            )
+
+            # Store task reference in module-level set to prevent GC before completion
+            bg_task = asyncio.create_task(
+                _execute_long_running_tool_with_streaming(
+                    tool_name=tool_name,
+                    parameters=arguments,
+                    tool_call_id=tool_call_id,
+                    operation_id=operation_id,
+                    task_id=task_id,
+                    session_id=session.session_id,
+                    user_id=session.user_id,
+                )
+            )
+            _background_tasks.add(bg_task)
+            bg_task.add_done_callback(_background_tasks.discard)
+
+            # Associate the asyncio task with the stream registry task
+            await stream_registry.set_task_asyncio_task(task_id, bg_task)
+        except Exception as e:
+            # Roll back appended messages to prevent data corruption on subsequent saves
+            if (
+                pending_message
+                and session.messages
+                and session.messages[-1] == pending_message
+            ):
+                session.messages.pop()
+            if (
+                assistant_message
+                and session.messages
+                and session.messages[-1] == assistant_message
+            ):
+                session.messages.pop()
+
+            # Release the Redis lock since the background task won't be spawned
+            await _mark_operation_completed(tool_call_id)
+            # Mark stream registry task as failed if it was created
+            try:
+                await stream_registry.mark_task_completed(task_id, status="failed")
+            except Exception:
+                pass
+            logger.error(
+                f"Failed to setup long-running tool {tool_name}: {e}", exc_info=True
+            )
+            raise
+
+        # Return immediately - don't wait for completion
+        yield StreamToolOutputAvailable(
+            toolCallId=tool_call_id,
+            toolName=tool_name,
+            output=OperationStartedResponse(
+                message=started_msg,
+                operation_id=operation_id,
+                tool_name=tool_name,
+                task_id=task_id,  # Include task_id for SSE reconnection
+            ).model_dump_json(),
+            success=True,
+        )
+        return
+
+    # Normal flow: Run tool execution in background task with heartbeats
+    tool_task = asyncio.create_task(
+        execute_tool(
+            tool_name=tool_name,
+            parameters=arguments,
+            tool_call_id=tool_call_id,
+            user_id=session.user_id,
+            session=session,
+        )
     )
-    logger.info(f"Yielding Tool execution response: {tool_execution_response}")
+
+    # Yield heartbeats every 15 seconds while waiting for tool to complete
+    heartbeat_interval = 15.0  # seconds
+    while not tool_task.done():
+        try:
+            # Wait for either the task to complete or the heartbeat interval
+            await asyncio.wait_for(
+                asyncio.shield(tool_task), timeout=heartbeat_interval
+            )
+        except asyncio.TimeoutError:
+            # Task still running, send heartbeat to keep connection alive
+            logger.debug(f"Sending heartbeat for tool {tool_name} ({tool_call_id})")
+            yield StreamHeartbeat(toolCallId=tool_call_id)
+        except CancelledError:
+            # Task was cancelled, clean up and propagate
+            tool_task.cancel()
+            logger.warning(f"Tool execution cancelled: {tool_name} ({tool_call_id})")
+            raise
+
+    # Get the result - handle any exceptions that occurred during execution
+    try:
+        tool_execution_response: StreamToolOutputAvailable = await tool_task
+    except Exception as e:
+        # Task raised an exception - ensure we send an error response to the frontend
+        logger.error(
+            f"Tool execution failed: {tool_name} ({tool_call_id}): {e}", exc_info=True
+        )
+        error_response = ErrorResponse(
+            message=f"Tool execution failed: {e!s}",
+            error=type(e).__name__,
+            session_id=session.session_id,
+        )
+        tool_execution_response = StreamToolOutputAvailable(
+            toolCallId=tool_call_id,
+            toolName=tool_name,
+            output=error_response.model_dump_json(),
+            success=False,
+        )
+
     yield tool_execution_response
 
 
-if __name__ == "__main__":
-    import asyncio
+async def _execute_long_running_tool(
+    tool_name: str,
+    parameters: dict[str, Any],
+    tool_call_id: str,
+    operation_id: str,
+    session_id: str,
+    user_id: str | None,
+) -> None:
+    """Execute a long-running tool in background and update chat history with result.
 
-    async def main():
-        session = await create_chat_session()
-        async for chunk in stream_chat_completion(
-            session.session_id,
-            "Please find me an agent that can help me with my business. Call the tool twice once with the query 'money printing agent' and once with the query 'money generating agent'",
-            user_id=session.user_id,
-        ):
-            print(chunk)
+    This function runs independently of the SSE connection, so the operation
+    survives if the user closes their browser tab.
 
-    asyncio.run(main())
+    NOTE: This is the legacy function without stream registry support.
+    Use _execute_long_running_tool_with_streaming for new implementations.
+    """
+    try:
+        # Load fresh session (not stale reference)
+        session = await get_chat_session(session_id, user_id)
+        if not session:
+            logger.error(f"Session {session_id} not found for background tool")
+            return
+
+        # Execute the actual tool
+        result = await execute_tool(
+            tool_name=tool_name,
+            parameters=parameters,
+            tool_call_id=tool_call_id,
+            user_id=user_id,
+            session=session,
+        )
+
+        # Update the pending message with result
+        await _update_pending_operation(
+            session_id=session_id,
+            tool_call_id=tool_call_id,
+            result=(
+                result.output
+                if isinstance(result.output, str)
+                else orjson.dumps(result.output).decode("utf-8")
+            ),
+        )
+
+        logger.info(f"Background tool {tool_name} completed for session {session_id}")
+
+        # Generate LLM continuation so user sees response when they poll/refresh
+        await _generate_llm_continuation(session_id=session_id, user_id=user_id)
+
+    except Exception as e:
+        logger.error(f"Background tool {tool_name} failed: {e}", exc_info=True)
+        error_response = ErrorResponse(
+            message=f"Tool {tool_name} failed: {str(e)}",
+        )
+        await _update_pending_operation(
+            session_id=session_id,
+            tool_call_id=tool_call_id,
+            result=error_response.model_dump_json(),
+        )
+        # Generate LLM continuation so user sees explanation even for errors
+        try:
+            await _generate_llm_continuation(session_id=session_id, user_id=user_id)
+        except Exception as llm_err:
+            logger.warning(f"Failed to generate LLM continuation for error: {llm_err}")
+    finally:
+        await _mark_operation_completed(tool_call_id)
+
+
+async def _execute_long_running_tool_with_streaming(
+    tool_name: str,
+    parameters: dict[str, Any],
+    tool_call_id: str,
+    operation_id: str,
+    task_id: str,
+    session_id: str,
+    user_id: str | None,
+) -> None:
+    """Execute a long-running tool with stream registry support for SSE reconnection.
+
+    This function runs independently of the SSE connection, publishes progress
+    to the stream registry, and survives if the user closes their browser tab.
+    Clients can reconnect via GET /chat/tasks/{task_id}/stream to resume streaming.
+
+    If the external service returns a 202 Accepted (async), this function exits
+    early and lets the Redis Streams completion consumer handle the rest.
+    """
+    # Track whether we delegated to async processing - if so, the Redis Streams
+    # completion consumer (stream_registry / completion_consumer) will handle cleanup, not us
+    delegated_to_async = False
+
+    try:
+        # Load fresh session (not stale reference)
+        session = await get_chat_session(session_id, user_id)
+        if not session:
+            logger.error(f"Session {session_id} not found for background tool")
+            await stream_registry.mark_task_completed(task_id, status="failed")
+            return
+
+        # Pass operation_id and task_id to the tool for async processing
+        enriched_parameters = {
+            **parameters,
+            "_operation_id": operation_id,
+            "_task_id": task_id,
+        }
+
+        # Execute the actual tool
+        result = await execute_tool(
+            tool_name=tool_name,
+            parameters=enriched_parameters,
+            tool_call_id=tool_call_id,
+            user_id=user_id,
+            session=session,
+        )
+
+        # Check if the tool result indicates async processing
+        # (e.g., Agent Generator returned 202 Accepted)
+        try:
+            if isinstance(result.output, dict):
+                result_data = result.output
+            elif result.output:
+                result_data = orjson.loads(result.output)
+            else:
+                result_data = {}
+            if result_data.get("status") == "accepted":
+                logger.info(
+                    f"Tool {tool_name} delegated to async processing "
+                    f"(operation_id={operation_id}, task_id={task_id}). "
+                    f"Redis Streams completion consumer will handle the rest."
+                )
+                # Don't publish result, don't continue with LLM, and don't cleanup
+                # The Redis Streams consumer (completion_consumer) will handle
+                # everything when the external service completes via webhook
+                delegated_to_async = True
+                return
+        except (orjson.JSONDecodeError, TypeError):
+            pass  # Not JSON or not async - continue normally
+
+        # Publish tool result to stream registry
+        await stream_registry.publish_chunk(task_id, result)
+
+        # Update the pending message with result
+        result_str = (
+            result.output
+            if isinstance(result.output, str)
+            else orjson.dumps(result.output).decode("utf-8")
+        )
+        await _update_pending_operation(
+            session_id=session_id,
+            tool_call_id=tool_call_id,
+            result=result_str,
+        )
+
+        logger.info(
+            f"Background tool {tool_name} completed for session {session_id} "
+            f"(task_id={task_id})"
+        )
+
+        # Generate LLM continuation and stream chunks to registry
+        await _generate_llm_continuation_with_streaming(
+            session_id=session_id,
+            user_id=user_id,
+            task_id=task_id,
+        )
+
+        # Mark task as completed in stream registry
+        await stream_registry.mark_task_completed(task_id, status="completed")
+
+    except Exception as e:
+        logger.error(f"Background tool {tool_name} failed: {e}", exc_info=True)
+        error_response = ErrorResponse(
+            message=f"Tool {tool_name} failed: {str(e)}",
+        )
+
+        # Publish error to stream registry followed by finish event
+        await stream_registry.publish_chunk(
+            task_id,
+            StreamError(errorText=str(e)),
+        )
+        await stream_registry.publish_chunk(task_id, StreamFinish())
+
+        await _update_pending_operation(
+            session_id=session_id,
+            tool_call_id=tool_call_id,
+            result=error_response.model_dump_json(),
+        )
+
+        # Mark task as failed in stream registry
+        await stream_registry.mark_task_completed(task_id, status="failed")
+    finally:
+        # Only cleanup if we didn't delegate to async processing
+        # For async path, the Redis Streams completion consumer handles cleanup
+        if not delegated_to_async:
+            await _mark_operation_completed(tool_call_id)
+
+
+async def _update_pending_operation(
+    session_id: str,
+    tool_call_id: str,
+    result: str,
+) -> None:
+    """Update the pending tool message with final result.
+
+    This is called by background tasks when long-running operations complete.
+    """
+    # Update the message in database
+    updated = await chat_db.update_tool_message_content(
+        session_id=session_id,
+        tool_call_id=tool_call_id,
+        new_content=result,
+    )
+
+    if updated:
+        # Invalidate Redis cache so next load gets fresh data
+        # Wrap in try/except to prevent cache failures from triggering error handling
+        # that would overwrite our successful DB update
+        try:
+            await invalidate_session_cache(session_id)
+        except Exception as e:
+            # Non-critical: cache will eventually be refreshed on next load
+            logger.warning(f"Failed to invalidate cache for session {session_id}: {e}")
+        logger.info(
+            f"Updated pending operation for tool_call_id {tool_call_id} "
+            f"in session {session_id}"
+        )
+    else:
+        logger.warning(
+            f"Failed to update pending operation for tool_call_id {tool_call_id} "
+            f"in session {session_id}"
+        )
+
+
+async def _generate_llm_continuation(
+    session_id: str,
+    user_id: str | None,
+) -> None:
+    """Generate an LLM response after a long-running tool completes.
+
+    This is called by background tasks to continue the conversation
+    after a tool result is saved. The response is saved to the database
+    so users see it when they refresh or poll.
+    """
+    try:
+        # Load fresh session from DB (bypass cache to get the updated tool result)
+        await invalidate_session_cache(session_id)
+        session = await get_chat_session(session_id, user_id)
+        if not session:
+            logger.error(f"Session {session_id} not found for LLM continuation")
+            return
+
+        # Build system prompt
+        system_prompt, _ = await _build_system_prompt(user_id)
+
+        messages = session.to_openai_messages()
+        if system_prompt:
+            system_message = ChatCompletionSystemMessageParam(
+                role="system",
+                content=system_prompt,
+            )
+            messages = [system_message] + messages
+
+        # Apply context window management to prevent oversized requests
+        context_result = await _manage_context_window(
+            messages=messages,
+            model=config.model,
+            api_key=config.api_key,
+            base_url=config.base_url,
+        )
+
+        if context_result.error and "System prompt dropped" not in context_result.error:
+            logger.error(
+                f"Context window management failed for session {session_id}: "
+                f"{context_result.error} (tokens={context_result.token_count})"
+            )
+            return
+
+        messages = context_result.messages
+        if context_result.was_compacted:
+            logger.info(
+                f"Context compacted for LLM continuation: "
+                f"{context_result.token_count} tokens"
+            )
+
+        # Build extra_body for tracing
+        extra_body: dict[str, Any] = {
+            "posthogProperties": {
+                "environment": settings.config.app_env.value,
+            },
+        }
+        if user_id:
+            extra_body["user"] = user_id[:128]
+            extra_body["posthogDistinctId"] = user_id
+        if session_id:
+            extra_body["session_id"] = session_id[:128]
+
+        retry_count = 0
+        last_error: Exception | None = None
+        response = None
+
+        while retry_count <= MAX_RETRIES:
+            try:
+                logger.info(
+                    f"Generating LLM continuation for session {session_id}"
+                    f"{f' (retry {retry_count}/{MAX_RETRIES})' if retry_count > 0 else ''}"
+                )
+
+                response = await client.chat.completions.create(
+                    model=config.model,
+                    messages=cast(list[ChatCompletionMessageParam], messages),
+                    extra_body=extra_body,
+                )
+                last_error = None  # Clear any previous error on success
+                break  # Success, exit retry loop
+            except Exception as e:
+                last_error = e
+                if _is_retryable_error(e) and retry_count < MAX_RETRIES:
+                    retry_count += 1
+                    delay = min(
+                        BASE_DELAY_SECONDS * (2 ** (retry_count - 1)),
+                        MAX_DELAY_SECONDS,
+                    )
+                    logger.warning(
+                        f"Retryable error in LLM continuation: {e!s}. "
+                        f"Retrying in {delay:.1f}s (attempt {retry_count}/{MAX_RETRIES})"
+                    )
+                    await asyncio.sleep(delay)
+                    continue
+                else:
+                    # Non-retryable error - log and exit gracefully
+                    logger.error(
+                        f"Non-retryable error in LLM continuation: {e!s}",
+                        exc_info=True,
+                    )
+                    return
+
+        if last_error:
+            logger.error(
+                f"Max retries ({MAX_RETRIES}) exceeded for LLM continuation. "
+                f"Last error: {last_error!s}"
+            )
+            return
+
+        if response and response.choices and response.choices[0].message.content:
+            assistant_content = response.choices[0].message.content
+
+            # Reload session from DB to avoid race condition with user messages
+            # that may have been sent while we were generating the LLM response
+            fresh_session = await get_chat_session(session_id, user_id)
+            if not fresh_session:
+                logger.error(
+                    f"Session {session_id} disappeared during LLM continuation"
+                )
+                return
+
+            # Save assistant message to database
+            assistant_message = ChatMessage(
+                role="assistant",
+                content=assistant_content,
+            )
+            fresh_session.messages.append(assistant_message)
+
+            # Save to database (not cache) to persist the response
+            await upsert_chat_session(fresh_session)
+
+            # Invalidate cache so next poll/refresh gets fresh data
+            await invalidate_session_cache(session_id)
+
+            logger.info(
+                f"Generated LLM continuation for session {session_id}, "
+                f"response length: {len(assistant_content)}"
+            )
+        else:
+            logger.warning(f"LLM continuation returned empty response for {session_id}")
+
+    except Exception as e:
+        logger.error(f"Failed to generate LLM continuation: {e}", exc_info=True)
+
+
+async def _generate_llm_continuation_with_streaming(
+    session_id: str,
+    user_id: str | None,
+    task_id: str,
+) -> None:
+    """Generate an LLM response with streaming to the stream registry.
+
+    This is called by background tasks to continue the conversation
+    after a tool result is saved. Chunks are published to the stream registry
+    so reconnecting clients can receive them.
+    """
+    import uuid as uuid_module
+
+    try:
+        # Load fresh session from DB (bypass cache to get the updated tool result)
+        await invalidate_session_cache(session_id)
+        session = await get_chat_session(session_id, user_id)
+        if not session:
+            logger.error(f"Session {session_id} not found for LLM continuation")
+            return
+
+        # Build system prompt
+        system_prompt, _ = await _build_system_prompt(user_id)
+
+        # Build messages in OpenAI format
+        messages = session.to_openai_messages()
+        if system_prompt:
+            from openai.types.chat import ChatCompletionSystemMessageParam
+
+            system_message = ChatCompletionSystemMessageParam(
+                role="system",
+                content=system_prompt,
+            )
+            messages = [system_message] + messages
+
+        # Build extra_body for tracing
+        extra_body: dict[str, Any] = {
+            "posthogProperties": {
+                "environment": settings.config.app_env.value,
+            },
+        }
+        if user_id:
+            extra_body["user"] = user_id[:128]
+            extra_body["posthogDistinctId"] = user_id
+        if session_id:
+            extra_body["session_id"] = session_id[:128]
+
+        # Make streaming LLM call (no tools - just text response)
+        from typing import cast
+
+        from openai.types.chat import ChatCompletionMessageParam
+
+        # Generate unique IDs for AI SDK protocol
+        message_id = str(uuid_module.uuid4())
+        text_block_id = str(uuid_module.uuid4())
+
+        # Publish start event
+        await stream_registry.publish_chunk(task_id, StreamStart(messageId=message_id))
+        await stream_registry.publish_chunk(task_id, StreamTextStart(id=text_block_id))
+
+        # Stream the response
+        stream = await client.chat.completions.create(
+            model=config.model,
+            messages=cast(list[ChatCompletionMessageParam], messages),
+            extra_body=extra_body,
+            stream=True,
+        )
+
+        assistant_content = ""
+        async for chunk in stream:
+            if chunk.choices and chunk.choices[0].delta.content:
+                delta = chunk.choices[0].delta.content
+                assistant_content += delta
+                # Publish delta to stream registry
+                await stream_registry.publish_chunk(
+                    task_id,
+                    StreamTextDelta(id=text_block_id, delta=delta),
+                )
+
+        # Publish end events
+        await stream_registry.publish_chunk(task_id, StreamTextEnd(id=text_block_id))
+
+        if assistant_content:
+            # Reload session from DB to avoid race condition with user messages
+            fresh_session = await get_chat_session(session_id, user_id)
+            if not fresh_session:
+                logger.error(
+                    f"Session {session_id} disappeared during LLM continuation"
+                )
+                return
+
+            # Save assistant message to database
+            assistant_message = ChatMessage(
+                role="assistant",
+                content=assistant_content,
+            )
+            fresh_session.messages.append(assistant_message)
+
+            # Save to database (not cache) to persist the response
+            await upsert_chat_session(fresh_session)
+
+            # Invalidate cache so next poll/refresh gets fresh data
+            await invalidate_session_cache(session_id)
+
+            logger.info(
+                f"Generated streaming LLM continuation for session {session_id} "
+                f"(task_id={task_id}), response length: {len(assistant_content)}"
+            )
+        else:
+            logger.warning(
+                f"Streaming LLM continuation returned empty response for {session_id}"
+            )
+
+    except Exception as e:
+        logger.error(
+            f"Failed to generate streaming LLM continuation: {e}", exc_info=True
+        )
+        # Publish error to stream registry followed by finish event
+        await stream_registry.publish_chunk(
+            task_id,
+            StreamError(errorText=f"Failed to generate response: {e}"),
+        )
+        await stream_registry.publish_chunk(task_id, StreamFinish())
diff --git a/autogpt_platform/backend/backend/api/features/chat/service_test.py b/autogpt_platform/backend/backend/api/features/chat/service_test.py
index d1af22a71a..70f27af14f 100644
--- a/autogpt_platform/backend/backend/api/features/chat/service_test.py
+++ b/autogpt_platform/backend/backend/api/features/chat/service_test.py
@@ -4,18 +4,19 @@ from os import getenv
 import pytest
 
 from . import service as chat_service
+from .model import create_chat_session, get_chat_session, upsert_chat_session
 from .response_model import (
-    StreamEnd,
     StreamError,
-    StreamTextChunk,
-    StreamToolExecutionResult,
+    StreamFinish,
+    StreamTextDelta,
+    StreamToolOutputAvailable,
 )
 
 logger = logging.getLogger(__name__)
 
 
 @pytest.mark.asyncio(loop_scope="session")
-async def test_stream_chat_completion():
+async def test_stream_chat_completion(setup_test_user, test_user_id):
     """
     Test the stream_chat_completion function.
     """
@@ -23,7 +24,7 @@ async def test_stream_chat_completion():
     if not api_key:
         return pytest.skip("OPEN_ROUTER_API_KEY is not set, skipping test")
 
-    session = await chat_service.create_chat_session()
+    session = await create_chat_session(test_user_id)
 
     has_errors = False
     has_ended = False
@@ -34,9 +35,9 @@ async def test_stream_chat_completion():
         logger.info(chunk)
         if isinstance(chunk, StreamError):
             has_errors = True
-        if isinstance(chunk, StreamTextChunk):
-            assistant_message += chunk.content
-        if isinstance(chunk, StreamEnd):
+        if isinstance(chunk, StreamTextDelta):
+            assistant_message += chunk.delta
+        if isinstance(chunk, StreamFinish):
             has_ended = True
 
     assert has_ended, "Chat completion did not end"
@@ -45,7 +46,7 @@ async def test_stream_chat_completion():
 
 
 @pytest.mark.asyncio(loop_scope="session")
-async def test_stream_chat_completion_with_tool_calls():
+async def test_stream_chat_completion_with_tool_calls(setup_test_user, test_user_id):
     """
     Test the stream_chat_completion function.
     """
@@ -53,8 +54,8 @@ async def test_stream_chat_completion_with_tool_calls():
     if not api_key:
         return pytest.skip("OPEN_ROUTER_API_KEY is not set, skipping test")
 
-    session = await chat_service.create_chat_session()
-    session = await chat_service.upsert_chat_session(session)
+    session = await create_chat_session(test_user_id)
+    session = await upsert_chat_session(session)
 
     has_errors = False
     has_ended = False
@@ -68,14 +69,14 @@ async def test_stream_chat_completion_with_tool_calls():
         if isinstance(chunk, StreamError):
             has_errors = True
 
-        if isinstance(chunk, StreamEnd):
+        if isinstance(chunk, StreamFinish):
             has_ended = True
-        if isinstance(chunk, StreamToolExecutionResult):
+        if isinstance(chunk, StreamToolOutputAvailable):
             had_tool_calls = True
 
     assert has_ended, "Chat completion did not end"
     assert not has_errors, "Error occurred while streaming chat completion"
     assert had_tool_calls, "Tool calls did not occur"
-    session = await chat_service.get_session(session.session_id)
+    session = await get_chat_session(session.session_id)
     assert session, "Session not found"
     assert session.usage, "Usage is empty"
diff --git a/autogpt_platform/backend/backend/api/features/chat/stream_registry.py b/autogpt_platform/backend/backend/api/features/chat/stream_registry.py
new file mode 100644
index 0000000000..88a5023e2b
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/chat/stream_registry.py
@@ -0,0 +1,704 @@
+"""Stream registry for managing reconnectable SSE streams.
+
+This module provides a registry for tracking active streaming tasks and their
+messages. It uses Redis for all state management (no in-memory state), making
+pods stateless and horizontally scalable.
+
+Architecture:
+- Redis Stream: Persists all messages for replay and real-time delivery
+- Redis Hash: Task metadata (status, session_id, etc.)
+
+Subscribers:
+1. Replay missed messages from Redis Stream (XREAD)
+2. Listen for live updates via blocking XREAD
+3. No in-memory state required on the subscribing pod
+"""
+
+import asyncio
+import logging
+from dataclasses import dataclass, field
+from datetime import datetime, timezone
+from typing import Any, Literal
+
+import orjson
+
+from backend.data.redis_client import get_redis_async
+
+from .config import ChatConfig
+from .response_model import StreamBaseResponse, StreamError, StreamFinish
+
+logger = logging.getLogger(__name__)
+config = ChatConfig()
+
+# Track background tasks for this pod (just the asyncio.Task reference, not subscribers)
+_local_tasks: dict[str, asyncio.Task] = {}
+
+# Track listener tasks per subscriber queue for cleanup
+# Maps queue id() to (task_id, asyncio.Task) for proper cleanup on unsubscribe
+_listener_tasks: dict[int, tuple[str, asyncio.Task]] = {}
+
+# Timeout for putting chunks into subscriber queues (seconds)
+# If the queue is full and doesn't drain within this time, send an overflow error
+QUEUE_PUT_TIMEOUT = 5.0
+
+# Lua script for atomic compare-and-swap status update (idempotent completion)
+# Returns 1 if status was updated, 0 if already completed/failed
+COMPLETE_TASK_SCRIPT = """
+local current = redis.call("HGET", KEYS[1], "status")
+if current == "running" then
+    redis.call("HSET", KEYS[1], "status", ARGV[1])
+    return 1
+end
+return 0
+"""
+
+
+@dataclass
+class ActiveTask:
+    """Represents an active streaming task (metadata only, no in-memory queues)."""
+
+    task_id: str
+    session_id: str
+    user_id: str | None
+    tool_call_id: str
+    tool_name: str
+    operation_id: str
+    status: Literal["running", "completed", "failed"] = "running"
+    created_at: datetime = field(default_factory=lambda: datetime.now(timezone.utc))
+    asyncio_task: asyncio.Task | None = None
+
+
+def _get_task_meta_key(task_id: str) -> str:
+    """Get Redis key for task metadata."""
+    return f"{config.task_meta_prefix}{task_id}"
+
+
+def _get_task_stream_key(task_id: str) -> str:
+    """Get Redis key for task message stream."""
+    return f"{config.task_stream_prefix}{task_id}"
+
+
+def _get_operation_mapping_key(operation_id: str) -> str:
+    """Get Redis key for operation_id to task_id mapping."""
+    return f"{config.task_op_prefix}{operation_id}"
+
+
+async def create_task(
+    task_id: str,
+    session_id: str,
+    user_id: str | None,
+    tool_call_id: str,
+    tool_name: str,
+    operation_id: str,
+) -> ActiveTask:
+    """Create a new streaming task in Redis.
+
+    Args:
+        task_id: Unique identifier for the task
+        session_id: Chat session ID
+        user_id: User ID (may be None for anonymous)
+        tool_call_id: Tool call ID from the LLM
+        tool_name: Name of the tool being executed
+        operation_id: Operation ID for webhook callbacks
+
+    Returns:
+        The created ActiveTask instance (metadata only)
+    """
+    task = ActiveTask(
+        task_id=task_id,
+        session_id=session_id,
+        user_id=user_id,
+        tool_call_id=tool_call_id,
+        tool_name=tool_name,
+        operation_id=operation_id,
+    )
+
+    # Store metadata in Redis
+    redis = await get_redis_async()
+    meta_key = _get_task_meta_key(task_id)
+    op_key = _get_operation_mapping_key(operation_id)
+
+    await redis.hset(  # type: ignore[misc]
+        meta_key,
+        mapping={
+            "task_id": task_id,
+            "session_id": session_id,
+            "user_id": user_id or "",
+            "tool_call_id": tool_call_id,
+            "tool_name": tool_name,
+            "operation_id": operation_id,
+            "status": task.status,
+            "created_at": task.created_at.isoformat(),
+        },
+    )
+    await redis.expire(meta_key, config.stream_ttl)
+
+    # Create operation_id -> task_id mapping for webhook lookups
+    await redis.set(op_key, task_id, ex=config.stream_ttl)
+
+    logger.debug(f"Created task {task_id} for session {session_id}")
+
+    return task
+
+
+async def publish_chunk(
+    task_id: str,
+    chunk: StreamBaseResponse,
+) -> str:
+    """Publish a chunk to Redis Stream.
+
+    All delivery is via Redis Streams - no in-memory state.
+
+    Args:
+        task_id: Task ID to publish to
+        chunk: The stream response chunk to publish
+
+    Returns:
+        The Redis Stream message ID
+    """
+    chunk_json = chunk.model_dump_json()
+    message_id = "0-0"
+
+    try:
+        redis = await get_redis_async()
+        stream_key = _get_task_stream_key(task_id)
+
+        # Write to Redis Stream for persistence and real-time delivery
+        raw_id = await redis.xadd(
+            stream_key,
+            {"data": chunk_json},
+            maxlen=config.stream_max_length,
+        )
+        message_id = raw_id if isinstance(raw_id, str) else raw_id.decode()
+
+        # Set TTL on stream to match task metadata TTL
+        await redis.expire(stream_key, config.stream_ttl)
+    except Exception as e:
+        logger.error(
+            f"Failed to publish chunk for task {task_id}: {e}",
+            exc_info=True,
+        )
+
+    return message_id
+
+
+async def subscribe_to_task(
+    task_id: str,
+    user_id: str | None,
+    last_message_id: str = "0-0",
+) -> asyncio.Queue[StreamBaseResponse] | None:
+    """Subscribe to a task's stream with replay of missed messages.
+
+    This is fully stateless - uses Redis Stream for replay and pub/sub for live updates.
+
+    Args:
+        task_id: Task ID to subscribe to
+        user_id: User ID for ownership validation
+        last_message_id: Last Redis Stream message ID received ("0-0" for full replay)
+
+    Returns:
+        An asyncio Queue that will receive stream chunks, or None if task not found
+        or user doesn't have access
+    """
+    redis = await get_redis_async()
+    meta_key = _get_task_meta_key(task_id)
+    meta: dict[Any, Any] = await redis.hgetall(meta_key)  # type: ignore[misc]
+
+    if not meta:
+        logger.debug(f"Task {task_id} not found in Redis")
+        return None
+
+    # Note: Redis client uses decode_responses=True, so keys are strings
+    task_status = meta.get("status", "")
+    task_user_id = meta.get("user_id", "") or None
+
+    # Validate ownership - if task has an owner, requester must match
+    if task_user_id:
+        if user_id != task_user_id:
+            logger.warning(
+                f"User {user_id} denied access to task {task_id} "
+                f"owned by {task_user_id}"
+            )
+            return None
+
+    subscriber_queue: asyncio.Queue[StreamBaseResponse] = asyncio.Queue()
+    stream_key = _get_task_stream_key(task_id)
+
+    # Step 1: Replay messages from Redis Stream
+    messages = await redis.xread({stream_key: last_message_id}, block=0, count=1000)
+
+    replayed_count = 0
+    replay_last_id = last_message_id
+    if messages:
+        for _stream_name, stream_messages in messages:
+            for msg_id, msg_data in stream_messages:
+                replay_last_id = msg_id if isinstance(msg_id, str) else msg_id.decode()
+                # Note: Redis client uses decode_responses=True, so keys are strings
+                if "data" in msg_data:
+                    try:
+                        chunk_data = orjson.loads(msg_data["data"])
+                        chunk = _reconstruct_chunk(chunk_data)
+                        if chunk:
+                            await subscriber_queue.put(chunk)
+                            replayed_count += 1
+                    except Exception as e:
+                        logger.warning(f"Failed to replay message: {e}")
+
+    logger.debug(f"Task {task_id}: replayed {replayed_count} messages")
+
+    # Step 2: If task is still running, start stream listener for live updates
+    if task_status == "running":
+        listener_task = asyncio.create_task(
+            _stream_listener(task_id, subscriber_queue, replay_last_id)
+        )
+        # Track listener task for cleanup on unsubscribe
+        _listener_tasks[id(subscriber_queue)] = (task_id, listener_task)
+    else:
+        # Task is completed/failed - add finish marker
+        await subscriber_queue.put(StreamFinish())
+
+    return subscriber_queue
+
+
+async def _stream_listener(
+    task_id: str,
+    subscriber_queue: asyncio.Queue[StreamBaseResponse],
+    last_replayed_id: str,
+) -> None:
+    """Listen to Redis Stream for new messages using blocking XREAD.
+
+    This approach avoids the duplicate message issue that can occur with pub/sub
+    when messages are published during the gap between replay and subscription.
+
+    Args:
+        task_id: Task ID to listen for
+        subscriber_queue: Queue to deliver messages to
+        last_replayed_id: Last message ID from replay (continue from here)
+    """
+    queue_id = id(subscriber_queue)
+    # Track the last successfully delivered message ID for recovery hints
+    last_delivered_id = last_replayed_id
+
+    try:
+        redis = await get_redis_async()
+        stream_key = _get_task_stream_key(task_id)
+        current_id = last_replayed_id
+
+        while True:
+            # Block for up to 30 seconds waiting for new messages
+            # This allows periodic checking if task is still running
+            messages = await redis.xread(
+                {stream_key: current_id}, block=30000, count=100
+            )
+
+            if not messages:
+                # Timeout - check if task is still running
+                meta_key = _get_task_meta_key(task_id)
+                status = await redis.hget(meta_key, "status")  # type: ignore[misc]
+                if status and status != "running":
+                    try:
+                        await asyncio.wait_for(
+                            subscriber_queue.put(StreamFinish()),
+                            timeout=QUEUE_PUT_TIMEOUT,
+                        )
+                    except asyncio.TimeoutError:
+                        logger.warning(
+                            f"Timeout delivering finish event for task {task_id}"
+                        )
+                    break
+                continue
+
+            for _stream_name, stream_messages in messages:
+                for msg_id, msg_data in stream_messages:
+                    current_id = msg_id if isinstance(msg_id, str) else msg_id.decode()
+
+                    if "data" not in msg_data:
+                        continue
+
+                    try:
+                        chunk_data = orjson.loads(msg_data["data"])
+                        chunk = _reconstruct_chunk(chunk_data)
+                        if chunk:
+                            try:
+                                await asyncio.wait_for(
+                                    subscriber_queue.put(chunk),
+                                    timeout=QUEUE_PUT_TIMEOUT,
+                                )
+                                # Update last delivered ID on successful delivery
+                                last_delivered_id = current_id
+                            except asyncio.TimeoutError:
+                                logger.warning(
+                                    f"Subscriber queue full for task {task_id}, "
+                                    f"message delivery timed out after {QUEUE_PUT_TIMEOUT}s"
+                                )
+                                # Send overflow error with recovery info
+                                try:
+                                    overflow_error = StreamError(
+                                        errorText="Message delivery timeout - some messages may have been missed",
+                                        code="QUEUE_OVERFLOW",
+                                        details={
+                                            "last_delivered_id": last_delivered_id,
+                                            "recovery_hint": f"Reconnect with last_message_id={last_delivered_id}",
+                                        },
+                                    )
+                                    subscriber_queue.put_nowait(overflow_error)
+                                except asyncio.QueueFull:
+                                    # Queue is completely stuck, nothing more we can do
+                                    logger.error(
+                                        f"Cannot deliver overflow error for task {task_id}, "
+                                        "queue completely blocked"
+                                    )
+
+                            # Stop listening on finish
+                            if isinstance(chunk, StreamFinish):
+                                return
+                    except Exception as e:
+                        logger.warning(f"Error processing stream message: {e}")
+
+    except asyncio.CancelledError:
+        logger.debug(f"Stream listener cancelled for task {task_id}")
+        raise  # Re-raise to propagate cancellation
+    except Exception as e:
+        logger.error(f"Stream listener error for task {task_id}: {e}")
+        # On error, send finish to unblock subscriber
+        try:
+            await asyncio.wait_for(
+                subscriber_queue.put(StreamFinish()),
+                timeout=QUEUE_PUT_TIMEOUT,
+            )
+        except (asyncio.TimeoutError, asyncio.QueueFull):
+            logger.warning(
+                f"Could not deliver finish event for task {task_id} after error"
+            )
+    finally:
+        # Clean up listener task mapping on exit
+        _listener_tasks.pop(queue_id, None)
+
+
+async def mark_task_completed(
+    task_id: str,
+    status: Literal["completed", "failed"] = "completed",
+) -> bool:
+    """Mark a task as completed and publish finish event.
+
+    This is idempotent - calling multiple times with the same task_id is safe.
+    Uses atomic compare-and-swap via Lua script to prevent race conditions.
+    Status is updated first (source of truth), then finish event is published (best-effort).
+
+    Args:
+        task_id: Task ID to mark as completed
+        status: Final status ("completed" or "failed")
+
+    Returns:
+        True if task was newly marked completed, False if already completed/failed
+    """
+    redis = await get_redis_async()
+    meta_key = _get_task_meta_key(task_id)
+
+    # Atomic compare-and-swap: only update if status is "running"
+    # This prevents race conditions when multiple callers try to complete simultaneously
+    result = await redis.eval(COMPLETE_TASK_SCRIPT, 1, meta_key, status)  # type: ignore[misc]
+
+    if result == 0:
+        logger.debug(f"Task {task_id} already completed/failed, skipping")
+        return False
+
+    # THEN publish finish event (best-effort - listeners can detect via status polling)
+    try:
+        await publish_chunk(task_id, StreamFinish())
+    except Exception as e:
+        logger.error(
+            f"Failed to publish finish event for task {task_id}: {e}. "
+            "Listeners will detect completion via status polling."
+        )
+
+    # Clean up local task reference if exists
+    _local_tasks.pop(task_id, None)
+    return True
+
+
+async def find_task_by_operation_id(operation_id: str) -> ActiveTask | None:
+    """Find a task by its operation ID.
+
+    Used by webhook callbacks to locate the task to update.
+
+    Args:
+        operation_id: Operation ID to search for
+
+    Returns:
+        ActiveTask if found, None otherwise
+    """
+    redis = await get_redis_async()
+    op_key = _get_operation_mapping_key(operation_id)
+    task_id = await redis.get(op_key)
+
+    if not task_id:
+        return None
+
+    task_id_str = task_id.decode() if isinstance(task_id, bytes) else task_id
+    return await get_task(task_id_str)
+
+
+async def get_task(task_id: str) -> ActiveTask | None:
+    """Get a task by its ID from Redis.
+
+    Args:
+        task_id: Task ID to look up
+
+    Returns:
+        ActiveTask if found, None otherwise
+    """
+    redis = await get_redis_async()
+    meta_key = _get_task_meta_key(task_id)
+    meta: dict[Any, Any] = await redis.hgetall(meta_key)  # type: ignore[misc]
+
+    if not meta:
+        return None
+
+    # Note: Redis client uses decode_responses=True, so keys/values are strings
+    return ActiveTask(
+        task_id=meta.get("task_id", ""),
+        session_id=meta.get("session_id", ""),
+        user_id=meta.get("user_id", "") or None,
+        tool_call_id=meta.get("tool_call_id", ""),
+        tool_name=meta.get("tool_name", ""),
+        operation_id=meta.get("operation_id", ""),
+        status=meta.get("status", "running"),  # type: ignore[arg-type]
+    )
+
+
+async def get_task_with_expiry_info(
+    task_id: str,
+) -> tuple[ActiveTask | None, str | None]:
+    """Get a task by its ID with expiration detection.
+
+    Returns (task, error_code) where error_code is:
+    - None if task found
+    - "TASK_EXPIRED" if stream exists but metadata is gone (TTL expired)
+    - "TASK_NOT_FOUND" if neither exists
+
+    Args:
+        task_id: Task ID to look up
+
+    Returns:
+        Tuple of (ActiveTask or None, error_code or None)
+    """
+    redis = await get_redis_async()
+    meta_key = _get_task_meta_key(task_id)
+    stream_key = _get_task_stream_key(task_id)
+
+    meta: dict[Any, Any] = await redis.hgetall(meta_key)  # type: ignore[misc]
+
+    if not meta:
+        # Check if stream still has data (metadata expired but stream hasn't)
+        stream_len = await redis.xlen(stream_key)
+        if stream_len > 0:
+            return None, "TASK_EXPIRED"
+        return None, "TASK_NOT_FOUND"
+
+    # Note: Redis client uses decode_responses=True, so keys/values are strings
+    return (
+        ActiveTask(
+            task_id=meta.get("task_id", ""),
+            session_id=meta.get("session_id", ""),
+            user_id=meta.get("user_id", "") or None,
+            tool_call_id=meta.get("tool_call_id", ""),
+            tool_name=meta.get("tool_name", ""),
+            operation_id=meta.get("operation_id", ""),
+            status=meta.get("status", "running"),  # type: ignore[arg-type]
+        ),
+        None,
+    )
+
+
+async def get_active_task_for_session(
+    session_id: str,
+    user_id: str | None = None,
+) -> tuple[ActiveTask | None, str]:
+    """Get the active (running) task for a session, if any.
+
+    Scans Redis for tasks matching the session_id with status="running".
+
+    Args:
+        session_id: Session ID to look up
+        user_id: User ID for ownership validation (optional)
+
+    Returns:
+        Tuple of (ActiveTask if found and running, last_message_id from Redis Stream)
+    """
+
+    redis = await get_redis_async()
+
+    # Scan Redis for task metadata keys
+    cursor = 0
+    tasks_checked = 0
+
+    while True:
+        cursor, keys = await redis.scan(
+            cursor, match=f"{config.task_meta_prefix}*", count=100
+        )
+
+        for key in keys:
+            tasks_checked += 1
+            meta: dict[Any, Any] = await redis.hgetall(key)  # type: ignore[misc]
+            if not meta:
+                continue
+
+            # Note: Redis client uses decode_responses=True, so keys/values are strings
+            task_session_id = meta.get("session_id", "")
+            task_status = meta.get("status", "")
+            task_user_id = meta.get("user_id", "") or None
+            task_id = meta.get("task_id", "")
+
+            if task_session_id == session_id and task_status == "running":
+                # Validate ownership - if task has an owner, requester must match
+                if task_user_id and user_id != task_user_id:
+                    continue
+
+                # Get the last message ID from Redis Stream
+                stream_key = _get_task_stream_key(task_id)
+                last_id = "0-0"
+                try:
+                    messages = await redis.xrevrange(stream_key, count=1)
+                    if messages:
+                        msg_id = messages[0][0]
+                        last_id = msg_id if isinstance(msg_id, str) else msg_id.decode()
+                except Exception as e:
+                    logger.warning(f"Failed to get last message ID: {e}")
+
+                return (
+                    ActiveTask(
+                        task_id=task_id,
+                        session_id=task_session_id,
+                        user_id=task_user_id,
+                        tool_call_id=meta.get("tool_call_id", ""),
+                        tool_name=meta.get("tool_name", ""),
+                        operation_id=meta.get("operation_id", ""),
+                        status="running",
+                    ),
+                    last_id,
+                )
+
+        if cursor == 0:
+            break
+
+    return None, "0-0"
+
+
+def _reconstruct_chunk(chunk_data: dict) -> StreamBaseResponse | None:
+    """Reconstruct a StreamBaseResponse from JSON data.
+
+    Args:
+        chunk_data: Parsed JSON data from Redis
+
+    Returns:
+        Reconstructed response object, or None if unknown type
+    """
+    from .response_model import (
+        ResponseType,
+        StreamError,
+        StreamFinish,
+        StreamHeartbeat,
+        StreamStart,
+        StreamTextDelta,
+        StreamTextEnd,
+        StreamTextStart,
+        StreamToolInputAvailable,
+        StreamToolInputStart,
+        StreamToolOutputAvailable,
+        StreamUsage,
+    )
+
+    # Map response types to their corresponding classes
+    type_to_class: dict[str, type[StreamBaseResponse]] = {
+        ResponseType.START.value: StreamStart,
+        ResponseType.FINISH.value: StreamFinish,
+        ResponseType.TEXT_START.value: StreamTextStart,
+        ResponseType.TEXT_DELTA.value: StreamTextDelta,
+        ResponseType.TEXT_END.value: StreamTextEnd,
+        ResponseType.TOOL_INPUT_START.value: StreamToolInputStart,
+        ResponseType.TOOL_INPUT_AVAILABLE.value: StreamToolInputAvailable,
+        ResponseType.TOOL_OUTPUT_AVAILABLE.value: StreamToolOutputAvailable,
+        ResponseType.ERROR.value: StreamError,
+        ResponseType.USAGE.value: StreamUsage,
+        ResponseType.HEARTBEAT.value: StreamHeartbeat,
+    }
+
+    chunk_type = chunk_data.get("type")
+    chunk_class = type_to_class.get(chunk_type)  # type: ignore[arg-type]
+
+    if chunk_class is None:
+        logger.warning(f"Unknown chunk type: {chunk_type}")
+        return None
+
+    try:
+        return chunk_class(**chunk_data)
+    except Exception as e:
+        logger.warning(f"Failed to reconstruct chunk of type {chunk_type}: {e}")
+        return None
+
+
+async def set_task_asyncio_task(task_id: str, asyncio_task: asyncio.Task) -> None:
+    """Track the asyncio.Task for a task (local reference only).
+
+    This is just for cleanup purposes - the task state is in Redis.
+
+    Args:
+        task_id: Task ID
+        asyncio_task: The asyncio Task to track
+    """
+    _local_tasks[task_id] = asyncio_task
+
+
+async def unsubscribe_from_task(
+    task_id: str,
+    subscriber_queue: asyncio.Queue[StreamBaseResponse],
+) -> None:
+    """Clean up when a subscriber disconnects.
+
+    Cancels the XREAD-based listener task associated with this subscriber queue
+    to prevent resource leaks.
+
+    Args:
+        task_id: Task ID
+        subscriber_queue: The subscriber's queue used to look up the listener task
+    """
+    queue_id = id(subscriber_queue)
+    listener_entry = _listener_tasks.pop(queue_id, None)
+
+    if listener_entry is None:
+        logger.debug(
+            f"No listener task found for task {task_id} queue {queue_id} "
+            "(may have already completed)"
+        )
+        return
+
+    stored_task_id, listener_task = listener_entry
+
+    if stored_task_id != task_id:
+        logger.warning(
+            f"Task ID mismatch in unsubscribe: expected {task_id}, "
+            f"found {stored_task_id}"
+        )
+
+    if listener_task.done():
+        logger.debug(f"Listener task for task {task_id} already completed")
+        return
+
+    # Cancel the listener task
+    listener_task.cancel()
+
+    try:
+        # Wait for the task to be cancelled with a timeout
+        await asyncio.wait_for(listener_task, timeout=5.0)
+    except asyncio.CancelledError:
+        # Expected - the task was successfully cancelled
+        pass
+    except asyncio.TimeoutError:
+        logger.warning(
+            f"Timeout waiting for listener task cancellation for task {task_id}"
+        )
+    except Exception as e:
+        logger.error(f"Error during listener task cancellation for task {task_id}: {e}")
+
+    logger.debug(f"Successfully unsubscribed from task {task_id}")
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/IDEAS.md b/autogpt_platform/backend/backend/api/features/chat/tools/IDEAS.md
new file mode 100644
index 0000000000..656aac61c4
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/IDEAS.md
@@ -0,0 +1,79 @@
+# CoPilot Tools - Future Ideas
+
+## Multimodal Image Support for CoPilot
+
+**Problem:** CoPilot uses a vision-capable model but can't "see" workspace images. When a block generates an image and returns `workspace://abc123`, CoPilot can't evaluate it (e.g., checking blog thumbnail quality).
+
+**Backend Solution:**
+When preparing messages for the LLM, detect `workspace://` image references and convert them to proper image content blocks:
+
+```python
+# Before sending to LLM, scan for workspace image references
+# and inject them as image content parts
+
+# Example message transformation:
+# FROM: {"role": "assistant", "content": "Generated image: workspace://abc123"}
+# TO:   {"role": "assistant", "content": [
+#         {"type": "text", "text": "Generated image: workspace://abc123"},
+#         {"type": "image_url", "image_url": {"url": "data:image/png;base64,..."}}
+#       ]}
+```
+
+**Where to implement:**
+- In the chat stream handler before calling the LLM
+- Or in a message preprocessing step
+- Need to fetch image from workspace, convert to base64, add as image content
+
+**Considerations:**
+- Only do this for image MIME types (image/png, image/jpeg, etc.)
+- May want a size limit (don't pass 10MB images)
+- Track which images were "shown" to the AI for frontend indicator
+- Cost implications - vision API calls are more expensive
+
+**Frontend Solution:**
+Show visual indicator on workspace files in chat:
+- If AI saw the image: normal display
+- If AI didn't see it: overlay icon saying "AI can't see this image"
+
+Requires response metadata indicating which `workspace://` refs were passed to the model.
+
+---
+
+## Output Post-Processing Layer for run_block
+
+**Problem:** Many blocks produce large outputs that:
+- Consume massive context (100KB base64 image = ~133KB tokens)
+- Can't fit in conversation
+- Break things and cause high LLM costs
+
+**Proposed Solution:** Instead of modifying individual blocks or `store_media_file()`, implement a centralized output processor in `run_block.py` that handles outputs before they're returned to CoPilot.
+
+**Benefits:**
+1. **Centralized** - one place to handle all output processing
+2. **Future-proof** - new blocks automatically get output processing
+3. **Keeps blocks pure** - they don't need to know about context constraints
+4. **Handles all large outputs** - not just images
+
+**Processing Rules:**
+- Detect base64 data URIs → save to workspace, return `workspace://` reference
+- Truncate very long strings (>N chars) with truncation note
+- Summarize large arrays/lists (e.g., "Array with 1000 items, first 5: [...]")
+- Handle nested large outputs in dicts recursively
+- Cap total output size
+
+**Implementation Location:** `run_block.py` after block execution, before returning `BlockOutputResponse`
+
+**Example:**
+```python
+def _process_outputs_for_context(
+    outputs: dict[str, list[Any]],
+    workspace_manager: WorkspaceManager,
+    max_string_length: int = 10000,
+    max_array_preview: int = 5,
+) -> dict[str, list[Any]]:
+    """Process block outputs to prevent context bloat."""
+    processed = {}
+    for name, values in outputs.items():
+        processed[name] = [_process_value(v, workspace_manager) for v in values]
+    return processed
+```
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/__init__.py b/autogpt_platform/backend/backend/api/features/chat/tools/__init__.py
index 5b9b8649a8..dcbc35ef37 100644
--- a/autogpt_platform/backend/backend/api/features/chat/tools/__init__.py
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/__init__.py
@@ -1,41 +1,94 @@
+import logging
 from typing import TYPE_CHECKING, Any
 
 from openai.types.chat import ChatCompletionToolParam
 
 from backend.api.features.chat.model import ChatSession
+from backend.api.features.chat.tracking import track_tool_called
 
+from .add_understanding import AddUnderstandingTool
+from .agent_output import AgentOutputTool
 from .base import BaseTool
+from .create_agent import CreateAgentTool
+from .customize_agent import CustomizeAgentTool
+from .edit_agent import EditAgentTool
 from .find_agent import FindAgentTool
+from .find_block import FindBlockTool
+from .find_library_agent import FindLibraryAgentTool
+from .get_doc_page import GetDocPageTool
 from .run_agent import RunAgentTool
+from .run_block import RunBlockTool
+from .search_docs import SearchDocsTool
+from .workspace_files import (
+    DeleteWorkspaceFileTool,
+    ListWorkspaceFilesTool,
+    ReadWorkspaceFileTool,
+    WriteWorkspaceFileTool,
+)
 
 if TYPE_CHECKING:
-    from backend.api.features.chat.response_model import StreamToolExecutionResult
+    from backend.api.features.chat.response_model import StreamToolOutputAvailable
 
-# Initialize tool instances
-find_agent_tool = FindAgentTool()
-run_agent_tool = RunAgentTool()
+logger = logging.getLogger(__name__)
 
-# Export tools as OpenAI format
+# Single source of truth for all tools
+TOOL_REGISTRY: dict[str, BaseTool] = {
+    "add_understanding": AddUnderstandingTool(),
+    "create_agent": CreateAgentTool(),
+    "customize_agent": CustomizeAgentTool(),
+    "edit_agent": EditAgentTool(),
+    "find_agent": FindAgentTool(),
+    "find_block": FindBlockTool(),
+    "find_library_agent": FindLibraryAgentTool(),
+    "run_agent": RunAgentTool(),
+    "run_block": RunBlockTool(),
+    "view_agent_output": AgentOutputTool(),
+    "search_docs": SearchDocsTool(),
+    "get_doc_page": GetDocPageTool(),
+    # Workspace tools for CoPilot file operations
+    "list_workspace_files": ListWorkspaceFilesTool(),
+    "read_workspace_file": ReadWorkspaceFileTool(),
+    "write_workspace_file": WriteWorkspaceFileTool(),
+    "delete_workspace_file": DeleteWorkspaceFileTool(),
+}
+
+# Export individual tool instances for backwards compatibility
+find_agent_tool = TOOL_REGISTRY["find_agent"]
+run_agent_tool = TOOL_REGISTRY["run_agent"]
+
+# Generated from registry for OpenAI API
 tools: list[ChatCompletionToolParam] = [
-    find_agent_tool.as_openai_tool(),
-    run_agent_tool.as_openai_tool(),
+    tool.as_openai_tool() for tool in TOOL_REGISTRY.values()
 ]
 
 
+def get_tool(tool_name: str) -> BaseTool | None:
+    """Get a tool instance by name."""
+    return TOOL_REGISTRY.get(tool_name)
+
+
 async def execute_tool(
     tool_name: str,
     parameters: dict[str, Any],
     user_id: str | None,
     session: ChatSession,
     tool_call_id: str,
-) -> "StreamToolExecutionResult":
-
-    tool_map: dict[str, BaseTool] = {
-        "find_agent": find_agent_tool,
-        "run_agent": run_agent_tool,
-    }
-    if tool_name not in tool_map:
+) -> "StreamToolOutputAvailable":
+    """Execute a tool by name."""
+    tool = get_tool(tool_name)
+    if not tool:
         raise ValueError(f"Tool {tool_name} not found")
-    return await tool_map[tool_name].execute(
-        user_id, session, tool_call_id, **parameters
+
+    # Track tool call in PostHog
+    logger.info(
+        f"Tracking tool call: tool={tool_name}, user={user_id}, "
+        f"session={session.session_id}, call_id={tool_call_id}"
     )
+    track_tool_called(
+        user_id=user_id,
+        session_id=session.session_id,
+        tool_name=tool_name,
+        tool_call_id=tool_call_id,
+    )
+
+    return await tool.execute(user_id, session, tool_call_id, **parameters)
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/_test_data.py b/autogpt_platform/backend/backend/api/features/chat/tools/_test_data.py
index f75b7bb0d0..a8f208ebb0 100644
--- a/autogpt_platform/backend/backend/api/features/chat/tools/_test_data.py
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/_test_data.py
@@ -3,6 +3,7 @@ from datetime import UTC, datetime
 from os import getenv
 
 import pytest
+from prisma.types import ProfileCreateInput
 from pydantic import SecretStr
 
 from backend.api.features.chat.model import ChatSession
@@ -17,7 +18,7 @@ from backend.data.user import get_or_create_user
 from backend.integrations.credentials_store import IntegrationCredentialsStore
 
 
-def make_session(user_id: str | None = None):
+def make_session(user_id: str):
     return ChatSession(
         session_id=str(uuid.uuid4()),
         user_id=user_id,
@@ -49,13 +50,13 @@ async def setup_test_data():
     # 1b. Create a profile with username for the user (required for store agent lookup)
     username = user.email.split("@")[0]
     await prisma.profile.create(
-        data={
-            "userId": user.id,
-            "username": username,
-            "name": f"Test User {username}",
-            "description": "Test user profile",
-            "links": [],  # Required field - empty array for test profiles
-        }
+        data=ProfileCreateInput(
+            userId=user.id,
+            username=username,
+            name=f"Test User {username}",
+            description="Test user profile",
+            links=[],  # Required field - empty array for test profiles
+        )
     )
 
     # 2. Create a test graph with agent input -> agent output
@@ -172,13 +173,13 @@ async def setup_llm_test_data():
     # 1b. Create a profile with username for the user (required for store agent lookup)
     username = user.email.split("@")[0]
     await prisma.profile.create(
-        data={
-            "userId": user.id,
-            "username": username,
-            "name": f"Test User {username}",
-            "description": "Test user profile for LLM tests",
-            "links": [],  # Required field - empty array for test profiles
-        }
+        data=ProfileCreateInput(
+            userId=user.id,
+            username=username,
+            name=f"Test User {username}",
+            description="Test user profile for LLM tests",
+            links=[],  # Required field - empty array for test profiles
+        )
     )
 
     # 2. Create test OpenAI credentials for the user
@@ -332,13 +333,13 @@ async def setup_firecrawl_test_data():
     # 1b. Create a profile with username for the user (required for store agent lookup)
     username = user.email.split("@")[0]
     await prisma.profile.create(
-        data={
-            "userId": user.id,
-            "username": username,
-            "name": f"Test User {username}",
-            "description": "Test user profile for Firecrawl tests",
-            "links": [],  # Required field - empty array for test profiles
-        }
+        data=ProfileCreateInput(
+            userId=user.id,
+            username=username,
+            name=f"Test User {username}",
+            description="Test user profile for Firecrawl tests",
+            links=[],  # Required field - empty array for test profiles
+        )
     )
 
     # NOTE: We deliberately do NOT create Firecrawl credentials for this user
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/add_understanding.py b/autogpt_platform/backend/backend/api/features/chat/tools/add_understanding.py
new file mode 100644
index 0000000000..fe3d5e8984
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/add_understanding.py
@@ -0,0 +1,119 @@
+"""Tool for capturing user business understanding incrementally."""
+
+import logging
+from typing import Any
+
+from backend.api.features.chat.model import ChatSession
+from backend.data.understanding import (
+    BusinessUnderstandingInput,
+    upsert_business_understanding,
+)
+
+from .base import BaseTool
+from .models import ErrorResponse, ToolResponseBase, UnderstandingUpdatedResponse
+
+logger = logging.getLogger(__name__)
+
+
+class AddUnderstandingTool(BaseTool):
+    """Tool for capturing user's business understanding incrementally."""
+
+    @property
+    def name(self) -> str:
+        return "add_understanding"
+
+    @property
+    def description(self) -> str:
+        return """Capture and store information about the user's business context,
+workflows, pain points, and automation goals. Call this tool whenever the user
+shares information about their business. Each call incrementally adds to the
+existing understanding - you don't need to provide all fields at once.
+
+Use this to build a comprehensive profile that helps recommend better agents
+and automations for the user's specific needs."""
+
+    @property
+    def parameters(self) -> dict[str, Any]:
+        # Auto-generate from Pydantic model schema
+        schema = BusinessUnderstandingInput.model_json_schema()
+        properties = {}
+        for field_name, field_schema in schema.get("properties", {}).items():
+            prop: dict[str, Any] = {"description": field_schema.get("description", "")}
+            # Handle anyOf for Optional types
+            if "anyOf" in field_schema:
+                for option in field_schema["anyOf"]:
+                    if option.get("type") != "null":
+                        prop["type"] = option.get("type", "string")
+                        if "items" in option:
+                            prop["items"] = option["items"]
+                        break
+            else:
+                prop["type"] = field_schema.get("type", "string")
+                if "items" in field_schema:
+                    prop["items"] = field_schema["items"]
+            properties[field_name] = prop
+        return {"type": "object", "properties": properties, "required": []}
+
+    @property
+    def requires_auth(self) -> bool:
+        """Requires authentication to store user-specific data."""
+        return True
+
+    async def _execute(
+        self,
+        user_id: str | None,
+        session: ChatSession,
+        **kwargs,
+    ) -> ToolResponseBase:
+        """
+        Capture and store business understanding incrementally.
+
+        Each call merges new data with existing understanding:
+        - String fields are overwritten if provided
+        - List fields are appended (with deduplication)
+        """
+        session_id = session.session_id
+
+        if not user_id:
+            return ErrorResponse(
+                message="Authentication required to save business understanding.",
+                session_id=session_id,
+            )
+
+        # Check if any data was provided
+        if not any(v is not None for v in kwargs.values()):
+            return ErrorResponse(
+                message="Please provide at least one field to update.",
+                session_id=session_id,
+            )
+
+        # Build input model from kwargs (only include fields defined in the model)
+        valid_fields = set(BusinessUnderstandingInput.model_fields.keys())
+        input_data = BusinessUnderstandingInput(
+            **{k: v for k, v in kwargs.items() if k in valid_fields}
+        )
+
+        # Track which fields were updated
+        updated_fields = [
+            k for k, v in kwargs.items() if k in valid_fields and v is not None
+        ]
+
+        # Upsert with merge
+        understanding = await upsert_business_understanding(user_id, input_data)
+
+        # Build current understanding summary (filter out empty values)
+        current_understanding = {
+            k: v
+            for k, v in understanding.model_dump(
+                exclude={"id", "user_id", "created_at", "updated_at"}
+            ).items()
+            if v is not None and v != [] and v != ""
+        }
+
+        return UnderstandingUpdatedResponse(
+            message=f"Updated understanding with: {', '.join(updated_fields)}. "
+            "I now have a better picture of your business context.",
+            session_id=session_id,
+            updated_fields=updated_fields,
+            current_understanding=current_understanding,
+        )
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/agent_generator/__init__.py b/autogpt_platform/backend/backend/api/features/chat/tools/agent_generator/__init__.py
new file mode 100644
index 0000000000..4266834220
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/agent_generator/__init__.py
@@ -0,0 +1,59 @@
+"""Agent generator package - Creates agents from natural language."""
+
+from .core import (
+    AgentGeneratorNotConfiguredError,
+    AgentJsonValidationError,
+    AgentSummary,
+    DecompositionResult,
+    DecompositionStep,
+    LibraryAgentSummary,
+    MarketplaceAgentSummary,
+    customize_template,
+    decompose_goal,
+    enrich_library_agents_from_steps,
+    extract_search_terms_from_steps,
+    extract_uuids_from_text,
+    generate_agent,
+    generate_agent_patch,
+    get_agent_as_json,
+    get_all_relevant_agents_for_generation,
+    get_library_agent_by_graph_id,
+    get_library_agent_by_id,
+    get_library_agents_for_generation,
+    graph_to_json,
+    json_to_graph,
+    save_agent_to_library,
+    search_marketplace_agents_for_generation,
+)
+from .errors import get_user_message_for_error
+from .service import health_check as check_external_service_health
+from .service import is_external_service_configured
+
+__all__ = [
+    "AgentGeneratorNotConfiguredError",
+    "AgentJsonValidationError",
+    "AgentSummary",
+    "DecompositionResult",
+    "DecompositionStep",
+    "LibraryAgentSummary",
+    "MarketplaceAgentSummary",
+    "check_external_service_health",
+    "customize_template",
+    "decompose_goal",
+    "enrich_library_agents_from_steps",
+    "extract_search_terms_from_steps",
+    "extract_uuids_from_text",
+    "generate_agent",
+    "generate_agent_patch",
+    "get_agent_as_json",
+    "get_all_relevant_agents_for_generation",
+    "get_library_agent_by_graph_id",
+    "get_library_agent_by_id",
+    "get_library_agents_for_generation",
+    "get_user_message_for_error",
+    "graph_to_json",
+    "is_external_service_configured",
+    "json_to_graph",
+    "save_agent_to_library",
+    "search_marketplace_agents_for_generation",
+]
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/agent_generator/core.py b/autogpt_platform/backend/backend/api/features/chat/tools/agent_generator/core.py
new file mode 100644
index 0000000000..b88b9b2924
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/agent_generator/core.py
@@ -0,0 +1,899 @@
+"""Core agent generation functions."""
+
+import logging
+import re
+import uuid
+from typing import Any, NotRequired, TypedDict
+
+from backend.api.features.library import db as library_db
+from backend.api.features.store import db as store_db
+from backend.data.graph import (
+    Graph,
+    Link,
+    Node,
+    create_graph,
+    get_graph,
+    get_graph_all_versions,
+    get_store_listed_graphs,
+)
+from backend.util.exceptions import DatabaseError, NotFoundError
+
+from .service import (
+    customize_template_external,
+    decompose_goal_external,
+    generate_agent_external,
+    generate_agent_patch_external,
+    is_external_service_configured,
+)
+
+logger = logging.getLogger(__name__)
+
+AGENT_EXECUTOR_BLOCK_ID = "e189baac-8c20-45a1-94a7-55177ea42565"
+
+
+class ExecutionSummary(TypedDict):
+    """Summary of a single execution for quality assessment."""
+
+    status: str
+    correctness_score: NotRequired[float]
+    activity_summary: NotRequired[str]
+
+
+class LibraryAgentSummary(TypedDict):
+    """Summary of a library agent for sub-agent composition.
+
+    Includes recent executions to help the LLM decide whether to use this agent.
+    Each execution shows status, correctness_score (0-1), and activity_summary.
+    """
+
+    graph_id: str
+    graph_version: int
+    name: str
+    description: str
+    input_schema: dict[str, Any]
+    output_schema: dict[str, Any]
+    recent_executions: NotRequired[list[ExecutionSummary]]
+
+
+class MarketplaceAgentSummary(TypedDict):
+    """Summary of a marketplace agent for sub-agent composition."""
+
+    name: str
+    description: str
+    sub_heading: str
+    creator: str
+    is_marketplace_agent: bool
+
+
+class DecompositionStep(TypedDict, total=False):
+    """A single step in decomposed instructions."""
+
+    description: str
+    action: str
+    block_name: str
+    tool: str
+    name: str
+
+
+class DecompositionResult(TypedDict, total=False):
+    """Result from decompose_goal - can be instructions, questions, or error."""
+
+    type: str
+    steps: list[DecompositionStep]
+    questions: list[dict[str, Any]]
+    error: str
+    error_type: str
+
+
+AgentSummary = LibraryAgentSummary | MarketplaceAgentSummary | dict[str, Any]
+
+
+def _to_dict_list(
+    agents: list[AgentSummary] | list[dict[str, Any]] | None,
+) -> list[dict[str, Any]] | None:
+    """Convert typed agent summaries to plain dicts for external service calls."""
+    if agents is None:
+        return None
+    return [dict(a) for a in agents]
+
+
+class AgentGeneratorNotConfiguredError(Exception):
+    """Raised when the external Agent Generator service is not configured."""
+
+    pass
+
+
+def _check_service_configured() -> None:
+    """Check if the external Agent Generator service is configured.
+
+    Raises:
+        AgentGeneratorNotConfiguredError: If the service is not configured.
+    """
+    if not is_external_service_configured():
+        raise AgentGeneratorNotConfiguredError(
+            "Agent Generator service is not configured. "
+            "Set AGENTGENERATOR_HOST environment variable to enable agent generation."
+        )
+
+
+_UUID_PATTERN = re.compile(
+    r"[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}",
+    re.IGNORECASE,
+)
+
+
+def extract_uuids_from_text(text: str) -> list[str]:
+    """Extract all UUID v4 strings from text.
+
+    Args:
+        text: Text that may contain UUIDs (e.g., user's goal description)
+
+    Returns:
+        List of unique UUIDs found in the text (lowercase)
+    """
+    matches = _UUID_PATTERN.findall(text)
+    return list({m.lower() for m in matches})
+
+
+async def get_library_agent_by_id(
+    user_id: str, agent_id: str
+) -> LibraryAgentSummary | None:
+    """Fetch a specific library agent by its ID (library agent ID or graph_id).
+
+    This function tries multiple lookup strategies:
+    1. First tries to find by graph_id (AgentGraph primary key)
+    2. If not found, tries to find by library agent ID (LibraryAgent primary key)
+
+    This handles both cases:
+    - User provides graph_id (e.g., from AgentExecutorBlock)
+    - User provides library agent ID (e.g., from library URL)
+
+    Args:
+        user_id: The user ID
+        agent_id: The ID to look up (can be graph_id or library agent ID)
+
+    Returns:
+        LibraryAgentSummary if found, None otherwise
+    """
+    try:
+        agent = await library_db.get_library_agent_by_graph_id(user_id, agent_id)
+        if agent:
+            logger.debug(f"Found library agent by graph_id: {agent.name}")
+            return LibraryAgentSummary(
+                graph_id=agent.graph_id,
+                graph_version=agent.graph_version,
+                name=agent.name,
+                description=agent.description,
+                input_schema=agent.input_schema,
+                output_schema=agent.output_schema,
+            )
+    except DatabaseError:
+        raise
+    except Exception as e:
+        logger.debug(f"Could not fetch library agent by graph_id {agent_id}: {e}")
+
+    try:
+        agent = await library_db.get_library_agent(agent_id, user_id)
+        if agent:
+            logger.debug(f"Found library agent by library_id: {agent.name}")
+            return LibraryAgentSummary(
+                graph_id=agent.graph_id,
+                graph_version=agent.graph_version,
+                name=agent.name,
+                description=agent.description,
+                input_schema=agent.input_schema,
+                output_schema=agent.output_schema,
+            )
+    except NotFoundError:
+        logger.debug(f"Library agent not found by library_id: {agent_id}")
+    except DatabaseError:
+        raise
+    except Exception as e:
+        logger.warning(
+            f"Could not fetch library agent by library_id {agent_id}: {e}",
+            exc_info=True,
+        )
+
+    return None
+
+
+get_library_agent_by_graph_id = get_library_agent_by_id
+
+
+async def get_library_agents_for_generation(
+    user_id: str,
+    search_query: str | None = None,
+    exclude_graph_id: str | None = None,
+    max_results: int = 15,
+) -> list[LibraryAgentSummary]:
+    """Fetch user's library agents formatted for Agent Generator.
+
+    Uses search-based fetching to return relevant agents instead of all agents.
+    This is more scalable for users with large libraries.
+
+    Includes recent_executions list to help the LLM assess agent quality:
+    - Each execution has status, correctness_score (0-1), and activity_summary
+    - This gives the LLM concrete examples of recent performance
+
+    Args:
+        user_id: The user ID
+        search_query: Optional search term to find relevant agents (user's goal/description)
+        exclude_graph_id: Optional graph ID to exclude (prevents circular references)
+        max_results: Maximum number of agents to return (default 15)
+
+    Returns:
+        List of LibraryAgentSummary with schemas and recent executions for sub-agent composition
+    """
+    try:
+        response = await library_db.list_library_agents(
+            user_id=user_id,
+            search_term=search_query,
+            page=1,
+            page_size=max_results,
+            include_executions=True,
+        )
+
+        results: list[LibraryAgentSummary] = []
+        for agent in response.agents:
+            if exclude_graph_id is not None and agent.graph_id == exclude_graph_id:
+                continue
+
+            summary = LibraryAgentSummary(
+                graph_id=agent.graph_id,
+                graph_version=agent.graph_version,
+                name=agent.name,
+                description=agent.description,
+                input_schema=agent.input_schema,
+                output_schema=agent.output_schema,
+            )
+            if agent.recent_executions:
+                exec_summaries: list[ExecutionSummary] = []
+                for ex in agent.recent_executions:
+                    exec_sum = ExecutionSummary(status=ex.status)
+                    if ex.correctness_score is not None:
+                        exec_sum["correctness_score"] = ex.correctness_score
+                    if ex.activity_summary:
+                        exec_sum["activity_summary"] = ex.activity_summary
+                    exec_summaries.append(exec_sum)
+                summary["recent_executions"] = exec_summaries
+            results.append(summary)
+        return results
+    except DatabaseError:
+        raise
+    except Exception as e:
+        logger.warning(f"Failed to fetch library agents: {e}")
+        return []
+
+
+async def search_marketplace_agents_for_generation(
+    search_query: str,
+    max_results: int = 10,
+) -> list[LibraryAgentSummary]:
+    """Search marketplace agents formatted for Agent Generator.
+
+    Fetches marketplace agents and their full schemas so they can be used
+    as sub-agents in generated workflows.
+
+    Args:
+        search_query: Search term to find relevant public agents
+        max_results: Maximum number of agents to return (default 10)
+
+    Returns:
+        List of LibraryAgentSummary with full input/output schemas
+    """
+    try:
+        response = await store_db.get_store_agents(
+            search_query=search_query,
+            page=1,
+            page_size=max_results,
+        )
+
+        agents_with_graphs = [
+            agent for agent in response.agents if agent.agent_graph_id
+        ]
+
+        if not agents_with_graphs:
+            return []
+
+        graph_ids = [agent.agent_graph_id for agent in agents_with_graphs]
+        graphs = await get_store_listed_graphs(*graph_ids)
+
+        results: list[LibraryAgentSummary] = []
+        for agent in agents_with_graphs:
+            graph_id = agent.agent_graph_id
+            if graph_id and graph_id in graphs:
+                graph = graphs[graph_id]
+                results.append(
+                    LibraryAgentSummary(
+                        graph_id=graph.id,
+                        graph_version=graph.version,
+                        name=agent.agent_name,
+                        description=agent.description,
+                        input_schema=graph.input_schema,
+                        output_schema=graph.output_schema,
+                    )
+                )
+        return results
+    except Exception as e:
+        logger.warning(f"Failed to search marketplace agents: {e}")
+        return []
+
+
+async def get_all_relevant_agents_for_generation(
+    user_id: str,
+    search_query: str | None = None,
+    exclude_graph_id: str | None = None,
+    include_library: bool = True,
+    include_marketplace: bool = True,
+    max_library_results: int = 15,
+    max_marketplace_results: int = 10,
+) -> list[AgentSummary]:
+    """Fetch relevant agents from library and/or marketplace.
+
+    Searches both user's library and marketplace by default.
+    Explicitly mentioned UUIDs in the search query are always looked up.
+
+    Args:
+        user_id: The user ID
+        search_query: Search term to find relevant agents (user's goal/description)
+        exclude_graph_id: Optional graph ID to exclude (prevents circular references)
+        include_library: Whether to search user's library (default True)
+        include_marketplace: Whether to also search marketplace (default True)
+        max_library_results: Max library agents to return (default 15)
+        max_marketplace_results: Max marketplace agents to return (default 10)
+
+    Returns:
+        List of AgentSummary with full schemas (both library and marketplace agents)
+    """
+    agents: list[AgentSummary] = []
+    seen_graph_ids: set[str] = set()
+
+    if search_query:
+        mentioned_uuids = extract_uuids_from_text(search_query)
+        for graph_id in mentioned_uuids:
+            if graph_id == exclude_graph_id:
+                continue
+            agent = await get_library_agent_by_graph_id(user_id, graph_id)
+            agent_graph_id = agent.get("graph_id") if agent else None
+            if agent and agent_graph_id and agent_graph_id not in seen_graph_ids:
+                agents.append(agent)
+                seen_graph_ids.add(agent_graph_id)
+                logger.debug(
+                    f"Found explicitly mentioned agent: {agent.get('name') or 'Unknown'}"
+                )
+
+    if include_library:
+        library_agents = await get_library_agents_for_generation(
+            user_id=user_id,
+            search_query=search_query,
+            exclude_graph_id=exclude_graph_id,
+            max_results=max_library_results,
+        )
+        for agent in library_agents:
+            graph_id = agent.get("graph_id")
+            if graph_id and graph_id not in seen_graph_ids:
+                agents.append(agent)
+                seen_graph_ids.add(graph_id)
+
+    if include_marketplace and search_query:
+        marketplace_agents = await search_marketplace_agents_for_generation(
+            search_query=search_query,
+            max_results=max_marketplace_results,
+        )
+        for agent in marketplace_agents:
+            graph_id = agent.get("graph_id")
+            if graph_id and graph_id not in seen_graph_ids:
+                agents.append(agent)
+                seen_graph_ids.add(graph_id)
+
+    return agents
+
+
+def extract_search_terms_from_steps(
+    decomposition_result: DecompositionResult | dict[str, Any],
+) -> list[str]:
+    """Extract search terms from decomposed instruction steps.
+
+    Analyzes the decomposition result to extract relevant keywords
+    for additional library agent searches.
+
+    Args:
+        decomposition_result: Result from decompose_goal containing steps
+
+    Returns:
+        List of unique search terms extracted from steps
+    """
+    search_terms: list[str] = []
+
+    if decomposition_result.get("type") != "instructions":
+        return search_terms
+
+    steps = decomposition_result.get("steps", [])
+    if not steps:
+        return search_terms
+
+    step_keys: list[str] = ["description", "action", "block_name", "tool", "name"]
+
+    for step in steps:
+        for key in step_keys:
+            value = step.get(key)  # type: ignore[union-attr]
+            if isinstance(value, str) and len(value) > 3:
+                search_terms.append(value)
+
+    seen: set[str] = set()
+    unique_terms: list[str] = []
+    for term in search_terms:
+        term_lower = term.lower()
+        if term_lower not in seen:
+            seen.add(term_lower)
+            unique_terms.append(term)
+
+    return unique_terms
+
+
+async def enrich_library_agents_from_steps(
+    user_id: str,
+    decomposition_result: DecompositionResult | dict[str, Any],
+    existing_agents: list[AgentSummary] | list[dict[str, Any]],
+    exclude_graph_id: str | None = None,
+    include_marketplace: bool = True,
+    max_additional_results: int = 10,
+) -> list[AgentSummary] | list[dict[str, Any]]:
+    """Enrich library agents list with additional searches based on decomposed steps.
+
+    This implements two-phase search: after decomposition, we search for additional
+    relevant agents based on the specific steps identified.
+
+    Args:
+        user_id: The user ID
+        decomposition_result: Result from decompose_goal containing steps
+        existing_agents: Already fetched library agents from initial search
+        exclude_graph_id: Optional graph ID to exclude
+        include_marketplace: Whether to also search marketplace
+        max_additional_results: Max additional agents per search term (default 10)
+
+    Returns:
+        Combined list of library agents (existing + newly discovered)
+    """
+    search_terms = extract_search_terms_from_steps(decomposition_result)
+
+    if not search_terms:
+        return existing_agents
+
+    existing_ids: set[str] = set()
+    existing_names: set[str] = set()
+
+    for agent in existing_agents:
+        agent_name = agent.get("name")
+        if agent_name and isinstance(agent_name, str):
+            existing_names.add(agent_name.lower())
+        graph_id = agent.get("graph_id")  # type: ignore[call-overload]
+        if graph_id and isinstance(graph_id, str):
+            existing_ids.add(graph_id)
+
+    all_agents: list[AgentSummary] | list[dict[str, Any]] = list(existing_agents)
+
+    for term in search_terms[:3]:
+        try:
+            additional_agents = await get_all_relevant_agents_for_generation(
+                user_id=user_id,
+                search_query=term,
+                exclude_graph_id=exclude_graph_id,
+                include_marketplace=include_marketplace,
+                max_library_results=max_additional_results,
+                max_marketplace_results=5,
+            )
+
+            for agent in additional_agents:
+                agent_name = agent.get("name")
+                if not agent_name or not isinstance(agent_name, str):
+                    continue
+                agent_name_lower = agent_name.lower()
+
+                if agent_name_lower in existing_names:
+                    continue
+
+                graph_id = agent.get("graph_id")  # type: ignore[call-overload]
+                if graph_id and graph_id in existing_ids:
+                    continue
+
+                all_agents.append(agent)
+                existing_names.add(agent_name_lower)
+                if graph_id and isinstance(graph_id, str):
+                    existing_ids.add(graph_id)
+
+        except DatabaseError:
+            logger.error(f"Database error searching for agents with term '{term}'")
+            raise
+        except Exception as e:
+            logger.warning(
+                f"Failed to search for additional agents with term '{term}': {e}"
+            )
+
+    logger.debug(
+        f"Enriched library agents: {len(existing_agents)} initial + "
+        f"{len(all_agents) - len(existing_agents)} additional = {len(all_agents)} total"
+    )
+
+    return all_agents
+
+
+async def decompose_goal(
+    description: str,
+    context: str = "",
+    library_agents: list[AgentSummary] | None = None,
+) -> DecompositionResult | None:
+    """Break down a goal into steps or return clarifying questions.
+
+    Args:
+        description: Natural language goal description
+        context: Additional context (e.g., answers to previous questions)
+        library_agents: User's library agents available for sub-agent composition
+
+    Returns:
+        DecompositionResult with either:
+        - {"type": "clarifying_questions", "questions": [...]}
+        - {"type": "instructions", "steps": [...]}
+        Or None on error
+
+    Raises:
+        AgentGeneratorNotConfiguredError: If the external service is not configured.
+    """
+    _check_service_configured()
+    logger.info("Calling external Agent Generator service for decompose_goal")
+    result = await decompose_goal_external(
+        description, context, _to_dict_list(library_agents)
+    )
+    return result  # type: ignore[return-value]
+
+
+async def generate_agent(
+    instructions: DecompositionResult | dict[str, Any],
+    library_agents: list[AgentSummary] | list[dict[str, Any]] | None = None,
+    operation_id: str | None = None,
+    task_id: str | None = None,
+) -> dict[str, Any] | None:
+    """Generate agent JSON from instructions.
+
+    Args:
+        instructions: Structured instructions from decompose_goal
+        library_agents: User's library agents available for sub-agent composition
+        operation_id: Operation ID for async processing (enables Redis Streams
+            completion notification)
+        task_id: Task ID for async processing (enables Redis Streams persistence
+            and SSE delivery)
+
+    Returns:
+        Agent JSON dict, {"status": "accepted"} for async, error dict {"type": "error", ...}, or None on error
+
+    Raises:
+        AgentGeneratorNotConfiguredError: If the external service is not configured.
+    """
+    _check_service_configured()
+    logger.info("Calling external Agent Generator service for generate_agent")
+    result = await generate_agent_external(
+        dict(instructions), _to_dict_list(library_agents), operation_id, task_id
+    )
+
+    # Don't modify async response
+    if result and result.get("status") == "accepted":
+        return result
+
+    if result:
+        if isinstance(result, dict) and result.get("type") == "error":
+            return result
+        if "id" not in result:
+            result["id"] = str(uuid.uuid4())
+        if "version" not in result:
+            result["version"] = 1
+        if "is_active" not in result:
+            result["is_active"] = True
+    return result
+
+
+class AgentJsonValidationError(Exception):
+    """Raised when agent JSON is invalid or missing required fields."""
+
+    pass
+
+
+def json_to_graph(agent_json: dict[str, Any]) -> Graph:
+    """Convert agent JSON dict to Graph model.
+
+    Args:
+        agent_json: Agent JSON with nodes and links
+
+    Returns:
+        Graph ready for saving
+
+    Raises:
+        AgentJsonValidationError: If required fields are missing from nodes or links
+    """
+    nodes = []
+    for idx, n in enumerate(agent_json.get("nodes", [])):
+        block_id = n.get("block_id")
+        if not block_id:
+            node_id = n.get("id", f"index_{idx}")
+            raise AgentJsonValidationError(
+                f"Node '{node_id}' is missing required field 'block_id'"
+            )
+        node = Node(
+            id=n.get("id", str(uuid.uuid4())),
+            block_id=block_id,
+            input_default=n.get("input_default", {}),
+            metadata=n.get("metadata", {}),
+        )
+        nodes.append(node)
+
+    links = []
+    for idx, link_data in enumerate(agent_json.get("links", [])):
+        source_id = link_data.get("source_id")
+        sink_id = link_data.get("sink_id")
+        source_name = link_data.get("source_name")
+        sink_name = link_data.get("sink_name")
+
+        missing_fields = []
+        if not source_id:
+            missing_fields.append("source_id")
+        if not sink_id:
+            missing_fields.append("sink_id")
+        if not source_name:
+            missing_fields.append("source_name")
+        if not sink_name:
+            missing_fields.append("sink_name")
+
+        if missing_fields:
+            link_id = link_data.get("id", f"index_{idx}")
+            raise AgentJsonValidationError(
+                f"Link '{link_id}' is missing required fields: {', '.join(missing_fields)}"
+            )
+
+        link = Link(
+            id=link_data.get("id", str(uuid.uuid4())),
+            source_id=source_id,
+            sink_id=sink_id,
+            source_name=source_name,
+            sink_name=sink_name,
+            is_static=link_data.get("is_static", False),
+        )
+        links.append(link)
+
+    return Graph(
+        id=agent_json.get("id", str(uuid.uuid4())),
+        version=agent_json.get("version", 1),
+        is_active=agent_json.get("is_active", True),
+        name=agent_json.get("name", "Generated Agent"),
+        description=agent_json.get("description", ""),
+        nodes=nodes,
+        links=links,
+    )
+
+
+def _reassign_node_ids(graph: Graph) -> None:
+    """Reassign all node and link IDs to new UUIDs.
+
+    This is needed when creating a new version to avoid unique constraint violations.
+    """
+    id_map = {node.id: str(uuid.uuid4()) for node in graph.nodes}
+
+    for node in graph.nodes:
+        node.id = id_map[node.id]
+
+    for link in graph.links:
+        link.id = str(uuid.uuid4())
+        if link.source_id in id_map:
+            link.source_id = id_map[link.source_id]
+        if link.sink_id in id_map:
+            link.sink_id = id_map[link.sink_id]
+
+
+def _populate_agent_executor_user_ids(agent_json: dict[str, Any], user_id: str) -> None:
+    """Populate user_id in AgentExecutorBlock nodes.
+
+    The external agent generator creates AgentExecutorBlock nodes with empty user_id.
+    This function fills in the actual user_id so sub-agents run with correct permissions.
+
+    Args:
+        agent_json: Agent JSON dict (modified in place)
+        user_id: User ID to set
+    """
+    for node in agent_json.get("nodes", []):
+        if node.get("block_id") == AGENT_EXECUTOR_BLOCK_ID:
+            input_default = node.get("input_default") or {}
+            if not input_default.get("user_id"):
+                input_default["user_id"] = user_id
+                node["input_default"] = input_default
+                logger.debug(
+                    f"Set user_id for AgentExecutorBlock node {node.get('id')}"
+                )
+
+
+async def save_agent_to_library(
+    agent_json: dict[str, Any], user_id: str, is_update: bool = False
+) -> tuple[Graph, Any]:
+    """Save agent to database and user's library.
+
+    Args:
+        agent_json: Agent JSON dict
+        user_id: User ID
+        is_update: Whether this is an update to an existing agent
+
+    Returns:
+        Tuple of (created Graph, LibraryAgent)
+    """
+    # Populate user_id in AgentExecutorBlock nodes before conversion
+    _populate_agent_executor_user_ids(agent_json, user_id)
+
+    graph = json_to_graph(agent_json)
+
+    if is_update:
+        if graph.id:
+            existing_versions = await get_graph_all_versions(graph.id, user_id)
+            if existing_versions:
+                latest_version = max(v.version for v in existing_versions)
+                graph.version = latest_version + 1
+                _reassign_node_ids(graph)
+                logger.info(f"Updating agent {graph.id} to version {graph.version}")
+    else:
+        graph.id = str(uuid.uuid4())
+        graph.version = 1
+        _reassign_node_ids(graph)
+        logger.info(f"Creating new agent with ID {graph.id}")
+
+    created_graph = await create_graph(graph, user_id)
+
+    library_agents = await library_db.create_library_agent(
+        graph=created_graph,
+        user_id=user_id,
+        sensitive_action_safe_mode=True,
+        create_library_agents_for_sub_graphs=False,
+    )
+
+    return created_graph, library_agents[0]
+
+
+def graph_to_json(graph: Graph) -> dict[str, Any]:
+    """Convert a Graph object to JSON format for the agent generator.
+
+    Args:
+        graph: Graph object to convert
+
+    Returns:
+        Agent as JSON dict
+    """
+    nodes = []
+    for node in graph.nodes:
+        nodes.append(
+            {
+                "id": node.id,
+                "block_id": node.block_id,
+                "input_default": node.input_default,
+                "metadata": node.metadata,
+            }
+        )
+
+    links = []
+    for node in graph.nodes:
+        for link in node.output_links:
+            links.append(
+                {
+                    "id": link.id,
+                    "source_id": link.source_id,
+                    "sink_id": link.sink_id,
+                    "source_name": link.source_name,
+                    "sink_name": link.sink_name,
+                    "is_static": link.is_static,
+                }
+            )
+
+    return {
+        "id": graph.id,
+        "name": graph.name,
+        "description": graph.description,
+        "version": graph.version,
+        "is_active": graph.is_active,
+        "nodes": nodes,
+        "links": links,
+    }
+
+
+async def get_agent_as_json(
+    agent_id: str, user_id: str | None
+) -> dict[str, Any] | None:
+    """Fetch an agent and convert to JSON format for editing.
+
+    Args:
+        agent_id: Graph ID or library agent ID
+        user_id: User ID
+
+    Returns:
+        Agent as JSON dict or None if not found
+    """
+    graph = await get_graph(agent_id, version=None, user_id=user_id)
+
+    if not graph and user_id:
+        try:
+            library_agent = await library_db.get_library_agent(agent_id, user_id)
+            graph = await get_graph(
+                library_agent.graph_id, version=None, user_id=user_id
+            )
+        except NotFoundError:
+            pass
+
+    if not graph:
+        return None
+
+    return graph_to_json(graph)
+
+
+async def generate_agent_patch(
+    update_request: str,
+    current_agent: dict[str, Any],
+    library_agents: list[AgentSummary] | None = None,
+    operation_id: str | None = None,
+    task_id: str | None = None,
+) -> dict[str, Any] | None:
+    """Update an existing agent using natural language.
+
+    The external Agent Generator service handles:
+    - Generating the patch
+    - Applying the patch
+    - Fixing and validating the result
+
+    Args:
+        update_request: Natural language description of changes
+        current_agent: Current agent JSON
+        library_agents: User's library agents available for sub-agent composition
+        operation_id: Operation ID for async processing (enables Redis Streams callback)
+        task_id: Task ID for async processing (enables Redis Streams callback)
+
+    Returns:
+        Updated agent JSON, clarifying questions dict {"type": "clarifying_questions", ...},
+        {"status": "accepted"} for async, error dict {"type": "error", ...}, or None on error
+
+    Raises:
+        AgentGeneratorNotConfiguredError: If the external service is not configured.
+    """
+    _check_service_configured()
+    logger.info("Calling external Agent Generator service for generate_agent_patch")
+    return await generate_agent_patch_external(
+        update_request,
+        current_agent,
+        _to_dict_list(library_agents),
+        operation_id,
+        task_id,
+    )
+
+
+async def customize_template(
+    template_agent: dict[str, Any],
+    modification_request: str,
+    context: str = "",
+) -> dict[str, Any] | None:
+    """Customize a template/marketplace agent using natural language.
+
+    This is used when users want to modify a template or marketplace agent
+    to fit their specific needs before adding it to their library.
+
+    The external Agent Generator service handles:
+    - Understanding the modification request
+    - Applying changes to the template
+    - Fixing and validating the result
+
+    Args:
+        template_agent: The template agent JSON to customize
+        modification_request: Natural language description of customizations
+        context: Additional context (e.g., answers to previous questions)
+
+    Returns:
+        Customized agent JSON, clarifying questions dict {"type": "clarifying_questions", ...},
+        error dict {"type": "error", ...}, or None on unexpected error
+
+    Raises:
+        AgentGeneratorNotConfiguredError: If the external service is not configured.
+    """
+    _check_service_configured()
+    logger.info("Calling external Agent Generator service for customize_template")
+    return await customize_template_external(
+        template_agent, modification_request, context
+    )
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/agent_generator/errors.py b/autogpt_platform/backend/backend/api/features/chat/tools/agent_generator/errors.py
new file mode 100644
index 0000000000..282d8cf9aa
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/agent_generator/errors.py
@@ -0,0 +1,95 @@
+"""Error handling utilities for agent generator."""
+
+import re
+
+
+def _sanitize_error_details(details: str) -> str:
+    """Sanitize error details to remove sensitive information.
+
+    Strips common patterns that could expose internal system info:
+    - File paths (Unix and Windows)
+    - Database connection strings
+    - URLs with credentials
+    - Stack trace internals
+
+    Args:
+        details: Raw error details string
+
+    Returns:
+        Sanitized error details safe for user display
+    """
+    sanitized = re.sub(
+        r"/[a-zA-Z0-9_./\-]+\.(py|js|ts|json|yaml|yml)", "[path]", details
+    )
+    sanitized = re.sub(r"[A-Z]:\\[a-zA-Z0-9_\\.\\-]+", "[path]", sanitized)
+    sanitized = re.sub(
+        r"(postgres|mysql|mongodb|redis)://[^\s]+", "[database_url]", sanitized
+    )
+    sanitized = re.sub(r"https?://[^:]+:[^@]+@[^\s]+", "[url]", sanitized)
+    sanitized = re.sub(r", line \d+", "", sanitized)
+    sanitized = re.sub(r'File "[^"]+",?', "", sanitized)
+
+    return sanitized.strip()
+
+
+def get_user_message_for_error(
+    error_type: str,
+    operation: str = "process the request",
+    llm_parse_message: str | None = None,
+    validation_message: str | None = None,
+    error_details: str | None = None,
+) -> str:
+    """Get a user-friendly error message based on error type.
+
+    This function maps internal error types to user-friendly messages,
+    providing a consistent experience across different agent operations.
+
+    Args:
+        error_type: The error type from the external service
+            (e.g., "llm_parse_error", "timeout", "rate_limit")
+        operation: Description of what operation failed, used in the default
+            message (e.g., "analyze the goal", "generate the agent")
+        llm_parse_message: Custom message for llm_parse_error type
+        validation_message: Custom message for validation_error type
+        error_details: Optional additional details about the error
+
+    Returns:
+        User-friendly error message suitable for display to the user
+    """
+    base_message = ""
+
+    if error_type == "llm_parse_error":
+        base_message = (
+            llm_parse_message
+            or "The AI had trouble processing this request. Please try again."
+        )
+    elif error_type == "validation_error":
+        base_message = (
+            validation_message
+            or "The generated agent failed validation. "
+            "This usually happens when the agent structure doesn't match "
+            "what the platform expects. Please try simplifying your goal "
+            "or breaking it into smaller parts."
+        )
+    elif error_type == "patch_error":
+        base_message = (
+            "Failed to apply the changes. The modification couldn't be "
+            "validated. Please try a different approach or simplify the change."
+        )
+    elif error_type in ("timeout", "llm_timeout"):
+        base_message = (
+            "The request took too long to process. This can happen with "
+            "complex agents. Please try again or simplify your goal."
+        )
+    elif error_type in ("rate_limit", "llm_rate_limit"):
+        base_message = "The service is currently busy. Please try again in a moment."
+    else:
+        base_message = f"Failed to {operation}. Please try again."
+
+    if error_details:
+        details = _sanitize_error_details(error_details)
+        if len(details) > 200:
+            details = details[:200] + "..."
+        base_message += f"\n\nTechnical details: {details}"
+
+    return base_message
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/agent_generator/service.py b/autogpt_platform/backend/backend/api/features/chat/tools/agent_generator/service.py
new file mode 100644
index 0000000000..62411b4e1b
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/agent_generator/service.py
@@ -0,0 +1,498 @@
+"""External Agent Generator service client.
+
+This module provides a client for communicating with the external Agent Generator
+microservice. When AGENTGENERATOR_HOST is configured, the agent generation functions
+will delegate to the external service instead of using the built-in LLM-based implementation.
+"""
+
+import logging
+from typing import Any
+
+import httpx
+
+from backend.util.settings import Settings
+
+logger = logging.getLogger(__name__)
+
+
+def _create_error_response(
+    error_message: str,
+    error_type: str = "unknown",
+    details: dict[str, Any] | None = None,
+) -> dict[str, Any]:
+    """Create a standardized error response dict.
+
+    Args:
+        error_message: Human-readable error message
+        error_type: Machine-readable error type
+        details: Optional additional error details
+
+    Returns:
+        Error dict with type="error" and error details
+    """
+    response: dict[str, Any] = {
+        "type": "error",
+        "error": error_message,
+        "error_type": error_type,
+    }
+    if details:
+        response["details"] = details
+    return response
+
+
+def _classify_http_error(e: httpx.HTTPStatusError) -> tuple[str, str]:
+    """Classify an HTTP error into error_type and message.
+
+    Args:
+        e: The HTTP status error
+
+    Returns:
+        Tuple of (error_type, error_message)
+    """
+    status = e.response.status_code
+    if status == 429:
+        return "rate_limit", f"Agent Generator rate limited: {e}"
+    elif status == 503:
+        return "service_unavailable", f"Agent Generator unavailable: {e}"
+    elif status == 504 or status == 408:
+        return "timeout", f"Agent Generator timed out: {e}"
+    else:
+        return "http_error", f"HTTP error calling Agent Generator: {e}"
+
+
+def _classify_request_error(e: httpx.RequestError) -> tuple[str, str]:
+    """Classify a request error into error_type and message.
+
+    Args:
+        e: The request error
+
+    Returns:
+        Tuple of (error_type, error_message)
+    """
+    error_str = str(e).lower()
+    if "timeout" in error_str or "timed out" in error_str:
+        return "timeout", f"Agent Generator request timed out: {e}"
+    elif "connect" in error_str:
+        return "connection_error", f"Could not connect to Agent Generator: {e}"
+    else:
+        return "request_error", f"Request error calling Agent Generator: {e}"
+
+
+_client: httpx.AsyncClient | None = None
+_settings: Settings | None = None
+
+
+def _get_settings() -> Settings:
+    """Get or create settings singleton."""
+    global _settings
+    if _settings is None:
+        _settings = Settings()
+    return _settings
+
+
+def is_external_service_configured() -> bool:
+    """Check if external Agent Generator service is configured."""
+    settings = _get_settings()
+    return bool(settings.config.agentgenerator_host)
+
+
+def _get_base_url() -> str:
+    """Get the base URL for the external service."""
+    settings = _get_settings()
+    host = settings.config.agentgenerator_host
+    port = settings.config.agentgenerator_port
+    return f"http://{host}:{port}"
+
+
+def _get_client() -> httpx.AsyncClient:
+    """Get or create the HTTP client for the external service."""
+    global _client
+    if _client is None:
+        settings = _get_settings()
+        _client = httpx.AsyncClient(
+            base_url=_get_base_url(),
+            timeout=httpx.Timeout(settings.config.agentgenerator_timeout),
+        )
+    return _client
+
+
+async def decompose_goal_external(
+    description: str,
+    context: str = "",
+    library_agents: list[dict[str, Any]] | None = None,
+) -> dict[str, Any] | None:
+    """Call the external service to decompose a goal.
+
+    Args:
+        description: Natural language goal description
+        context: Additional context (e.g., answers to previous questions)
+        library_agents: User's library agents available for sub-agent composition
+
+    Returns:
+        Dict with either:
+        - {"type": "clarifying_questions", "questions": [...]}
+        - {"type": "instructions", "steps": [...]}
+        - {"type": "unachievable_goal", ...}
+        - {"type": "vague_goal", ...}
+        - {"type": "error", "error": "...", "error_type": "..."} on error
+        Or None on unexpected error
+    """
+    client = _get_client()
+
+    if context:
+        description = f"{description}\n\nAdditional context from user:\n{context}"
+
+    payload: dict[str, Any] = {"description": description}
+    if library_agents:
+        payload["library_agents"] = library_agents
+
+    try:
+        response = await client.post("/api/decompose-description", json=payload)
+        response.raise_for_status()
+        data = response.json()
+
+        if not data.get("success"):
+            error_msg = data.get("error", "Unknown error from Agent Generator")
+            error_type = data.get("error_type", "unknown")
+            logger.error(
+                f"Agent Generator decomposition failed: {error_msg} "
+                f"(type: {error_type})"
+            )
+            return _create_error_response(error_msg, error_type)
+
+        # Map the response to the expected format
+        response_type = data.get("type")
+        if response_type == "instructions":
+            return {"type": "instructions", "steps": data.get("steps", [])}
+        elif response_type == "clarifying_questions":
+            return {
+                "type": "clarifying_questions",
+                "questions": data.get("questions", []),
+            }
+        elif response_type == "unachievable_goal":
+            return {
+                "type": "unachievable_goal",
+                "reason": data.get("reason"),
+                "suggested_goal": data.get("suggested_goal"),
+            }
+        elif response_type == "vague_goal":
+            return {
+                "type": "vague_goal",
+                "suggested_goal": data.get("suggested_goal"),
+            }
+        elif response_type == "error":
+            # Pass through error from the service
+            return _create_error_response(
+                data.get("error", "Unknown error"),
+                data.get("error_type", "unknown"),
+            )
+        else:
+            logger.error(
+                f"Unknown response type from external service: {response_type}"
+            )
+            return _create_error_response(
+                f"Unknown response type from Agent Generator: {response_type}",
+                "invalid_response",
+            )
+
+    except httpx.HTTPStatusError as e:
+        error_type, error_msg = _classify_http_error(e)
+        logger.error(error_msg)
+        return _create_error_response(error_msg, error_type)
+    except httpx.RequestError as e:
+        error_type, error_msg = _classify_request_error(e)
+        logger.error(error_msg)
+        return _create_error_response(error_msg, error_type)
+    except Exception as e:
+        error_msg = f"Unexpected error calling Agent Generator: {e}"
+        logger.error(error_msg)
+        return _create_error_response(error_msg, "unexpected_error")
+
+
+async def generate_agent_external(
+    instructions: dict[str, Any],
+    library_agents: list[dict[str, Any]] | None = None,
+    operation_id: str | None = None,
+    task_id: str | None = None,
+) -> dict[str, Any] | None:
+    """Call the external service to generate an agent from instructions.
+
+    Args:
+        instructions: Structured instructions from decompose_goal
+        library_agents: User's library agents available for sub-agent composition
+        operation_id: Operation ID for async processing (enables Redis Streams callback)
+        task_id: Task ID for async processing (enables Redis Streams callback)
+
+    Returns:
+        Agent JSON dict, {"status": "accepted"} for async, or error dict {"type": "error", ...} on error
+    """
+    client = _get_client()
+
+    # Build request payload
+    payload: dict[str, Any] = {"instructions": instructions}
+    if library_agents:
+        payload["library_agents"] = library_agents
+    if operation_id and task_id:
+        payload["operation_id"] = operation_id
+        payload["task_id"] = task_id
+
+    try:
+        response = await client.post("/api/generate-agent", json=payload)
+
+        # Handle 202 Accepted for async processing
+        if response.status_code == 202:
+            logger.info(
+                f"Agent Generator accepted async request "
+                f"(operation_id={operation_id}, task_id={task_id})"
+            )
+            return {
+                "status": "accepted",
+                "operation_id": operation_id,
+                "task_id": task_id,
+            }
+
+        response.raise_for_status()
+        data = response.json()
+
+        if not data.get("success"):
+            error_msg = data.get("error", "Unknown error from Agent Generator")
+            error_type = data.get("error_type", "unknown")
+            logger.error(
+                f"Agent Generator generation failed: {error_msg} (type: {error_type})"
+            )
+            return _create_error_response(error_msg, error_type)
+
+        return data.get("agent_json")
+
+    except httpx.HTTPStatusError as e:
+        error_type, error_msg = _classify_http_error(e)
+        logger.error(error_msg)
+        return _create_error_response(error_msg, error_type)
+    except httpx.RequestError as e:
+        error_type, error_msg = _classify_request_error(e)
+        logger.error(error_msg)
+        return _create_error_response(error_msg, error_type)
+    except Exception as e:
+        error_msg = f"Unexpected error calling Agent Generator: {e}"
+        logger.error(error_msg)
+        return _create_error_response(error_msg, "unexpected_error")
+
+
+async def generate_agent_patch_external(
+    update_request: str,
+    current_agent: dict[str, Any],
+    library_agents: list[dict[str, Any]] | None = None,
+    operation_id: str | None = None,
+    task_id: str | None = None,
+) -> dict[str, Any] | None:
+    """Call the external service to generate a patch for an existing agent.
+
+    Args:
+        update_request: Natural language description of changes
+        current_agent: Current agent JSON
+        library_agents: User's library agents available for sub-agent composition
+        operation_id: Operation ID for async processing (enables Redis Streams callback)
+        task_id: Task ID for async processing (enables Redis Streams callback)
+
+    Returns:
+        Updated agent JSON, clarifying questions dict, {"status": "accepted"} for async, or error dict on error
+    """
+    client = _get_client()
+
+    # Build request payload
+    payload: dict[str, Any] = {
+        "update_request": update_request,
+        "current_agent_json": current_agent,
+    }
+    if library_agents:
+        payload["library_agents"] = library_agents
+    if operation_id and task_id:
+        payload["operation_id"] = operation_id
+        payload["task_id"] = task_id
+
+    try:
+        response = await client.post("/api/update-agent", json=payload)
+
+        # Handle 202 Accepted for async processing
+        if response.status_code == 202:
+            logger.info(
+                f"Agent Generator accepted async update request "
+                f"(operation_id={operation_id}, task_id={task_id})"
+            )
+            return {
+                "status": "accepted",
+                "operation_id": operation_id,
+                "task_id": task_id,
+            }
+
+        response.raise_for_status()
+        data = response.json()
+
+        if not data.get("success"):
+            error_msg = data.get("error", "Unknown error from Agent Generator")
+            error_type = data.get("error_type", "unknown")
+            logger.error(
+                f"Agent Generator patch generation failed: {error_msg} "
+                f"(type: {error_type})"
+            )
+            return _create_error_response(error_msg, error_type)
+
+        # Check if it's clarifying questions
+        if data.get("type") == "clarifying_questions":
+            return {
+                "type": "clarifying_questions",
+                "questions": data.get("questions", []),
+            }
+
+        # Check if it's an error passed through
+        if data.get("type") == "error":
+            return _create_error_response(
+                data.get("error", "Unknown error"),
+                data.get("error_type", "unknown"),
+            )
+
+        # Otherwise return the updated agent JSON
+        return data.get("agent_json")
+
+    except httpx.HTTPStatusError as e:
+        error_type, error_msg = _classify_http_error(e)
+        logger.error(error_msg)
+        return _create_error_response(error_msg, error_type)
+    except httpx.RequestError as e:
+        error_type, error_msg = _classify_request_error(e)
+        logger.error(error_msg)
+        return _create_error_response(error_msg, error_type)
+    except Exception as e:
+        error_msg = f"Unexpected error calling Agent Generator: {e}"
+        logger.error(error_msg)
+        return _create_error_response(error_msg, "unexpected_error")
+
+
+async def customize_template_external(
+    template_agent: dict[str, Any],
+    modification_request: str,
+    context: str = "",
+) -> dict[str, Any] | None:
+    """Call the external service to customize a template/marketplace agent.
+
+    Args:
+        template_agent: The template agent JSON to customize
+        modification_request: Natural language description of customizations
+        context: Additional context (e.g., answers to previous questions)
+
+    Returns:
+        Customized agent JSON, clarifying questions dict, or error dict on error
+    """
+    client = _get_client()
+
+    request = modification_request
+    if context:
+        request = f"{modification_request}\n\nAdditional context from user:\n{context}"
+
+    payload: dict[str, Any] = {
+        "template_agent_json": template_agent,
+        "modification_request": request,
+    }
+
+    try:
+        response = await client.post("/api/template-modification", json=payload)
+        response.raise_for_status()
+        data = response.json()
+
+        if not data.get("success"):
+            error_msg = data.get("error", "Unknown error from Agent Generator")
+            error_type = data.get("error_type", "unknown")
+            logger.error(
+                f"Agent Generator template customization failed: {error_msg} "
+                f"(type: {error_type})"
+            )
+            return _create_error_response(error_msg, error_type)
+
+        # Check if it's clarifying questions
+        if data.get("type") == "clarifying_questions":
+            return {
+                "type": "clarifying_questions",
+                "questions": data.get("questions", []),
+            }
+
+        # Check if it's an error passed through
+        if data.get("type") == "error":
+            return _create_error_response(
+                data.get("error", "Unknown error"),
+                data.get("error_type", "unknown"),
+            )
+
+        # Otherwise return the customized agent JSON
+        return data.get("agent_json")
+
+    except httpx.HTTPStatusError as e:
+        error_type, error_msg = _classify_http_error(e)
+        logger.error(error_msg)
+        return _create_error_response(error_msg, error_type)
+    except httpx.RequestError as e:
+        error_type, error_msg = _classify_request_error(e)
+        logger.error(error_msg)
+        return _create_error_response(error_msg, error_type)
+    except Exception as e:
+        error_msg = f"Unexpected error calling Agent Generator: {e}"
+        logger.error(error_msg)
+        return _create_error_response(error_msg, "unexpected_error")
+
+
+async def get_blocks_external() -> list[dict[str, Any]] | None:
+    """Get available blocks from the external service.
+
+    Returns:
+        List of block info dicts or None on error
+    """
+    client = _get_client()
+
+    try:
+        response = await client.get("/api/blocks")
+        response.raise_for_status()
+        data = response.json()
+
+        if not data.get("success"):
+            logger.error("External service returned error getting blocks")
+            return None
+
+        return data.get("blocks", [])
+
+    except httpx.HTTPStatusError as e:
+        logger.error(f"HTTP error getting blocks from external service: {e}")
+        return None
+    except httpx.RequestError as e:
+        logger.error(f"Request error getting blocks from external service: {e}")
+        return None
+    except Exception as e:
+        logger.error(f"Unexpected error getting blocks from external service: {e}")
+        return None
+
+
+async def health_check() -> bool:
+    """Check if the external service is healthy.
+
+    Returns:
+        True if healthy, False otherwise
+    """
+    if not is_external_service_configured():
+        return False
+
+    client = _get_client()
+
+    try:
+        response = await client.get("/health")
+        response.raise_for_status()
+        data = response.json()
+        return data.get("status") == "healthy" and data.get("blocks_loaded", False)
+    except Exception as e:
+        logger.warning(f"External agent generator health check failed: {e}")
+        return False
+
+
+async def close_client() -> None:
+    """Close the HTTP client."""
+    global _client
+    if _client is not None:
+        await _client.aclose()
+        _client = None
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/agent_output.py b/autogpt_platform/backend/backend/api/features/chat/tools/agent_output.py
new file mode 100644
index 0000000000..457e4a4f9b
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/agent_output.py
@@ -0,0 +1,446 @@
+"""Tool for retrieving agent execution outputs from user's library."""
+
+import logging
+import re
+from datetime import datetime, timedelta, timezone
+from typing import Any
+
+from pydantic import BaseModel, field_validator
+
+from backend.api.features.chat.model import ChatSession
+from backend.api.features.library import db as library_db
+from backend.api.features.library.model import LibraryAgent
+from backend.data import execution as execution_db
+from backend.data.execution import ExecutionStatus, GraphExecution, GraphExecutionMeta
+
+from .base import BaseTool
+from .models import (
+    AgentOutputResponse,
+    ErrorResponse,
+    ExecutionOutputInfo,
+    NoResultsResponse,
+    ToolResponseBase,
+)
+from .utils import fetch_graph_from_store_slug
+
+logger = logging.getLogger(__name__)
+
+
+class AgentOutputInput(BaseModel):
+    """Input parameters for the agent_output tool."""
+
+    agent_name: str = ""
+    library_agent_id: str = ""
+    store_slug: str = ""
+    execution_id: str = ""
+    run_time: str = "latest"
+
+    @field_validator(
+        "agent_name",
+        "library_agent_id",
+        "store_slug",
+        "execution_id",
+        "run_time",
+        mode="before",
+    )
+    @classmethod
+    def strip_strings(cls, v: Any) -> Any:
+        """Strip whitespace from string fields."""
+        return v.strip() if isinstance(v, str) else v
+
+
+def parse_time_expression(
+    time_expr: str | None,
+) -> tuple[datetime | None, datetime | None]:
+    """
+    Parse time expression into datetime range (start, end).
+
+    Supports: "latest", "yesterday", "today", "last week", "last 7 days",
+    "last month", "last 30 days", ISO date "YYYY-MM-DD", ISO datetime.
+    """
+    if not time_expr or time_expr.lower() == "latest":
+        return None, None
+
+    now = datetime.now(timezone.utc)
+    today_start = now.replace(hour=0, minute=0, second=0, microsecond=0)
+    expr = time_expr.lower().strip()
+
+    # Relative time expressions lookup
+    relative_times: dict[str, tuple[datetime, datetime]] = {
+        "yesterday": (today_start - timedelta(days=1), today_start),
+        "today": (today_start, now),
+        "last week": (now - timedelta(days=7), now),
+        "last 7 days": (now - timedelta(days=7), now),
+        "last month": (now - timedelta(days=30), now),
+        "last 30 days": (now - timedelta(days=30), now),
+    }
+    if expr in relative_times:
+        return relative_times[expr]
+
+    # Try ISO date format (YYYY-MM-DD)
+    date_match = re.match(r"^(\d{4})-(\d{2})-(\d{2})$", expr)
+    if date_match:
+        try:
+            year, month, day = map(int, date_match.groups())
+            start = datetime(year, month, day, 0, 0, 0, tzinfo=timezone.utc)
+            return start, start + timedelta(days=1)
+        except ValueError:
+            # Invalid date components (e.g., month=13, day=32)
+            pass
+
+    # Try ISO datetime
+    try:
+        parsed = datetime.fromisoformat(expr.replace("Z", "+00:00"))
+        if parsed.tzinfo is None:
+            parsed = parsed.replace(tzinfo=timezone.utc)
+        return parsed - timedelta(hours=1), parsed + timedelta(hours=1)
+    except ValueError:
+        return None, None
+
+
+class AgentOutputTool(BaseTool):
+    """Tool for retrieving execution outputs from user's library agents."""
+
+    @property
+    def name(self) -> str:
+        return "view_agent_output"
+
+    @property
+    def description(self) -> str:
+        return """Retrieve execution outputs from agents in the user's library.
+
+        Identify the agent using one of:
+        - agent_name: Fuzzy search in user's library
+        - library_agent_id: Exact library agent ID
+        - store_slug: Marketplace format 'username/agent-name'
+
+        Select which run to retrieve using:
+        - execution_id: Specific execution ID
+        - run_time: 'latest' (default), 'yesterday', 'last week', or ISO date 'YYYY-MM-DD'
+        """
+
+    @property
+    def parameters(self) -> dict[str, Any]:
+        return {
+            "type": "object",
+            "properties": {
+                "agent_name": {
+                    "type": "string",
+                    "description": "Agent name to search for in user's library (fuzzy match)",
+                },
+                "library_agent_id": {
+                    "type": "string",
+                    "description": "Exact library agent ID",
+                },
+                "store_slug": {
+                    "type": "string",
+                    "description": "Marketplace identifier: 'username/agent-slug'",
+                },
+                "execution_id": {
+                    "type": "string",
+                    "description": "Specific execution ID to retrieve",
+                },
+                "run_time": {
+                    "type": "string",
+                    "description": (
+                        "Time filter: 'latest', 'yesterday', 'last week', or 'YYYY-MM-DD'"
+                    ),
+                },
+            },
+            "required": [],
+        }
+
+    @property
+    def requires_auth(self) -> bool:
+        return True
+
+    async def _resolve_agent(
+        self,
+        user_id: str,
+        agent_name: str | None,
+        library_agent_id: str | None,
+        store_slug: str | None,
+    ) -> tuple[LibraryAgent | None, str | None]:
+        """
+        Resolve agent from provided identifiers.
+        Returns (library_agent, error_message).
+        """
+        # Priority 1: Exact library agent ID
+        if library_agent_id:
+            try:
+                agent = await library_db.get_library_agent(library_agent_id, user_id)
+                return agent, None
+            except Exception as e:
+                logger.warning(f"Failed to get library agent by ID: {e}")
+                return None, f"Library agent '{library_agent_id}' not found"
+
+        # Priority 2: Store slug (username/agent-name)
+        if store_slug and "/" in store_slug:
+            username, agent_slug = store_slug.split("/", 1)
+            graph, _ = await fetch_graph_from_store_slug(username, agent_slug)
+            if not graph:
+                return None, f"Agent '{store_slug}' not found in marketplace"
+
+            # Find in user's library by graph_id
+            agent = await library_db.get_library_agent_by_graph_id(user_id, graph.id)
+            if not agent:
+                return (
+                    None,
+                    f"Agent '{store_slug}' is not in your library. "
+                    "Add it first to see outputs.",
+                )
+            return agent, None
+
+        # Priority 3: Fuzzy name search in library
+        if agent_name:
+            try:
+                response = await library_db.list_library_agents(
+                    user_id=user_id,
+                    search_term=agent_name,
+                    page_size=5,
+                )
+                if not response.agents:
+                    return (
+                        None,
+                        f"No agents matching '{agent_name}' found in your library",
+                    )
+
+                # Return best match (first result from search)
+                return response.agents[0], None
+            except Exception as e:
+                logger.error(f"Error searching library agents: {e}")
+                return None, f"Error searching for agent: {e}"
+
+        return (
+            None,
+            "Please specify an agent name, library_agent_id, or store_slug",
+        )
+
+    async def _get_execution(
+        self,
+        user_id: str,
+        graph_id: str,
+        execution_id: str | None,
+        time_start: datetime | None,
+        time_end: datetime | None,
+    ) -> tuple[GraphExecution | None, list[GraphExecutionMeta], str | None]:
+        """
+        Fetch execution(s) based on filters.
+        Returns (single_execution, available_executions_meta, error_message).
+        """
+        # If specific execution_id provided, fetch it directly
+        if execution_id:
+            execution = await execution_db.get_graph_execution(
+                user_id=user_id,
+                execution_id=execution_id,
+                include_node_executions=False,
+            )
+            if not execution:
+                return None, [], f"Execution '{execution_id}' not found"
+            return execution, [], None
+
+        # Get completed executions with time filters
+        executions = await execution_db.get_graph_executions(
+            graph_id=graph_id,
+            user_id=user_id,
+            statuses=[ExecutionStatus.COMPLETED],
+            created_time_gte=time_start,
+            created_time_lte=time_end,
+            limit=10,
+        )
+
+        if not executions:
+            return None, [], None  # No error, just no executions
+
+        # If only one execution, fetch full details
+        if len(executions) == 1:
+            full_execution = await execution_db.get_graph_execution(
+                user_id=user_id,
+                execution_id=executions[0].id,
+                include_node_executions=False,
+            )
+            return full_execution, [], None
+
+        # Multiple executions - return latest with full details, plus list of available
+        full_execution = await execution_db.get_graph_execution(
+            user_id=user_id,
+            execution_id=executions[0].id,
+            include_node_executions=False,
+        )
+        return full_execution, executions, None
+
+    def _build_response(
+        self,
+        agent: LibraryAgent,
+        execution: GraphExecution | None,
+        available_executions: list[GraphExecutionMeta],
+        session_id: str | None,
+    ) -> AgentOutputResponse:
+        """Build the response based on execution data."""
+        library_agent_link = f"/library/agents/{agent.id}"
+
+        if not execution:
+            return AgentOutputResponse(
+                message=f"No completed executions found for agent '{agent.name}'",
+                session_id=session_id,
+                agent_name=agent.name,
+                agent_id=agent.graph_id,
+                library_agent_id=agent.id,
+                library_agent_link=library_agent_link,
+                total_executions=0,
+            )
+
+        execution_info = ExecutionOutputInfo(
+            execution_id=execution.id,
+            status=execution.status.value,
+            started_at=execution.started_at,
+            ended_at=execution.ended_at,
+            outputs=dict(execution.outputs),
+            inputs_summary=execution.inputs if execution.inputs else None,
+        )
+
+        available_list = None
+        if len(available_executions) > 1:
+            available_list = [
+                {
+                    "id": e.id,
+                    "status": e.status.value,
+                    "started_at": e.started_at.isoformat() if e.started_at else None,
+                }
+                for e in available_executions[:5]
+            ]
+
+        message = f"Found execution outputs for agent '{agent.name}'"
+        if len(available_executions) > 1:
+            message += (
+                f". Showing latest of {len(available_executions)} matching executions."
+            )
+
+        return AgentOutputResponse(
+            message=message,
+            session_id=session_id,
+            agent_name=agent.name,
+            agent_id=agent.graph_id,
+            library_agent_id=agent.id,
+            library_agent_link=library_agent_link,
+            execution=execution_info,
+            available_executions=available_list,
+            total_executions=len(available_executions) if available_executions else 1,
+        )
+
+    async def _execute(
+        self,
+        user_id: str | None,
+        session: ChatSession,
+        **kwargs,
+    ) -> ToolResponseBase:
+        """Execute the agent_output tool."""
+        session_id = session.session_id
+
+        # Parse and validate input
+        try:
+            input_data = AgentOutputInput(**kwargs)
+        except Exception as e:
+            logger.error(f"Invalid input: {e}")
+            return ErrorResponse(
+                message="Invalid input parameters",
+                error=str(e),
+                session_id=session_id,
+            )
+
+        # Ensure user_id is present (should be guaranteed by requires_auth)
+        if not user_id:
+            return ErrorResponse(
+                message="User authentication required",
+                session_id=session_id,
+            )
+
+        # Check if at least one identifier is provided
+        if not any(
+            [
+                input_data.agent_name,
+                input_data.library_agent_id,
+                input_data.store_slug,
+                input_data.execution_id,
+            ]
+        ):
+            return ErrorResponse(
+                message=(
+                    "Please specify at least one of: agent_name, "
+                    "library_agent_id, store_slug, or execution_id"
+                ),
+                session_id=session_id,
+            )
+
+        # If only execution_id provided, we need to find the agent differently
+        if (
+            input_data.execution_id
+            and not input_data.agent_name
+            and not input_data.library_agent_id
+            and not input_data.store_slug
+        ):
+            # Fetch execution directly to get graph_id
+            execution = await execution_db.get_graph_execution(
+                user_id=user_id,
+                execution_id=input_data.execution_id,
+                include_node_executions=False,
+            )
+            if not execution:
+                return ErrorResponse(
+                    message=f"Execution '{input_data.execution_id}' not found",
+                    session_id=session_id,
+                )
+
+            # Find library agent by graph_id
+            agent = await library_db.get_library_agent_by_graph_id(
+                user_id, execution.graph_id
+            )
+            if not agent:
+                return NoResultsResponse(
+                    message=(
+                        f"Execution found but agent not in your library. "
+                        f"Graph ID: {execution.graph_id}"
+                    ),
+                    session_id=session_id,
+                    suggestions=["Add the agent to your library to see more details"],
+                )
+
+            return self._build_response(agent, execution, [], session_id)
+
+        # Resolve agent from identifiers
+        agent, error = await self._resolve_agent(
+            user_id=user_id,
+            agent_name=input_data.agent_name or None,
+            library_agent_id=input_data.library_agent_id or None,
+            store_slug=input_data.store_slug or None,
+        )
+
+        if error or not agent:
+            return NoResultsResponse(
+                message=error or "Agent not found",
+                session_id=session_id,
+                suggestions=[
+                    "Check the agent name or ID",
+                    "Make sure the agent is in your library",
+                ],
+            )
+
+        # Parse time expression
+        time_start, time_end = parse_time_expression(input_data.run_time)
+
+        # Fetch execution(s)
+        execution, available_executions, exec_error = await self._get_execution(
+            user_id=user_id,
+            graph_id=agent.graph_id,
+            execution_id=input_data.execution_id or None,
+            time_start=time_start,
+            time_end=time_end,
+        )
+
+        if exec_error:
+            return ErrorResponse(
+                message=exec_error,
+                session_id=session_id,
+            )
+
+        return self._build_response(agent, execution, available_executions, session_id)
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/agent_search.py b/autogpt_platform/backend/backend/api/features/chat/tools/agent_search.py
new file mode 100644
index 0000000000..62d59c470e
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/agent_search.py
@@ -0,0 +1,239 @@
+"""Shared agent search functionality for find_agent and find_library_agent tools."""
+
+import logging
+import re
+from typing import Literal
+
+from backend.api.features.library import db as library_db
+from backend.api.features.store import db as store_db
+from backend.util.exceptions import DatabaseError, NotFoundError
+
+from .models import (
+    AgentInfo,
+    AgentsFoundResponse,
+    ErrorResponse,
+    NoResultsResponse,
+    ToolResponseBase,
+)
+
+logger = logging.getLogger(__name__)
+
+SearchSource = Literal["marketplace", "library"]
+
+_UUID_PATTERN = re.compile(
+    r"^[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}$",
+    re.IGNORECASE,
+)
+
+
+def _is_uuid(text: str) -> bool:
+    """Check if text is a valid UUID v4."""
+    return bool(_UUID_PATTERN.match(text.strip()))
+
+
+async def _get_library_agent_by_id(user_id: str, agent_id: str) -> AgentInfo | None:
+    """Fetch a library agent by ID (library agent ID or graph_id).
+
+    Tries multiple lookup strategies:
+    1. First by graph_id (AgentGraph primary key)
+    2. Then by library agent ID (LibraryAgent primary key)
+
+    Args:
+        user_id: The user ID
+        agent_id: The ID to look up (can be graph_id or library agent ID)
+
+    Returns:
+        AgentInfo if found, None otherwise
+    """
+    try:
+        agent = await library_db.get_library_agent_by_graph_id(user_id, agent_id)
+        if agent:
+            logger.debug(f"Found library agent by graph_id: {agent.name}")
+            return AgentInfo(
+                id=agent.id,
+                name=agent.name,
+                description=agent.description or "",
+                source="library",
+                in_library=True,
+                creator=agent.creator_name,
+                status=agent.status.value,
+                can_access_graph=agent.can_access_graph,
+                has_external_trigger=agent.has_external_trigger,
+                new_output=agent.new_output,
+                graph_id=agent.graph_id,
+            )
+    except DatabaseError:
+        raise
+    except Exception as e:
+        logger.warning(
+            f"Could not fetch library agent by graph_id {agent_id}: {e}",
+            exc_info=True,
+        )
+
+    try:
+        agent = await library_db.get_library_agent(agent_id, user_id)
+        if agent:
+            logger.debug(f"Found library agent by library_id: {agent.name}")
+            return AgentInfo(
+                id=agent.id,
+                name=agent.name,
+                description=agent.description or "",
+                source="library",
+                in_library=True,
+                creator=agent.creator_name,
+                status=agent.status.value,
+                can_access_graph=agent.can_access_graph,
+                has_external_trigger=agent.has_external_trigger,
+                new_output=agent.new_output,
+                graph_id=agent.graph_id,
+            )
+    except NotFoundError:
+        logger.debug(f"Library agent not found by library_id: {agent_id}")
+    except DatabaseError:
+        raise
+    except Exception as e:
+        logger.warning(
+            f"Could not fetch library agent by library_id {agent_id}: {e}",
+            exc_info=True,
+        )
+
+    return None
+
+
+async def search_agents(
+    query: str,
+    source: SearchSource,
+    session_id: str | None,
+    user_id: str | None = None,
+) -> ToolResponseBase:
+    """
+    Search for agents in marketplace or user library.
+
+    Args:
+        query: Search query string
+        source: "marketplace" or "library"
+        session_id: Chat session ID
+        user_id: User ID (required for library search)
+
+    Returns:
+        AgentsFoundResponse, NoResultsResponse, or ErrorResponse
+    """
+    if not query:
+        return ErrorResponse(
+            message="Please provide a search query", session_id=session_id
+        )
+
+    if source == "library" and not user_id:
+        return ErrorResponse(
+            message="User authentication required to search library",
+            session_id=session_id,
+        )
+
+    agents: list[AgentInfo] = []
+    try:
+        if source == "marketplace":
+            logger.info(f"Searching marketplace for: {query}")
+            results = await store_db.get_store_agents(search_query=query, page_size=5)
+            for agent in results.agents:
+                agents.append(
+                    AgentInfo(
+                        id=f"{agent.creator}/{agent.slug}",
+                        name=agent.agent_name,
+                        description=agent.description or "",
+                        source="marketplace",
+                        in_library=False,
+                        creator=agent.creator,
+                        category="general",
+                        rating=agent.rating,
+                        runs=agent.runs,
+                        is_featured=False,
+                    )
+                )
+        else:
+            if _is_uuid(query):
+                logger.info(f"Query looks like UUID, trying direct lookup: {query}")
+                agent = await _get_library_agent_by_id(user_id, query)  # type: ignore[arg-type]
+                if agent:
+                    agents.append(agent)
+                    logger.info(f"Found agent by direct ID lookup: {agent.name}")
+
+            if not agents:
+                logger.info(f"Searching user library for: {query}")
+                results = await library_db.list_library_agents(
+                    user_id=user_id,  # type: ignore[arg-type]
+                    search_term=query,
+                    page_size=10,
+                )
+                for agent in results.agents:
+                    agents.append(
+                        AgentInfo(
+                            id=agent.id,
+                            name=agent.name,
+                            description=agent.description or "",
+                            source="library",
+                            in_library=True,
+                            creator=agent.creator_name,
+                            status=agent.status.value,
+                            can_access_graph=agent.can_access_graph,
+                            has_external_trigger=agent.has_external_trigger,
+                            new_output=agent.new_output,
+                            graph_id=agent.graph_id,
+                        )
+                    )
+        logger.info(f"Found {len(agents)} agents in {source}")
+    except NotFoundError:
+        pass
+    except DatabaseError as e:
+        logger.error(f"Error searching {source}: {e}", exc_info=True)
+        return ErrorResponse(
+            message=f"Failed to search {source}. Please try again.",
+            error=str(e),
+            session_id=session_id,
+        )
+
+    if not agents:
+        suggestions = (
+            [
+                "Try more general terms",
+                "Browse categories in the marketplace",
+                "Check spelling",
+            ]
+            if source == "marketplace"
+            else [
+                "Try different keywords",
+                "Use find_agent to search the marketplace",
+                "Check your library at /library",
+            ]
+        )
+        no_results_msg = (
+            f"No agents found matching '{query}'. Try different keywords or browse the marketplace."
+            if source == "marketplace"
+            else f"No agents matching '{query}' found in your library."
+        )
+        return NoResultsResponse(
+            message=no_results_msg, session_id=session_id, suggestions=suggestions
+        )
+
+    title = f"Found {len(agents)} agent{'s' if len(agents) != 1 else ''} "
+    title += (
+        f"for '{query}'"
+        if source == "marketplace"
+        else f"in your library for '{query}'"
+    )
+
+    message = (
+        "Now you have found some options for the user to choose from. "
+        "You can add a link to a recommended agent at: /marketplace/agent/agent_id "
+        "Please ask the user if they would like to use any of these agents."
+        if source == "marketplace"
+        else "Found agents in the user's library. You can provide a link to view an agent at: "
+        "/library/agents/{agent_id}. Use agent_output to get execution results, or run_agent to execute."
+    )
+
+    return AgentsFoundResponse(
+        message=message,
+        title=title,
+        agents=agents,
+        count=len(agents),
+        session_id=session_id,
+    )
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/base.py b/autogpt_platform/backend/backend/api/features/chat/tools/base.py
index b4c9d8d731..809e06632b 100644
--- a/autogpt_platform/backend/backend/api/features/chat/tools/base.py
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/base.py
@@ -6,7 +6,7 @@ from typing import Any
 from openai.types.chat import ChatCompletionToolParam
 
 from backend.api.features.chat.model import ChatSession
-from backend.api.features.chat.response_model import StreamToolExecutionResult
+from backend.api.features.chat.response_model import StreamToolOutputAvailable
 
 from .models import ErrorResponse, NeedLoginResponse, ToolResponseBase
 
@@ -36,6 +36,16 @@ class BaseTool:
         """Whether this tool requires authentication."""
         return False
 
+    @property
+    def is_long_running(self) -> bool:
+        """Whether this tool is long-running and should execute in background.
+
+        Long-running tools (like agent generation) are executed via background
+        tasks to survive SSE disconnections. The result is persisted to chat
+        history and visible when the user refreshes.
+        """
+        return False
+
     def as_openai_tool(self) -> ChatCompletionToolParam:
         """Convert to OpenAI tool format."""
         return ChatCompletionToolParam(
@@ -53,7 +63,7 @@ class BaseTool:
         session: ChatSession,
         tool_call_id: str,
         **kwargs,
-    ) -> StreamToolExecutionResult:
+    ) -> StreamToolOutputAvailable:
         """Execute the tool with authentication check.
 
         Args:
@@ -69,10 +79,10 @@ class BaseTool:
             logger.error(
                 f"Attempted tool call for {self.name} but user not authenticated"
             )
-            return StreamToolExecutionResult(
-                tool_id=tool_call_id,
-                tool_name=self.name,
-                result=NeedLoginResponse(
+            return StreamToolOutputAvailable(
+                toolCallId=tool_call_id,
+                toolName=self.name,
+                output=NeedLoginResponse(
                     message=f"Please sign in to use {self.name}",
                     session_id=session.session_id,
                 ).model_dump_json(),
@@ -81,17 +91,17 @@ class BaseTool:
 
         try:
             result = await self._execute(user_id, session, **kwargs)
-            return StreamToolExecutionResult(
-                tool_id=tool_call_id,
-                tool_name=self.name,
-                result=result.model_dump_json(),
+            return StreamToolOutputAvailable(
+                toolCallId=tool_call_id,
+                toolName=self.name,
+                output=result.model_dump_json(),
             )
         except Exception as e:
             logger.error(f"Error in {self.name}: {e}", exc_info=True)
-            return StreamToolExecutionResult(
-                tool_id=tool_call_id,
-                tool_name=self.name,
-                result=ErrorResponse(
+            return StreamToolOutputAvailable(
+                toolCallId=tool_call_id,
+                toolName=self.name,
+                output=ErrorResponse(
                     message=f"An error occurred while executing {self.name}",
                     error=str(e),
                     session_id=session.session_id,
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/create_agent.py b/autogpt_platform/backend/backend/api/features/chat/tools/create_agent.py
new file mode 100644
index 0000000000..7333851a5b
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/create_agent.py
@@ -0,0 +1,335 @@
+"""CreateAgentTool - Creates agents from natural language descriptions."""
+
+import logging
+from typing import Any
+
+from backend.api.features.chat.model import ChatSession
+
+from .agent_generator import (
+    AgentGeneratorNotConfiguredError,
+    decompose_goal,
+    enrich_library_agents_from_steps,
+    generate_agent,
+    get_all_relevant_agents_for_generation,
+    get_user_message_for_error,
+    save_agent_to_library,
+)
+from .base import BaseTool
+from .models import (
+    AgentPreviewResponse,
+    AgentSavedResponse,
+    AsyncProcessingResponse,
+    ClarificationNeededResponse,
+    ClarifyingQuestion,
+    ErrorResponse,
+    ToolResponseBase,
+)
+
+logger = logging.getLogger(__name__)
+
+
+class CreateAgentTool(BaseTool):
+    """Tool for creating agents from natural language descriptions."""
+
+    @property
+    def name(self) -> str:
+        return "create_agent"
+
+    @property
+    def description(self) -> str:
+        return (
+            "Create a new agent workflow from a natural language description. "
+            "First generates a preview, then saves to library if save=true."
+        )
+
+    @property
+    def requires_auth(self) -> bool:
+        return True
+
+    @property
+    def is_long_running(self) -> bool:
+        return True
+
+    @property
+    def parameters(self) -> dict[str, Any]:
+        return {
+            "type": "object",
+            "properties": {
+                "description": {
+                    "type": "string",
+                    "description": (
+                        "Natural language description of what the agent should do. "
+                        "Be specific about inputs, outputs, and the workflow steps."
+                    ),
+                },
+                "context": {
+                    "type": "string",
+                    "description": (
+                        "Additional context or answers to previous clarifying questions. "
+                        "Include any preferences or constraints mentioned by the user."
+                    ),
+                },
+                "save": {
+                    "type": "boolean",
+                    "description": (
+                        "Whether to save the agent to the user's library. "
+                        "Default is true. Set to false for preview only."
+                    ),
+                    "default": True,
+                },
+            },
+            "required": ["description"],
+        }
+
+    async def _execute(
+        self,
+        user_id: str | None,
+        session: ChatSession,
+        **kwargs,
+    ) -> ToolResponseBase:
+        """Execute the create_agent tool.
+
+        Flow:
+        1. Decompose the description into steps (may return clarifying questions)
+        2. Generate agent JSON (external service handles fixing and validation)
+        3. Preview or save based on the save parameter
+        """
+        description = kwargs.get("description", "").strip()
+        context = kwargs.get("context", "")
+        save = kwargs.get("save", True)
+        session_id = session.session_id if session else None
+
+        # Extract async processing params (passed by long-running tool handler)
+        operation_id = kwargs.get("_operation_id")
+        task_id = kwargs.get("_task_id")
+
+        if not description:
+            return ErrorResponse(
+                message="Please provide a description of what the agent should do.",
+                error="Missing description parameter",
+                session_id=session_id,
+            )
+
+        library_agents = None
+        if user_id:
+            try:
+                library_agents = await get_all_relevant_agents_for_generation(
+                    user_id=user_id,
+                    search_query=description,
+                    include_marketplace=True,
+                )
+                logger.debug(
+                    f"Found {len(library_agents)} relevant agents for sub-agent composition"
+                )
+            except Exception as e:
+                logger.warning(f"Failed to fetch library agents: {e}")
+
+        try:
+            decomposition_result = await decompose_goal(
+                description, context, library_agents
+            )
+        except AgentGeneratorNotConfiguredError:
+            return ErrorResponse(
+                message=(
+                    "Agent generation is not available. "
+                    "The Agent Generator service is not configured."
+                ),
+                error="service_not_configured",
+                session_id=session_id,
+            )
+
+        if decomposition_result is None:
+            return ErrorResponse(
+                message="Failed to analyze the goal. The agent generation service may be unavailable. Please try again.",
+                error="decomposition_failed",
+                details={"description": description[:100]},
+                session_id=session_id,
+            )
+
+        if decomposition_result.get("type") == "error":
+            error_msg = decomposition_result.get("error", "Unknown error")
+            error_type = decomposition_result.get("error_type", "unknown")
+            user_message = get_user_message_for_error(
+                error_type,
+                operation="analyze the goal",
+                llm_parse_message="The AI had trouble understanding this request. Please try rephrasing your goal.",
+            )
+            return ErrorResponse(
+                message=user_message,
+                error=f"decomposition_failed:{error_type}",
+                details={
+                    "description": description[:100],
+                    "service_error": error_msg,
+                    "error_type": error_type,
+                },
+                session_id=session_id,
+            )
+
+        if decomposition_result.get("type") == "clarifying_questions":
+            questions = decomposition_result.get("questions", [])
+            return ClarificationNeededResponse(
+                message=(
+                    "I need some more information to create this agent. "
+                    "Please answer the following questions:"
+                ),
+                questions=[
+                    ClarifyingQuestion(
+                        question=q.get("question", ""),
+                        keyword=q.get("keyword", ""),
+                        example=q.get("example"),
+                    )
+                    for q in questions
+                ],
+                session_id=session_id,
+            )
+
+        if decomposition_result.get("type") == "unachievable_goal":
+            suggested = decomposition_result.get("suggested_goal", "")
+            reason = decomposition_result.get("reason", "")
+            return ErrorResponse(
+                message=(
+                    f"This goal cannot be accomplished with the available blocks. "
+                    f"{reason} "
+                    f"Suggestion: {suggested}"
+                ),
+                error="unachievable_goal",
+                details={"suggested_goal": suggested, "reason": reason},
+                session_id=session_id,
+            )
+
+        if decomposition_result.get("type") == "vague_goal":
+            suggested = decomposition_result.get("suggested_goal", "")
+            return ErrorResponse(
+                message=(
+                    f"The goal is too vague to create a specific workflow. "
+                    f"Suggestion: {suggested}"
+                ),
+                error="vague_goal",
+                details={"suggested_goal": suggested},
+                session_id=session_id,
+            )
+
+        if user_id and library_agents is not None:
+            try:
+                library_agents = await enrich_library_agents_from_steps(
+                    user_id=user_id,
+                    decomposition_result=decomposition_result,
+                    existing_agents=library_agents,
+                    include_marketplace=True,
+                )
+                logger.debug(
+                    f"After enrichment: {len(library_agents)} total agents for sub-agent composition"
+                )
+            except Exception as e:
+                logger.warning(f"Failed to enrich library agents from steps: {e}")
+
+        try:
+            agent_json = await generate_agent(
+                decomposition_result,
+                library_agents,
+                operation_id=operation_id,
+                task_id=task_id,
+            )
+        except AgentGeneratorNotConfiguredError:
+            return ErrorResponse(
+                message=(
+                    "Agent generation is not available. "
+                    "The Agent Generator service is not configured."
+                ),
+                error="service_not_configured",
+                session_id=session_id,
+            )
+
+        if agent_json is None:
+            return ErrorResponse(
+                message="Failed to generate the agent. The agent generation service may be unavailable. Please try again.",
+                error="generation_failed",
+                details={"description": description[:100]},
+                session_id=session_id,
+            )
+
+        if isinstance(agent_json, dict) and agent_json.get("type") == "error":
+            error_msg = agent_json.get("error", "Unknown error")
+            error_type = agent_json.get("error_type", "unknown")
+            user_message = get_user_message_for_error(
+                error_type,
+                operation="generate the agent",
+                llm_parse_message="The AI had trouble generating the agent. Please try again or simplify your goal.",
+                validation_message=(
+                    "I wasn't able to create a valid agent for this request. "
+                    "The generated workflow had some structural issues. "
+                    "Please try simplifying your goal or breaking it into smaller steps."
+                ),
+                error_details=error_msg,
+            )
+            return ErrorResponse(
+                message=user_message,
+                error=f"generation_failed:{error_type}",
+                details={
+                    "description": description[:100],
+                    "service_error": error_msg,
+                    "error_type": error_type,
+                },
+                session_id=session_id,
+            )
+
+        # Check if Agent Generator accepted for async processing
+        if agent_json.get("status") == "accepted":
+            logger.info(
+                f"Agent generation delegated to async processing "
+                f"(operation_id={operation_id}, task_id={task_id})"
+            )
+            return AsyncProcessingResponse(
+                message="Agent generation started. You'll be notified when it's complete.",
+                operation_id=operation_id,
+                task_id=task_id,
+                session_id=session_id,
+            )
+
+        agent_name = agent_json.get("name", "Generated Agent")
+        agent_description = agent_json.get("description", "")
+        node_count = len(agent_json.get("nodes", []))
+        link_count = len(agent_json.get("links", []))
+
+        if not save:
+            return AgentPreviewResponse(
+                message=(
+                    f"I've generated an agent called '{agent_name}' with {node_count} blocks. "
+                    f"Review it and call create_agent with save=true to save it to your library."
+                ),
+                agent_json=agent_json,
+                agent_name=agent_name,
+                description=agent_description,
+                node_count=node_count,
+                link_count=link_count,
+                session_id=session_id,
+            )
+
+        if not user_id:
+            return ErrorResponse(
+                message="You must be logged in to save agents.",
+                error="auth_required",
+                session_id=session_id,
+            )
+
+        try:
+            created_graph, library_agent = await save_agent_to_library(
+                agent_json, user_id
+            )
+
+            return AgentSavedResponse(
+                message=f"Agent '{created_graph.name}' has been saved to your library!",
+                agent_id=created_graph.id,
+                agent_name=created_graph.name,
+                library_agent_id=library_agent.id,
+                library_agent_link=f"/library/agents/{library_agent.id}",
+                agent_page_link=f"/build?flowID={created_graph.id}",
+                session_id=session_id,
+            )
+        except Exception as e:
+            return ErrorResponse(
+                message=f"Failed to save the agent: {str(e)}",
+                error="save_failed",
+                details={"exception": str(e)},
+                session_id=session_id,
+            )
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/customize_agent.py b/autogpt_platform/backend/backend/api/features/chat/tools/customize_agent.py
new file mode 100644
index 0000000000..c0568bd936
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/customize_agent.py
@@ -0,0 +1,337 @@
+"""CustomizeAgentTool - Customizes marketplace/template agents using natural language."""
+
+import logging
+from typing import Any
+
+from backend.api.features.chat.model import ChatSession
+from backend.api.features.store import db as store_db
+from backend.api.features.store.exceptions import AgentNotFoundError
+
+from .agent_generator import (
+    AgentGeneratorNotConfiguredError,
+    customize_template,
+    get_user_message_for_error,
+    graph_to_json,
+    save_agent_to_library,
+)
+from .base import BaseTool
+from .models import (
+    AgentPreviewResponse,
+    AgentSavedResponse,
+    ClarificationNeededResponse,
+    ClarifyingQuestion,
+    ErrorResponse,
+    ToolResponseBase,
+)
+
+logger = logging.getLogger(__name__)
+
+
+class CustomizeAgentTool(BaseTool):
+    """Tool for customizing marketplace/template agents using natural language."""
+
+    @property
+    def name(self) -> str:
+        return "customize_agent"
+
+    @property
+    def description(self) -> str:
+        return (
+            "Customize a marketplace or template agent using natural language. "
+            "Takes an existing agent from the marketplace and modifies it based on "
+            "the user's requirements before adding to their library."
+        )
+
+    @property
+    def requires_auth(self) -> bool:
+        return True
+
+    @property
+    def is_long_running(self) -> bool:
+        return True
+
+    @property
+    def parameters(self) -> dict[str, Any]:
+        return {
+            "type": "object",
+            "properties": {
+                "agent_id": {
+                    "type": "string",
+                    "description": (
+                        "The marketplace agent ID in format 'creator/slug' "
+                        "(e.g., 'autogpt/newsletter-writer'). "
+                        "Get this from find_agent results."
+                    ),
+                },
+                "modifications": {
+                    "type": "string",
+                    "description": (
+                        "Natural language description of how to customize the agent. "
+                        "Be specific about what changes you want to make."
+                    ),
+                },
+                "context": {
+                    "type": "string",
+                    "description": (
+                        "Additional context or answers to previous clarifying questions."
+                    ),
+                },
+                "save": {
+                    "type": "boolean",
+                    "description": (
+                        "Whether to save the customized agent to the user's library. "
+                        "Default is true. Set to false for preview only."
+                    ),
+                    "default": True,
+                },
+            },
+            "required": ["agent_id", "modifications"],
+        }
+
+    async def _execute(
+        self,
+        user_id: str | None,
+        session: ChatSession,
+        **kwargs,
+    ) -> ToolResponseBase:
+        """Execute the customize_agent tool.
+
+        Flow:
+        1. Parse the agent ID to get creator/slug
+        2. Fetch the template agent from the marketplace
+        3. Call customize_template with the modification request
+        4. Preview or save based on the save parameter
+        """
+        agent_id = kwargs.get("agent_id", "").strip()
+        modifications = kwargs.get("modifications", "").strip()
+        context = kwargs.get("context", "")
+        save = kwargs.get("save", True)
+        session_id = session.session_id if session else None
+
+        if not agent_id:
+            return ErrorResponse(
+                message="Please provide the marketplace agent ID (e.g., 'creator/agent-name').",
+                error="missing_agent_id",
+                session_id=session_id,
+            )
+
+        if not modifications:
+            return ErrorResponse(
+                message="Please describe how you want to customize this agent.",
+                error="missing_modifications",
+                session_id=session_id,
+            )
+
+        # Parse agent_id in format "creator/slug"
+        parts = [p.strip() for p in agent_id.split("/")]
+        if len(parts) != 2 or not parts[0] or not parts[1]:
+            return ErrorResponse(
+                message=(
+                    f"Invalid agent ID format: '{agent_id}'. "
+                    "Expected format is 'creator/agent-name' "
+                    "(e.g., 'autogpt/newsletter-writer')."
+                ),
+                error="invalid_agent_id_format",
+                session_id=session_id,
+            )
+
+        creator_username, agent_slug = parts
+
+        # Fetch the marketplace agent details
+        try:
+            agent_details = await store_db.get_store_agent_details(
+                username=creator_username, agent_name=agent_slug
+            )
+        except AgentNotFoundError:
+            return ErrorResponse(
+                message=(
+                    f"Could not find marketplace agent '{agent_id}'. "
+                    "Please check the agent ID and try again."
+                ),
+                error="agent_not_found",
+                session_id=session_id,
+            )
+        except Exception as e:
+            logger.error(f"Error fetching marketplace agent {agent_id}: {e}")
+            return ErrorResponse(
+                message="Failed to fetch the marketplace agent. Please try again.",
+                error="fetch_error",
+                session_id=session_id,
+            )
+
+        if not agent_details.store_listing_version_id:
+            return ErrorResponse(
+                message=(
+                    f"The agent '{agent_id}' does not have an available version. "
+                    "Please try a different agent."
+                ),
+                error="no_version_available",
+                session_id=session_id,
+            )
+
+        # Get the full agent graph
+        try:
+            graph = await store_db.get_agent(agent_details.store_listing_version_id)
+            template_agent = graph_to_json(graph)
+        except Exception as e:
+            logger.error(f"Error fetching agent graph for {agent_id}: {e}")
+            return ErrorResponse(
+                message="Failed to fetch the agent configuration. Please try again.",
+                error="graph_fetch_error",
+                session_id=session_id,
+            )
+
+        # Call customize_template
+        try:
+            result = await customize_template(
+                template_agent=template_agent,
+                modification_request=modifications,
+                context=context,
+            )
+        except AgentGeneratorNotConfiguredError:
+            return ErrorResponse(
+                message=(
+                    "Agent customization is not available. "
+                    "The Agent Generator service is not configured."
+                ),
+                error="service_not_configured",
+                session_id=session_id,
+            )
+        except Exception as e:
+            logger.error(f"Error calling customize_template for {agent_id}: {e}")
+            return ErrorResponse(
+                message=(
+                    "Failed to customize the agent due to a service error. "
+                    "Please try again."
+                ),
+                error="customization_service_error",
+                session_id=session_id,
+            )
+
+        if result is None:
+            return ErrorResponse(
+                message=(
+                    "Failed to customize the agent. "
+                    "The agent generation service may be unavailable or timed out. "
+                    "Please try again."
+                ),
+                error="customization_failed",
+                session_id=session_id,
+            )
+
+        # Handle error response
+        if isinstance(result, dict) and result.get("type") == "error":
+            error_msg = result.get("error", "Unknown error")
+            error_type = result.get("error_type", "unknown")
+            user_message = get_user_message_for_error(
+                error_type,
+                operation="customize the agent",
+                llm_parse_message=(
+                    "The AI had trouble customizing the agent. "
+                    "Please try again or simplify your request."
+                ),
+                validation_message=(
+                    "The customized agent failed validation. "
+                    "Please try rephrasing your request."
+                ),
+                error_details=error_msg,
+            )
+            return ErrorResponse(
+                message=user_message,
+                error=f"customization_failed:{error_type}",
+                session_id=session_id,
+            )
+
+        # Handle clarifying questions
+        if isinstance(result, dict) and result.get("type") == "clarifying_questions":
+            questions = result.get("questions") or []
+            if not isinstance(questions, list):
+                logger.error(
+                    f"Unexpected clarifying questions format: {type(questions)}"
+                )
+                questions = []
+            return ClarificationNeededResponse(
+                message=(
+                    "I need some more information to customize this agent. "
+                    "Please answer the following questions:"
+                ),
+                questions=[
+                    ClarifyingQuestion(
+                        question=q.get("question", ""),
+                        keyword=q.get("keyword", ""),
+                        example=q.get("example"),
+                    )
+                    for q in questions
+                    if isinstance(q, dict)
+                ],
+                session_id=session_id,
+            )
+
+        # Result should be the customized agent JSON
+        if not isinstance(result, dict):
+            logger.error(f"Unexpected customize_template response type: {type(result)}")
+            return ErrorResponse(
+                message="Failed to customize the agent due to an unexpected response.",
+                error="unexpected_response_type",
+                session_id=session_id,
+            )
+
+        customized_agent = result
+
+        agent_name = customized_agent.get(
+            "name", f"Customized {agent_details.agent_name}"
+        )
+        agent_description = customized_agent.get("description", "")
+        nodes = customized_agent.get("nodes")
+        links = customized_agent.get("links")
+        node_count = len(nodes) if isinstance(nodes, list) else 0
+        link_count = len(links) if isinstance(links, list) else 0
+
+        if not save:
+            return AgentPreviewResponse(
+                message=(
+                    f"I've customized the agent '{agent_details.agent_name}'. "
+                    f"The customized agent has {node_count} blocks. "
+                    f"Review it and call customize_agent with save=true to save it."
+                ),
+                agent_json=customized_agent,
+                agent_name=agent_name,
+                description=agent_description,
+                node_count=node_count,
+                link_count=link_count,
+                session_id=session_id,
+            )
+
+        if not user_id:
+            return ErrorResponse(
+                message="You must be logged in to save agents.",
+                error="auth_required",
+                session_id=session_id,
+            )
+
+        # Save to user's library
+        try:
+            created_graph, library_agent = await save_agent_to_library(
+                customized_agent, user_id, is_update=False
+            )
+
+            return AgentSavedResponse(
+                message=(
+                    f"Customized agent '{created_graph.name}' "
+                    f"(based on '{agent_details.agent_name}') "
+                    f"has been saved to your library!"
+                ),
+                agent_id=created_graph.id,
+                agent_name=created_graph.name,
+                library_agent_id=library_agent.id,
+                library_agent_link=f"/library/agents/{library_agent.id}",
+                agent_page_link=f"/build?flowID={created_graph.id}",
+                session_id=session_id,
+            )
+        except Exception as e:
+            logger.error(f"Error saving customized agent: {e}")
+            return ErrorResponse(
+                message="Failed to save the customized agent. Please try again.",
+                error="save_failed",
+                session_id=session_id,
+            )
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/edit_agent.py b/autogpt_platform/backend/backend/api/features/chat/tools/edit_agent.py
new file mode 100644
index 0000000000..3ae56407a7
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/edit_agent.py
@@ -0,0 +1,284 @@
+"""EditAgentTool - Edits existing agents using natural language."""
+
+import logging
+from typing import Any
+
+from backend.api.features.chat.model import ChatSession
+
+from .agent_generator import (
+    AgentGeneratorNotConfiguredError,
+    generate_agent_patch,
+    get_agent_as_json,
+    get_all_relevant_agents_for_generation,
+    get_user_message_for_error,
+    save_agent_to_library,
+)
+from .base import BaseTool
+from .models import (
+    AgentPreviewResponse,
+    AgentSavedResponse,
+    AsyncProcessingResponse,
+    ClarificationNeededResponse,
+    ClarifyingQuestion,
+    ErrorResponse,
+    ToolResponseBase,
+)
+
+logger = logging.getLogger(__name__)
+
+
+class EditAgentTool(BaseTool):
+    """Tool for editing existing agents using natural language."""
+
+    @property
+    def name(self) -> str:
+        return "edit_agent"
+
+    @property
+    def description(self) -> str:
+        return (
+            "Edit an existing agent from the user's library using natural language. "
+            "Generates updates to the agent while preserving unchanged parts."
+        )
+
+    @property
+    def requires_auth(self) -> bool:
+        return True
+
+    @property
+    def is_long_running(self) -> bool:
+        return True
+
+    @property
+    def parameters(self) -> dict[str, Any]:
+        return {
+            "type": "object",
+            "properties": {
+                "agent_id": {
+                    "type": "string",
+                    "description": (
+                        "The ID of the agent to edit. "
+                        "Can be a graph ID or library agent ID."
+                    ),
+                },
+                "changes": {
+                    "type": "string",
+                    "description": (
+                        "Natural language description of what changes to make. "
+                        "Be specific about what to add, remove, or modify."
+                    ),
+                },
+                "context": {
+                    "type": "string",
+                    "description": (
+                        "Additional context or answers to previous clarifying questions."
+                    ),
+                },
+                "save": {
+                    "type": "boolean",
+                    "description": (
+                        "Whether to save the changes. "
+                        "Default is true. Set to false for preview only."
+                    ),
+                    "default": True,
+                },
+            },
+            "required": ["agent_id", "changes"],
+        }
+
+    async def _execute(
+        self,
+        user_id: str | None,
+        session: ChatSession,
+        **kwargs,
+    ) -> ToolResponseBase:
+        """Execute the edit_agent tool.
+
+        Flow:
+        1. Fetch the current agent
+        2. Generate updated agent (external service handles fixing and validation)
+        3. Preview or save based on the save parameter
+        """
+        agent_id = kwargs.get("agent_id", "").strip()
+        changes = kwargs.get("changes", "").strip()
+        context = kwargs.get("context", "")
+        save = kwargs.get("save", True)
+        session_id = session.session_id if session else None
+
+        # Extract async processing params (passed by long-running tool handler)
+        operation_id = kwargs.get("_operation_id")
+        task_id = kwargs.get("_task_id")
+
+        if not agent_id:
+            return ErrorResponse(
+                message="Please provide the agent ID to edit.",
+                error="Missing agent_id parameter",
+                session_id=session_id,
+            )
+
+        if not changes:
+            return ErrorResponse(
+                message="Please describe what changes you want to make.",
+                error="Missing changes parameter",
+                session_id=session_id,
+            )
+
+        current_agent = await get_agent_as_json(agent_id, user_id)
+
+        if current_agent is None:
+            return ErrorResponse(
+                message=f"Could not find agent with ID '{agent_id}' in your library.",
+                error="agent_not_found",
+                session_id=session_id,
+            )
+
+        library_agents = None
+        if user_id:
+            try:
+                graph_id = current_agent.get("id")
+                library_agents = await get_all_relevant_agents_for_generation(
+                    user_id=user_id,
+                    search_query=changes,
+                    exclude_graph_id=graph_id,
+                    include_marketplace=True,
+                )
+                logger.debug(
+                    f"Found {len(library_agents)} relevant agents for sub-agent composition"
+                )
+            except Exception as e:
+                logger.warning(f"Failed to fetch library agents: {e}")
+
+        update_request = changes
+        if context:
+            update_request = f"{changes}\n\nAdditional context:\n{context}"
+
+        try:
+            result = await generate_agent_patch(
+                update_request,
+                current_agent,
+                library_agents,
+                operation_id=operation_id,
+                task_id=task_id,
+            )
+        except AgentGeneratorNotConfiguredError:
+            return ErrorResponse(
+                message=(
+                    "Agent editing is not available. "
+                    "The Agent Generator service is not configured."
+                ),
+                error="service_not_configured",
+                session_id=session_id,
+            )
+
+        if result is None:
+            return ErrorResponse(
+                message="Failed to generate changes. The agent generation service may be unavailable or timed out. Please try again.",
+                error="update_generation_failed",
+                details={"agent_id": agent_id, "changes": changes[:100]},
+                session_id=session_id,
+            )
+
+        # Check if Agent Generator accepted for async processing
+        if result.get("status") == "accepted":
+            logger.info(
+                f"Agent edit delegated to async processing "
+                f"(operation_id={operation_id}, task_id={task_id})"
+            )
+            return AsyncProcessingResponse(
+                message="Agent edit started. You'll be notified when it's complete.",
+                operation_id=operation_id,
+                task_id=task_id,
+                session_id=session_id,
+            )
+
+        # Check if the result is an error from the external service
+        if isinstance(result, dict) and result.get("type") == "error":
+            error_msg = result.get("error", "Unknown error")
+            error_type = result.get("error_type", "unknown")
+            user_message = get_user_message_for_error(
+                error_type,
+                operation="generate the changes",
+                llm_parse_message="The AI had trouble generating the changes. Please try again or simplify your request.",
+                validation_message="The generated changes failed validation. Please try rephrasing your request.",
+                error_details=error_msg,
+            )
+            return ErrorResponse(
+                message=user_message,
+                error=f"update_generation_failed:{error_type}",
+                details={
+                    "agent_id": agent_id,
+                    "changes": changes[:100],
+                    "service_error": error_msg,
+                    "error_type": error_type,
+                },
+                session_id=session_id,
+            )
+
+        if result.get("type") == "clarifying_questions":
+            questions = result.get("questions", [])
+            return ClarificationNeededResponse(
+                message=(
+                    "I need some more information about the changes. "
+                    "Please answer the following questions:"
+                ),
+                questions=[
+                    ClarifyingQuestion(
+                        question=q.get("question", ""),
+                        keyword=q.get("keyword", ""),
+                        example=q.get("example"),
+                    )
+                    for q in questions
+                ],
+                session_id=session_id,
+            )
+
+        updated_agent = result
+
+        agent_name = updated_agent.get("name", "Updated Agent")
+        agent_description = updated_agent.get("description", "")
+        node_count = len(updated_agent.get("nodes", []))
+        link_count = len(updated_agent.get("links", []))
+
+        if not save:
+            return AgentPreviewResponse(
+                message=(
+                    f"I've updated the agent. "
+                    f"The agent now has {node_count} blocks. "
+                    f"Review it and call edit_agent with save=true to save the changes."
+                ),
+                agent_json=updated_agent,
+                agent_name=agent_name,
+                description=agent_description,
+                node_count=node_count,
+                link_count=link_count,
+                session_id=session_id,
+            )
+
+        if not user_id:
+            return ErrorResponse(
+                message="You must be logged in to save agents.",
+                error="auth_required",
+                session_id=session_id,
+            )
+
+        try:
+            created_graph, library_agent = await save_agent_to_library(
+                updated_agent, user_id, is_update=True
+            )
+
+            return AgentSavedResponse(
+                message=f"Updated agent '{created_graph.name}' has been saved to your library!",
+                agent_id=created_graph.id,
+                agent_name=created_graph.name,
+                library_agent_id=library_agent.id,
+                library_agent_link=f"/library/agents/{library_agent.id}",
+                agent_page_link=f"/build?flowID={created_graph.id}",
+                session_id=session_id,
+            )
+        except Exception as e:
+            return ErrorResponse(
+                message=f"Failed to save the updated agent: {str(e)}",
+                error="save_failed",
+                details={"exception": str(e)},
+                session_id=session_id,
+            )
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/find_agent.py b/autogpt_platform/backend/backend/api/features/chat/tools/find_agent.py
index 3ad071f412..477522757d 100644
--- a/autogpt_platform/backend/backend/api/features/chat/tools/find_agent.py
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/find_agent.py
@@ -1,26 +1,16 @@
-"""Tool for discovering agents from marketplace and user library."""
+"""Tool for discovering agents from marketplace."""
 
-import logging
 from typing import Any
 
 from backend.api.features.chat.model import ChatSession
-from backend.api.features.store import db as store_db
-from backend.util.exceptions import DatabaseError, NotFoundError
 
+from .agent_search import search_agents
 from .base import BaseTool
-from .models import (
-    AgentCarouselResponse,
-    AgentInfo,
-    ErrorResponse,
-    NoResultsResponse,
-    ToolResponseBase,
-)
-
-logger = logging.getLogger(__name__)
+from .models import ToolResponseBase
 
 
 class FindAgentTool(BaseTool):
-    """Tool for discovering agents based on user needs."""
+    """Tool for discovering agents from the marketplace."""
 
     @property
     def name(self) -> str:
@@ -46,84 +36,11 @@ class FindAgentTool(BaseTool):
         }
 
     async def _execute(
-        self,
-        user_id: str | None,
-        session: ChatSession,
-        **kwargs,
+        self, user_id: str | None, session: ChatSession, **kwargs
     ) -> ToolResponseBase:
-        """Search for agents in the marketplace.
-
-        Args:
-            user_id: User ID (may be anonymous)
-            session_id: Chat session ID
-            query: Search query
-
-        Returns:
-            AgentCarouselResponse: List of agents found in the marketplace
-            NoResultsResponse: No agents found in the marketplace
-            ErrorResponse: Error message
-        """
-        query = kwargs.get("query", "").strip()
-        session_id = session.session_id
-        if not query:
-            return ErrorResponse(
-                message="Please provide a search query",
-                session_id=session_id,
-            )
-        agents = []
-        try:
-            logger.info(f"Searching marketplace for: {query}")
-            store_results = await store_db.get_store_agents(
-                search_query=query,
-                page_size=5,
-            )
-
-            logger.info(f"Find agents tool found {len(store_results.agents)} agents")
-            for agent in store_results.agents:
-                agent_id = f"{agent.creator}/{agent.slug}"
-                logger.info(f"Building agent ID = {agent_id}")
-                agents.append(
-                    AgentInfo(
-                        id=agent_id,
-                        name=agent.agent_name,
-                        description=agent.description or "",
-                        source="marketplace",
-                        in_library=False,
-                        creator=agent.creator,
-                        category="general",
-                        rating=agent.rating,
-                        runs=agent.runs,
-                        is_featured=False,
-                    ),
-                )
-        except NotFoundError:
-            pass
-        except DatabaseError as e:
-            logger.error(f"Error searching agents: {e}", exc_info=True)
-            return ErrorResponse(
-                message="Failed to search for agents. Please try again.",
-                error=str(e),
-                session_id=session_id,
-            )
-        if not agents:
-            return NoResultsResponse(
-                message=f"No agents found matching '{query}'. Try different keywords or browse the marketplace. If you have 3 consecutive find_agent tool calls results and found no agents. Please stop trying and ask the user if there is anything else you can help with.",
-                session_id=session_id,
-                suggestions=[
-                    "Try more general terms",
-                    "Browse categories in the marketplace",
-                    "Check spelling",
-                ],
-            )
-
-        # Return formatted carousel
-        title = (
-            f"Found {len(agents)} agent{'s' if len(agents) != 1 else ''} for '{query}'"
-        )
-        return AgentCarouselResponse(
-            message="Now you have found some options for the user to choose from. You can add a link to a recommended agent at: /marketplace/agent/agent_id Please ask the user if they would like to use any of these agents. If they do, please call the get_agent_details tool for this agent.",
-            title=title,
-            agents=agents,
-            count=len(agents),
-            session_id=session_id,
+        return await search_agents(
+            query=kwargs.get("query", "").strip(),
+            source="marketplace",
+            session_id=session.session_id,
+            user_id=user_id,
         )
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/find_block.py b/autogpt_platform/backend/backend/api/features/chat/tools/find_block.py
new file mode 100644
index 0000000000..7ca85961f9
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/find_block.py
@@ -0,0 +1,193 @@
+import logging
+from typing import Any
+
+from prisma.enums import ContentType
+
+from backend.api.features.chat.model import ChatSession
+from backend.api.features.chat.tools.base import BaseTool, ToolResponseBase
+from backend.api.features.chat.tools.models import (
+    BlockInfoSummary,
+    BlockInputFieldInfo,
+    BlockListResponse,
+    ErrorResponse,
+    NoResultsResponse,
+)
+from backend.api.features.store.hybrid_search import unified_hybrid_search
+from backend.data.block import get_block
+
+logger = logging.getLogger(__name__)
+
+
+class FindBlockTool(BaseTool):
+    """Tool for searching available blocks."""
+
+    @property
+    def name(self) -> str:
+        return "find_block"
+
+    @property
+    def description(self) -> str:
+        return (
+            "Search for available blocks by name or description. "
+            "Blocks are reusable components that perform specific tasks like "
+            "sending emails, making API calls, processing text, etc. "
+            "IMPORTANT: Use this tool FIRST to get the block's 'id' before calling run_block. "
+            "The response includes each block's id, required_inputs, and input_schema."
+        )
+
+    @property
+    def parameters(self) -> dict[str, Any]:
+        return {
+            "type": "object",
+            "properties": {
+                "query": {
+                    "type": "string",
+                    "description": (
+                        "Search query to find blocks by name or description. "
+                        "Use keywords like 'email', 'http', 'text', 'ai', etc."
+                    ),
+                },
+            },
+            "required": ["query"],
+        }
+
+    @property
+    def requires_auth(self) -> bool:
+        return True
+
+    async def _execute(
+        self,
+        user_id: str | None,
+        session: ChatSession,
+        **kwargs,
+    ) -> ToolResponseBase:
+        """Search for blocks matching the query.
+
+        Args:
+            user_id: User ID (required)
+            session: Chat session
+            query: Search query
+
+        Returns:
+            BlockListResponse: List of matching blocks
+            NoResultsResponse: No blocks found
+            ErrorResponse: Error message
+        """
+        query = kwargs.get("query", "").strip()
+        session_id = session.session_id
+
+        if not query:
+            return ErrorResponse(
+                message="Please provide a search query",
+                session_id=session_id,
+            )
+
+        try:
+            # Search for blocks using hybrid search
+            results, total = await unified_hybrid_search(
+                query=query,
+                content_types=[ContentType.BLOCK],
+                page=1,
+                page_size=10,
+            )
+
+            if not results:
+                return NoResultsResponse(
+                    message=f"No blocks found for '{query}'",
+                    suggestions=[
+                        "Try broader keywords like 'email', 'http', 'text', 'ai'",
+                        "Check spelling of technical terms",
+                    ],
+                    session_id=session_id,
+                )
+
+            # Enrich results with full block information
+            blocks: list[BlockInfoSummary] = []
+            for result in results:
+                block_id = result["content_id"]
+                block = get_block(block_id)
+
+                # Skip disabled blocks
+                if block and not block.disabled:
+                    # Get input/output schemas
+                    input_schema = {}
+                    output_schema = {}
+                    try:
+                        input_schema = block.input_schema.jsonschema()
+                    except Exception:
+                        pass
+                    try:
+                        output_schema = block.output_schema.jsonschema()
+                    except Exception:
+                        pass
+
+                    # Get categories from block instance
+                    categories = []
+                    if hasattr(block, "categories") and block.categories:
+                        categories = [cat.value for cat in block.categories]
+
+                    # Extract required inputs for easier use
+                    required_inputs: list[BlockInputFieldInfo] = []
+                    if input_schema:
+                        properties = input_schema.get("properties", {})
+                        required_fields = set(input_schema.get("required", []))
+                        # Get credential field names to exclude from required inputs
+                        credentials_fields = set(
+                            block.input_schema.get_credentials_fields().keys()
+                        )
+
+                        for field_name, field_schema in properties.items():
+                            # Skip credential fields - they're handled separately
+                            if field_name in credentials_fields:
+                                continue
+
+                            required_inputs.append(
+                                BlockInputFieldInfo(
+                                    name=field_name,
+                                    type=field_schema.get("type", "string"),
+                                    description=field_schema.get("description", ""),
+                                    required=field_name in required_fields,
+                                    default=field_schema.get("default"),
+                                )
+                            )
+
+                    blocks.append(
+                        BlockInfoSummary(
+                            id=block_id,
+                            name=block.name,
+                            description=block.description or "",
+                            categories=categories,
+                            input_schema=input_schema,
+                            output_schema=output_schema,
+                            required_inputs=required_inputs,
+                        )
+                    )
+
+            if not blocks:
+                return NoResultsResponse(
+                    message=f"No blocks found for '{query}'",
+                    suggestions=[
+                        "Try broader keywords like 'email', 'http', 'text', 'ai'",
+                    ],
+                    session_id=session_id,
+                )
+
+            return BlockListResponse(
+                message=(
+                    f"Found {len(blocks)} block(s) matching '{query}'. "
+                    "To execute a block, use run_block with the block's 'id' field "
+                    "and provide 'input_data' matching the block's input_schema."
+                ),
+                blocks=blocks,
+                count=len(blocks),
+                query=query,
+                session_id=session_id,
+            )
+
+        except Exception as e:
+            logger.error(f"Error searching blocks: {e}", exc_info=True)
+            return ErrorResponse(
+                message="Failed to search blocks",
+                error=str(e),
+                session_id=session_id,
+            )
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/find_library_agent.py b/autogpt_platform/backend/backend/api/features/chat/tools/find_library_agent.py
new file mode 100644
index 0000000000..108fba75ae
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/find_library_agent.py
@@ -0,0 +1,52 @@
+"""Tool for searching agents in the user's library."""
+
+from typing import Any
+
+from backend.api.features.chat.model import ChatSession
+
+from .agent_search import search_agents
+from .base import BaseTool
+from .models import ToolResponseBase
+
+
+class FindLibraryAgentTool(BaseTool):
+    """Tool for searching agents in the user's library."""
+
+    @property
+    def name(self) -> str:
+        return "find_library_agent"
+
+    @property
+    def description(self) -> str:
+        return (
+            "Search for agents in the user's library. Use this to find agents "
+            "the user has already added to their library, including agents they "
+            "created or added from the marketplace."
+        )
+
+    @property
+    def parameters(self) -> dict[str, Any]:
+        return {
+            "type": "object",
+            "properties": {
+                "query": {
+                    "type": "string",
+                    "description": "Search query to find agents by name or description.",
+                },
+            },
+            "required": ["query"],
+        }
+
+    @property
+    def requires_auth(self) -> bool:
+        return True
+
+    async def _execute(
+        self, user_id: str | None, session: ChatSession, **kwargs
+    ) -> ToolResponseBase:
+        return await search_agents(
+            query=kwargs.get("query", "").strip(),
+            source="library",
+            session_id=session.session_id,
+            user_id=user_id,
+        )
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/get_doc_page.py b/autogpt_platform/backend/backend/api/features/chat/tools/get_doc_page.py
new file mode 100644
index 0000000000..7040cd7db5
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/get_doc_page.py
@@ -0,0 +1,148 @@
+"""GetDocPageTool - Fetch full content of a documentation page."""
+
+import logging
+from pathlib import Path
+from typing import Any
+
+from backend.api.features.chat.model import ChatSession
+from backend.api.features.chat.tools.base import BaseTool
+from backend.api.features.chat.tools.models import (
+    DocPageResponse,
+    ErrorResponse,
+    ToolResponseBase,
+)
+
+logger = logging.getLogger(__name__)
+
+# Base URL for documentation (can be configured)
+DOCS_BASE_URL = "https://docs.agpt.co"
+
+
+class GetDocPageTool(BaseTool):
+    """Tool for fetching full content of a documentation page."""
+
+    @property
+    def name(self) -> str:
+        return "get_doc_page"
+
+    @property
+    def description(self) -> str:
+        return (
+            "Get the full content of a documentation page by its path. "
+            "Use this after search_docs to read the complete content of a relevant page."
+        )
+
+    @property
+    def parameters(self) -> dict[str, Any]:
+        return {
+            "type": "object",
+            "properties": {
+                "path": {
+                    "type": "string",
+                    "description": (
+                        "The path to the documentation file, as returned by search_docs. "
+                        "Example: 'platform/block-sdk-guide.md'"
+                    ),
+                },
+            },
+            "required": ["path"],
+        }
+
+    @property
+    def requires_auth(self) -> bool:
+        return False  # Documentation is public
+
+    def _get_docs_root(self) -> Path:
+        """Get the documentation root directory."""
+        this_file = Path(__file__)
+        project_root = this_file.parent.parent.parent.parent.parent.parent.parent.parent
+        return project_root / "docs"
+
+    def _extract_title(self, content: str, fallback: str) -> str:
+        """Extract title from markdown content."""
+        lines = content.split("\n")
+        for line in lines:
+            if line.startswith("# "):
+                return line[2:].strip()
+        return fallback
+
+    def _make_doc_url(self, path: str) -> str:
+        """Create a URL for a documentation page."""
+        url_path = path.rsplit(".", 1)[0] if "." in path else path
+        return f"{DOCS_BASE_URL}/{url_path}"
+
+    async def _execute(
+        self,
+        user_id: str | None,
+        session: ChatSession,
+        **kwargs,
+    ) -> ToolResponseBase:
+        """Fetch full content of a documentation page.
+
+        Args:
+            user_id: User ID (not required for docs)
+            session: Chat session
+            path: Path to the documentation file
+
+        Returns:
+            DocPageResponse: Full document content
+            ErrorResponse: Error message
+        """
+        path = kwargs.get("path", "").strip()
+        session_id = session.session_id if session else None
+
+        if not path:
+            return ErrorResponse(
+                message="Please provide a documentation path.",
+                error="Missing path parameter",
+                session_id=session_id,
+            )
+
+        # Sanitize path to prevent directory traversal
+        if ".." in path or path.startswith("/"):
+            return ErrorResponse(
+                message="Invalid documentation path.",
+                error="invalid_path",
+                session_id=session_id,
+            )
+
+        docs_root = self._get_docs_root()
+        full_path = docs_root / path
+
+        if not full_path.exists():
+            return ErrorResponse(
+                message=f"Documentation page not found: {path}",
+                error="not_found",
+                session_id=session_id,
+            )
+
+        # Ensure the path is within docs root
+        try:
+            full_path.resolve().relative_to(docs_root.resolve())
+        except ValueError:
+            return ErrorResponse(
+                message="Invalid documentation path.",
+                error="invalid_path",
+                session_id=session_id,
+            )
+
+        try:
+            content = full_path.read_text(encoding="utf-8")
+            title = self._extract_title(content, path)
+
+            return DocPageResponse(
+                message=f"Retrieved documentation page: {title}",
+                title=title,
+                path=path,
+                content=content,
+                doc_url=self._make_doc_url(path),
+                session_id=session_id,
+            )
+
+        except Exception as e:
+            logger.error(f"Failed to read documentation page {path}: {e}")
+            return ErrorResponse(
+                message=f"Failed to read documentation page: {str(e)}",
+                error="read_failed",
+                session_id=session_id,
+            )
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/models.py b/autogpt_platform/backend/backend/api/features/chat/tools/models.py
index a3fbbe025c..69c8c6c684 100644
--- a/autogpt_platform/backend/backend/api/features/chat/tools/models.py
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/models.py
@@ -1,5 +1,6 @@
 """Pydantic models for tool responses."""
 
+from datetime import datetime
 from enum import Enum
 from typing import Any
 
@@ -11,14 +12,34 @@ from backend.data.model import CredentialsMetaInput
 class ResponseType(str, Enum):
     """Types of tool responses."""
 
-    AGENT_CAROUSEL = "agent_carousel"
+    AGENTS_FOUND = "agents_found"
     AGENT_DETAILS = "agent_details"
     SETUP_REQUIREMENTS = "setup_requirements"
     EXECUTION_STARTED = "execution_started"
     NEED_LOGIN = "need_login"
     ERROR = "error"
     NO_RESULTS = "no_results"
-    SUCCESS = "success"
+    AGENT_OUTPUT = "agent_output"
+    UNDERSTANDING_UPDATED = "understanding_updated"
+    AGENT_PREVIEW = "agent_preview"
+    AGENT_SAVED = "agent_saved"
+    CLARIFICATION_NEEDED = "clarification_needed"
+    BLOCK_LIST = "block_list"
+    BLOCK_OUTPUT = "block_output"
+    DOC_SEARCH_RESULTS = "doc_search_results"
+    DOC_PAGE = "doc_page"
+    # Workspace response types
+    WORKSPACE_FILE_LIST = "workspace_file_list"
+    WORKSPACE_FILE_CONTENT = "workspace_file_content"
+    WORKSPACE_FILE_METADATA = "workspace_file_metadata"
+    WORKSPACE_FILE_WRITTEN = "workspace_file_written"
+    WORKSPACE_FILE_DELETED = "workspace_file_deleted"
+    # Long-running operation types
+    OPERATION_STARTED = "operation_started"
+    OPERATION_PENDING = "operation_pending"
+    OPERATION_IN_PROGRESS = "operation_in_progress"
+    # Input validation
+    INPUT_VALIDATION_ERROR = "input_validation_error"
 
 
 # Base response model
@@ -49,16 +70,20 @@ class AgentInfo(BaseModel):
     has_external_trigger: bool | None = None
     new_output: bool | None = None
     graph_id: str | None = None
+    inputs: dict[str, Any] | None = Field(
+        default=None,
+        description="Input schema for the agent, including field names, types, and defaults",
+    )
 
 
-class AgentCarouselResponse(ToolResponseBase):
+class AgentsFoundResponse(ToolResponseBase):
     """Response for find_agent tool."""
 
-    type: ResponseType = ResponseType.AGENT_CAROUSEL
+    type: ResponseType = ResponseType.AGENTS_FOUND
     title: str = "Available Agents"
     agents: list[AgentInfo]
     count: int
-    name: str = "agent_carousel"
+    name: str = "agents_found"
 
 
 class NoResultsResponse(ToolResponseBase):
@@ -173,3 +198,226 @@ class ErrorResponse(ToolResponseBase):
     type: ResponseType = ResponseType.ERROR
     error: str | None = None
     details: dict[str, Any] | None = None
+
+
+class InputValidationErrorResponse(ToolResponseBase):
+    """Response when run_agent receives unknown input fields."""
+
+    type: ResponseType = ResponseType.INPUT_VALIDATION_ERROR
+    unrecognized_fields: list[str] = Field(
+        description="List of input field names that were not recognized"
+    )
+    inputs: dict[str, Any] = Field(
+        description="The agent's valid input schema for reference"
+    )
+    graph_id: str | None = None
+    graph_version: int | None = None
+
+
+# Agent output models
+class ExecutionOutputInfo(BaseModel):
+    """Summary of a single execution's outputs."""
+
+    execution_id: str
+    status: str
+    started_at: datetime | None = None
+    ended_at: datetime | None = None
+    outputs: dict[str, list[Any]]
+    inputs_summary: dict[str, Any] | None = None
+
+
+class AgentOutputResponse(ToolResponseBase):
+    """Response for agent_output tool."""
+
+    type: ResponseType = ResponseType.AGENT_OUTPUT
+    agent_name: str
+    agent_id: str
+    library_agent_id: str | None = None
+    library_agent_link: str | None = None
+    execution: ExecutionOutputInfo | None = None
+    available_executions: list[dict[str, Any]] | None = None
+    total_executions: int = 0
+
+
+# Business understanding models
+class UnderstandingUpdatedResponse(ToolResponseBase):
+    """Response for add_understanding tool."""
+
+    type: ResponseType = ResponseType.UNDERSTANDING_UPDATED
+    updated_fields: list[str] = Field(default_factory=list)
+    current_understanding: dict[str, Any] = Field(default_factory=dict)
+
+
+# Agent generation models
+class ClarifyingQuestion(BaseModel):
+    """A question that needs user clarification."""
+
+    question: str
+    keyword: str
+    example: str | None = None
+
+
+class AgentPreviewResponse(ToolResponseBase):
+    """Response for previewing a generated agent before saving."""
+
+    type: ResponseType = ResponseType.AGENT_PREVIEW
+    agent_json: dict[str, Any]
+    agent_name: str
+    description: str
+    node_count: int
+    link_count: int = 0
+
+
+class AgentSavedResponse(ToolResponseBase):
+    """Response when an agent is saved to the library."""
+
+    type: ResponseType = ResponseType.AGENT_SAVED
+    agent_id: str
+    agent_name: str
+    library_agent_id: str
+    library_agent_link: str
+    agent_page_link: str  # Link to the agent builder/editor page
+
+
+class ClarificationNeededResponse(ToolResponseBase):
+    """Response when the LLM needs more information from the user."""
+
+    type: ResponseType = ResponseType.CLARIFICATION_NEEDED
+    questions: list[ClarifyingQuestion] = Field(default_factory=list)
+
+
+# Documentation search models
+class DocSearchResult(BaseModel):
+    """A single documentation search result."""
+
+    title: str
+    path: str
+    section: str
+    snippet: str  # Short excerpt for UI display
+    score: float
+    doc_url: str | None = None
+
+
+class DocSearchResultsResponse(ToolResponseBase):
+    """Response for search_docs tool."""
+
+    type: ResponseType = ResponseType.DOC_SEARCH_RESULTS
+    results: list[DocSearchResult]
+    count: int
+    query: str
+
+
+class DocPageResponse(ToolResponseBase):
+    """Response for get_doc_page tool."""
+
+    type: ResponseType = ResponseType.DOC_PAGE
+    title: str
+    path: str
+    content: str  # Full document content
+    doc_url: str | None = None
+
+
+# Block models
+class BlockInputFieldInfo(BaseModel):
+    """Information about a block input field."""
+
+    name: str
+    type: str
+    description: str = ""
+    required: bool = False
+    default: Any | None = None
+
+
+class BlockInfoSummary(BaseModel):
+    """Summary of a block for search results."""
+
+    id: str
+    name: str
+    description: str
+    categories: list[str]
+    input_schema: dict[str, Any]
+    output_schema: dict[str, Any]
+    required_inputs: list[BlockInputFieldInfo] = Field(
+        default_factory=list,
+        description="List of required input fields for this block",
+    )
+
+
+class BlockListResponse(ToolResponseBase):
+    """Response for find_block tool."""
+
+    type: ResponseType = ResponseType.BLOCK_LIST
+    blocks: list[BlockInfoSummary]
+    count: int
+    query: str
+    usage_hint: str = Field(
+        default="To execute a block, call run_block with block_id set to the block's "
+        "'id' field and input_data containing the required fields from input_schema."
+    )
+
+
+class BlockOutputResponse(ToolResponseBase):
+    """Response for run_block tool."""
+
+    type: ResponseType = ResponseType.BLOCK_OUTPUT
+    block_id: str
+    block_name: str
+    outputs: dict[str, list[Any]]
+    success: bool = True
+
+
+# Long-running operation models
+class OperationStartedResponse(ToolResponseBase):
+    """Response when a long-running operation has been started in the background.
+
+    This is returned immediately to the client while the operation continues
+    to execute. The user can close the tab and check back later.
+
+    The task_id can be used to reconnect to the SSE stream via
+    GET /chat/tasks/{task_id}/stream?last_idx=0
+    """
+
+    type: ResponseType = ResponseType.OPERATION_STARTED
+    operation_id: str
+    tool_name: str
+    task_id: str | None = None  # For SSE reconnection
+
+
+class OperationPendingResponse(ToolResponseBase):
+    """Response stored in chat history while a long-running operation is executing.
+
+    This is persisted to the database so users see a pending state when they
+    refresh before the operation completes.
+    """
+
+    type: ResponseType = ResponseType.OPERATION_PENDING
+    operation_id: str
+    tool_name: str
+
+
+class OperationInProgressResponse(ToolResponseBase):
+    """Response when an operation is already in progress.
+
+    Returned for idempotency when the same tool_call_id is requested again
+    while the background task is still running.
+    """
+
+    type: ResponseType = ResponseType.OPERATION_IN_PROGRESS
+    tool_call_id: str
+
+
+class AsyncProcessingResponse(ToolResponseBase):
+    """Response when an operation has been delegated to async processing.
+
+    This is returned by tools when the external service accepts the request
+    for async processing (HTTP 202 Accepted). The Redis Streams completion
+    consumer will handle the result when the external service completes.
+
+    The status field is specifically "accepted" to allow the long-running tool
+    handler to detect this response and skip LLM continuation.
+    """
+
+    type: ResponseType = ResponseType.OPERATION_STARTED
+    status: str = "accepted"  # Must be "accepted" for detection
+    operation_id: str | None = None
+    task_id: str | None = None
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/run_agent.py b/autogpt_platform/backend/backend/api/features/chat/tools/run_agent.py
index 931e075021..73d4cf81f2 100644
--- a/autogpt_platform/backend/backend/api/features/chat/tools/run_agent.py
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/run_agent.py
@@ -7,6 +7,11 @@ from pydantic import BaseModel, Field, field_validator
 
 from backend.api.features.chat.config import ChatConfig
 from backend.api.features.chat.model import ChatSession
+from backend.api.features.chat.tracking import (
+    track_agent_run_success,
+    track_agent_scheduled,
+)
+from backend.api.features.library import db as library_db
 from backend.data.graph import GraphModel
 from backend.data.model import CredentialsMetaInput
 from backend.data.user import get_user_by_id
@@ -25,13 +30,14 @@ from .models import (
     ErrorResponse,
     ExecutionOptions,
     ExecutionStartedResponse,
+    InputValidationErrorResponse,
     SetupInfo,
     SetupRequirementsResponse,
     ToolResponseBase,
     UserReadiness,
 )
 from .utils import (
-    check_user_has_required_credentials,
+    build_missing_credentials_from_graph,
     extract_credentials_from_schema,
     fetch_graph_from_store_slug,
     get_or_create_library_agent,
@@ -57,6 +63,7 @@ class RunAgentInput(BaseModel):
     """Input parameters for the run_agent tool."""
 
     username_agent_slug: str = ""
+    library_agent_id: str = ""
     inputs: dict[str, Any] = Field(default_factory=dict)
     use_defaults: bool = False
     schedule_name: str = ""
@@ -64,7 +71,12 @@ class RunAgentInput(BaseModel):
     timezone: str = "UTC"
 
     @field_validator(
-        "username_agent_slug", "schedule_name", "cron", "timezone", mode="before"
+        "username_agent_slug",
+        "library_agent_id",
+        "schedule_name",
+        "cron",
+        "timezone",
+        mode="before",
     )
     @classmethod
     def strip_strings(cls, v: Any) -> Any:
@@ -90,7 +102,7 @@ class RunAgentTool(BaseTool):
 
     @property
     def description(self) -> str:
-        return """Run or schedule an agent from the marketplace.
+        return """Run or schedule an agent from the marketplace or user's library.
 
         The tool automatically handles the setup flow:
         - Returns missing inputs if required fields are not provided
@@ -98,6 +110,10 @@ class RunAgentTool(BaseTool):
         - Executes immediately if all requirements are met
         - Schedules execution if cron expression is provided
 
+        Identify the agent using either:
+        - username_agent_slug: Marketplace format 'username/agent-name'
+        - library_agent_id: ID of an agent in the user's library
+
         For scheduled execution, provide: schedule_name, cron, and optionally timezone."""
 
     @property
@@ -109,6 +125,10 @@ class RunAgentTool(BaseTool):
                     "type": "string",
                     "description": "Agent identifier in format 'username/agent-name'",
                 },
+                "library_agent_id": {
+                    "type": "string",
+                    "description": "Library agent ID from user's library",
+                },
                 "inputs": {
                     "type": "object",
                     "description": "Input values for the agent",
@@ -131,7 +151,7 @@ class RunAgentTool(BaseTool):
                     "description": "IANA timezone for schedule (default: UTC)",
                 },
             },
-            "required": ["username_agent_slug"],
+            "required": [],
         }
 
     @property
@@ -149,10 +169,16 @@ class RunAgentTool(BaseTool):
         params = RunAgentInput(**kwargs)
         session_id = session.session_id
 
-        # Validate agent slug format
-        if not params.username_agent_slug or "/" not in params.username_agent_slug:
+        # Validate at least one identifier is provided
+        has_slug = params.username_agent_slug and "/" in params.username_agent_slug
+        has_library_id = bool(params.library_agent_id)
+
+        if not has_slug and not has_library_id:
             return ErrorResponse(
-                message="Please provide an agent slug in format 'username/agent-name'",
+                message=(
+                    "Please provide either a username_agent_slug "
+                    "(format 'username/agent-name') or a library_agent_id"
+                ),
                 session_id=session_id,
             )
 
@@ -167,13 +193,41 @@ class RunAgentTool(BaseTool):
         is_schedule = bool(params.schedule_name or params.cron)
 
         try:
-            # Step 1: Fetch agent details (always happens first)
-            username, agent_name = params.username_agent_slug.split("/", 1)
-            graph, store_agent = await fetch_graph_from_store_slug(username, agent_name)
+            # Step 1: Fetch agent details
+            graph: GraphModel | None = None
+            library_agent = None
+
+            # Priority: library_agent_id if provided
+            if has_library_id:
+                library_agent = await library_db.get_library_agent(
+                    params.library_agent_id, user_id
+                )
+                if not library_agent:
+                    return ErrorResponse(
+                        message=f"Library agent '{params.library_agent_id}' not found",
+                        session_id=session_id,
+                    )
+                # Get the graph from the library agent
+                from backend.data.graph import get_graph
+
+                graph = await get_graph(
+                    library_agent.graph_id,
+                    library_agent.graph_version,
+                    user_id=user_id,
+                )
+            else:
+                # Fetch from marketplace slug
+                username, agent_name = params.username_agent_slug.split("/", 1)
+                graph, _ = await fetch_graph_from_store_slug(username, agent_name)
 
             if not graph:
+                identifier = (
+                    params.library_agent_id
+                    if has_library_id
+                    else params.username_agent_slug
+                )
                 return ErrorResponse(
-                    message=f"Agent '{params.username_agent_slug}' not found in marketplace",
+                    message=f"Agent '{identifier}' not found",
                     session_id=session_id,
                 )
 
@@ -186,15 +240,13 @@ class RunAgentTool(BaseTool):
                 # Return credentials needed response with input data info
                 # The UI handles credential setup automatically, so the message
                 # focuses on asking about input data
-                credentials = extract_credentials_from_schema(
-                    graph.credentials_input_schema
+                requirements_creds_dict = build_missing_credentials_from_graph(
+                    graph, None
                 )
-                missing_creds_check = await check_user_has_required_credentials(
-                    user_id, credentials
+                missing_credentials_dict = build_missing_credentials_from_graph(
+                    graph, graph_credentials
                 )
-                missing_credentials_dict = {
-                    c.id: c.model_dump() for c in missing_creds_check
-                }
+                requirements_creds_list = list(requirements_creds_dict.values())
 
                 return SetupRequirementsResponse(
                     message=self._build_inputs_message(graph, MSG_WHAT_VALUES_TO_USE),
@@ -208,7 +260,7 @@ class RunAgentTool(BaseTool):
                             ready_to_run=False,
                         ),
                         requirements={
-                            "credentials": [c.model_dump() for c in credentials],
+                            "credentials": requirements_creds_list,
                             "inputs": self._get_inputs_list(graph.input_schema),
                             "execution_modes": self._get_execution_modes(graph),
                         },
@@ -222,6 +274,22 @@ class RunAgentTool(BaseTool):
             input_properties = graph.input_schema.get("properties", {})
             required_fields = set(graph.input_schema.get("required", []))
             provided_inputs = set(params.inputs.keys())
+            valid_fields = set(input_properties.keys())
+
+            # Check for unknown input fields
+            unrecognized_fields = provided_inputs - valid_fields
+            if unrecognized_fields:
+                return InputValidationErrorResponse(
+                    message=(
+                        f"Unknown input field(s) provided: {', '.join(sorted(unrecognized_fields))}. "
+                        f"Agent was not executed. Please use the correct field names from the schema."
+                    ),
+                    session_id=session_id,
+                    unrecognized_fields=sorted(unrecognized_fields),
+                    inputs=graph.input_schema,
+                    graph_id=graph.id,
+                    graph_version=graph.version,
+                )
 
             # If agent has inputs but none were provided AND use_defaults is not set,
             # always show what's available first so user can decide
@@ -404,6 +472,16 @@ class RunAgentTool(BaseTool):
             session.successful_agent_runs.get(library_agent.graph_id, 0) + 1
         )
 
+        # Track in PostHog
+        track_agent_run_success(
+            user_id=user_id,
+            session_id=session_id,
+            graph_id=library_agent.graph_id,
+            graph_name=library_agent.name,
+            execution_id=execution.id,
+            library_agent_id=library_agent.id,
+        )
+
         library_agent_link = f"/library/agents/{library_agent.id}"
         return ExecutionStartedResponse(
             message=(
@@ -485,6 +563,18 @@ class RunAgentTool(BaseTool):
             session.successful_agent_schedules.get(library_agent.graph_id, 0) + 1
         )
 
+        # Track in PostHog
+        track_agent_scheduled(
+            user_id=user_id,
+            session_id=session_id,
+            graph_id=library_agent.graph_id,
+            graph_name=library_agent.name,
+            schedule_id=result.id,
+            schedule_name=schedule_name,
+            cron=cron,
+            library_agent_id=library_agent.id,
+        )
+
         library_agent_link = f"/library/agents/{library_agent.id}"
         return ExecutionStartedResponse(
             message=(
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/run_agent_test.py b/autogpt_platform/backend/backend/api/features/chat/tools/run_agent_test.py
index ebad1a0050..d5da394fa6 100644
--- a/autogpt_platform/backend/backend/api/features/chat/tools/run_agent_test.py
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/run_agent_test.py
@@ -1,4 +1,5 @@
 import uuid
+from unittest.mock import AsyncMock, patch
 
 import orjson
 import pytest
@@ -17,7 +18,18 @@ setup_test_data = setup_test_data
 setup_firecrawl_test_data = setup_firecrawl_test_data
 
 
-@pytest.mark.asyncio(scope="session")
+@pytest.fixture(scope="session", autouse=True)
+def mock_embedding_functions():
+    """Mock embedding functions for all tests to avoid database/API dependencies."""
+    with patch(
+        "backend.api.features.store.db.ensure_embedding",
+        new_callable=AsyncMock,
+        return_value=True,
+    ):
+        yield
+
+
+@pytest.mark.asyncio(loop_scope="session")
 async def test_run_agent(setup_test_data):
     """Test that the run_agent tool successfully executes an approved agent"""
     # Use test data from fixture
@@ -46,11 +58,11 @@ async def test_run_agent(setup_test_data):
 
     # Verify the response
     assert response is not None
-    assert hasattr(response, "result")
+    assert hasattr(response, "output")
     # Parse the result JSON to verify the execution started
 
-    assert isinstance(response.result, str)
-    result_data = orjson.loads(response.result)
+    assert isinstance(response.output, str)
+    result_data = orjson.loads(response.output)
     assert "execution_id" in result_data
     assert "graph_id" in result_data
     assert result_data["graph_id"] == graph.id
@@ -58,7 +70,7 @@ async def test_run_agent(setup_test_data):
     assert result_data["graph_name"] == "Test Agent"
 
 
-@pytest.mark.asyncio(scope="session")
+@pytest.mark.asyncio(loop_scope="session")
 async def test_run_agent_missing_inputs(setup_test_data):
     """Test that the run_agent tool returns error when inputs are missing"""
     # Use test data from fixture
@@ -86,15 +98,15 @@ async def test_run_agent_missing_inputs(setup_test_data):
 
     # Verify that we get an error response
     assert response is not None
-    assert hasattr(response, "result")
+    assert hasattr(response, "output")
     # The tool should return an ErrorResponse when setup info indicates not ready
 
-    assert isinstance(response.result, str)
-    result_data = orjson.loads(response.result)
+    assert isinstance(response.output, str)
+    result_data = orjson.loads(response.output)
     assert "message" in result_data
 
 
-@pytest.mark.asyncio(scope="session")
+@pytest.mark.asyncio(loop_scope="session")
 async def test_run_agent_invalid_agent_id(setup_test_data):
     """Test that the run_agent tool returns error for invalid agent ID"""
     # Use test data from fixture
@@ -118,10 +130,10 @@ async def test_run_agent_invalid_agent_id(setup_test_data):
 
     # Verify that we get an error response
     assert response is not None
-    assert hasattr(response, "result")
+    assert hasattr(response, "output")
 
-    assert isinstance(response.result, str)
-    result_data = orjson.loads(response.result)
+    assert isinstance(response.output, str)
+    result_data = orjson.loads(response.output)
     assert "message" in result_data
     # Should get an error about failed setup or not found
     assert any(
@@ -129,7 +141,7 @@ async def test_run_agent_invalid_agent_id(setup_test_data):
     )
 
 
-@pytest.mark.asyncio(scope="session")
+@pytest.mark.asyncio(loop_scope="session")
 async def test_run_agent_with_llm_credentials(setup_llm_test_data):
     """Test that run_agent works with an agent requiring LLM credentials"""
     # Use test data from fixture
@@ -158,12 +170,12 @@ async def test_run_agent_with_llm_credentials(setup_llm_test_data):
 
     # Verify the response
     assert response is not None
-    assert hasattr(response, "result")
+    assert hasattr(response, "output")
 
     # Parse the result JSON to verify the execution started
 
-    assert isinstance(response.result, str)
-    result_data = orjson.loads(response.result)
+    assert isinstance(response.output, str)
+    result_data = orjson.loads(response.output)
 
     # Should successfully start execution since credentials are available
     assert "execution_id" in result_data
@@ -173,7 +185,7 @@ async def test_run_agent_with_llm_credentials(setup_llm_test_data):
     assert result_data["graph_name"] == "LLM Test Agent"
 
 
-@pytest.mark.asyncio(scope="session")
+@pytest.mark.asyncio(loop_scope="session")
 async def test_run_agent_shows_available_inputs_when_none_provided(setup_test_data):
     """Test that run_agent returns available inputs when called without inputs or use_defaults."""
     user = setup_test_data["user"]
@@ -195,9 +207,9 @@ async def test_run_agent_shows_available_inputs_when_none_provided(setup_test_da
     )
 
     assert response is not None
-    assert hasattr(response, "result")
-    assert isinstance(response.result, str)
-    result_data = orjson.loads(response.result)
+    assert hasattr(response, "output")
+    assert isinstance(response.output, str)
+    result_data = orjson.loads(response.output)
 
     # Should return agent_details type showing available inputs
     assert result_data.get("type") == "agent_details"
@@ -207,7 +219,7 @@ async def test_run_agent_shows_available_inputs_when_none_provided(setup_test_da
     assert "inputs" in result_data["message"].lower()
 
 
-@pytest.mark.asyncio(scope="session")
+@pytest.mark.asyncio(loop_scope="session")
 async def test_run_agent_with_use_defaults(setup_test_data):
     """Test that run_agent executes successfully with use_defaults=True."""
     user = setup_test_data["user"]
@@ -230,16 +242,16 @@ async def test_run_agent_with_use_defaults(setup_test_data):
     )
 
     assert response is not None
-    assert hasattr(response, "result")
-    assert isinstance(response.result, str)
-    result_data = orjson.loads(response.result)
+    assert hasattr(response, "output")
+    assert isinstance(response.output, str)
+    result_data = orjson.loads(response.output)
 
     # Should execute successfully
     assert "execution_id" in result_data
     assert result_data["graph_id"] == graph.id
 
 
-@pytest.mark.asyncio(scope="session")
+@pytest.mark.asyncio(loop_scope="session")
 async def test_run_agent_missing_credentials(setup_firecrawl_test_data):
     """Test that run_agent returns setup_requirements when credentials are missing."""
     user = setup_firecrawl_test_data["user"]
@@ -260,9 +272,9 @@ async def test_run_agent_missing_credentials(setup_firecrawl_test_data):
     )
 
     assert response is not None
-    assert hasattr(response, "result")
-    assert isinstance(response.result, str)
-    result_data = orjson.loads(response.result)
+    assert hasattr(response, "output")
+    assert isinstance(response.output, str)
+    result_data = orjson.loads(response.output)
 
     # Should return setup_requirements type with missing credentials
     assert result_data.get("type") == "setup_requirements"
@@ -273,7 +285,7 @@ async def test_run_agent_missing_credentials(setup_firecrawl_test_data):
     assert len(setup_info["user_readiness"]["missing_credentials"]) > 0
 
 
-@pytest.mark.asyncio(scope="session")
+@pytest.mark.asyncio(loop_scope="session")
 async def test_run_agent_invalid_slug_format(setup_test_data):
     """Test that run_agent returns error for invalid slug format (no slash)."""
     user = setup_test_data["user"]
@@ -292,22 +304,23 @@ async def test_run_agent_invalid_slug_format(setup_test_data):
     )
 
     assert response is not None
-    assert hasattr(response, "result")
-    assert isinstance(response.result, str)
-    result_data = orjson.loads(response.result)
+    assert hasattr(response, "output")
+    assert isinstance(response.output, str)
+    result_data = orjson.loads(response.output)
 
     # Should return error
     assert result_data.get("type") == "error"
     assert "username/agent-name" in result_data["message"]
 
 
-@pytest.mark.asyncio(scope="session")
+@pytest.mark.asyncio(loop_scope="session")
 async def test_run_agent_unauthenticated():
     """Test that run_agent returns need_login for unauthenticated users."""
     tool = RunAgentTool()
-    session = make_session(user_id=None)
+    # Session has a user_id (session owner), but we test tool execution without user_id
+    session = make_session(user_id="test-session-owner")
 
-    # Execute without user_id
+    # Execute without user_id to test unauthenticated behavior
     response = await tool.execute(
         user_id=None,
         session_id=str(uuid.uuid4()),
@@ -318,16 +331,16 @@ async def test_run_agent_unauthenticated():
     )
 
     assert response is not None
-    assert hasattr(response, "result")
-    assert isinstance(response.result, str)
-    result_data = orjson.loads(response.result)
+    assert hasattr(response, "output")
+    assert isinstance(response.output, str)
+    result_data = orjson.loads(response.output)
 
     # Base tool returns need_login type for unauthenticated users
     assert result_data.get("type") == "need_login"
     assert "sign in" in result_data["message"].lower()
 
 
-@pytest.mark.asyncio(scope="session")
+@pytest.mark.asyncio(loop_scope="session")
 async def test_run_agent_schedule_without_cron(setup_test_data):
     """Test that run_agent returns error when scheduling without cron expression."""
     user = setup_test_data["user"]
@@ -350,16 +363,16 @@ async def test_run_agent_schedule_without_cron(setup_test_data):
     )
 
     assert response is not None
-    assert hasattr(response, "result")
-    assert isinstance(response.result, str)
-    result_data = orjson.loads(response.result)
+    assert hasattr(response, "output")
+    assert isinstance(response.output, str)
+    result_data = orjson.loads(response.output)
 
     # Should return error about missing cron
     assert result_data.get("type") == "error"
     assert "cron" in result_data["message"].lower()
 
 
-@pytest.mark.asyncio(scope="session")
+@pytest.mark.asyncio(loop_scope="session")
 async def test_run_agent_schedule_without_name(setup_test_data):
     """Test that run_agent returns error when scheduling without schedule_name."""
     user = setup_test_data["user"]
@@ -382,10 +395,49 @@ async def test_run_agent_schedule_without_name(setup_test_data):
     )
 
     assert response is not None
-    assert hasattr(response, "result")
-    assert isinstance(response.result, str)
-    result_data = orjson.loads(response.result)
+    assert hasattr(response, "output")
+    assert isinstance(response.output, str)
+    result_data = orjson.loads(response.output)
 
     # Should return error about missing schedule_name
     assert result_data.get("type") == "error"
     assert "schedule_name" in result_data["message"].lower()
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_run_agent_rejects_unknown_input_fields(setup_test_data):
+    """Test that run_agent returns input_validation_error for unknown input fields."""
+    user = setup_test_data["user"]
+    store_submission = setup_test_data["store_submission"]
+
+    tool = RunAgentTool()
+    agent_marketplace_id = f"{user.email.split('@')[0]}/{store_submission.slug}"
+    session = make_session(user_id=user.id)
+
+    # Execute with unknown input field names
+    response = await tool.execute(
+        user_id=user.id,
+        session_id=str(uuid.uuid4()),
+        tool_call_id=str(uuid.uuid4()),
+        username_agent_slug=agent_marketplace_id,
+        inputs={
+            "unknown_field": "some value",
+            "another_unknown": "another value",
+        },
+        session=session,
+    )
+
+    assert response is not None
+    assert hasattr(response, "output")
+    assert isinstance(response.output, str)
+    result_data = orjson.loads(response.output)
+
+    # Should return input_validation_error type with unrecognized fields
+    assert result_data.get("type") == "input_validation_error"
+    assert "unrecognized_fields" in result_data
+    assert set(result_data["unrecognized_fields"]) == {
+        "another_unknown",
+        "unknown_field",
+    }
+    assert "inputs" in result_data  # Contains the valid schema
+    assert "Agent was not executed" in result_data["message"]
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/run_block.py b/autogpt_platform/backend/backend/api/features/chat/tools/run_block.py
new file mode 100644
index 0000000000..51bb2c0575
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/run_block.py
@@ -0,0 +1,373 @@
+"""Tool for executing blocks directly."""
+
+import logging
+import uuid
+from collections import defaultdict
+from typing import Any
+
+from pydantic_core import PydanticUndefined
+
+from backend.api.features.chat.model import ChatSession
+from backend.data.block import get_block
+from backend.data.execution import ExecutionContext
+from backend.data.model import CredentialsMetaInput
+from backend.data.workspace import get_or_create_workspace
+from backend.integrations.creds_manager import IntegrationCredentialsManager
+from backend.util.exceptions import BlockError
+
+from .base import BaseTool
+from .models import (
+    BlockOutputResponse,
+    ErrorResponse,
+    SetupInfo,
+    SetupRequirementsResponse,
+    ToolResponseBase,
+    UserReadiness,
+)
+from .utils import build_missing_credentials_from_field_info
+
+logger = logging.getLogger(__name__)
+
+
+class RunBlockTool(BaseTool):
+    """Tool for executing a block and returning its outputs."""
+
+    @property
+    def name(self) -> str:
+        return "run_block"
+
+    @property
+    def description(self) -> str:
+        return (
+            "Execute a specific block with the provided input data. "
+            "IMPORTANT: You MUST call find_block first to get the block's 'id' - "
+            "do NOT guess or make up block IDs. "
+            "Use the 'id' from find_block results and provide input_data "
+            "matching the block's required_inputs."
+        )
+
+    @property
+    def parameters(self) -> dict[str, Any]:
+        return {
+            "type": "object",
+            "properties": {
+                "block_id": {
+                    "type": "string",
+                    "description": (
+                        "The block's 'id' field from find_block results. "
+                        "NEVER guess this - always get it from find_block first."
+                    ),
+                },
+                "input_data": {
+                    "type": "object",
+                    "description": (
+                        "Input values for the block. Use the 'required_inputs' field "
+                        "from find_block to see what fields are needed."
+                    ),
+                },
+            },
+            "required": ["block_id", "input_data"],
+        }
+
+    @property
+    def requires_auth(self) -> bool:
+        return True
+
+    async def _check_block_credentials(
+        self,
+        user_id: str,
+        block: Any,
+        input_data: dict[str, Any] | None = None,
+    ) -> tuple[dict[str, CredentialsMetaInput], list[CredentialsMetaInput]]:
+        """
+        Check if user has required credentials for a block.
+
+        Args:
+            user_id: User ID
+            block: Block to check credentials for
+            input_data: Input data for the block (used to determine provider via discriminator)
+
+        Returns:
+            tuple[matched_credentials, missing_credentials]
+        """
+        matched_credentials: dict[str, CredentialsMetaInput] = {}
+        missing_credentials: list[CredentialsMetaInput] = []
+        input_data = input_data or {}
+
+        # Get credential field info from block's input schema
+        credentials_fields_info = block.input_schema.get_credentials_fields_info()
+
+        if not credentials_fields_info:
+            return matched_credentials, missing_credentials
+
+        # Get user's available credentials
+        creds_manager = IntegrationCredentialsManager()
+        available_creds = await creds_manager.store.get_all_creds(user_id)
+
+        for field_name, field_info in credentials_fields_info.items():
+            effective_field_info = field_info
+            if field_info.discriminator and field_info.discriminator_mapping:
+                # Get discriminator from input, falling back to schema default
+                discriminator_value = input_data.get(field_info.discriminator)
+                if discriminator_value is None:
+                    field = block.input_schema.model_fields.get(
+                        field_info.discriminator
+                    )
+                    if field and field.default is not PydanticUndefined:
+                        discriminator_value = field.default
+
+                if (
+                    discriminator_value
+                    and discriminator_value in field_info.discriminator_mapping
+                ):
+                    effective_field_info = field_info.discriminate(discriminator_value)
+                    logger.debug(
+                        f"Discriminated provider for {field_name}: "
+                        f"{discriminator_value} -> {effective_field_info.provider}"
+                    )
+
+            matching_cred = next(
+                (
+                    cred
+                    for cred in available_creds
+                    if cred.provider in effective_field_info.provider
+                    and cred.type in effective_field_info.supported_types
+                ),
+                None,
+            )
+
+            if matching_cred:
+                matched_credentials[field_name] = CredentialsMetaInput(
+                    id=matching_cred.id,
+                    provider=matching_cred.provider,  # type: ignore
+                    type=matching_cred.type,
+                    title=matching_cred.title,
+                )
+            else:
+                # Create a placeholder for the missing credential
+                provider = next(iter(effective_field_info.provider), "unknown")
+                cred_type = next(iter(effective_field_info.supported_types), "api_key")
+                missing_credentials.append(
+                    CredentialsMetaInput(
+                        id=field_name,
+                        provider=provider,  # type: ignore
+                        type=cred_type,  # type: ignore
+                        title=field_name.replace("_", " ").title(),
+                    )
+                )
+
+        return matched_credentials, missing_credentials
+
+    async def _execute(
+        self,
+        user_id: str | None,
+        session: ChatSession,
+        **kwargs,
+    ) -> ToolResponseBase:
+        """Execute a block with the given input data.
+
+        Args:
+            user_id: User ID (required)
+            session: Chat session
+            block_id: Block UUID to execute
+            input_data: Input values for the block
+
+        Returns:
+            BlockOutputResponse: Block execution outputs
+            SetupRequirementsResponse: Missing credentials
+            ErrorResponse: Error message
+        """
+        block_id = kwargs.get("block_id", "").strip()
+        input_data = kwargs.get("input_data", {})
+        session_id = session.session_id
+
+        if not block_id:
+            return ErrorResponse(
+                message="Please provide a block_id",
+                session_id=session_id,
+            )
+
+        if not isinstance(input_data, dict):
+            return ErrorResponse(
+                message="input_data must be an object",
+                session_id=session_id,
+            )
+
+        if not user_id:
+            return ErrorResponse(
+                message="Authentication required",
+                session_id=session_id,
+            )
+
+        # Get the block
+        block = get_block(block_id)
+        if not block:
+            return ErrorResponse(
+                message=f"Block '{block_id}' not found",
+                session_id=session_id,
+            )
+        if block.disabled:
+            return ErrorResponse(
+                message=f"Block '{block_id}' is disabled",
+                session_id=session_id,
+            )
+
+        logger.info(f"Executing block {block.name} ({block_id}) for user {user_id}")
+
+        creds_manager = IntegrationCredentialsManager()
+        matched_credentials, missing_credentials = await self._check_block_credentials(
+            user_id, block, input_data
+        )
+
+        if missing_credentials:
+            # Return setup requirements response with missing credentials
+            credentials_fields_info = block.input_schema.get_credentials_fields_info()
+            missing_creds_dict = build_missing_credentials_from_field_info(
+                credentials_fields_info, set(matched_credentials.keys())
+            )
+            missing_creds_list = list(missing_creds_dict.values())
+
+            return SetupRequirementsResponse(
+                message=(
+                    f"Block '{block.name}' requires credentials that are not configured. "
+                    "Please set up the required credentials before running this block."
+                ),
+                session_id=session_id,
+                setup_info=SetupInfo(
+                    agent_id=block_id,
+                    agent_name=block.name,
+                    user_readiness=UserReadiness(
+                        has_all_credentials=False,
+                        missing_credentials=missing_creds_dict,
+                        ready_to_run=False,
+                    ),
+                    requirements={
+                        "credentials": missing_creds_list,
+                        "inputs": self._get_inputs_list(block),
+                        "execution_modes": ["immediate"],
+                    },
+                ),
+                graph_id=None,
+                graph_version=None,
+            )
+
+        try:
+            # Get or create user's workspace for CoPilot file operations
+            workspace = await get_or_create_workspace(user_id)
+
+            # Generate synthetic IDs for CoPilot context
+            # Each chat session is treated as its own agent with one continuous run
+            # This means:
+            # - graph_id (agent) = session (memories scoped to session when limit_to_agent=True)
+            # - graph_exec_id (run) = session (memories scoped to session when limit_to_run=True)
+            # - node_exec_id = unique per block execution
+            synthetic_graph_id = f"copilot-session-{session.session_id}"
+            synthetic_graph_exec_id = f"copilot-session-{session.session_id}"
+            synthetic_node_id = f"copilot-node-{block_id}"
+            synthetic_node_exec_id = (
+                f"copilot-{session.session_id}-{uuid.uuid4().hex[:8]}"
+            )
+
+            # Create unified execution context with all required fields
+            execution_context = ExecutionContext(
+                # Execution identity
+                user_id=user_id,
+                graph_id=synthetic_graph_id,
+                graph_exec_id=synthetic_graph_exec_id,
+                graph_version=1,  # Versions are 1-indexed
+                node_id=synthetic_node_id,
+                node_exec_id=synthetic_node_exec_id,
+                # Workspace with session scoping
+                workspace_id=workspace.id,
+                session_id=session.session_id,
+            )
+
+            # Prepare kwargs for block execution
+            # Keep individual kwargs for backwards compatibility with existing blocks
+            exec_kwargs: dict[str, Any] = {
+                "user_id": user_id,
+                "execution_context": execution_context,
+                # Legacy: individual kwargs for blocks not yet using execution_context
+                "workspace_id": workspace.id,
+                "graph_exec_id": synthetic_graph_exec_id,
+                "node_exec_id": synthetic_node_exec_id,
+                "node_id": synthetic_node_id,
+                "graph_version": 1,  # Versions are 1-indexed
+                "graph_id": synthetic_graph_id,
+            }
+
+            for field_name, cred_meta in matched_credentials.items():
+                # Inject metadata into input_data (for validation)
+                if field_name not in input_data:
+                    input_data[field_name] = cred_meta.model_dump()
+
+                # Fetch actual credentials and pass as kwargs (for execution)
+                actual_credentials = await creds_manager.get(
+                    user_id, cred_meta.id, lock=False
+                )
+                if actual_credentials:
+                    exec_kwargs[field_name] = actual_credentials
+                else:
+                    return ErrorResponse(
+                        message=f"Failed to retrieve credentials for {field_name}",
+                        session_id=session_id,
+                    )
+
+            # Execute the block and collect outputs
+            outputs: dict[str, list[Any]] = defaultdict(list)
+            async for output_name, output_data in block.execute(
+                input_data,
+                **exec_kwargs,
+            ):
+                outputs[output_name].append(output_data)
+
+            return BlockOutputResponse(
+                message=f"Block '{block.name}' executed successfully",
+                block_id=block_id,
+                block_name=block.name,
+                outputs=dict(outputs),
+                success=True,
+                session_id=session_id,
+            )
+
+        except BlockError as e:
+            logger.warning(f"Block execution failed: {e}")
+            return ErrorResponse(
+                message=f"Block execution failed: {e}",
+                error=str(e),
+                session_id=session_id,
+            )
+        except Exception as e:
+            logger.error(f"Unexpected error executing block: {e}", exc_info=True)
+            return ErrorResponse(
+                message=f"Failed to execute block: {str(e)}",
+                error=str(e),
+                session_id=session_id,
+            )
+
+    def _get_inputs_list(self, block: Any) -> list[dict[str, Any]]:
+        """Extract non-credential inputs from block schema."""
+        inputs_list = []
+        schema = block.input_schema.jsonschema()
+        properties = schema.get("properties", {})
+        required_fields = set(schema.get("required", []))
+
+        # Get credential field names to exclude
+        credentials_fields = set(block.input_schema.get_credentials_fields().keys())
+
+        for field_name, field_schema in properties.items():
+            # Skip credential fields
+            if field_name in credentials_fields:
+                continue
+
+            inputs_list.append(
+                {
+                    "name": field_name,
+                    "title": field_schema.get("title", field_name),
+                    "type": field_schema.get("type", "string"),
+                    "description": field_schema.get("description", ""),
+                    "required": field_name in required_fields,
+                }
+            )
+
+        return inputs_list
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/search_docs.py b/autogpt_platform/backend/backend/api/features/chat/tools/search_docs.py
new file mode 100644
index 0000000000..edb0c0de1e
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/search_docs.py
@@ -0,0 +1,208 @@
+"""SearchDocsTool - Search documentation using hybrid search."""
+
+import logging
+from typing import Any
+
+from prisma.enums import ContentType
+
+from backend.api.features.chat.model import ChatSession
+from backend.api.features.chat.tools.base import BaseTool
+from backend.api.features.chat.tools.models import (
+    DocSearchResult,
+    DocSearchResultsResponse,
+    ErrorResponse,
+    NoResultsResponse,
+    ToolResponseBase,
+)
+from backend.api.features.store.hybrid_search import unified_hybrid_search
+
+logger = logging.getLogger(__name__)
+
+# Base URL for documentation (can be configured)
+DOCS_BASE_URL = "https://docs.agpt.co"
+
+# Maximum number of results to return
+MAX_RESULTS = 5
+
+# Snippet length for preview
+SNIPPET_LENGTH = 200
+
+
+class SearchDocsTool(BaseTool):
+    """Tool for searching AutoGPT platform documentation."""
+
+    @property
+    def name(self) -> str:
+        return "search_docs"
+
+    @property
+    def description(self) -> str:
+        return (
+            "Search the AutoGPT platform documentation for information about "
+            "how to use the platform, build agents, configure blocks, and more. "
+            "Returns relevant documentation sections. Use get_doc_page to read full content."
+        )
+
+    @property
+    def parameters(self) -> dict[str, Any]:
+        return {
+            "type": "object",
+            "properties": {
+                "query": {
+                    "type": "string",
+                    "description": (
+                        "Search query to find relevant documentation. "
+                        "Use natural language to describe what you're looking for."
+                    ),
+                },
+            },
+            "required": ["query"],
+        }
+
+    @property
+    def requires_auth(self) -> bool:
+        return False  # Documentation is public
+
+    def _create_snippet(self, content: str, max_length: int = SNIPPET_LENGTH) -> str:
+        """Create a short snippet from content for preview."""
+        # Remove markdown formatting for cleaner snippet
+        clean_content = content.replace("#", "").replace("*", "").replace("`", "")
+        # Remove extra whitespace
+        clean_content = " ".join(clean_content.split())
+
+        if len(clean_content) <= max_length:
+            return clean_content
+
+        # Truncate at word boundary
+        truncated = clean_content[:max_length]
+        last_space = truncated.rfind(" ")
+        if last_space > max_length // 2:
+            truncated = truncated[:last_space]
+
+        return truncated + "..."
+
+    def _make_doc_url(self, path: str) -> str:
+        """Create a URL for a documentation page."""
+        # Remove file extension for URL
+        url_path = path.rsplit(".", 1)[0] if "." in path else path
+        return f"{DOCS_BASE_URL}/{url_path}"
+
+    async def _execute(
+        self,
+        user_id: str | None,
+        session: ChatSession,
+        **kwargs,
+    ) -> ToolResponseBase:
+        """Search documentation and return relevant sections.
+
+        Args:
+            user_id: User ID (not required for docs)
+            session: Chat session
+            query: Search query
+
+        Returns:
+            DocSearchResultsResponse: List of matching documentation sections
+            NoResultsResponse: No results found
+            ErrorResponse: Error message
+        """
+        query = kwargs.get("query", "").strip()
+        session_id = session.session_id if session else None
+
+        if not query:
+            return ErrorResponse(
+                message="Please provide a search query.",
+                error="Missing query parameter",
+                session_id=session_id,
+            )
+
+        try:
+            # Search using hybrid search for DOCUMENTATION content type only
+            results, total = await unified_hybrid_search(
+                query=query,
+                content_types=[ContentType.DOCUMENTATION],
+                page=1,
+                page_size=MAX_RESULTS * 2,  # Fetch extra for deduplication
+                min_score=0.1,  # Lower threshold for docs
+            )
+
+            if not results:
+                return NoResultsResponse(
+                    message=f"No documentation found for '{query}'.",
+                    suggestions=[
+                        "Try different keywords",
+                        "Use more general terms",
+                        "Check for typos in your query",
+                    ],
+                    session_id=session_id,
+                )
+
+            # Deduplicate by document path (keep highest scoring section per doc)
+            seen_docs: dict[str, dict[str, Any]] = {}
+            for result in results:
+                metadata = result.get("metadata", {})
+                doc_path = metadata.get("path", "")
+
+                if not doc_path:
+                    continue
+
+                # Keep the highest scoring result for each document
+                if doc_path not in seen_docs:
+                    seen_docs[doc_path] = result
+                elif result.get("combined_score", 0) > seen_docs[doc_path].get(
+                    "combined_score", 0
+                ):
+                    seen_docs[doc_path] = result
+
+            # Sort by score and take top MAX_RESULTS
+            deduplicated = sorted(
+                seen_docs.values(),
+                key=lambda x: x.get("combined_score", 0),
+                reverse=True,
+            )[:MAX_RESULTS]
+
+            if not deduplicated:
+                return NoResultsResponse(
+                    message=f"No documentation found for '{query}'.",
+                    suggestions=[
+                        "Try different keywords",
+                        "Use more general terms",
+                    ],
+                    session_id=session_id,
+                )
+
+            # Build response
+            doc_results: list[DocSearchResult] = []
+            for result in deduplicated:
+                metadata = result.get("metadata", {})
+                doc_path = metadata.get("path", "")
+                doc_title = metadata.get("doc_title", "")
+                section_title = metadata.get("section_title", "")
+                searchable_text = result.get("searchable_text", "")
+                score = result.get("combined_score", 0)
+
+                doc_results.append(
+                    DocSearchResult(
+                        title=doc_title or section_title or doc_path,
+                        path=doc_path,
+                        section=section_title,
+                        snippet=self._create_snippet(searchable_text),
+                        score=round(score, 3),
+                        doc_url=self._make_doc_url(doc_path),
+                    )
+                )
+
+            return DocSearchResultsResponse(
+                message=f"Found {len(doc_results)} relevant documentation sections.",
+                results=doc_results,
+                count=len(doc_results),
+                query=query,
+                session_id=session_id,
+            )
+
+        except Exception as e:
+            logger.error(f"Documentation search failed: {e}")
+            return ErrorResponse(
+                message=f"Failed to search documentation: {str(e)}",
+                error="search_failed",
+                session_id=session_id,
+            )
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/utils.py b/autogpt_platform/backend/backend/api/features/chat/tools/utils.py
index 19e092c312..bd25594b8a 100644
--- a/autogpt_platform/backend/backend/api/features/chat/tools/utils.py
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/utils.py
@@ -8,7 +8,12 @@ from backend.api.features.library import model as library_model
 from backend.api.features.store import db as store_db
 from backend.data import graph as graph_db
 from backend.data.graph import GraphModel
-from backend.data.model import CredentialsMetaInput
+from backend.data.model import (
+    CredentialsFieldInfo,
+    CredentialsMetaInput,
+    HostScopedCredentials,
+    OAuth2Credentials,
+)
 from backend.integrations.creds_manager import IntegrationCredentialsManager
 from backend.util.exceptions import NotFoundError
 
@@ -89,6 +94,59 @@ def extract_credentials_from_schema(
     return credentials
 
 
+def _serialize_missing_credential(
+    field_key: str, field_info: CredentialsFieldInfo
+) -> dict[str, Any]:
+    """
+    Convert credential field info into a serializable dict that preserves all supported
+    credential types (e.g., api_key + oauth2) so the UI can offer multiple options.
+    """
+    supported_types = sorted(field_info.supported_types)
+    provider = next(iter(field_info.provider), "unknown")
+    scopes = sorted(field_info.required_scopes or [])
+
+    return {
+        "id": field_key,
+        "title": field_key.replace("_", " ").title(),
+        "provider": provider,
+        "provider_name": provider.replace("_", " ").title(),
+        "type": supported_types[0] if supported_types else "api_key",
+        "types": supported_types,
+        "scopes": scopes,
+    }
+
+
+def build_missing_credentials_from_graph(
+    graph: GraphModel, matched_credentials: dict[str, CredentialsMetaInput] | None
+) -> dict[str, Any]:
+    """
+    Build a missing_credentials mapping from a graph's aggregated credentials inputs,
+    preserving all supported credential types for each field.
+    """
+    matched_keys = set(matched_credentials.keys()) if matched_credentials else set()
+    aggregated_fields = graph.aggregate_credentials_inputs()
+
+    return {
+        field_key: _serialize_missing_credential(field_key, field_info)
+        for field_key, (field_info, _node_fields) in aggregated_fields.items()
+        if field_key not in matched_keys
+    }
+
+
+def build_missing_credentials_from_field_info(
+    credential_fields: dict[str, CredentialsFieldInfo],
+    matched_keys: set[str],
+) -> dict[str, Any]:
+    """
+    Build missing_credentials mapping from a simple credentials field info dictionary.
+    """
+    return {
+        field_key: _serialize_missing_credential(field_key, field_info)
+        for field_key, field_info in credential_fields.items()
+        if field_key not in matched_keys
+    }
+
+
 def extract_credentials_as_dict(
     credentials_input_schema: dict[str, Any] | None,
 ) -> dict[str, CredentialsMetaInput]:
@@ -213,13 +271,21 @@ async def match_user_credentials_to_graph(
         credential_requirements,
         _node_fields,
     ) in aggregated_creds.items():
-        # Find first matching credential by provider and type
+        # Find first matching credential by provider, type, and scopes
         matching_cred = next(
             (
                 cred
                 for cred in available_creds
                 if cred.provider in credential_requirements.provider
                 and cred.type in credential_requirements.supported_types
+                and (
+                    cred.type != "oauth2"
+                    or _credential_has_required_scopes(cred, credential_requirements)
+                )
+                and (
+                    cred.type != "host_scoped"
+                    or _credential_is_for_host(cred, credential_requirements)
+                )
             ),
             None,
         )
@@ -243,10 +309,17 @@ async def match_user_credentials_to_graph(
                     f"{credential_field_name} (validation failed: {e})"
                 )
         else:
+            # Build a helpful error message including scope requirements
+            error_parts = [
+                f"provider in {list(credential_requirements.provider)}",
+                f"type in {list(credential_requirements.supported_types)}",
+            ]
+            if credential_requirements.required_scopes:
+                error_parts.append(
+                    f"scopes including {list(credential_requirements.required_scopes)}"
+                )
             missing_creds.append(
-                f"{credential_field_name} "
-                f"(requires provider in {list(credential_requirements.provider)}, "
-                f"type in {list(credential_requirements.supported_types)})"
+                f"{credential_field_name} (requires {', '.join(error_parts)})"
             )
 
     logger.info(
@@ -256,6 +329,35 @@ async def match_user_credentials_to_graph(
     return graph_credentials_inputs, missing_creds
 
 
+def _credential_has_required_scopes(
+    credential: OAuth2Credentials,
+    requirements: CredentialsFieldInfo,
+) -> bool:
+    """Check if an OAuth2 credential has all the scopes required by the input."""
+    # If no scopes are required, any credential matches
+    if not requirements.required_scopes:
+        return True
+
+    # Check that credential scopes are a superset of required scopes
+    return set(credential.scopes).issuperset(requirements.required_scopes)
+
+
+def _credential_is_for_host(
+    credential: HostScopedCredentials,
+    requirements: CredentialsFieldInfo,
+) -> bool:
+    """Check if a host-scoped credential matches the host required by the input."""
+    # We need to know the host to match host-scoped credentials to.
+    # Graph.aggregate_credentials_inputs() adds the node's set URL value (if any)
+    # to discriminator_values. No discriminator_values -> no host to match against.
+    if not requirements.discriminator_values:
+        return True
+
+    # Check that credential host matches required host.
+    # Host-scoped credential inputs are grouped by host, so any item from the set works.
+    return credential.matches_url(list(requirements.discriminator_values)[0])
+
+
 async def check_user_has_required_credentials(
     user_id: str,
     required_credentials: list[CredentialsMetaInput],
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/workspace_files.py b/autogpt_platform/backend/backend/api/features/chat/tools/workspace_files.py
new file mode 100644
index 0000000000..03532c8fee
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/workspace_files.py
@@ -0,0 +1,620 @@
+"""CoPilot tools for workspace file operations."""
+
+import base64
+import logging
+from typing import Any, Optional
+
+from pydantic import BaseModel
+
+from backend.api.features.chat.model import ChatSession
+from backend.data.workspace import get_or_create_workspace
+from backend.util.settings import Config
+from backend.util.virus_scanner import scan_content_safe
+from backend.util.workspace import WorkspaceManager
+
+from .base import BaseTool
+from .models import ErrorResponse, ResponseType, ToolResponseBase
+
+logger = logging.getLogger(__name__)
+
+
+class WorkspaceFileInfoData(BaseModel):
+    """Data model for workspace file information (not a response itself)."""
+
+    file_id: str
+    name: str
+    path: str
+    mime_type: str
+    size_bytes: int
+
+
+class WorkspaceFileListResponse(ToolResponseBase):
+    """Response containing list of workspace files."""
+
+    type: ResponseType = ResponseType.WORKSPACE_FILE_LIST
+    files: list[WorkspaceFileInfoData]
+    total_count: int
+
+
+class WorkspaceFileContentResponse(ToolResponseBase):
+    """Response containing workspace file content (legacy, for small text files)."""
+
+    type: ResponseType = ResponseType.WORKSPACE_FILE_CONTENT
+    file_id: str
+    name: str
+    path: str
+    mime_type: str
+    content_base64: str
+
+
+class WorkspaceFileMetadataResponse(ToolResponseBase):
+    """Response containing workspace file metadata and download URL (prevents context bloat)."""
+
+    type: ResponseType = ResponseType.WORKSPACE_FILE_METADATA
+    file_id: str
+    name: str
+    path: str
+    mime_type: str
+    size_bytes: int
+    download_url: str
+    preview: str | None = None  # First 500 chars for text files
+
+
+class WorkspaceWriteResponse(ToolResponseBase):
+    """Response after writing a file to workspace."""
+
+    type: ResponseType = ResponseType.WORKSPACE_FILE_WRITTEN
+    file_id: str
+    name: str
+    path: str
+    size_bytes: int
+
+
+class WorkspaceDeleteResponse(ToolResponseBase):
+    """Response after deleting a file from workspace."""
+
+    type: ResponseType = ResponseType.WORKSPACE_FILE_DELETED
+    file_id: str
+    success: bool
+
+
+class ListWorkspaceFilesTool(BaseTool):
+    """Tool for listing files in user's workspace."""
+
+    @property
+    def name(self) -> str:
+        return "list_workspace_files"
+
+    @property
+    def description(self) -> str:
+        return (
+            "List files in the user's workspace. "
+            "Returns file names, paths, sizes, and metadata. "
+            "Optionally filter by path prefix."
+        )
+
+    @property
+    def parameters(self) -> dict[str, Any]:
+        return {
+            "type": "object",
+            "properties": {
+                "path_prefix": {
+                    "type": "string",
+                    "description": (
+                        "Optional path prefix to filter files "
+                        "(e.g., '/documents/' to list only files in documents folder). "
+                        "By default, only files from the current session are listed."
+                    ),
+                },
+                "limit": {
+                    "type": "integer",
+                    "description": "Maximum number of files to return (default 50, max 100)",
+                    "minimum": 1,
+                    "maximum": 100,
+                },
+                "include_all_sessions": {
+                    "type": "boolean",
+                    "description": (
+                        "If true, list files from all sessions. "
+                        "Default is false (only current session's files)."
+                    ),
+                },
+            },
+            "required": [],
+        }
+
+    @property
+    def requires_auth(self) -> bool:
+        return True
+
+    async def _execute(
+        self,
+        user_id: str | None,
+        session: ChatSession,
+        **kwargs,
+    ) -> ToolResponseBase:
+        session_id = session.session_id
+
+        if not user_id:
+            return ErrorResponse(
+                message="Authentication required",
+                session_id=session_id,
+            )
+
+        path_prefix: Optional[str] = kwargs.get("path_prefix")
+        limit = min(kwargs.get("limit", 50), 100)
+        include_all_sessions: bool = kwargs.get("include_all_sessions", False)
+
+        try:
+            workspace = await get_or_create_workspace(user_id)
+            # Pass session_id for session-scoped file access
+            manager = WorkspaceManager(user_id, workspace.id, session_id)
+
+            files = await manager.list_files(
+                path=path_prefix,
+                limit=limit,
+                include_all_sessions=include_all_sessions,
+            )
+            total = await manager.get_file_count(
+                path=path_prefix,
+                include_all_sessions=include_all_sessions,
+            )
+
+            file_infos = [
+                WorkspaceFileInfoData(
+                    file_id=f.id,
+                    name=f.name,
+                    path=f.path,
+                    mime_type=f.mimeType,
+                    size_bytes=f.sizeBytes,
+                )
+                for f in files
+            ]
+
+            scope_msg = "all sessions" if include_all_sessions else "current session"
+            return WorkspaceFileListResponse(
+                files=file_infos,
+                total_count=total,
+                message=f"Found {len(files)} files in workspace ({scope_msg})",
+                session_id=session_id,
+            )
+
+        except Exception as e:
+            logger.error(f"Error listing workspace files: {e}", exc_info=True)
+            return ErrorResponse(
+                message=f"Failed to list workspace files: {str(e)}",
+                error=str(e),
+                session_id=session_id,
+            )
+
+
+class ReadWorkspaceFileTool(BaseTool):
+    """Tool for reading file content from workspace."""
+
+    # Size threshold for returning full content vs metadata+URL
+    # Files larger than this return metadata with download URL to prevent context bloat
+    MAX_INLINE_SIZE_BYTES = 32 * 1024  # 32KB
+    # Preview size for text files
+    PREVIEW_SIZE = 500
+
+    @property
+    def name(self) -> str:
+        return "read_workspace_file"
+
+    @property
+    def description(self) -> str:
+        return (
+            "Read a file from the user's workspace. "
+            "Specify either file_id or path to identify the file. "
+            "For small text files, returns content directly. "
+            "For large or binary files, returns metadata and a download URL. "
+            "Paths are scoped to the current session by default. "
+            "Use /sessions/<session_id>/... for cross-session access."
+        )
+
+    @property
+    def parameters(self) -> dict[str, Any]:
+        return {
+            "type": "object",
+            "properties": {
+                "file_id": {
+                    "type": "string",
+                    "description": "The file's unique ID (from list_workspace_files)",
+                },
+                "path": {
+                    "type": "string",
+                    "description": (
+                        "The virtual file path (e.g., '/documents/report.pdf'). "
+                        "Scoped to current session by default."
+                    ),
+                },
+                "force_download_url": {
+                    "type": "boolean",
+                    "description": (
+                        "If true, always return metadata+URL instead of inline content. "
+                        "Default is false (auto-selects based on file size/type)."
+                    ),
+                },
+            },
+            "required": [],  # At least one must be provided
+        }
+
+    @property
+    def requires_auth(self) -> bool:
+        return True
+
+    def _is_text_mime_type(self, mime_type: str) -> bool:
+        """Check if the MIME type is a text-based type."""
+        text_types = [
+            "text/",
+            "application/json",
+            "application/xml",
+            "application/javascript",
+            "application/x-python",
+            "application/x-sh",
+        ]
+        return any(mime_type.startswith(t) for t in text_types)
+
+    async def _execute(
+        self,
+        user_id: str | None,
+        session: ChatSession,
+        **kwargs,
+    ) -> ToolResponseBase:
+        session_id = session.session_id
+
+        if not user_id:
+            return ErrorResponse(
+                message="Authentication required",
+                session_id=session_id,
+            )
+
+        file_id: Optional[str] = kwargs.get("file_id")
+        path: Optional[str] = kwargs.get("path")
+        force_download_url: bool = kwargs.get("force_download_url", False)
+
+        if not file_id and not path:
+            return ErrorResponse(
+                message="Please provide either file_id or path",
+                session_id=session_id,
+            )
+
+        try:
+            workspace = await get_or_create_workspace(user_id)
+            # Pass session_id for session-scoped file access
+            manager = WorkspaceManager(user_id, workspace.id, session_id)
+
+            # Get file info
+            if file_id:
+                file_info = await manager.get_file_info(file_id)
+                if file_info is None:
+                    return ErrorResponse(
+                        message=f"File not found: {file_id}",
+                        session_id=session_id,
+                    )
+                target_file_id = file_id
+            else:
+                # path is guaranteed to be non-None here due to the check above
+                assert path is not None
+                file_info = await manager.get_file_info_by_path(path)
+                if file_info is None:
+                    return ErrorResponse(
+                        message=f"File not found at path: {path}",
+                        session_id=session_id,
+                    )
+                target_file_id = file_info.id
+
+            # Decide whether to return inline content or metadata+URL
+            is_small_file = file_info.sizeBytes <= self.MAX_INLINE_SIZE_BYTES
+            is_text_file = self._is_text_mime_type(file_info.mimeType)
+
+            # Return inline content for small text files (unless force_download_url)
+            if is_small_file and is_text_file and not force_download_url:
+                content = await manager.read_file_by_id(target_file_id)
+                content_b64 = base64.b64encode(content).decode("utf-8")
+
+                return WorkspaceFileContentResponse(
+                    file_id=file_info.id,
+                    name=file_info.name,
+                    path=file_info.path,
+                    mime_type=file_info.mimeType,
+                    content_base64=content_b64,
+                    message=f"Successfully read file: {file_info.name}",
+                    session_id=session_id,
+                )
+
+            # Return metadata + workspace:// reference for large or binary files
+            # This prevents context bloat (100KB file = ~133KB as base64)
+            # Use workspace:// format so frontend urlTransform can add proxy prefix
+            download_url = f"workspace://{target_file_id}"
+
+            # Generate preview for text files
+            preview: str | None = None
+            if is_text_file:
+                try:
+                    content = await manager.read_file_by_id(target_file_id)
+                    preview_text = content[: self.PREVIEW_SIZE].decode(
+                        "utf-8", errors="replace"
+                    )
+                    if len(content) > self.PREVIEW_SIZE:
+                        preview_text += "..."
+                    preview = preview_text
+                except Exception:
+                    pass  # Preview is optional
+
+            return WorkspaceFileMetadataResponse(
+                file_id=file_info.id,
+                name=file_info.name,
+                path=file_info.path,
+                mime_type=file_info.mimeType,
+                size_bytes=file_info.sizeBytes,
+                download_url=download_url,
+                preview=preview,
+                message=f"File: {file_info.name} ({file_info.sizeBytes} bytes). Use download_url to retrieve content.",
+                session_id=session_id,
+            )
+
+        except FileNotFoundError as e:
+            return ErrorResponse(
+                message=str(e),
+                session_id=session_id,
+            )
+        except Exception as e:
+            logger.error(f"Error reading workspace file: {e}", exc_info=True)
+            return ErrorResponse(
+                message=f"Failed to read workspace file: {str(e)}",
+                error=str(e),
+                session_id=session_id,
+            )
+
+
+class WriteWorkspaceFileTool(BaseTool):
+    """Tool for writing files to workspace."""
+
+    @property
+    def name(self) -> str:
+        return "write_workspace_file"
+
+    @property
+    def description(self) -> str:
+        return (
+            "Write or create a file in the user's workspace. "
+            "Provide the content as a base64-encoded string. "
+            f"Maximum file size is {Config().max_file_size_mb}MB. "
+            "Files are saved to the current session's folder by default. "
+            "Use /sessions/<session_id>/... for cross-session access."
+        )
+
+    @property
+    def parameters(self) -> dict[str, Any]:
+        return {
+            "type": "object",
+            "properties": {
+                "filename": {
+                    "type": "string",
+                    "description": "Name for the file (e.g., 'report.pdf')",
+                },
+                "content_base64": {
+                    "type": "string",
+                    "description": "Base64-encoded file content",
+                },
+                "path": {
+                    "type": "string",
+                    "description": (
+                        "Optional virtual path where to save the file "
+                        "(e.g., '/documents/report.pdf'). "
+                        "Defaults to '/{filename}'. Scoped to current session."
+                    ),
+                },
+                "mime_type": {
+                    "type": "string",
+                    "description": (
+                        "Optional MIME type of the file. "
+                        "Auto-detected from filename if not provided."
+                    ),
+                },
+                "overwrite": {
+                    "type": "boolean",
+                    "description": "Whether to overwrite if file exists at path (default: false)",
+                },
+            },
+            "required": ["filename", "content_base64"],
+        }
+
+    @property
+    def requires_auth(self) -> bool:
+        return True
+
+    async def _execute(
+        self,
+        user_id: str | None,
+        session: ChatSession,
+        **kwargs,
+    ) -> ToolResponseBase:
+        session_id = session.session_id
+
+        if not user_id:
+            return ErrorResponse(
+                message="Authentication required",
+                session_id=session_id,
+            )
+
+        filename: str = kwargs.get("filename", "")
+        content_b64: str = kwargs.get("content_base64", "")
+        path: Optional[str] = kwargs.get("path")
+        mime_type: Optional[str] = kwargs.get("mime_type")
+        overwrite: bool = kwargs.get("overwrite", False)
+
+        if not filename:
+            return ErrorResponse(
+                message="Please provide a filename",
+                session_id=session_id,
+            )
+
+        if not content_b64:
+            return ErrorResponse(
+                message="Please provide content_base64",
+                session_id=session_id,
+            )
+
+        # Decode content
+        try:
+            content = base64.b64decode(content_b64)
+        except Exception:
+            return ErrorResponse(
+                message="Invalid base64-encoded content",
+                session_id=session_id,
+            )
+
+        # Check size
+        max_file_size = Config().max_file_size_mb * 1024 * 1024
+        if len(content) > max_file_size:
+            return ErrorResponse(
+                message=f"File too large. Maximum size is {Config().max_file_size_mb}MB",
+                session_id=session_id,
+            )
+
+        try:
+            # Virus scan
+            await scan_content_safe(content, filename=filename)
+
+            workspace = await get_or_create_workspace(user_id)
+            # Pass session_id for session-scoped file access
+            manager = WorkspaceManager(user_id, workspace.id, session_id)
+
+            file_record = await manager.write_file(
+                content=content,
+                filename=filename,
+                path=path,
+                mime_type=mime_type,
+                overwrite=overwrite,
+            )
+
+            return WorkspaceWriteResponse(
+                file_id=file_record.id,
+                name=file_record.name,
+                path=file_record.path,
+                size_bytes=file_record.sizeBytes,
+                message=f"Successfully wrote file: {file_record.name}",
+                session_id=session_id,
+            )
+
+        except ValueError as e:
+            return ErrorResponse(
+                message=str(e),
+                session_id=session_id,
+            )
+        except Exception as e:
+            logger.error(f"Error writing workspace file: {e}", exc_info=True)
+            return ErrorResponse(
+                message=f"Failed to write workspace file: {str(e)}",
+                error=str(e),
+                session_id=session_id,
+            )
+
+
+class DeleteWorkspaceFileTool(BaseTool):
+    """Tool for deleting files from workspace."""
+
+    @property
+    def name(self) -> str:
+        return "delete_workspace_file"
+
+    @property
+    def description(self) -> str:
+        return (
+            "Delete a file from the user's workspace. "
+            "Specify either file_id or path to identify the file. "
+            "Paths are scoped to the current session by default. "
+            "Use /sessions/<session_id>/... for cross-session access."
+        )
+
+    @property
+    def parameters(self) -> dict[str, Any]:
+        return {
+            "type": "object",
+            "properties": {
+                "file_id": {
+                    "type": "string",
+                    "description": "The file's unique ID (from list_workspace_files)",
+                },
+                "path": {
+                    "type": "string",
+                    "description": (
+                        "The virtual file path (e.g., '/documents/report.pdf'). "
+                        "Scoped to current session by default."
+                    ),
+                },
+            },
+            "required": [],  # At least one must be provided
+        }
+
+    @property
+    def requires_auth(self) -> bool:
+        return True
+
+    async def _execute(
+        self,
+        user_id: str | None,
+        session: ChatSession,
+        **kwargs,
+    ) -> ToolResponseBase:
+        session_id = session.session_id
+
+        if not user_id:
+            return ErrorResponse(
+                message="Authentication required",
+                session_id=session_id,
+            )
+
+        file_id: Optional[str] = kwargs.get("file_id")
+        path: Optional[str] = kwargs.get("path")
+
+        if not file_id and not path:
+            return ErrorResponse(
+                message="Please provide either file_id or path",
+                session_id=session_id,
+            )
+
+        try:
+            workspace = await get_or_create_workspace(user_id)
+            # Pass session_id for session-scoped file access
+            manager = WorkspaceManager(user_id, workspace.id, session_id)
+
+            # Determine the file_id to delete
+            target_file_id: str
+            if file_id:
+                target_file_id = file_id
+            else:
+                # path is guaranteed to be non-None here due to the check above
+                assert path is not None
+                file_info = await manager.get_file_info_by_path(path)
+                if file_info is None:
+                    return ErrorResponse(
+                        message=f"File not found at path: {path}",
+                        session_id=session_id,
+                    )
+                target_file_id = file_info.id
+
+            success = await manager.delete_file(target_file_id)
+
+            if not success:
+                return ErrorResponse(
+                    message=f"File not found: {target_file_id}",
+                    session_id=session_id,
+                )
+
+            return WorkspaceDeleteResponse(
+                file_id=target_file_id,
+                success=True,
+                message="File deleted successfully",
+                session_id=session_id,
+            )
+
+        except Exception as e:
+            logger.error(f"Error deleting workspace file: {e}", exc_info=True)
+            return ErrorResponse(
+                message=f"Failed to delete workspace file: {str(e)}",
+                error=str(e),
+                session_id=session_id,
+            )
diff --git a/autogpt_platform/backend/backend/api/features/chat/tracking.py b/autogpt_platform/backend/backend/api/features/chat/tracking.py
new file mode 100644
index 0000000000..b2c0fd032f
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/chat/tracking.py
@@ -0,0 +1,250 @@
+"""PostHog analytics tracking for the chat system."""
+
+import atexit
+import logging
+from typing import Any
+
+from posthog import Posthog
+
+from backend.util.settings import Settings
+
+logger = logging.getLogger(__name__)
+settings = Settings()
+
+# PostHog client instance (lazily initialized)
+_posthog_client: Posthog | None = None
+
+
+def _shutdown_posthog() -> None:
+    """Flush and shutdown PostHog client on process exit."""
+    if _posthog_client is not None:
+        _posthog_client.flush()
+        _posthog_client.shutdown()
+
+
+atexit.register(_shutdown_posthog)
+
+
+def _get_posthog_client() -> Posthog | None:
+    """Get or create the PostHog client instance."""
+    global _posthog_client
+    if _posthog_client is not None:
+        return _posthog_client
+
+    if not settings.secrets.posthog_api_key:
+        logger.debug("PostHog API key not configured, analytics disabled")
+        return None
+
+    _posthog_client = Posthog(
+        settings.secrets.posthog_api_key,
+        host=settings.secrets.posthog_host,
+    )
+    logger.info(
+        f"PostHog client initialized with host: {settings.secrets.posthog_host}"
+    )
+    return _posthog_client
+
+
+def _get_base_properties() -> dict[str, Any]:
+    """Get base properties included in all events."""
+    return {
+        "environment": settings.config.app_env.value,
+        "source": "chat_copilot",
+    }
+
+
+def track_user_message(
+    user_id: str | None,
+    session_id: str,
+    message_length: int,
+) -> None:
+    """Track when a user sends a message in chat.
+
+    Args:
+        user_id: The user's ID (or None for anonymous)
+        session_id: The chat session ID
+        message_length: Length of the user's message
+    """
+    client = _get_posthog_client()
+    if not client:
+        return
+
+    try:
+        properties = {
+            **_get_base_properties(),
+            "session_id": session_id,
+            "message_length": message_length,
+        }
+        client.capture(
+            distinct_id=user_id or f"anonymous_{session_id}",
+            event="copilot_message_sent",
+            properties=properties,
+        )
+    except Exception as e:
+        logger.warning(f"Failed to track user message: {e}")
+
+
+def track_tool_called(
+    user_id: str | None,
+    session_id: str,
+    tool_name: str,
+    tool_call_id: str,
+) -> None:
+    """Track when a tool is called in chat.
+
+    Args:
+        user_id: The user's ID (or None for anonymous)
+        session_id: The chat session ID
+        tool_name: Name of the tool being called
+        tool_call_id: Unique ID of the tool call
+    """
+    client = _get_posthog_client()
+    if not client:
+        logger.info("PostHog client not available for tool tracking")
+        return
+
+    try:
+        properties = {
+            **_get_base_properties(),
+            "session_id": session_id,
+            "tool_name": tool_name,
+            "tool_call_id": tool_call_id,
+        }
+        distinct_id = user_id or f"anonymous_{session_id}"
+        logger.info(
+            f"Sending copilot_tool_called event to PostHog: distinct_id={distinct_id}, "
+            f"tool_name={tool_name}"
+        )
+        client.capture(
+            distinct_id=distinct_id,
+            event="copilot_tool_called",
+            properties=properties,
+        )
+    except Exception as e:
+        logger.warning(f"Failed to track tool call: {e}")
+
+
+def track_agent_run_success(
+    user_id: str,
+    session_id: str,
+    graph_id: str,
+    graph_name: str,
+    execution_id: str,
+    library_agent_id: str,
+) -> None:
+    """Track when an agent is successfully run.
+
+    Args:
+        user_id: The user's ID
+        session_id: The chat session ID
+        graph_id: ID of the agent graph
+        graph_name: Name of the agent
+        execution_id: ID of the execution
+        library_agent_id: ID of the library agent
+    """
+    client = _get_posthog_client()
+    if not client:
+        return
+
+    try:
+        properties = {
+            **_get_base_properties(),
+            "session_id": session_id,
+            "graph_id": graph_id,
+            "graph_name": graph_name,
+            "execution_id": execution_id,
+            "library_agent_id": library_agent_id,
+        }
+        client.capture(
+            distinct_id=user_id,
+            event="copilot_agent_run_success",
+            properties=properties,
+        )
+    except Exception as e:
+        logger.warning(f"Failed to track agent run: {e}")
+
+
+def track_agent_scheduled(
+    user_id: str,
+    session_id: str,
+    graph_id: str,
+    graph_name: str,
+    schedule_id: str,
+    schedule_name: str,
+    cron: str,
+    library_agent_id: str,
+) -> None:
+    """Track when an agent is successfully scheduled.
+
+    Args:
+        user_id: The user's ID
+        session_id: The chat session ID
+        graph_id: ID of the agent graph
+        graph_name: Name of the agent
+        schedule_id: ID of the schedule
+        schedule_name: Name of the schedule
+        cron: Cron expression for the schedule
+        library_agent_id: ID of the library agent
+    """
+    client = _get_posthog_client()
+    if not client:
+        return
+
+    try:
+        properties = {
+            **_get_base_properties(),
+            "session_id": session_id,
+            "graph_id": graph_id,
+            "graph_name": graph_name,
+            "schedule_id": schedule_id,
+            "schedule_name": schedule_name,
+            "cron": cron,
+            "library_agent_id": library_agent_id,
+        }
+        client.capture(
+            distinct_id=user_id,
+            event="copilot_agent_scheduled",
+            properties=properties,
+        )
+    except Exception as e:
+        logger.warning(f"Failed to track agent schedule: {e}")
+
+
+def track_trigger_setup(
+    user_id: str,
+    session_id: str,
+    graph_id: str,
+    graph_name: str,
+    trigger_type: str,
+    library_agent_id: str,
+) -> None:
+    """Track when a trigger is set up for an agent.
+
+    Args:
+        user_id: The user's ID
+        session_id: The chat session ID
+        graph_id: ID of the agent graph
+        graph_name: Name of the agent
+        trigger_type: Type of trigger (e.g., 'webhook')
+        library_agent_id: ID of the library agent
+    """
+    client = _get_posthog_client()
+    if not client:
+        return
+
+    try:
+        properties = {
+            **_get_base_properties(),
+            "session_id": session_id,
+            "graph_id": graph_id,
+            "graph_name": graph_name,
+            "trigger_type": trigger_type,
+            "library_agent_id": library_agent_id,
+        }
+        client.capture(
+            distinct_id=user_id,
+            event="copilot_trigger_setup",
+            properties=properties,
+        )
+    except Exception as e:
+        logger.warning(f"Failed to track trigger setup: {e}")
diff --git a/autogpt_platform/backend/backend/api/features/executions/review/model.py b/autogpt_platform/backend/backend/api/features/executions/review/model.py
index 74f72fe1ff..bad8b8d304 100644
--- a/autogpt_platform/backend/backend/api/features/executions/review/model.py
+++ b/autogpt_platform/backend/backend/api/features/executions/review/model.py
@@ -23,6 +23,7 @@ class PendingHumanReviewModel(BaseModel):
         id: Unique identifier for the review record
         user_id: ID of the user who must perform the review
         node_exec_id: ID of the node execution that created this review
+        node_id: ID of the node definition (for grouping reviews from same node)
         graph_exec_id: ID of the graph execution containing the node
         graph_id: ID of the graph template being executed
         graph_version: Version number of the graph template
@@ -37,6 +38,10 @@ class PendingHumanReviewModel(BaseModel):
     """
 
     node_exec_id: str = Field(description="Node execution ID (primary key)")
+    node_id: str = Field(
+        description="Node definition ID (for grouping)",
+        default="",  # Temporary default for test compatibility
+    )
     user_id: str = Field(description="User ID associated with the review")
     graph_exec_id: str = Field(description="Graph execution ID")
     graph_id: str = Field(description="Graph ID")
@@ -66,7 +71,9 @@ class PendingHumanReviewModel(BaseModel):
     )
 
     @classmethod
-    def from_db(cls, review: "PendingHumanReview") -> "PendingHumanReviewModel":
+    def from_db(
+        cls, review: "PendingHumanReview", node_id: str
+    ) -> "PendingHumanReviewModel":
         """
         Convert a database model to a response model.
 
@@ -74,9 +81,14 @@ class PendingHumanReviewModel(BaseModel):
         payload, instructions, and editable flag.
 
         Handles invalid data gracefully by using safe defaults.
+
+        Args:
+            review: Database review object
+            node_id: Node definition ID (fetched from NodeExecution)
         """
         return cls(
             node_exec_id=review.nodeExecId,
+            node_id=node_id,
             user_id=review.userId,
             graph_exec_id=review.graphExecId,
             graph_id=review.graphId,
@@ -107,6 +119,13 @@ class ReviewItem(BaseModel):
     reviewed_data: SafeJsonData | None = Field(
         None, description="Optional edited data (ignored if approved=False)"
     )
+    auto_approve_future: bool = Field(
+        default=False,
+        description=(
+            "If true and this review is approved, future executions of this same "
+            "block (node) will be automatically approved. This only affects approved reviews."
+        ),
+    )
 
     @field_validator("reviewed_data")
     @classmethod
@@ -174,6 +193,9 @@ class ReviewRequest(BaseModel):
     This request must include ALL pending reviews for a graph execution.
     Each review will be either approved (with optional data modifications)
     or rejected (data ignored). The execution will resume only after ALL reviews are processed.
+
+    Each review item can individually specify whether to auto-approve future executions
+    of the same block via the `auto_approve_future` field on ReviewItem.
     """
 
     reviews: List[ReviewItem] = Field(
diff --git a/autogpt_platform/backend/backend/api/features/executions/review/review_routes_test.py b/autogpt_platform/backend/backend/api/features/executions/review/review_routes_test.py
index c4eba0befc..c8bbfe4bb0 100644
--- a/autogpt_platform/backend/backend/api/features/executions/review/review_routes_test.py
+++ b/autogpt_platform/backend/backend/api/features/executions/review/review_routes_test.py
@@ -1,35 +1,43 @@
 import datetime
+from typing import AsyncGenerator
 
-import fastapi
-import fastapi.testclient
+import httpx
 import pytest
+import pytest_asyncio
 import pytest_mock
 from prisma.enums import ReviewStatus
 from pytest_snapshot.plugin import Snapshot
 
-from backend.api.rest_api import handle_internal_http_error
+from backend.api.rest_api import app
+from backend.data.execution import (
+    ExecutionContext,
+    ExecutionStatus,
+    NodeExecutionResult,
+)
+from backend.data.graph import GraphSettings
 
 from .model import PendingHumanReviewModel
-from .routes import router
 
 # Using a fixed timestamp for reproducible tests
 FIXED_NOW = datetime.datetime(2023, 1, 1, 0, 0, 0, tzinfo=datetime.timezone.utc)
 
-app = fastapi.FastAPI()
-app.include_router(router, prefix="/api/review")
-app.add_exception_handler(ValueError, handle_internal_http_error(400))
 
-client = fastapi.testclient.TestClient(app)
-
-
-@pytest.fixture(autouse=True)
-def setup_app_auth(mock_jwt_user):
-    """Setup auth overrides for all tests in this module"""
+@pytest_asyncio.fixture(loop_scope="session")
+async def client(server, mock_jwt_user) -> AsyncGenerator[httpx.AsyncClient, None]:
+    """Create async HTTP client with auth overrides"""
     from autogpt_libs.auth.jwt_utils import get_jwt_payload
 
+    # Override get_jwt_payload dependency to return our test user
     app.dependency_overrides[get_jwt_payload] = mock_jwt_user["get_jwt_payload"]
-    yield
-    app.dependency_overrides.clear()
+
+    async with httpx.AsyncClient(
+        transport=httpx.ASGITransport(app=app),
+        base_url="http://test",
+    ) as http_client:
+        yield http_client
+
+    # Clean up overrides
+    app.dependency_overrides.pop(get_jwt_payload, None)
 
 
 @pytest.fixture
@@ -37,6 +45,7 @@ def sample_pending_review(test_user_id: str) -> PendingHumanReviewModel:
     """Create a sample pending review for testing"""
     return PendingHumanReviewModel(
         node_exec_id="test_node_123",
+        node_id="test_node_def_456",
         user_id=test_user_id,
         graph_exec_id="test_graph_exec_456",
         graph_id="test_graph_789",
@@ -54,7 +63,9 @@ def sample_pending_review(test_user_id: str) -> PendingHumanReviewModel:
     )
 
 
-def test_get_pending_reviews_empty(
+@pytest.mark.asyncio(loop_scope="session")
+async def test_get_pending_reviews_empty(
+    client: httpx.AsyncClient,
     mocker: pytest_mock.MockerFixture,
     snapshot: Snapshot,
     test_user_id: str,
@@ -65,14 +76,16 @@ def test_get_pending_reviews_empty(
     )
     mock_get_reviews.return_value = []
 
-    response = client.get("/api/review/pending")
+    response = await client.get("/api/review/pending")
 
     assert response.status_code == 200
     assert response.json() == []
     mock_get_reviews.assert_called_once_with(test_user_id, 1, 25)
 
 
-def test_get_pending_reviews_with_data(
+@pytest.mark.asyncio(loop_scope="session")
+async def test_get_pending_reviews_with_data(
+    client: httpx.AsyncClient,
     mocker: pytest_mock.MockerFixture,
     sample_pending_review: PendingHumanReviewModel,
     snapshot: Snapshot,
@@ -84,7 +97,7 @@ def test_get_pending_reviews_with_data(
     )
     mock_get_reviews.return_value = [sample_pending_review]
 
-    response = client.get("/api/review/pending?page=2&page_size=10")
+    response = await client.get("/api/review/pending?page=2&page_size=10")
 
     assert response.status_code == 200
     data = response.json()
@@ -94,7 +107,9 @@ def test_get_pending_reviews_with_data(
     mock_get_reviews.assert_called_once_with(test_user_id, 2, 10)
 
 
-def test_get_pending_reviews_for_execution_success(
+@pytest.mark.asyncio(loop_scope="session")
+async def test_get_pending_reviews_for_execution_success(
+    client: httpx.AsyncClient,
     mocker: pytest_mock.MockerFixture,
     sample_pending_review: PendingHumanReviewModel,
     snapshot: Snapshot,
@@ -114,7 +129,7 @@ def test_get_pending_reviews_for_execution_success(
     )
     mock_get_reviews.return_value = [sample_pending_review]
 
-    response = client.get("/api/review/execution/test_graph_exec_456")
+    response = await client.get("/api/review/execution/test_graph_exec_456")
 
     assert response.status_code == 200
     data = response.json()
@@ -122,7 +137,9 @@ def test_get_pending_reviews_for_execution_success(
     assert data[0]["graph_exec_id"] == "test_graph_exec_456"
 
 
-def test_get_pending_reviews_for_execution_not_available(
+@pytest.mark.asyncio(loop_scope="session")
+async def test_get_pending_reviews_for_execution_not_available(
+    client: httpx.AsyncClient,
     mocker: pytest_mock.MockerFixture,
 ) -> None:
     """Test access denied when user doesn't own the execution"""
@@ -131,13 +148,15 @@ def test_get_pending_reviews_for_execution_not_available(
     )
     mock_get_graph_execution.return_value = None
 
-    response = client.get("/api/review/execution/test_graph_exec_456")
+    response = await client.get("/api/review/execution/test_graph_exec_456")
 
     assert response.status_code == 404
     assert "not found" in response.json()["detail"]
 
 
-def test_process_review_action_approve_success(
+@pytest.mark.asyncio(loop_scope="session")
+async def test_process_review_action_approve_success(
+    client: httpx.AsyncClient,
     mocker: pytest_mock.MockerFixture,
     sample_pending_review: PendingHumanReviewModel,
     test_user_id: str,
@@ -145,6 +164,12 @@ def test_process_review_action_approve_success(
     """Test successful review approval"""
     # Mock the route functions
 
+    # Mock get_reviews_by_node_exec_ids (called to find the graph_exec_id)
+    mock_get_reviews_for_user = mocker.patch(
+        "backend.api.features.executions.review.routes.get_reviews_by_node_exec_ids"
+    )
+    mock_get_reviews_for_user.return_value = {"test_node_123": sample_pending_review}
+
     mock_get_reviews_for_execution = mocker.patch(
         "backend.api.features.executions.review.routes.get_pending_reviews_for_execution"
     )
@@ -173,6 +198,14 @@ def test_process_review_action_approve_success(
     )
     mock_process_all_reviews.return_value = {"test_node_123": approved_review}
 
+    # Mock get_graph_execution_meta to return execution in REVIEW status
+    mock_get_graph_exec = mocker.patch(
+        "backend.api.features.executions.review.routes.get_graph_execution_meta"
+    )
+    mock_graph_exec_meta = mocker.Mock()
+    mock_graph_exec_meta.status = ExecutionStatus.REVIEW
+    mock_get_graph_exec.return_value = mock_graph_exec_meta
+
     mock_has_pending = mocker.patch(
         "backend.api.features.executions.review.routes.has_pending_reviews_for_graph_exec"
     )
@@ -191,7 +224,7 @@ def test_process_review_action_approve_success(
         ]
     }
 
-    response = client.post("/api/review/action", json=request_data)
+    response = await client.post("/api/review/action", json=request_data)
 
     assert response.status_code == 200
     data = response.json()
@@ -201,7 +234,9 @@ def test_process_review_action_approve_success(
     assert data["error"] is None
 
 
-def test_process_review_action_reject_success(
+@pytest.mark.asyncio(loop_scope="session")
+async def test_process_review_action_reject_success(
+    client: httpx.AsyncClient,
     mocker: pytest_mock.MockerFixture,
     sample_pending_review: PendingHumanReviewModel,
     test_user_id: str,
@@ -209,6 +244,20 @@ def test_process_review_action_reject_success(
     """Test successful review rejection"""
     # Mock the route functions
 
+    # Mock get_reviews_by_node_exec_ids (called to find the graph_exec_id)
+    mock_get_reviews_for_user = mocker.patch(
+        "backend.api.features.executions.review.routes.get_reviews_by_node_exec_ids"
+    )
+    mock_get_reviews_for_user.return_value = {"test_node_123": sample_pending_review}
+
+    # Mock get_graph_execution_meta to return execution in REVIEW status
+    mock_get_graph_exec = mocker.patch(
+        "backend.api.features.executions.review.routes.get_graph_execution_meta"
+    )
+    mock_graph_exec_meta = mocker.Mock()
+    mock_graph_exec_meta.status = ExecutionStatus.REVIEW
+    mock_get_graph_exec.return_value = mock_graph_exec_meta
+
     mock_get_reviews_for_execution = mocker.patch(
         "backend.api.features.executions.review.routes.get_pending_reviews_for_execution"
     )
@@ -251,7 +300,7 @@ def test_process_review_action_reject_success(
         ]
     }
 
-    response = client.post("/api/review/action", json=request_data)
+    response = await client.post("/api/review/action", json=request_data)
 
     assert response.status_code == 200
     data = response.json()
@@ -261,7 +310,9 @@ def test_process_review_action_reject_success(
     assert data["error"] is None
 
 
-def test_process_review_action_mixed_success(
+@pytest.mark.asyncio(loop_scope="session")
+async def test_process_review_action_mixed_success(
+    client: httpx.AsyncClient,
     mocker: pytest_mock.MockerFixture,
     sample_pending_review: PendingHumanReviewModel,
     test_user_id: str,
@@ -288,6 +339,15 @@ def test_process_review_action_mixed_success(
 
     # Mock the route functions
 
+    # Mock get_reviews_by_node_exec_ids (called to find the graph_exec_id)
+    mock_get_reviews_for_user = mocker.patch(
+        "backend.api.features.executions.review.routes.get_reviews_by_node_exec_ids"
+    )
+    mock_get_reviews_for_user.return_value = {
+        "test_node_123": sample_pending_review,
+        "test_node_456": second_review,
+    }
+
     mock_get_reviews_for_execution = mocker.patch(
         "backend.api.features.executions.review.routes.get_pending_reviews_for_execution"
     )
@@ -337,6 +397,14 @@ def test_process_review_action_mixed_success(
         "test_node_456": rejected_review,
     }
 
+    # Mock get_graph_execution_meta to return execution in REVIEW status
+    mock_get_graph_exec = mocker.patch(
+        "backend.api.features.executions.review.routes.get_graph_execution_meta"
+    )
+    mock_graph_exec_meta = mocker.Mock()
+    mock_graph_exec_meta.status = ExecutionStatus.REVIEW
+    mock_get_graph_exec.return_value = mock_graph_exec_meta
+
     mock_has_pending = mocker.patch(
         "backend.api.features.executions.review.routes.has_pending_reviews_for_graph_exec"
     )
@@ -358,7 +426,7 @@ def test_process_review_action_mixed_success(
         ]
     }
 
-    response = client.post("/api/review/action", json=request_data)
+    response = await client.post("/api/review/action", json=request_data)
 
     assert response.status_code == 200
     data = response.json()
@@ -368,14 +436,16 @@ def test_process_review_action_mixed_success(
     assert data["error"] is None
 
 
-def test_process_review_action_empty_request(
+@pytest.mark.asyncio(loop_scope="session")
+async def test_process_review_action_empty_request(
+    client: httpx.AsyncClient,
     mocker: pytest_mock.MockerFixture,
     test_user_id: str,
 ) -> None:
     """Test error when no reviews provided"""
     request_data = {"reviews": []}
 
-    response = client.post("/api/review/action", json=request_data)
+    response = await client.post("/api/review/action", json=request_data)
 
     assert response.status_code == 422
     response_data = response.json()
@@ -385,11 +455,29 @@ def test_process_review_action_empty_request(
     assert "At least one review must be provided" in response_data["detail"][0]["msg"]
 
 
-def test_process_review_action_review_not_found(
+@pytest.mark.asyncio(loop_scope="session")
+async def test_process_review_action_review_not_found(
+    client: httpx.AsyncClient,
     mocker: pytest_mock.MockerFixture,
+    sample_pending_review: PendingHumanReviewModel,
     test_user_id: str,
 ) -> None:
     """Test error when review is not found"""
+    # Mock get_reviews_by_node_exec_ids (called to find the graph_exec_id)
+    mock_get_reviews_for_user = mocker.patch(
+        "backend.api.features.executions.review.routes.get_reviews_by_node_exec_ids"
+    )
+    # Return empty dict to simulate review not found
+    mock_get_reviews_for_user.return_value = {}
+
+    # Mock get_graph_execution_meta to return execution in REVIEW status
+    mock_get_graph_exec = mocker.patch(
+        "backend.api.features.executions.review.routes.get_graph_execution_meta"
+    )
+    mock_graph_exec_meta = mocker.Mock()
+    mock_graph_exec_meta.status = ExecutionStatus.REVIEW
+    mock_get_graph_exec.return_value = mock_graph_exec_meta
+
     # Mock the functions that extract graph execution ID from the request
     mock_get_reviews_for_execution = mocker.patch(
         "backend.api.features.executions.review.routes.get_pending_reviews_for_execution"
@@ -415,18 +503,34 @@ def test_process_review_action_review_not_found(
         ]
     }
 
-    response = client.post("/api/review/action", json=request_data)
+    response = await client.post("/api/review/action", json=request_data)
 
-    assert response.status_code == 400
-    assert "Reviews not found" in response.json()["detail"]
+    assert response.status_code == 404
+    assert "Review(s) not found" in response.json()["detail"]
 
 
-def test_process_review_action_partial_failure(
+@pytest.mark.asyncio(loop_scope="session")
+async def test_process_review_action_partial_failure(
+    client: httpx.AsyncClient,
     mocker: pytest_mock.MockerFixture,
     sample_pending_review: PendingHumanReviewModel,
     test_user_id: str,
 ) -> None:
     """Test handling of partial failures in review processing"""
+    # Mock get_reviews_by_node_exec_ids (called to find the graph_exec_id)
+    mock_get_reviews_for_user = mocker.patch(
+        "backend.api.features.executions.review.routes.get_reviews_by_node_exec_ids"
+    )
+    mock_get_reviews_for_user.return_value = {"test_node_123": sample_pending_review}
+
+    # Mock get_graph_execution_meta to return execution in REVIEW status
+    mock_get_graph_exec = mocker.patch(
+        "backend.api.features.executions.review.routes.get_graph_execution_meta"
+    )
+    mock_graph_exec_meta = mocker.Mock()
+    mock_graph_exec_meta.status = ExecutionStatus.REVIEW
+    mock_get_graph_exec.return_value = mock_graph_exec_meta
+
     # Mock the route functions
     mock_get_reviews_for_execution = mocker.patch(
         "backend.api.features.executions.review.routes.get_pending_reviews_for_execution"
@@ -449,31 +553,34 @@ def test_process_review_action_partial_failure(
         ]
     }
 
-    response = client.post("/api/review/action", json=request_data)
+    response = await client.post("/api/review/action", json=request_data)
 
     assert response.status_code == 400
     assert "Some reviews failed validation" in response.json()["detail"]
 
 
-def test_process_review_action_invalid_node_exec_id(
+@pytest.mark.asyncio(loop_scope="session")
+async def test_process_review_action_invalid_node_exec_id(
+    client: httpx.AsyncClient,
     mocker: pytest_mock.MockerFixture,
     sample_pending_review: PendingHumanReviewModel,
     test_user_id: str,
 ) -> None:
     """Test failure when trying to process review with invalid node execution ID"""
-    # Mock the route functions
-    mock_get_reviews_for_execution = mocker.patch(
-        "backend.api.features.executions.review.routes.get_pending_reviews_for_execution"
+    # Mock get_reviews_by_node_exec_ids (called to find the graph_exec_id)
+    mock_get_reviews_for_user = mocker.patch(
+        "backend.api.features.executions.review.routes.get_reviews_by_node_exec_ids"
     )
-    mock_get_reviews_for_execution.return_value = [sample_pending_review]
+    # Return empty dict to simulate review not found
+    mock_get_reviews_for_user.return_value = {}
 
-    # Mock validation failure - this should return 400, not 500
-    mock_process_all_reviews = mocker.patch(
-        "backend.api.features.executions.review.routes.process_all_reviews_for_execution"
-    )
-    mock_process_all_reviews.side_effect = ValueError(
-        "Invalid node execution ID format"
+    # Mock get_graph_execution_meta to return execution in REVIEW status
+    mock_get_graph_exec = mocker.patch(
+        "backend.api.features.executions.review.routes.get_graph_execution_meta"
     )
+    mock_graph_exec_meta = mocker.Mock()
+    mock_graph_exec_meta.status = ExecutionStatus.REVIEW
+    mock_get_graph_exec.return_value = mock_graph_exec_meta
 
     request_data = {
         "reviews": [
@@ -485,8 +592,638 @@ def test_process_review_action_invalid_node_exec_id(
         ]
     }
 
-    response = client.post("/api/review/action", json=request_data)
+    response = await client.post("/api/review/action", json=request_data)
 
-    # Should be a 400 Bad Request, not 500 Internal Server Error
-    assert response.status_code == 400
-    assert "Invalid node execution ID format" in response.json()["detail"]
+    # Returns 404 when review is not found
+    assert response.status_code == 404
+    assert "Review(s) not found" in response.json()["detail"]
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_process_review_action_auto_approve_creates_auto_approval_records(
+    client: httpx.AsyncClient,
+    mocker: pytest_mock.MockerFixture,
+    sample_pending_review: PendingHumanReviewModel,
+    test_user_id: str,
+) -> None:
+    """Test that auto_approve_future_actions flag creates auto-approval records"""
+    # Mock get_reviews_by_node_exec_ids (called to find the graph_exec_id)
+    mock_get_reviews_for_user = mocker.patch(
+        "backend.api.features.executions.review.routes.get_reviews_by_node_exec_ids"
+    )
+    mock_get_reviews_for_user.return_value = {"test_node_123": sample_pending_review}
+
+    # Mock process_all_reviews
+    mock_process_all_reviews = mocker.patch(
+        "backend.api.features.executions.review.routes.process_all_reviews_for_execution"
+    )
+    approved_review = PendingHumanReviewModel(
+        node_exec_id="test_node_123",
+        user_id=test_user_id,
+        graph_exec_id="test_graph_exec_456",
+        graph_id="test_graph_789",
+        graph_version=1,
+        payload={"data": "test payload"},
+        instructions="Please review",
+        editable=True,
+        status=ReviewStatus.APPROVED,
+        review_message="Approved",
+        was_edited=False,
+        processed=False,
+        created_at=FIXED_NOW,
+        updated_at=FIXED_NOW,
+        reviewed_at=FIXED_NOW,
+    )
+    mock_process_all_reviews.return_value = {"test_node_123": approved_review}
+
+    # Mock get_node_executions to return node_id mapping
+    mock_get_node_executions = mocker.patch(
+        "backend.data.execution.get_node_executions"
+    )
+    mock_node_exec = mocker.Mock(spec=NodeExecutionResult)
+    mock_node_exec.node_exec_id = "test_node_123"
+    mock_node_exec.node_id = "test_node_def_456"
+    mock_get_node_executions.return_value = [mock_node_exec]
+
+    # Mock create_auto_approval_record
+    mock_create_auto_approval = mocker.patch(
+        "backend.api.features.executions.review.routes.create_auto_approval_record"
+    )
+
+    # Mock get_graph_execution_meta to return execution in REVIEW status
+    mock_get_graph_exec = mocker.patch(
+        "backend.api.features.executions.review.routes.get_graph_execution_meta"
+    )
+    mock_graph_exec_meta = mocker.Mock()
+    mock_graph_exec_meta.status = ExecutionStatus.REVIEW
+    mock_get_graph_exec.return_value = mock_graph_exec_meta
+
+    # Mock has_pending_reviews_for_graph_exec
+    mock_has_pending = mocker.patch(
+        "backend.api.features.executions.review.routes.has_pending_reviews_for_graph_exec"
+    )
+    mock_has_pending.return_value = False
+
+    # Mock get_graph_settings to return custom settings
+    mock_get_settings = mocker.patch(
+        "backend.api.features.executions.review.routes.get_graph_settings"
+    )
+    mock_get_settings.return_value = GraphSettings(
+        human_in_the_loop_safe_mode=True,
+        sensitive_action_safe_mode=True,
+    )
+
+    # Mock get_user_by_id to prevent database access
+    mock_get_user = mocker.patch(
+        "backend.api.features.executions.review.routes.get_user_by_id"
+    )
+    mock_user = mocker.Mock()
+    mock_user.timezone = "UTC"
+    mock_get_user.return_value = mock_user
+
+    # Mock add_graph_execution
+    mock_add_execution = mocker.patch(
+        "backend.api.features.executions.review.routes.add_graph_execution"
+    )
+
+    request_data = {
+        "reviews": [
+            {
+                "node_exec_id": "test_node_123",
+                "approved": True,
+                "message": "Approved",
+                "auto_approve_future": True,
+            }
+        ],
+    }
+
+    response = await client.post("/api/review/action", json=request_data)
+
+    assert response.status_code == 200
+
+    # Verify process_all_reviews_for_execution was called (without auto_approve param)
+    mock_process_all_reviews.assert_called_once()
+
+    # Verify create_auto_approval_record was called for the approved review
+    mock_create_auto_approval.assert_called_once_with(
+        user_id=test_user_id,
+        graph_exec_id="test_graph_exec_456",
+        graph_id="test_graph_789",
+        graph_version=1,
+        node_id="test_node_def_456",
+        payload={"data": "test payload"},
+    )
+
+    # Verify get_graph_settings was called with correct parameters
+    mock_get_settings.assert_called_once_with(
+        user_id=test_user_id, graph_id="test_graph_789"
+    )
+
+    # Verify add_graph_execution was called with proper ExecutionContext
+    mock_add_execution.assert_called_once()
+    call_kwargs = mock_add_execution.call_args.kwargs
+    execution_context = call_kwargs["execution_context"]
+
+    assert isinstance(execution_context, ExecutionContext)
+    assert execution_context.human_in_the_loop_safe_mode is True
+    assert execution_context.sensitive_action_safe_mode is True
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_process_review_action_without_auto_approve_still_loads_settings(
+    client: httpx.AsyncClient,
+    mocker: pytest_mock.MockerFixture,
+    sample_pending_review: PendingHumanReviewModel,
+    test_user_id: str,
+) -> None:
+    """Test that execution context is created with settings even without auto-approve"""
+    # Mock get_reviews_by_node_exec_ids (called to find the graph_exec_id)
+    mock_get_reviews_for_user = mocker.patch(
+        "backend.api.features.executions.review.routes.get_reviews_by_node_exec_ids"
+    )
+    mock_get_reviews_for_user.return_value = {"test_node_123": sample_pending_review}
+
+    # Mock process_all_reviews
+    mock_process_all_reviews = mocker.patch(
+        "backend.api.features.executions.review.routes.process_all_reviews_for_execution"
+    )
+    approved_review = PendingHumanReviewModel(
+        node_exec_id="test_node_123",
+        user_id=test_user_id,
+        graph_exec_id="test_graph_exec_456",
+        graph_id="test_graph_789",
+        graph_version=1,
+        payload={"data": "test payload"},
+        instructions="Please review",
+        editable=True,
+        status=ReviewStatus.APPROVED,
+        review_message="Approved",
+        was_edited=False,
+        processed=False,
+        created_at=FIXED_NOW,
+        updated_at=FIXED_NOW,
+        reviewed_at=FIXED_NOW,
+    )
+    mock_process_all_reviews.return_value = {"test_node_123": approved_review}
+
+    # Mock create_auto_approval_record - should NOT be called when auto_approve is False
+    mock_create_auto_approval = mocker.patch(
+        "backend.api.features.executions.review.routes.create_auto_approval_record"
+    )
+
+    # Mock get_graph_execution_meta to return execution in REVIEW status
+    mock_get_graph_exec = mocker.patch(
+        "backend.api.features.executions.review.routes.get_graph_execution_meta"
+    )
+    mock_graph_exec_meta = mocker.Mock()
+    mock_graph_exec_meta.status = ExecutionStatus.REVIEW
+    mock_get_graph_exec.return_value = mock_graph_exec_meta
+
+    # Mock has_pending_reviews_for_graph_exec
+    mock_has_pending = mocker.patch(
+        "backend.api.features.executions.review.routes.has_pending_reviews_for_graph_exec"
+    )
+    mock_has_pending.return_value = False
+
+    # Mock get_graph_settings with sensitive_action_safe_mode enabled
+    mock_get_settings = mocker.patch(
+        "backend.api.features.executions.review.routes.get_graph_settings"
+    )
+    mock_get_settings.return_value = GraphSettings(
+        human_in_the_loop_safe_mode=False,
+        sensitive_action_safe_mode=True,
+    )
+
+    # Mock get_user_by_id to prevent database access
+    mock_get_user = mocker.patch(
+        "backend.api.features.executions.review.routes.get_user_by_id"
+    )
+    mock_user = mocker.Mock()
+    mock_user.timezone = "UTC"
+    mock_get_user.return_value = mock_user
+
+    # Mock add_graph_execution
+    mock_add_execution = mocker.patch(
+        "backend.api.features.executions.review.routes.add_graph_execution"
+    )
+
+    # Request WITHOUT auto_approve_future (defaults to False)
+    request_data = {
+        "reviews": [
+            {
+                "node_exec_id": "test_node_123",
+                "approved": True,
+                "message": "Approved",
+                # auto_approve_future defaults to False
+            }
+        ],
+    }
+
+    response = await client.post("/api/review/action", json=request_data)
+
+    assert response.status_code == 200
+
+    # Verify process_all_reviews_for_execution was called
+    mock_process_all_reviews.assert_called_once()
+
+    # Verify create_auto_approval_record was NOT called (auto_approve_future=False)
+    mock_create_auto_approval.assert_not_called()
+
+    # Verify settings were loaded
+    mock_get_settings.assert_called_once()
+
+    # Verify ExecutionContext has proper settings
+    mock_add_execution.assert_called_once()
+    call_kwargs = mock_add_execution.call_args.kwargs
+    execution_context = call_kwargs["execution_context"]
+
+    assert isinstance(execution_context, ExecutionContext)
+    assert execution_context.human_in_the_loop_safe_mode is False
+    assert execution_context.sensitive_action_safe_mode is True
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_process_review_action_auto_approve_only_applies_to_approved_reviews(
+    client: httpx.AsyncClient,
+    mocker: pytest_mock.MockerFixture,
+    test_user_id: str,
+) -> None:
+    """Test that auto_approve record is created only for approved reviews"""
+    # Create two reviews - one approved, one rejected
+    approved_review = PendingHumanReviewModel(
+        node_exec_id="node_exec_approved",
+        user_id=test_user_id,
+        graph_exec_id="test_graph_exec_456",
+        graph_id="test_graph_789",
+        graph_version=1,
+        payload={"data": "approved"},
+        instructions="Review",
+        editable=True,
+        status=ReviewStatus.APPROVED,
+        review_message=None,
+        was_edited=False,
+        processed=False,
+        created_at=FIXED_NOW,
+        updated_at=FIXED_NOW,
+        reviewed_at=FIXED_NOW,
+    )
+    rejected_review = PendingHumanReviewModel(
+        node_exec_id="node_exec_rejected",
+        user_id=test_user_id,
+        graph_exec_id="test_graph_exec_456",
+        graph_id="test_graph_789",
+        graph_version=1,
+        payload={"data": "rejected"},
+        instructions="Review",
+        editable=True,
+        status=ReviewStatus.REJECTED,
+        review_message="Rejected",
+        was_edited=False,
+        processed=False,
+        created_at=FIXED_NOW,
+        updated_at=FIXED_NOW,
+        reviewed_at=FIXED_NOW,
+    )
+
+    # Mock get_reviews_by_node_exec_ids (called to find the graph_exec_id)
+    mock_get_reviews_for_user = mocker.patch(
+        "backend.api.features.executions.review.routes.get_reviews_by_node_exec_ids"
+    )
+    # Need to return both reviews in WAITING state (before processing)
+    approved_review_waiting = PendingHumanReviewModel(
+        node_exec_id="node_exec_approved",
+        user_id=test_user_id,
+        graph_exec_id="test_graph_exec_456",
+        graph_id="test_graph_789",
+        graph_version=1,
+        payload={"data": "approved"},
+        instructions="Review",
+        editable=True,
+        status=ReviewStatus.WAITING,
+        review_message=None,
+        was_edited=False,
+        processed=False,
+        created_at=FIXED_NOW,
+    )
+    rejected_review_waiting = PendingHumanReviewModel(
+        node_exec_id="node_exec_rejected",
+        user_id=test_user_id,
+        graph_exec_id="test_graph_exec_456",
+        graph_id="test_graph_789",
+        graph_version=1,
+        payload={"data": "rejected"},
+        instructions="Review",
+        editable=True,
+        status=ReviewStatus.WAITING,
+        review_message=None,
+        was_edited=False,
+        processed=False,
+        created_at=FIXED_NOW,
+    )
+    mock_get_reviews_for_user.return_value = {
+        "node_exec_approved": approved_review_waiting,
+        "node_exec_rejected": rejected_review_waiting,
+    }
+
+    # Mock process_all_reviews
+    mock_process_all_reviews = mocker.patch(
+        "backend.api.features.executions.review.routes.process_all_reviews_for_execution"
+    )
+    mock_process_all_reviews.return_value = {
+        "node_exec_approved": approved_review,
+        "node_exec_rejected": rejected_review,
+    }
+
+    # Mock get_node_executions to return node_id mapping
+    mock_get_node_executions = mocker.patch(
+        "backend.data.execution.get_node_executions"
+    )
+    mock_node_exec = mocker.Mock(spec=NodeExecutionResult)
+    mock_node_exec.node_exec_id = "node_exec_approved"
+    mock_node_exec.node_id = "test_node_def_approved"
+    mock_get_node_executions.return_value = [mock_node_exec]
+
+    # Mock create_auto_approval_record
+    mock_create_auto_approval = mocker.patch(
+        "backend.api.features.executions.review.routes.create_auto_approval_record"
+    )
+
+    # Mock get_graph_execution_meta to return execution in REVIEW status
+    mock_get_graph_exec = mocker.patch(
+        "backend.api.features.executions.review.routes.get_graph_execution_meta"
+    )
+    mock_graph_exec_meta = mocker.Mock()
+    mock_graph_exec_meta.status = ExecutionStatus.REVIEW
+    mock_get_graph_exec.return_value = mock_graph_exec_meta
+
+    # Mock has_pending_reviews_for_graph_exec
+    mock_has_pending = mocker.patch(
+        "backend.api.features.executions.review.routes.has_pending_reviews_for_graph_exec"
+    )
+    mock_has_pending.return_value = False
+
+    # Mock get_graph_settings
+    mock_get_settings = mocker.patch(
+        "backend.api.features.executions.review.routes.get_graph_settings"
+    )
+    mock_get_settings.return_value = GraphSettings()
+
+    # Mock get_user_by_id to prevent database access
+    mock_get_user = mocker.patch(
+        "backend.api.features.executions.review.routes.get_user_by_id"
+    )
+    mock_user = mocker.Mock()
+    mock_user.timezone = "UTC"
+    mock_get_user.return_value = mock_user
+
+    # Mock add_graph_execution
+    mock_add_execution = mocker.patch(
+        "backend.api.features.executions.review.routes.add_graph_execution"
+    )
+
+    request_data = {
+        "reviews": [
+            {
+                "node_exec_id": "node_exec_approved",
+                "approved": True,
+                "auto_approve_future": True,
+            },
+            {
+                "node_exec_id": "node_exec_rejected",
+                "approved": False,
+                "auto_approve_future": True,  # Should be ignored since rejected
+            },
+        ],
+    }
+
+    response = await client.post("/api/review/action", json=request_data)
+
+    assert response.status_code == 200
+
+    # Verify process_all_reviews_for_execution was called
+    mock_process_all_reviews.assert_called_once()
+
+    # Verify create_auto_approval_record was called ONLY for the approved review
+    # (not for the rejected one)
+    mock_create_auto_approval.assert_called_once_with(
+        user_id=test_user_id,
+        graph_exec_id="test_graph_exec_456",
+        graph_id="test_graph_789",
+        graph_version=1,
+        node_id="test_node_def_approved",
+        payload={"data": "approved"},
+    )
+
+    # Verify get_node_executions was called to batch-fetch node data
+    mock_get_node_executions.assert_called_once()
+
+    # Verify ExecutionContext was created (auto-approval is now DB-based)
+    call_kwargs = mock_add_execution.call_args.kwargs
+    execution_context = call_kwargs["execution_context"]
+    assert isinstance(execution_context, ExecutionContext)
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_process_review_action_per_review_auto_approve_granularity(
+    client: httpx.AsyncClient,
+    mocker: pytest_mock.MockerFixture,
+    sample_pending_review: PendingHumanReviewModel,
+    test_user_id: str,
+) -> None:
+    """Test that auto-approval can be set per-review (granular control)"""
+    # Mock get_reviews_by_node_exec_ids - return different reviews based on node_exec_id
+    mock_get_reviews_for_user = mocker.patch(
+        "backend.api.features.executions.review.routes.get_reviews_by_node_exec_ids"
+    )
+
+    # Create a mapping of node_exec_id to review
+    review_map = {
+        "node_1_auto": PendingHumanReviewModel(
+            node_exec_id="node_1_auto",
+            user_id=test_user_id,
+            graph_exec_id="test_graph_exec",
+            graph_id="test_graph",
+            graph_version=1,
+            payload={"data": "node1"},
+            instructions="Review 1",
+            editable=True,
+            status=ReviewStatus.WAITING,
+            review_message=None,
+            was_edited=False,
+            processed=False,
+            created_at=FIXED_NOW,
+        ),
+        "node_2_manual": PendingHumanReviewModel(
+            node_exec_id="node_2_manual",
+            user_id=test_user_id,
+            graph_exec_id="test_graph_exec",
+            graph_id="test_graph",
+            graph_version=1,
+            payload={"data": "node2"},
+            instructions="Review 2",
+            editable=True,
+            status=ReviewStatus.WAITING,
+            review_message=None,
+            was_edited=False,
+            processed=False,
+            created_at=FIXED_NOW,
+        ),
+        "node_3_auto": PendingHumanReviewModel(
+            node_exec_id="node_3_auto",
+            user_id=test_user_id,
+            graph_exec_id="test_graph_exec",
+            graph_id="test_graph",
+            graph_version=1,
+            payload={"data": "node3"},
+            instructions="Review 3",
+            editable=True,
+            status=ReviewStatus.WAITING,
+            review_message=None,
+            was_edited=False,
+            processed=False,
+            created_at=FIXED_NOW,
+        ),
+    }
+
+    # Return the review map dict (batch function returns all requested reviews)
+    mock_get_reviews_for_user.return_value = review_map
+
+    # Mock process_all_reviews - return 3 approved reviews
+    mock_process_all_reviews = mocker.patch(
+        "backend.api.features.executions.review.routes.process_all_reviews_for_execution"
+    )
+    mock_process_all_reviews.return_value = {
+        "node_1_auto": PendingHumanReviewModel(
+            node_exec_id="node_1_auto",
+            user_id=test_user_id,
+            graph_exec_id="test_graph_exec",
+            graph_id="test_graph",
+            graph_version=1,
+            payload={"data": "node1"},
+            instructions="Review 1",
+            editable=True,
+            status=ReviewStatus.APPROVED,
+            review_message=None,
+            was_edited=False,
+            processed=False,
+            created_at=FIXED_NOW,
+            updated_at=FIXED_NOW,
+            reviewed_at=FIXED_NOW,
+        ),
+        "node_2_manual": PendingHumanReviewModel(
+            node_exec_id="node_2_manual",
+            user_id=test_user_id,
+            graph_exec_id="test_graph_exec",
+            graph_id="test_graph",
+            graph_version=1,
+            payload={"data": "node2"},
+            instructions="Review 2",
+            editable=True,
+            status=ReviewStatus.APPROVED,
+            review_message=None,
+            was_edited=False,
+            processed=False,
+            created_at=FIXED_NOW,
+            updated_at=FIXED_NOW,
+            reviewed_at=FIXED_NOW,
+        ),
+        "node_3_auto": PendingHumanReviewModel(
+            node_exec_id="node_3_auto",
+            user_id=test_user_id,
+            graph_exec_id="test_graph_exec",
+            graph_id="test_graph",
+            graph_version=1,
+            payload={"data": "node3"},
+            instructions="Review 3",
+            editable=True,
+            status=ReviewStatus.APPROVED,
+            review_message=None,
+            was_edited=False,
+            processed=False,
+            created_at=FIXED_NOW,
+            updated_at=FIXED_NOW,
+            reviewed_at=FIXED_NOW,
+        ),
+    }
+
+    # Mock get_node_executions to return batch node data
+    mock_get_node_executions = mocker.patch(
+        "backend.data.execution.get_node_executions"
+    )
+    # Create mock node executions for each review
+    mock_node_execs = []
+    for node_exec_id in ["node_1_auto", "node_2_manual", "node_3_auto"]:
+        mock_node = mocker.Mock(spec=NodeExecutionResult)
+        mock_node.node_exec_id = node_exec_id
+        mock_node.node_id = f"node_def_{node_exec_id}"
+        mock_node_execs.append(mock_node)
+    mock_get_node_executions.return_value = mock_node_execs
+
+    # Mock create_auto_approval_record
+    mock_create_auto_approval = mocker.patch(
+        "backend.api.features.executions.review.routes.create_auto_approval_record"
+    )
+
+    # Mock get_graph_execution_meta
+    mock_get_graph_exec = mocker.patch(
+        "backend.api.features.executions.review.routes.get_graph_execution_meta"
+    )
+    mock_graph_exec_meta = mocker.Mock()
+    mock_graph_exec_meta.status = ExecutionStatus.REVIEW
+    mock_get_graph_exec.return_value = mock_graph_exec_meta
+
+    # Mock has_pending_reviews_for_graph_exec
+    mock_has_pending = mocker.patch(
+        "backend.api.features.executions.review.routes.has_pending_reviews_for_graph_exec"
+    )
+    mock_has_pending.return_value = False
+
+    # Mock settings and execution
+    mock_get_settings = mocker.patch(
+        "backend.api.features.executions.review.routes.get_graph_settings"
+    )
+    mock_get_settings.return_value = GraphSettings(
+        human_in_the_loop_safe_mode=False, sensitive_action_safe_mode=False
+    )
+
+    mocker.patch("backend.api.features.executions.review.routes.add_graph_execution")
+    mocker.patch("backend.api.features.executions.review.routes.get_user_by_id")
+
+    # Request with granular auto-approval:
+    # - node_1_auto: auto_approve_future=True
+    # - node_2_manual: auto_approve_future=False (explicit)
+    # - node_3_auto: auto_approve_future=True
+    request_data = {
+        "reviews": [
+            {
+                "node_exec_id": "node_1_auto",
+                "approved": True,
+                "auto_approve_future": True,
+            },
+            {
+                "node_exec_id": "node_2_manual",
+                "approved": True,
+                "auto_approve_future": False,  # Don't auto-approve this one
+            },
+            {
+                "node_exec_id": "node_3_auto",
+                "approved": True,
+                "auto_approve_future": True,
+            },
+        ],
+    }
+
+    response = await client.post("/api/review/action", json=request_data)
+
+    assert response.status_code == 200
+
+    # Verify create_auto_approval_record was called ONLY for reviews with auto_approve_future=True
+    assert mock_create_auto_approval.call_count == 2
+
+    # Check that it was called for node_1 and node_3, but NOT node_2
+    call_args_list = [call.kwargs for call in mock_create_auto_approval.call_args_list]
+    node_ids_with_auto_approval = [args["node_id"] for args in call_args_list]
+
+    assert "node_def_node_1_auto" in node_ids_with_auto_approval
+    assert "node_def_node_3_auto" in node_ids_with_auto_approval
+    assert "node_def_node_2_manual" not in node_ids_with_auto_approval
diff --git a/autogpt_platform/backend/backend/api/features/executions/review/routes.py b/autogpt_platform/backend/backend/api/features/executions/review/routes.py
index 88646046da..539c7fd87b 100644
--- a/autogpt_platform/backend/backend/api/features/executions/review/routes.py
+++ b/autogpt_platform/backend/backend/api/features/executions/review/routes.py
@@ -1,17 +1,27 @@
+import asyncio
 import logging
-from typing import List
+from typing import Any, List
 
 import autogpt_libs.auth as autogpt_auth_lib
 from fastapi import APIRouter, HTTPException, Query, Security, status
 from prisma.enums import ReviewStatus
 
-from backend.data.execution import get_graph_execution_meta
+from backend.data.execution import (
+    ExecutionContext,
+    ExecutionStatus,
+    get_graph_execution_meta,
+)
+from backend.data.graph import get_graph_settings
 from backend.data.human_review import (
+    create_auto_approval_record,
     get_pending_reviews_for_execution,
     get_pending_reviews_for_user,
+    get_reviews_by_node_exec_ids,
     has_pending_reviews_for_graph_exec,
     process_all_reviews_for_execution,
 )
+from backend.data.model import USER_TIMEZONE_NOT_SET
+from backend.data.user import get_user_by_id
 from backend.executor.utils import add_graph_execution
 
 from .model import PendingHumanReviewModel, ReviewRequest, ReviewResponse
@@ -127,17 +137,70 @@ async def process_review_action(
             detail="At least one review must be provided",
         )
 
-    # Build review decisions map
+    # Batch fetch all requested reviews (regardless of status for idempotent handling)
+    reviews_map = await get_reviews_by_node_exec_ids(
+        list(all_request_node_ids), user_id
+    )
+
+    # Validate all reviews were found (must exist, any status is OK for now)
+    missing_ids = all_request_node_ids - set(reviews_map.keys())
+    if missing_ids:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=f"Review(s) not found: {', '.join(missing_ids)}",
+        )
+
+    # Validate all reviews belong to the same execution
+    graph_exec_ids = {review.graph_exec_id for review in reviews_map.values()}
+    if len(graph_exec_ids) > 1:
+        raise HTTPException(
+            status_code=status.HTTP_409_CONFLICT,
+            detail="All reviews in a single request must belong to the same execution.",
+        )
+
+    graph_exec_id = next(iter(graph_exec_ids))
+
+    # Validate execution status before processing reviews
+    graph_exec_meta = await get_graph_execution_meta(
+        user_id=user_id, execution_id=graph_exec_id
+    )
+
+    if not graph_exec_meta:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=f"Graph execution #{graph_exec_id} not found",
+        )
+
+    # Only allow processing reviews if execution is paused for review
+    # or incomplete (partial execution with some reviews already processed)
+    if graph_exec_meta.status not in (
+        ExecutionStatus.REVIEW,
+        ExecutionStatus.INCOMPLETE,
+    ):
+        raise HTTPException(
+            status_code=status.HTTP_409_CONFLICT,
+            detail=f"Cannot process reviews while execution status is {graph_exec_meta.status}. "
+            f"Reviews can only be processed when execution is paused (REVIEW status). "
+            f"Current status: {graph_exec_meta.status}",
+        )
+
+    # Build review decisions map and track which reviews requested auto-approval
+    # Auto-approved reviews use original data (no modifications allowed)
     review_decisions = {}
+    auto_approve_requests = {}  # Map node_exec_id -> auto_approve_future flag
+
     for review in request.reviews:
         review_status = (
             ReviewStatus.APPROVED if review.approved else ReviewStatus.REJECTED
         )
+        # If this review requested auto-approval, don't allow data modifications
+        reviewed_data = None if review.auto_approve_future else review.reviewed_data
         review_decisions[review.node_exec_id] = (
             review_status,
-            review.reviewed_data,
+            reviewed_data,
             review.message,
         )
+        auto_approve_requests[review.node_exec_id] = review.auto_approve_future
 
     # Process all reviews
     updated_reviews = await process_all_reviews_for_execution(
@@ -145,6 +208,87 @@ async def process_review_action(
         review_decisions=review_decisions,
     )
 
+    # Create auto-approval records for approved reviews that requested it
+    # Deduplicate by node_id to avoid race conditions when multiple reviews
+    # for the same node are processed in parallel
+    async def create_auto_approval_for_node(
+        node_id: str, review_result
+    ) -> tuple[str, bool]:
+        """
+        Create auto-approval record for a node.
+        Returns (node_id, success) tuple for tracking failures.
+        """
+        try:
+            await create_auto_approval_record(
+                user_id=user_id,
+                graph_exec_id=review_result.graph_exec_id,
+                graph_id=review_result.graph_id,
+                graph_version=review_result.graph_version,
+                node_id=node_id,
+                payload=review_result.payload,
+            )
+            return (node_id, True)
+        except Exception as e:
+            logger.error(
+                f"Failed to create auto-approval record for node {node_id}",
+                exc_info=e,
+            )
+            return (node_id, False)
+
+    # Collect node_exec_ids that need auto-approval
+    node_exec_ids_needing_auto_approval = [
+        node_exec_id
+        for node_exec_id, review_result in updated_reviews.items()
+        if review_result.status == ReviewStatus.APPROVED
+        and auto_approve_requests.get(node_exec_id, False)
+    ]
+
+    # Batch-fetch node executions to get node_ids
+    nodes_needing_auto_approval: dict[str, Any] = {}
+    if node_exec_ids_needing_auto_approval:
+        from backend.data.execution import get_node_executions
+
+        node_execs = await get_node_executions(
+            graph_exec_id=graph_exec_id, include_exec_data=False
+        )
+        node_exec_map = {node_exec.node_exec_id: node_exec for node_exec in node_execs}
+
+        for node_exec_id in node_exec_ids_needing_auto_approval:
+            node_exec = node_exec_map.get(node_exec_id)
+            if node_exec:
+                review_result = updated_reviews[node_exec_id]
+                # Use the first approved review for this node (deduplicate by node_id)
+                if node_exec.node_id not in nodes_needing_auto_approval:
+                    nodes_needing_auto_approval[node_exec.node_id] = review_result
+            else:
+                logger.error(
+                    f"Failed to create auto-approval record for {node_exec_id}: "
+                    f"Node execution not found. This may indicate a race condition "
+                    f"or data inconsistency."
+                )
+
+    # Execute all auto-approval creations in parallel (deduplicated by node_id)
+    auto_approval_results = await asyncio.gather(
+        *[
+            create_auto_approval_for_node(node_id, review_result)
+            for node_id, review_result in nodes_needing_auto_approval.items()
+        ],
+        return_exceptions=True,
+    )
+
+    # Count auto-approval failures
+    auto_approval_failed_count = 0
+    for result in auto_approval_results:
+        if isinstance(result, Exception):
+            # Unexpected exception during auto-approval creation
+            auto_approval_failed_count += 1
+            logger.error(
+                f"Unexpected exception during auto-approval creation: {result}"
+            )
+        elif isinstance(result, tuple) and len(result) == 2 and not result[1]:
+            # Auto-approval creation failed (returned False)
+            auto_approval_failed_count += 1
+
     # Count results
     approved_count = sum(
         1
@@ -157,30 +301,53 @@ async def process_review_action(
         if review.status == ReviewStatus.REJECTED
     )
 
-    # Resume execution if we processed some reviews
+    # Resume execution only if ALL pending reviews for this execution have been processed
     if updated_reviews:
-        # Get graph execution ID from any processed review
-        first_review = next(iter(updated_reviews.values()))
-        graph_exec_id = first_review.graph_exec_id
-
-        # Check if any pending reviews remain for this execution
         still_has_pending = await has_pending_reviews_for_graph_exec(graph_exec_id)
 
         if not still_has_pending:
-            # Resume execution
+            # Get the graph_id from any processed review
+            first_review = next(iter(updated_reviews.values()))
+
             try:
+                # Fetch user and settings to build complete execution context
+                user = await get_user_by_id(user_id)
+                settings = await get_graph_settings(
+                    user_id=user_id, graph_id=first_review.graph_id
+                )
+
+                # Preserve user's timezone preference when resuming execution
+                user_timezone = (
+                    user.timezone if user.timezone != USER_TIMEZONE_NOT_SET else "UTC"
+                )
+
+                execution_context = ExecutionContext(
+                    human_in_the_loop_safe_mode=settings.human_in_the_loop_safe_mode,
+                    sensitive_action_safe_mode=settings.sensitive_action_safe_mode,
+                    user_timezone=user_timezone,
+                )
+
                 await add_graph_execution(
                     graph_id=first_review.graph_id,
                     user_id=user_id,
                     graph_exec_id=graph_exec_id,
+                    execution_context=execution_context,
                 )
                 logger.info(f"Resumed execution {graph_exec_id}")
             except Exception as e:
                 logger.error(f"Failed to resume execution {graph_exec_id}: {str(e)}")
 
+    # Build error message if auto-approvals failed
+    error_message = None
+    if auto_approval_failed_count > 0:
+        error_message = (
+            f"{auto_approval_failed_count} auto-approval setting(s) could not be saved. "
+            f"You may need to manually approve these reviews in future executions."
+        )
+
     return ReviewResponse(
         approved_count=approved_count,
         rejected_count=rejected_count,
-        failed_count=0,
-        error=None,
+        failed_count=auto_approval_failed_count,
+        error=error_message,
     )
diff --git a/autogpt_platform/backend/backend/api/features/integrations/router.py b/autogpt_platform/backend/backend/api/features/integrations/router.py
index f5dd8c092b..00500dc8a8 100644
--- a/autogpt_platform/backend/backend/api/features/integrations/router.py
+++ b/autogpt_platform/backend/backend/api/features/integrations/router.py
@@ -35,11 +35,7 @@ from backend.data.model import (
     OAuth2Credentials,
     UserIntegrations,
 )
-from backend.data.onboarding import (
-    OnboardingStep,
-    complete_onboarding_step,
-    increment_runs,
-)
+from backend.data.onboarding import OnboardingStep, complete_onboarding_step
 from backend.data.user import get_user_integrations
 from backend.executor.utils import add_graph_execution
 from backend.integrations.ayrshare import AyrshareClient, SocialPlatform
@@ -175,6 +171,7 @@ async def callback(
         f"Successfully processed OAuth callback for user {user_id} "
         f"and provider {provider.value}"
     )
+
     return CredentialsMetaResponse(
         id=credentials.id,
         provider=credentials.provider,
@@ -193,6 +190,7 @@ async def list_credentials(
     user_id: Annotated[str, Security(get_user_id)],
 ) -> list[CredentialsMetaResponse]:
     credentials = await creds_manager.store.get_all_creds(user_id)
+
     return [
         CredentialsMetaResponse(
             id=cred.id,
@@ -215,6 +213,7 @@ async def list_credentials_by_provider(
     user_id: Annotated[str, Security(get_user_id)],
 ) -> list[CredentialsMetaResponse]:
     credentials = await creds_manager.store.get_creds_by_provider(user_id, provider)
+
     return [
         CredentialsMetaResponse(
             id=cred.id,
@@ -378,7 +377,6 @@ async def webhook_ingress_generic(
         return
 
     await complete_onboarding_step(user_id, OnboardingStep.TRIGGER_WEBHOOK)
-    await increment_runs(user_id)
 
     # Execute all triggers concurrently for better performance
     tasks = []
@@ -831,6 +829,18 @@ async def list_providers() -> List[str]:
     return all_providers
 
 
+@router.get("/providers/system", response_model=List[str])
+async def list_system_providers() -> List[str]:
+    """
+    Get a list of providers that have platform credits (system credentials) available.
+
+    These providers can be used without the user providing their own API keys.
+    """
+    from backend.integrations.credentials_store import SYSTEM_PROVIDERS
+
+    return list(SYSTEM_PROVIDERS)
+
+
 @router.get("/providers/names", response_model=ProviderNamesResponse)
 async def get_provider_names() -> ProviderNamesResponse:
     """
diff --git a/autogpt_platform/backend/backend/api/features/library/db.py b/autogpt_platform/backend/backend/api/features/library/db.py
index 69ed0d2730..394f959953 100644
--- a/autogpt_platform/backend/backend/api/features/library/db.py
+++ b/autogpt_platform/backend/backend/api/features/library/db.py
@@ -21,7 +21,7 @@ from backend.data.model import CredentialsMetaInput
 from backend.integrations.creds_manager import IntegrationCredentialsManager
 from backend.integrations.webhooks.graph_lifecycle_hooks import on_graph_activate
 from backend.util.clients import get_scheduler_client
-from backend.util.exceptions import DatabaseError, NotFoundError
+from backend.util.exceptions import DatabaseError, InvalidInputError, NotFoundError
 from backend.util.json import SafeJson
 from backend.util.models import Pagination
 from backend.util.settings import Config
@@ -39,6 +39,7 @@ async def list_library_agents(
     sort_by: library_model.LibraryAgentSort = library_model.LibraryAgentSort.UPDATED_AT,
     page: int = 1,
     page_size: int = 50,
+    include_executions: bool = False,
 ) -> library_model.LibraryAgentResponse:
     """
     Retrieves a paginated list of LibraryAgent records for a given user.
@@ -49,6 +50,9 @@ async def list_library_agents(
         sort_by: Sorting field (createdAt, updatedAt, isFavorite, isCreatedByUser).
         page: Current page (1-indexed).
         page_size: Number of items per page.
+        include_executions: Whether to include execution data for status calculation.
+            Defaults to False for performance (UI fetches status separately).
+            Set to True when accurate status/metrics are needed (e.g., agent generator).
 
     Returns:
         A LibraryAgentResponse containing the list of agents and pagination details.
@@ -64,11 +68,11 @@ async def list_library_agents(
 
     if page < 1 or page_size < 1:
         logger.warning(f"Invalid pagination: page={page}, page_size={page_size}")
-        raise DatabaseError("Invalid pagination input")
+        raise InvalidInputError("Invalid pagination input")
 
     if search_term and len(search_term.strip()) > 100:
         logger.warning(f"Search term too long: {repr(search_term)}")
-        raise DatabaseError("Search term is too long")
+        raise InvalidInputError("Search term is too long")
 
     where_clause: prisma.types.LibraryAgentWhereInput = {
         "userId": user_id,
@@ -76,7 +80,6 @@ async def list_library_agents(
         "isArchived": False,
     }
 
-    # Build search filter if applicable
     if search_term:
         where_clause["OR"] = [
             {
@@ -93,7 +96,6 @@ async def list_library_agents(
             },
         ]
 
-    # Determine sorting
     order_by: prisma.types.LibraryAgentOrderByInput | None = None
 
     if sort_by == library_model.LibraryAgentSort.CREATED_AT:
@@ -105,7 +107,7 @@ async def list_library_agents(
         library_agents = await prisma.models.LibraryAgent.prisma().find_many(
             where=where_clause,
             include=library_agent_include(
-                user_id, include_nodes=False, include_executions=False
+                user_id, include_nodes=False, include_executions=include_executions
             ),
             order=order_by,
             skip=(page - 1) * page_size,
@@ -175,7 +177,7 @@ async def list_favorite_library_agents(
 
     if page < 1 or page_size < 1:
         logger.warning(f"Invalid pagination: page={page}, page_size={page_size}")
-        raise DatabaseError("Invalid pagination input")
+        raise InvalidInputError("Invalid pagination input")
 
     where_clause: prisma.types.LibraryAgentWhereInput = {
         "userId": user_id,
@@ -401,27 +403,11 @@ async def add_generated_agent_image(
     )
 
 
-def _initialize_graph_settings(graph: graph_db.GraphModel) -> GraphSettings:
-    """
-    Initialize GraphSettings based on graph content.
-
-    Args:
-        graph: The graph to analyze
-
-    Returns:
-        GraphSettings with appropriate human_in_the_loop_safe_mode value
-    """
-    if graph.has_human_in_the_loop:
-        # Graph has HITL blocks - set safe mode to True by default
-        return GraphSettings(human_in_the_loop_safe_mode=True)
-    else:
-        # Graph has no HITL blocks - keep None
-        return GraphSettings(human_in_the_loop_safe_mode=None)
-
-
 async def create_library_agent(
     graph: graph_db.GraphModel,
     user_id: str,
+    hitl_safe_mode: bool = True,
+    sensitive_action_safe_mode: bool = False,
     create_library_agents_for_sub_graphs: bool = True,
 ) -> list[library_model.LibraryAgent]:
     """
@@ -430,6 +416,8 @@ async def create_library_agent(
     Args:
         agent: The agent/Graph to add to the library.
         user_id: The user to whom the agent will be added.
+        hitl_safe_mode: Whether HITL blocks require manual review (default True).
+        sensitive_action_safe_mode: Whether sensitive action blocks require review.
         create_library_agents_for_sub_graphs: If True, creates LibraryAgent records for sub-graphs as well.
 
     Returns:
@@ -465,7 +453,11 @@ async def create_library_agent(
                             }
                         },
                         settings=SafeJson(
-                            _initialize_graph_settings(graph_entry).model_dump()
+                            GraphSettings.from_graph(
+                                graph_entry,
+                                hitl_safe_mode=hitl_safe_mode,
+                                sensitive_action_safe_mode=sensitive_action_safe_mode,
+                            ).model_dump()
                         ),
                     ),
                     include=library_agent_include(
@@ -489,7 +481,7 @@ async def update_agent_version_in_library(
     agent_graph_version: int,
 ) -> library_model.LibraryAgent:
     """
-    Updates the agent version in the library if useGraphIsActiveVersion is True.
+    Updates the agent version in the library for any agent owned by the user.
 
     Args:
         user_id: Owner of the LibraryAgent.
@@ -498,20 +490,31 @@ async def update_agent_version_in_library(
 
     Raises:
         DatabaseError: If there's an error with the update.
+        NotFoundError: If no library agent is found for this user and agent.
     """
     logger.debug(
         f"Updating agent version in library for user #{user_id}, "
         f"agent #{agent_graph_id} v{agent_graph_version}"
     )
-    try:
-        library_agent = await prisma.models.LibraryAgent.prisma().find_first_or_raise(
+    async with transaction() as tx:
+        library_agent = await prisma.models.LibraryAgent.prisma(tx).find_first_or_raise(
             where={
                 "userId": user_id,
                 "agentGraphId": agent_graph_id,
-                "useGraphIsActiveVersion": True,
             },
         )
-        lib = await prisma.models.LibraryAgent.prisma().update(
+
+        # Delete any conflicting LibraryAgent for the target version
+        await prisma.models.LibraryAgent.prisma(tx).delete_many(
+            where={
+                "userId": user_id,
+                "agentGraphId": agent_graph_id,
+                "agentGraphVersion": agent_graph_version,
+                "id": {"not": library_agent.id},
+            }
+        )
+
+        lib = await prisma.models.LibraryAgent.prisma(tx).update(
             where={"id": library_agent.id},
             data={
                 "AgentGraph": {
@@ -525,13 +528,13 @@ async def update_agent_version_in_library(
             },
             include={"AgentGraph": True},
         )
-        if lib is None:
-            raise NotFoundError(f"Library agent {library_agent.id} not found")
 
-        return library_model.LibraryAgent.from_db(lib)
-    except prisma.errors.PrismaError as e:
-        logger.error(f"Database error updating agent version in library: {e}")
-        raise DatabaseError("Failed to update agent version in library") from e
+    if lib is None:
+        raise NotFoundError(
+            f"Failed to update library agent for {agent_graph_id} v{agent_graph_version}"
+        )
+
+    return library_model.LibraryAgent.from_db(lib)
 
 
 async def update_library_agent(
@@ -582,7 +585,13 @@ async def update_library_agent(
             )
         update_fields["isDeleted"] = is_deleted
     if settings is not None:
-        update_fields["settings"] = SafeJson(settings.model_dump())
+        existing_agent = await get_library_agent(id=library_agent_id, user_id=user_id)
+        current_settings_dict = (
+            existing_agent.settings.model_dump() if existing_agent.settings else {}
+        )
+        new_settings = settings.model_dump(exclude_unset=True)
+        merged_settings = {**current_settings_dict, **new_settings}
+        update_fields["settings"] = SafeJson(merged_settings)
 
     try:
         # If graph_version is provided, update to that specific version
@@ -616,33 +625,6 @@ async def update_library_agent(
         raise DatabaseError("Failed to update library agent") from e
 
 
-async def update_library_agent_settings(
-    user_id: str,
-    agent_id: str,
-    settings: GraphSettings,
-) -> library_model.LibraryAgent:
-    """
-    Updates the settings for a specific LibraryAgent.
-
-    Args:
-        user_id: The owner of the LibraryAgent.
-        agent_id: The ID of the LibraryAgent to update.
-        settings: New GraphSettings to apply.
-
-    Returns:
-        The updated LibraryAgent.
-
-    Raises:
-        NotFoundError: If the specified LibraryAgent does not exist.
-        DatabaseError: If there's an error in the update operation.
-    """
-    return await update_library_agent(
-        library_agent_id=agent_id,
-        user_id=user_id,
-        settings=settings,
-    )
-
-
 async def delete_library_agent(
     library_agent_id: str, user_id: str, soft_delete: bool = True
 ) -> None:
@@ -825,8 +807,9 @@ async def add_store_agent_to_library(
                     }
                 },
                 "isCreatedByUser": False,
+                "useGraphIsActiveVersion": False,
                 "settings": SafeJson(
-                    _initialize_graph_settings(graph_model).model_dump()
+                    GraphSettings.from_graph(graph_model).model_dump()
                 ),
             },
             include=library_agent_include(
@@ -1216,8 +1199,15 @@ async def fork_library_agent(
         )
         new_graph = await on_graph_activate(new_graph, user_id=user_id)
 
-        # Create a library agent for the new graph
-        return (await create_library_agent(new_graph, user_id))[0]
+        # Create a library agent for the new graph, preserving safe mode settings
+        return (
+            await create_library_agent(
+                new_graph,
+                user_id,
+                hitl_safe_mode=original_agent.settings.human_in_the_loop_safe_mode,
+                sensitive_action_safe_mode=original_agent.settings.sensitive_action_safe_mode,
+            )
+        )[0]
     except prisma.errors.PrismaError as e:
         logger.error(f"Database error cloning library agent: {e}")
         raise DatabaseError("Failed to fork library agent") from e
diff --git a/autogpt_platform/backend/backend/api/features/library/model.py b/autogpt_platform/backend/backend/api/features/library/model.py
index c20f82afae..c6bc0e0427 100644
--- a/autogpt_platform/backend/backend/api/features/library/model.py
+++ b/autogpt_platform/backend/backend/api/features/library/model.py
@@ -9,6 +9,7 @@ import pydantic
 from backend.data.block import BlockInput
 from backend.data.graph import GraphModel, GraphSettings, GraphTriggerInfo
 from backend.data.model import CredentialsMetaInput, is_credentials_field_name
+from backend.util.json import loads as json_loads
 from backend.util.models import Pagination
 
 if TYPE_CHECKING:
@@ -16,10 +17,10 @@ if TYPE_CHECKING:
 
 
 class LibraryAgentStatus(str, Enum):
-    COMPLETED = "COMPLETED"  # All runs completed
-    HEALTHY = "HEALTHY"  # Agent is running (not all runs have completed)
-    WAITING = "WAITING"  # Agent is queued or waiting to start
-    ERROR = "ERROR"  # Agent is in an error state
+    COMPLETED = "COMPLETED"
+    HEALTHY = "HEALTHY"
+    WAITING = "WAITING"
+    ERROR = "ERROR"
 
 
 class MarketplaceListingCreator(pydantic.BaseModel):
@@ -39,6 +40,30 @@ class MarketplaceListing(pydantic.BaseModel):
     creator: MarketplaceListingCreator
 
 
+class RecentExecution(pydantic.BaseModel):
+    """Summary of a recent execution for quality assessment.
+
+    Used by the LLM to understand the agent's recent performance with specific examples
+    rather than just aggregate statistics.
+    """
+
+    status: str
+    correctness_score: float | None = None
+    activity_summary: str | None = None
+
+
+def _parse_settings(settings: dict | str | None) -> GraphSettings:
+    """Parse settings from database, handling both dict and string formats."""
+    if settings is None:
+        return GraphSettings()
+    try:
+        if isinstance(settings, str):
+            settings = json_loads(settings)
+        return GraphSettings.model_validate(settings)
+    except Exception:
+        return GraphSettings()
+
+
 class LibraryAgent(pydantic.BaseModel):
     """
     Represents an agent in the library, including metadata for display and
@@ -48,6 +73,7 @@ class LibraryAgent(pydantic.BaseModel):
     id: str
     graph_id: str
     graph_version: int
+    owner_user_id: str
 
     image_url: str | None
 
@@ -63,7 +89,7 @@ class LibraryAgent(pydantic.BaseModel):
     description: str
     instructions: str | None = None
 
-    input_schema: dict[str, Any]  # Should be BlockIOObjectSubSchema in frontend
+    input_schema: dict[str, Any]
     output_schema: dict[str, Any]
     credentials_input_schema: dict[str, Any] | None = pydantic.Field(
         description="Input schema for credentials required by the agent",
@@ -72,27 +98,27 @@ class LibraryAgent(pydantic.BaseModel):
     has_external_trigger: bool = pydantic.Field(
         description="Whether the agent has an external trigger (e.g. webhook) node"
     )
+    has_human_in_the_loop: bool = pydantic.Field(
+        description="Whether the agent has human-in-the-loop blocks"
+    )
+    has_sensitive_action: bool = pydantic.Field(
+        description="Whether the agent has sensitive action blocks"
+    )
     trigger_setup_info: Optional[GraphTriggerInfo] = None
 
-    # Indicates whether there's a new output (based on recent runs)
     new_output: bool
-
-    # Whether the user can access the underlying graph
+    execution_count: int = 0
+    success_rate: float | None = None
+    avg_correctness_score: float | None = None
+    recent_executions: list[RecentExecution] = pydantic.Field(
+        default_factory=list,
+        description="List of recent executions with status, score, and summary",
+    )
     can_access_graph: bool
-
-    # Indicates if this agent is the latest version
     is_latest_version: bool
-
-    # Whether the agent is marked as favorite by the user
     is_favorite: bool
-
-    # Recommended schedule cron (from marketplace agents)
     recommended_schedule_cron: str | None = None
-
-    # User-specific settings for this library agent
     settings: GraphSettings = pydantic.Field(default_factory=GraphSettings)
-
-    # Marketplace listing information if the agent has been published
     marketplace_listing: Optional["MarketplaceListing"] = None
 
     @staticmethod
@@ -116,7 +142,6 @@ class LibraryAgent(pydantic.BaseModel):
         agent_updated_at = agent.AgentGraph.updatedAt
         lib_agent_updated_at = agent.updatedAt
 
-        # Compute updated_at as the latest between library agent and graph
         updated_at = (
             max(agent_updated_at, lib_agent_updated_at)
             if agent_updated_at
@@ -129,7 +154,6 @@ class LibraryAgent(pydantic.BaseModel):
             creator_name = agent.Creator.name or "Unknown"
             creator_image_url = agent.Creator.avatarUrl or ""
 
-        # Logic to calculate status and new_output
         week_ago = datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(
             days=7
         )
@@ -138,13 +162,55 @@ class LibraryAgent(pydantic.BaseModel):
         status = status_result.status
         new_output = status_result.new_output
 
-        # Check if user can access the graph
-        can_access_graph = agent.AgentGraph.userId == agent.userId
+        execution_count = len(executions)
+        success_rate: float | None = None
+        avg_correctness_score: float | None = None
+        if execution_count > 0:
+            success_count = sum(
+                1
+                for e in executions
+                if e.executionStatus == prisma.enums.AgentExecutionStatus.COMPLETED
+            )
+            success_rate = (success_count / execution_count) * 100
 
-        # Hard-coded to True until a method to check is implemented
+            correctness_scores = []
+            for e in executions:
+                if e.stats and isinstance(e.stats, dict):
+                    score = e.stats.get("correctness_score")
+                    if score is not None and isinstance(score, (int, float)):
+                        correctness_scores.append(float(score))
+            if correctness_scores:
+                avg_correctness_score = sum(correctness_scores) / len(
+                    correctness_scores
+                )
+
+        recent_executions: list[RecentExecution] = []
+        for e in executions:
+            exec_score: float | None = None
+            exec_summary: str | None = None
+            if e.stats and isinstance(e.stats, dict):
+                score = e.stats.get("correctness_score")
+                if score is not None and isinstance(score, (int, float)):
+                    exec_score = float(score)
+                summary = e.stats.get("activity_status")
+                if summary is not None and isinstance(summary, str):
+                    exec_summary = summary
+            exec_status = (
+                e.executionStatus.value
+                if hasattr(e.executionStatus, "value")
+                else str(e.executionStatus)
+            )
+            recent_executions.append(
+                RecentExecution(
+                    status=exec_status,
+                    correctness_score=exec_score,
+                    activity_summary=exec_summary,
+                )
+            )
+
+        can_access_graph = agent.AgentGraph.userId == agent.userId
         is_latest_version = True
 
-        # Build marketplace_listing if available
         marketplace_listing_data = None
         if store_listing and store_listing.ActiveVersion and profile:
             creator_data = MarketplaceListingCreator(
@@ -163,6 +229,7 @@ class LibraryAgent(pydantic.BaseModel):
             id=agent.id,
             graph_id=agent.agentGraphId,
             graph_version=agent.agentGraphVersion,
+            owner_user_id=agent.userId,
             image_url=agent.imageUrl,
             creator_name=creator_name,
             creator_image_url=creator_image_url,
@@ -178,13 +245,19 @@ class LibraryAgent(pydantic.BaseModel):
                 graph.credentials_input_schema if sub_graphs is not None else None
             ),
             has_external_trigger=graph.has_external_trigger,
+            has_human_in_the_loop=graph.has_human_in_the_loop,
+            has_sensitive_action=graph.has_sensitive_action,
             trigger_setup_info=graph.trigger_setup_info,
             new_output=new_output,
+            execution_count=execution_count,
+            success_rate=success_rate,
+            avg_correctness_score=avg_correctness_score,
+            recent_executions=recent_executions,
             can_access_graph=can_access_graph,
             is_latest_version=is_latest_version,
             is_favorite=agent.isFavorite,
             recommended_schedule_cron=agent.AgentGraph.recommendedScheduleCron,
-            settings=GraphSettings.model_validate(agent.settings),
+            settings=_parse_settings(agent.settings),
             marketplace_listing=marketplace_listing_data,
         )
 
@@ -210,18 +283,15 @@ def _calculate_agent_status(
     if not executions:
         return AgentStatusResult(status=LibraryAgentStatus.COMPLETED, new_output=False)
 
-    # Track how many times each execution status appears
     status_counts = {status: 0 for status in prisma.enums.AgentExecutionStatus}
     new_output = False
 
     for execution in executions:
-        # Check if there's a completed run more recent than `recent_threshold`
         if execution.createdAt >= recent_threshold:
             if execution.executionStatus == prisma.enums.AgentExecutionStatus.COMPLETED:
                 new_output = True
         status_counts[execution.executionStatus] += 1
 
-    # Determine the final status based on counts
     if status_counts[prisma.enums.AgentExecutionStatus.FAILED] > 0:
         return AgentStatusResult(status=LibraryAgentStatus.ERROR, new_output=new_output)
     elif status_counts[prisma.enums.AgentExecutionStatus.QUEUED] > 0:
diff --git a/autogpt_platform/backend/backend/api/features/library/routes/agents.py b/autogpt_platform/backend/backend/api/features/library/routes/agents.py
index 38c34dd3b8..fa3d1a0f0c 100644
--- a/autogpt_platform/backend/backend/api/features/library/routes/agents.py
+++ b/autogpt_platform/backend/backend/api/features/library/routes/agents.py
@@ -1,4 +1,3 @@
-import logging
 from typing import Literal, Optional
 
 import autogpt_libs.auth as autogpt_auth_lib
@@ -6,15 +5,11 @@ from fastapi import APIRouter, Body, HTTPException, Query, Security, status
 from fastapi.responses import Response
 from prisma.enums import OnboardingStep
 
-import backend.api.features.store.exceptions as store_exceptions
 from backend.data.onboarding import complete_onboarding_step
-from backend.util.exceptions import DatabaseError, NotFoundError
 
 from .. import db as library_db
 from .. import model as library_model
 
-logger = logging.getLogger(__name__)
-
 router = APIRouter(
     prefix="/agents",
     tags=["library", "private"],
@@ -26,10 +21,6 @@ router = APIRouter(
     "",
     summary="List Library Agents",
     response_model=library_model.LibraryAgentResponse,
-    responses={
-        200: {"description": "List of library agents"},
-        500: {"description": "Server error", "content": {"application/json": {}}},
-    },
 )
 async def list_library_agents(
     user_id: str = Security(autogpt_auth_lib.get_user_id),
@@ -53,43 +44,19 @@ async def list_library_agents(
 ) -> library_model.LibraryAgentResponse:
     """
     Get all agents in the user's library (both created and saved).
-
-    Args:
-        user_id: ID of the authenticated user.
-        search_term: Optional search term to filter agents by name/description.
-        filter_by: List of filters to apply (favorites, created by user).
-        sort_by: List of sorting criteria (created date, updated date).
-        page: Page number to retrieve.
-        page_size: Number of agents per page.
-
-    Returns:
-        A LibraryAgentResponse containing agents and pagination metadata.
-
-    Raises:
-        HTTPException: If a server/database error occurs.
     """
-    try:
-        return await library_db.list_library_agents(
-            user_id=user_id,
-            search_term=search_term,
-            sort_by=sort_by,
-            page=page,
-            page_size=page_size,
-        )
-    except Exception as e:
-        logger.error(f"Could not list library agents for user #{user_id}: {e}")
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail=str(e),
-        ) from e
+    return await library_db.list_library_agents(
+        user_id=user_id,
+        search_term=search_term,
+        sort_by=sort_by,
+        page=page,
+        page_size=page_size,
+    )
 
 
 @router.get(
     "/favorites",
     summary="List Favorite Library Agents",
-    responses={
-        500: {"description": "Server error", "content": {"application/json": {}}},
-    },
 )
 async def list_favorite_library_agents(
     user_id: str = Security(autogpt_auth_lib.get_user_id),
@@ -106,30 +73,12 @@ async def list_favorite_library_agents(
 ) -> library_model.LibraryAgentResponse:
     """
     Get all favorite agents in the user's library.
-
-    Args:
-        user_id: ID of the authenticated user.
-        page: Page number to retrieve.
-        page_size: Number of agents per page.
-
-    Returns:
-        A LibraryAgentResponse containing favorite agents and pagination metadata.
-
-    Raises:
-        HTTPException: If a server/database error occurs.
     """
-    try:
-        return await library_db.list_favorite_library_agents(
-            user_id=user_id,
-            page=page,
-            page_size=page_size,
-        )
-    except Exception as e:
-        logger.error(f"Could not list favorite library agents for user #{user_id}: {e}")
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail=str(e),
-        ) from e
+    return await library_db.list_favorite_library_agents(
+        user_id=user_id,
+        page=page,
+        page_size=page_size,
+    )
 
 
 @router.get("/{library_agent_id}", summary="Get Library Agent")
@@ -162,10 +111,6 @@ async def get_library_agent_by_graph_id(
     summary="Get Agent By Store ID",
     tags=["store", "library"],
     response_model=library_model.LibraryAgent | None,
-    responses={
-        200: {"description": "Library agent found"},
-        404: {"description": "Agent not found"},
-    },
 )
 async def get_library_agent_by_store_listing_version_id(
     store_listing_version_id: str,
@@ -174,32 +119,15 @@ async def get_library_agent_by_store_listing_version_id(
     """
     Get Library Agent from Store Listing Version ID.
     """
-    try:
-        return await library_db.get_library_agent_by_store_version_id(
-            store_listing_version_id, user_id
-        )
-    except NotFoundError as e:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail=str(e),
-        )
-    except Exception as e:
-        logger.error(f"Could not fetch library agent from store version ID: {e}")
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail=str(e),
-        ) from e
+    return await library_db.get_library_agent_by_store_version_id(
+        store_listing_version_id, user_id
+    )
 
 
 @router.post(
     "",
     summary="Add Marketplace Agent",
     status_code=status.HTTP_201_CREATED,
-    responses={
-        201: {"description": "Agent added successfully"},
-        404: {"description": "Store listing version not found"},
-        500: {"description": "Server error"},
-    },
 )
 async def add_marketplace_agent_to_library(
     store_listing_version_id: str = Body(embed=True),
@@ -210,59 +138,19 @@ async def add_marketplace_agent_to_library(
 ) -> library_model.LibraryAgent:
     """
     Add an agent from the marketplace to the user's library.
-
-    Args:
-        store_listing_version_id: ID of the store listing version to add.
-        user_id: ID of the authenticated user.
-
-    Returns:
-        library_model.LibraryAgent: Agent added to the library
-
-    Raises:
-        HTTPException(404): If the listing version is not found.
-        HTTPException(500): If a server/database error occurs.
     """
-    try:
-        agent = await library_db.add_store_agent_to_library(
-            store_listing_version_id=store_listing_version_id,
-            user_id=user_id,
-        )
-        if source != "onboarding":
-            await complete_onboarding_step(
-                user_id, OnboardingStep.MARKETPLACE_ADD_AGENT
-            )
-        return agent
-
-    except store_exceptions.AgentNotFoundError as e:
-        logger.warning(
-            f"Could not find store listing version {store_listing_version_id} "
-            "to add to library"
-        )
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(e))
-    except DatabaseError as e:
-        logger.error(f"Database error while adding agent to library: {e}", e)
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail={"message": str(e), "hint": "Inspect DB logs for details."},
-        ) from e
-    except Exception as e:
-        logger.error(f"Unexpected error while adding agent to library: {e}")
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail={
-                "message": str(e),
-                "hint": "Check server logs for more information.",
-            },
-        ) from e
+    agent = await library_db.add_store_agent_to_library(
+        store_listing_version_id=store_listing_version_id,
+        user_id=user_id,
+    )
+    if source != "onboarding":
+        await complete_onboarding_step(user_id, OnboardingStep.MARKETPLACE_ADD_AGENT)
+    return agent
 
 
 @router.patch(
     "/{library_agent_id}",
     summary="Update Library Agent",
-    responses={
-        200: {"description": "Agent updated successfully"},
-        500: {"description": "Server error"},
-    },
 )
 async def update_library_agent(
     library_agent_id: str,
@@ -271,52 +159,21 @@ async def update_library_agent(
 ) -> library_model.LibraryAgent:
     """
     Update the library agent with the given fields.
-
-    Args:
-        library_agent_id: ID of the library agent to update.
-        payload: Fields to update (auto_update_version, is_favorite, etc.).
-        user_id: ID of the authenticated user.
-
-    Raises:
-        HTTPException(500): If a server/database error occurs.
     """
-    try:
-        return await library_db.update_library_agent(
-            library_agent_id=library_agent_id,
-            user_id=user_id,
-            auto_update_version=payload.auto_update_version,
-            graph_version=payload.graph_version,
-            is_favorite=payload.is_favorite,
-            is_archived=payload.is_archived,
-            settings=payload.settings,
-        )
-    except NotFoundError as e:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail=str(e),
-        ) from e
-    except DatabaseError as e:
-        logger.error(f"Database error while updating library agent: {e}")
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail={"message": str(e), "hint": "Verify DB connection."},
-        ) from e
-    except Exception as e:
-        logger.error(f"Unexpected error while updating library agent: {e}")
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail={"message": str(e), "hint": "Check server logs."},
-        ) from e
+    return await library_db.update_library_agent(
+        library_agent_id=library_agent_id,
+        user_id=user_id,
+        auto_update_version=payload.auto_update_version,
+        graph_version=payload.graph_version,
+        is_favorite=payload.is_favorite,
+        is_archived=payload.is_archived,
+        settings=payload.settings,
+    )
 
 
 @router.delete(
     "/{library_agent_id}",
     summary="Delete Library Agent",
-    responses={
-        204: {"description": "Agent deleted successfully"},
-        404: {"description": "Agent not found"},
-        500: {"description": "Server error"},
-    },
 )
 async def delete_library_agent(
     library_agent_id: str,
@@ -324,28 +181,11 @@ async def delete_library_agent(
 ) -> Response:
     """
     Soft-delete the specified library agent.
-
-    Args:
-        library_agent_id: ID of the library agent to delete.
-        user_id: ID of the authenticated user.
-
-    Returns:
-        204 No Content if successful.
-
-    Raises:
-        HTTPException(404): If the agent does not exist.
-        HTTPException(500): If a server/database error occurs.
     """
-    try:
-        await library_db.delete_library_agent(
-            library_agent_id=library_agent_id, user_id=user_id
-        )
-        return Response(status_code=status.HTTP_204_NO_CONTENT)
-    except NotFoundError as e:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail=str(e),
-        ) from e
+    await library_db.delete_library_agent(
+        library_agent_id=library_agent_id, user_id=user_id
+    )
+    return Response(status_code=status.HTTP_204_NO_CONTENT)
 
 
 @router.post("/{library_agent_id}/fork", summary="Fork Library Agent")
diff --git a/autogpt_platform/backend/backend/api/features/library/routes/presets.py b/autogpt_platform/backend/backend/api/features/library/routes/presets.py
index cd4c04e0f2..98f2cb5f15 100644
--- a/autogpt_platform/backend/backend/api/features/library/routes/presets.py
+++ b/autogpt_platform/backend/backend/api/features/library/routes/presets.py
@@ -8,7 +8,6 @@ from backend.data.execution import GraphExecutionMeta
 from backend.data.graph import get_graph
 from backend.data.integrations import get_webhook
 from backend.data.model import CredentialsMetaInput
-from backend.data.onboarding import increment_runs
 from backend.executor.utils import add_graph_execution, make_node_credentials_input_map
 from backend.integrations.creds_manager import IntegrationCredentialsManager
 from backend.integrations.webhooks import get_webhook_manager
@@ -403,8 +402,6 @@ async def execute_preset(
     merged_node_input = preset.inputs | inputs
     merged_credential_inputs = preset.credentials | credential_inputs
 
-    await increment_runs(user_id)
-
     return await add_graph_execution(
         user_id=user_id,
         graph_id=preset.graph_id,
diff --git a/autogpt_platform/backend/backend/api/features/library/routes_test.py b/autogpt_platform/backend/backend/api/features/library/routes_test.py
index ad28b5b6bd..4d83812891 100644
--- a/autogpt_platform/backend/backend/api/features/library/routes_test.py
+++ b/autogpt_platform/backend/backend/api/features/library/routes_test.py
@@ -42,6 +42,7 @@ async def test_get_library_agents_success(
                 id="test-agent-1",
                 graph_id="test-agent-1",
                 graph_version=1,
+                owner_user_id=test_user_id,
                 name="Test Agent 1",
                 description="Test Description 1",
                 image_url=None,
@@ -51,6 +52,8 @@ async def test_get_library_agents_success(
                 output_schema={"type": "object", "properties": {}},
                 credentials_input_schema={"type": "object", "properties": {}},
                 has_external_trigger=False,
+                has_human_in_the_loop=False,
+                has_sensitive_action=False,
                 status=library_model.LibraryAgentStatus.COMPLETED,
                 recommended_schedule_cron=None,
                 new_output=False,
@@ -64,6 +67,7 @@ async def test_get_library_agents_success(
                 id="test-agent-2",
                 graph_id="test-agent-2",
                 graph_version=1,
+                owner_user_id=test_user_id,
                 name="Test Agent 2",
                 description="Test Description 2",
                 image_url=None,
@@ -73,6 +77,8 @@ async def test_get_library_agents_success(
                 output_schema={"type": "object", "properties": {}},
                 credentials_input_schema={"type": "object", "properties": {}},
                 has_external_trigger=False,
+                has_human_in_the_loop=False,
+                has_sensitive_action=False,
                 status=library_model.LibraryAgentStatus.COMPLETED,
                 recommended_schedule_cron=None,
                 new_output=False,
@@ -112,21 +118,6 @@ async def test_get_library_agents_success(
     )
 
 
-def test_get_library_agents_error(mocker: pytest_mock.MockFixture, test_user_id: str):
-    mock_db_call = mocker.patch("backend.api.features.library.db.list_library_agents")
-    mock_db_call.side_effect = Exception("Test error")
-
-    response = client.get("/agents?search_term=test")
-    assert response.status_code == 500
-    mock_db_call.assert_called_once_with(
-        user_id=test_user_id,
-        search_term="test",
-        sort_by=library_model.LibraryAgentSort.UPDATED_AT,
-        page=1,
-        page_size=15,
-    )
-
-
 @pytest.mark.asyncio
 async def test_get_favorite_library_agents_success(
     mocker: pytest_mock.MockFixture,
@@ -138,6 +129,7 @@ async def test_get_favorite_library_agents_success(
                 id="test-agent-1",
                 graph_id="test-agent-1",
                 graph_version=1,
+                owner_user_id=test_user_id,
                 name="Favorite Agent 1",
                 description="Test Favorite Description 1",
                 image_url=None,
@@ -147,6 +139,8 @@ async def test_get_favorite_library_agents_success(
                 output_schema={"type": "object", "properties": {}},
                 credentials_input_schema={"type": "object", "properties": {}},
                 has_external_trigger=False,
+                has_human_in_the_loop=False,
+                has_sensitive_action=False,
                 status=library_model.LibraryAgentStatus.COMPLETED,
                 recommended_schedule_cron=None,
                 new_output=False,
@@ -181,23 +175,6 @@ async def test_get_favorite_library_agents_success(
     )
 
 
-def test_get_favorite_library_agents_error(
-    mocker: pytest_mock.MockFixture, test_user_id: str
-):
-    mock_db_call = mocker.patch(
-        "backend.api.features.library.db.list_favorite_library_agents"
-    )
-    mock_db_call.side_effect = Exception("Test error")
-
-    response = client.get("/agents/favorites")
-    assert response.status_code == 500
-    mock_db_call.assert_called_once_with(
-        user_id=test_user_id,
-        page=1,
-        page_size=15,
-    )
-
-
 def test_add_agent_to_library_success(
     mocker: pytest_mock.MockFixture, test_user_id: str
 ):
@@ -205,6 +182,7 @@ def test_add_agent_to_library_success(
         id="test-library-agent-id",
         graph_id="test-agent-1",
         graph_version=1,
+        owner_user_id=test_user_id,
         name="Test Agent 1",
         description="Test Description 1",
         image_url=None,
@@ -214,6 +192,8 @@ def test_add_agent_to_library_success(
         output_schema={"type": "object", "properties": {}},
         credentials_input_schema={"type": "object", "properties": {}},
         has_external_trigger=False,
+        has_human_in_the_loop=False,
+        has_sensitive_action=False,
         status=library_model.LibraryAgentStatus.COMPLETED,
         new_output=False,
         can_access_graph=True,
@@ -246,19 +226,3 @@ def test_add_agent_to_library_success(
         store_listing_version_id="test-version-id", user_id=test_user_id
     )
     mock_complete_onboarding.assert_awaited_once()
-
-
-def test_add_agent_to_library_error(mocker: pytest_mock.MockFixture, test_user_id: str):
-    mock_db_call = mocker.patch(
-        "backend.api.features.library.db.add_store_agent_to_library"
-    )
-    mock_db_call.side_effect = Exception("Test error")
-
-    response = client.post(
-        "/agents", json={"store_listing_version_id": "test-version-id"}
-    )
-    assert response.status_code == 500
-    assert "detail" in response.json()  # Verify error response structure
-    mock_db_call.assert_called_once_with(
-        store_listing_version_id="test-version-id", user_id=test_user_id
-    )
diff --git a/autogpt_platform/backend/backend/api/features/oauth_test.py b/autogpt_platform/backend/backend/api/features/oauth_test.py
index 5f6b85a88a..5fd35f82e7 100644
--- a/autogpt_platform/backend/backend/api/features/oauth_test.py
+++ b/autogpt_platform/backend/backend/api/features/oauth_test.py
@@ -20,6 +20,7 @@ from typing import AsyncGenerator
 
 import httpx
 import pytest
+import pytest_asyncio
 from autogpt_libs.api_key.keysmith import APIKeySmith
 from prisma.enums import APIKeyPermission
 from prisma.models import OAuthAccessToken as PrismaOAuthAccessToken
@@ -38,13 +39,13 @@ keysmith = APIKeySmith()
 # ============================================================================
 
 
-@pytest.fixture
+@pytest.fixture(scope="session")
 def test_user_id() -> str:
     """Test user ID for OAuth tests."""
     return str(uuid.uuid4())
 
 
-@pytest.fixture
+@pytest_asyncio.fixture(scope="session", loop_scope="session")
 async def test_user(server, test_user_id: str):
     """Create a test user in the database."""
     await PrismaUser.prisma().create(
@@ -67,7 +68,7 @@ async def test_user(server, test_user_id: str):
     await PrismaUser.prisma().delete(where={"id": test_user_id})
 
 
-@pytest.fixture
+@pytest_asyncio.fixture
 async def test_oauth_app(test_user: str):
     """Create a test OAuth application in the database."""
     app_id = str(uuid.uuid4())
@@ -122,7 +123,7 @@ def pkce_credentials() -> tuple[str, str]:
     return generate_pkce()
 
 
-@pytest.fixture
+@pytest_asyncio.fixture
 async def client(server, test_user: str) -> AsyncGenerator[httpx.AsyncClient, None]:
     """
     Create an async HTTP client that talks directly to the FastAPI app.
@@ -287,7 +288,7 @@ async def test_authorize_invalid_client_returns_error(
     assert query_params["error"][0] == "invalid_client"
 
 
-@pytest.fixture
+@pytest_asyncio.fixture
 async def inactive_oauth_app(test_user: str):
     """Create an inactive test OAuth application in the database."""
     app_id = str(uuid.uuid4())
@@ -1004,7 +1005,7 @@ async def test_token_refresh_revoked(
     assert "revoked" in response.json()["detail"].lower()
 
 
-@pytest.fixture
+@pytest_asyncio.fixture
 async def other_oauth_app(test_user: str):
     """Create a second OAuth application for cross-app tests."""
     app_id = str(uuid.uuid4())
diff --git a/autogpt_platform/backend/backend/api/features/store/content_handlers.py b/autogpt_platform/backend/backend/api/features/store/content_handlers.py
new file mode 100644
index 0000000000..cbbdcfbebf
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/store/content_handlers.py
@@ -0,0 +1,621 @@
+"""
+Content Type Handlers for Unified Embeddings
+
+Pluggable system for different content sources (store agents, blocks, docs).
+Each handler knows how to fetch and process its content type for embedding.
+"""
+
+import logging
+from abc import ABC, abstractmethod
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Any
+
+from prisma.enums import ContentType
+
+from backend.data.db import query_raw_with_schema
+
+logger = logging.getLogger(__name__)
+
+
+@dataclass
+class ContentItem:
+    """Represents a piece of content to be embedded."""
+
+    content_id: str  # Unique identifier (DB ID or file path)
+    content_type: ContentType
+    searchable_text: str  # Combined text for embedding
+    metadata: dict[str, Any]  # Content-specific metadata
+    user_id: str | None = None  # For user-scoped content
+
+
+class ContentHandler(ABC):
+    """Base handler for fetching and processing content for embeddings."""
+
+    @property
+    @abstractmethod
+    def content_type(self) -> ContentType:
+        """The ContentType this handler manages."""
+        pass
+
+    @abstractmethod
+    async def get_missing_items(self, batch_size: int) -> list[ContentItem]:
+        """
+        Fetch items that don't have embeddings yet.
+
+        Args:
+            batch_size: Maximum number of items to return
+
+        Returns:
+            List of ContentItem objects ready for embedding
+        """
+        pass
+
+    @abstractmethod
+    async def get_stats(self) -> dict[str, int]:
+        """
+        Get statistics about embedding coverage.
+
+        Returns:
+            Dict with keys: total, with_embeddings, without_embeddings
+        """
+        pass
+
+
+class StoreAgentHandler(ContentHandler):
+    """Handler for marketplace store agent listings."""
+
+    @property
+    def content_type(self) -> ContentType:
+        return ContentType.STORE_AGENT
+
+    async def get_missing_items(self, batch_size: int) -> list[ContentItem]:
+        """Fetch approved store listings without embeddings."""
+        from backend.api.features.store.embeddings import build_searchable_text
+
+        missing = await query_raw_with_schema(
+            """
+            SELECT
+                slv.id,
+                slv.name,
+                slv.description,
+                slv."subHeading",
+                slv.categories
+            FROM {schema_prefix}"StoreListingVersion" slv
+            LEFT JOIN {schema_prefix}"UnifiedContentEmbedding" uce
+                ON slv.id = uce."contentId" AND uce."contentType" = 'STORE_AGENT'::{schema_prefix}"ContentType"
+            WHERE slv."submissionStatus" = 'APPROVED'
+            AND slv."isDeleted" = false
+            AND uce."contentId" IS NULL
+            LIMIT $1
+            """,
+            batch_size,
+        )
+
+        return [
+            ContentItem(
+                content_id=row["id"],
+                content_type=ContentType.STORE_AGENT,
+                searchable_text=build_searchable_text(
+                    name=row["name"],
+                    description=row["description"],
+                    sub_heading=row["subHeading"],
+                    categories=row["categories"] or [],
+                ),
+                metadata={
+                    "name": row["name"],
+                    "categories": row["categories"] or [],
+                },
+                user_id=None,  # Store agents are public
+            )
+            for row in missing
+        ]
+
+    async def get_stats(self) -> dict[str, int]:
+        """Get statistics about store agent embedding coverage."""
+        # Count approved versions
+        approved_result = await query_raw_with_schema(
+            """
+            SELECT COUNT(*) as count
+            FROM {schema_prefix}"StoreListingVersion"
+            WHERE "submissionStatus" = 'APPROVED'
+            AND "isDeleted" = false
+            """
+        )
+        total_approved = approved_result[0]["count"] if approved_result else 0
+
+        # Count versions with embeddings
+        embedded_result = await query_raw_with_schema(
+            """
+            SELECT COUNT(*) as count
+            FROM {schema_prefix}"StoreListingVersion" slv
+            JOIN {schema_prefix}"UnifiedContentEmbedding" uce ON slv.id = uce."contentId" AND uce."contentType" = 'STORE_AGENT'::{schema_prefix}"ContentType"
+            WHERE slv."submissionStatus" = 'APPROVED'
+            AND slv."isDeleted" = false
+            """
+        )
+        with_embeddings = embedded_result[0]["count"] if embedded_result else 0
+
+        return {
+            "total": total_approved,
+            "with_embeddings": with_embeddings,
+            "without_embeddings": total_approved - with_embeddings,
+        }
+
+
+class BlockHandler(ContentHandler):
+    """Handler for block definitions (Python classes)."""
+
+    @property
+    def content_type(self) -> ContentType:
+        return ContentType.BLOCK
+
+    async def get_missing_items(self, batch_size: int) -> list[ContentItem]:
+        """Fetch blocks without embeddings."""
+        from backend.data.block import get_blocks
+
+        # Get all available blocks
+        all_blocks = get_blocks()
+
+        # Check which ones have embeddings
+        if not all_blocks:
+            return []
+
+        block_ids = list(all_blocks.keys())
+
+        # Query for existing embeddings
+        placeholders = ",".join([f"${i+1}" for i in range(len(block_ids))])
+        existing_result = await query_raw_with_schema(
+            f"""
+            SELECT "contentId"
+            FROM {{schema_prefix}}"UnifiedContentEmbedding"
+            WHERE "contentType" = 'BLOCK'::{{schema_prefix}}"ContentType"
+            AND "contentId" = ANY(ARRAY[{placeholders}])
+            """,
+            *block_ids,
+        )
+
+        existing_ids = {row["contentId"] for row in existing_result}
+        missing_blocks = [
+            (block_id, block_cls)
+            for block_id, block_cls in all_blocks.items()
+            if block_id not in existing_ids
+        ]
+
+        # Convert to ContentItem
+        items = []
+        for block_id, block_cls in missing_blocks[:batch_size]:
+            try:
+                block_instance = block_cls()
+
+                # Skip disabled blocks - they shouldn't be indexed
+                if block_instance.disabled:
+                    continue
+
+                # Build searchable text from block metadata
+                parts = []
+                if hasattr(block_instance, "name") and block_instance.name:
+                    parts.append(block_instance.name)
+                if (
+                    hasattr(block_instance, "description")
+                    and block_instance.description
+                ):
+                    parts.append(block_instance.description)
+                if hasattr(block_instance, "categories") and block_instance.categories:
+                    # Convert BlockCategory enum to strings
+                    parts.append(
+                        " ".join(str(cat.value) for cat in block_instance.categories)
+                    )
+
+                # Add input/output schema info
+                if hasattr(block_instance, "input_schema"):
+                    schema = block_instance.input_schema
+                    if hasattr(schema, "model_json_schema"):
+                        schema_dict = schema.model_json_schema()
+                        if "properties" in schema_dict:
+                            for prop_name, prop_info in schema_dict[
+                                "properties"
+                            ].items():
+                                if "description" in prop_info:
+                                    parts.append(
+                                        f"{prop_name}: {prop_info['description']}"
+                                    )
+
+                searchable_text = " ".join(parts)
+
+                # Convert categories set of enums to list of strings for JSON serialization
+                categories = getattr(block_instance, "categories", set())
+                categories_list = (
+                    [cat.value for cat in categories] if categories else []
+                )
+
+                items.append(
+                    ContentItem(
+                        content_id=block_id,
+                        content_type=ContentType.BLOCK,
+                        searchable_text=searchable_text,
+                        metadata={
+                            "name": getattr(block_instance, "name", ""),
+                            "categories": categories_list,
+                        },
+                        user_id=None,  # Blocks are public
+                    )
+                )
+            except Exception as e:
+                logger.warning(f"Failed to process block {block_id}: {e}")
+                continue
+
+        return items
+
+    async def get_stats(self) -> dict[str, int]:
+        """Get statistics about block embedding coverage."""
+        from backend.data.block import get_blocks
+
+        all_blocks = get_blocks()
+
+        # Filter out disabled blocks - they're not indexed
+        enabled_block_ids = [
+            block_id
+            for block_id, block_cls in all_blocks.items()
+            if not block_cls().disabled
+        ]
+        total_blocks = len(enabled_block_ids)
+
+        if total_blocks == 0:
+            return {"total": 0, "with_embeddings": 0, "without_embeddings": 0}
+
+        block_ids = enabled_block_ids
+        placeholders = ",".join([f"${i+1}" for i in range(len(block_ids))])
+
+        embedded_result = await query_raw_with_schema(
+            f"""
+            SELECT COUNT(*) as count
+            FROM {{schema_prefix}}"UnifiedContentEmbedding"
+            WHERE "contentType" = 'BLOCK'::{{schema_prefix}}"ContentType"
+            AND "contentId" = ANY(ARRAY[{placeholders}])
+            """,
+            *block_ids,
+        )
+
+        with_embeddings = embedded_result[0]["count"] if embedded_result else 0
+
+        return {
+            "total": total_blocks,
+            "with_embeddings": with_embeddings,
+            "without_embeddings": total_blocks - with_embeddings,
+        }
+
+
+@dataclass
+class MarkdownSection:
+    """Represents a section of a markdown document."""
+
+    title: str  # Section heading text
+    content: str  # Section content (including the heading line)
+    level: int  # Heading level (1 for #, 2 for ##, etc.)
+    index: int  # Section index within the document
+
+
+class DocumentationHandler(ContentHandler):
+    """Handler for documentation files (.md/.mdx).
+
+    Chunks documents by markdown headings to create multiple embeddings per file.
+    Each section (## heading) becomes a separate embedding for better retrieval.
+    """
+
+    @property
+    def content_type(self) -> ContentType:
+        return ContentType.DOCUMENTATION
+
+    def _get_docs_root(self) -> Path:
+        """Get the documentation root directory."""
+        # content_handlers.py is at: backend/backend/api/features/store/content_handlers.py
+        # Need to go up to project root then into docs/
+        # In container: /app/autogpt_platform/backend/backend/api/features/store -> /app/docs
+        # In development: /repo/autogpt_platform/backend/backend/api/features/store -> /repo/docs
+        this_file = Path(
+            __file__
+        )  # .../backend/backend/api/features/store/content_handlers.py
+        project_root = (
+            this_file.parent.parent.parent.parent.parent.parent.parent
+        )  # -> /app or /repo
+        docs_root = project_root / "docs"
+        return docs_root
+
+    def _extract_doc_title(self, file_path: Path) -> str:
+        """Extract the document title from a markdown file."""
+        try:
+            content = file_path.read_text(encoding="utf-8")
+            lines = content.split("\n")
+
+            # Try to extract title from first # heading
+            for line in lines:
+                if line.startswith("# "):
+                    return line[2:].strip()
+
+            # If no title found, use filename
+            return file_path.stem.replace("-", " ").replace("_", " ").title()
+        except Exception as e:
+            logger.warning(f"Failed to read title from {file_path}: {e}")
+            return file_path.stem.replace("-", " ").replace("_", " ").title()
+
+    def _chunk_markdown_by_headings(
+        self, file_path: Path, min_heading_level: int = 2
+    ) -> list[MarkdownSection]:
+        """
+        Split a markdown file into sections based on headings.
+
+        Args:
+            file_path: Path to the markdown file
+            min_heading_level: Minimum heading level to split on (default: 2 for ##)
+
+        Returns:
+            List of MarkdownSection objects, one per section.
+            If no headings found, returns a single section with all content.
+        """
+        try:
+            content = file_path.read_text(encoding="utf-8")
+        except Exception as e:
+            logger.warning(f"Failed to read {file_path}: {e}")
+            return []
+
+        lines = content.split("\n")
+        sections: list[MarkdownSection] = []
+        current_section_lines: list[str] = []
+        current_title = ""
+        current_level = 0
+        section_index = 0
+        doc_title = ""
+
+        for line in lines:
+            # Check if line is a heading
+            if line.startswith("#"):
+                # Count heading level
+                level = 0
+                for char in line:
+                    if char == "#":
+                        level += 1
+                    else:
+                        break
+
+                heading_text = line[level:].strip()
+
+                # Track document title (level 1 heading)
+                if level == 1 and not doc_title:
+                    doc_title = heading_text
+                    # Don't create a section for just the title - add it to first section
+                    current_section_lines.append(line)
+                    continue
+
+                # Check if this heading should start a new section
+                if level >= min_heading_level:
+                    # Save previous section if it has content
+                    if current_section_lines:
+                        section_content = "\n".join(current_section_lines).strip()
+                        if section_content:
+                            # Use doc title for first section if no specific title
+                            title = current_title if current_title else doc_title
+                            if not title:
+                                title = file_path.stem.replace("-", " ").replace(
+                                    "_", " "
+                                )
+                            sections.append(
+                                MarkdownSection(
+                                    title=title,
+                                    content=section_content,
+                                    level=current_level if current_level else 1,
+                                    index=section_index,
+                                )
+                            )
+                            section_index += 1
+
+                    # Start new section
+                    current_section_lines = [line]
+                    current_title = heading_text
+                    current_level = level
+                else:
+                    # Lower level heading (e.g., # when splitting on ##)
+                    current_section_lines.append(line)
+            else:
+                current_section_lines.append(line)
+
+        # Don't forget the last section
+        if current_section_lines:
+            section_content = "\n".join(current_section_lines).strip()
+            if section_content:
+                title = current_title if current_title else doc_title
+                if not title:
+                    title = file_path.stem.replace("-", " ").replace("_", " ")
+                sections.append(
+                    MarkdownSection(
+                        title=title,
+                        content=section_content,
+                        level=current_level if current_level else 1,
+                        index=section_index,
+                    )
+                )
+
+        # If no sections were created (no headings found), create one section with all content
+        if not sections and content.strip():
+            title = (
+                doc_title
+                if doc_title
+                else file_path.stem.replace("-", " ").replace("_", " ")
+            )
+            sections.append(
+                MarkdownSection(
+                    title=title,
+                    content=content.strip(),
+                    level=1,
+                    index=0,
+                )
+            )
+
+        return sections
+
+    def _make_section_content_id(self, doc_path: str, section_index: int) -> str:
+        """Create a unique content ID for a document section.
+
+        Format: doc_path::section_index
+        Example: 'platform/getting-started.md::0'
+        """
+        return f"{doc_path}::{section_index}"
+
+    def _parse_section_content_id(self, content_id: str) -> tuple[str, int]:
+        """Parse a section content ID back into doc_path and section_index.
+
+        Returns: (doc_path, section_index)
+        """
+        if "::" in content_id:
+            parts = content_id.rsplit("::", 1)
+            return parts[0], int(parts[1])
+        # Legacy format (whole document)
+        return content_id, 0
+
+    async def get_missing_items(self, batch_size: int) -> list[ContentItem]:
+        """Fetch documentation sections without embeddings.
+
+        Chunks each document by markdown headings and creates embeddings for each section.
+        Content IDs use the format: 'path/to/doc.md::section_index'
+        """
+        docs_root = self._get_docs_root()
+
+        if not docs_root.exists():
+            logger.warning(f"Documentation root not found: {docs_root}")
+            return []
+
+        # Find all .md and .mdx files
+        all_docs = list(docs_root.rglob("*.md")) + list(docs_root.rglob("*.mdx"))
+
+        if not all_docs:
+            return []
+
+        # Build list of all sections from all documents
+        all_sections: list[tuple[str, Path, MarkdownSection]] = []
+        for doc_file in all_docs:
+            doc_path = str(doc_file.relative_to(docs_root))
+            sections = self._chunk_markdown_by_headings(doc_file)
+            for section in sections:
+                all_sections.append((doc_path, doc_file, section))
+
+        if not all_sections:
+            return []
+
+        # Generate content IDs for all sections
+        section_content_ids = [
+            self._make_section_content_id(doc_path, section.index)
+            for doc_path, _, section in all_sections
+        ]
+
+        # Check which ones have embeddings
+        placeholders = ",".join([f"${i+1}" for i in range(len(section_content_ids))])
+        existing_result = await query_raw_with_schema(
+            f"""
+            SELECT "contentId"
+            FROM {{schema_prefix}}"UnifiedContentEmbedding"
+            WHERE "contentType" = 'DOCUMENTATION'::{{schema_prefix}}"ContentType"
+            AND "contentId" = ANY(ARRAY[{placeholders}])
+            """,
+            *section_content_ids,
+        )
+
+        existing_ids = {row["contentId"] for row in existing_result}
+
+        # Filter to missing sections
+        missing_sections = [
+            (doc_path, doc_file, section, content_id)
+            for (doc_path, doc_file, section), content_id in zip(
+                all_sections, section_content_ids
+            )
+            if content_id not in existing_ids
+        ]
+
+        # Convert to ContentItem (up to batch_size)
+        items = []
+        for doc_path, doc_file, section, content_id in missing_sections[:batch_size]:
+            try:
+                # Get document title for context
+                doc_title = self._extract_doc_title(doc_file)
+
+                # Build searchable text with context
+                # Include doc title and section title for better search relevance
+                searchable_text = f"{doc_title} - {section.title}\n\n{section.content}"
+
+                items.append(
+                    ContentItem(
+                        content_id=content_id,
+                        content_type=ContentType.DOCUMENTATION,
+                        searchable_text=searchable_text,
+                        metadata={
+                            "doc_title": doc_title,
+                            "section_title": section.title,
+                            "section_index": section.index,
+                            "heading_level": section.level,
+                            "path": doc_path,
+                        },
+                        user_id=None,  # Documentation is public
+                    )
+                )
+            except Exception as e:
+                logger.warning(f"Failed to process section {content_id}: {e}")
+                continue
+
+        return items
+
+    def _get_all_section_content_ids(self, docs_root: Path) -> set[str]:
+        """Get all current section content IDs from the docs directory.
+
+        Used for stats and cleanup to know what sections should exist.
+        """
+        all_docs = list(docs_root.rglob("*.md")) + list(docs_root.rglob("*.mdx"))
+        content_ids = set()
+
+        for doc_file in all_docs:
+            doc_path = str(doc_file.relative_to(docs_root))
+            sections = self._chunk_markdown_by_headings(doc_file)
+            for section in sections:
+                content_ids.add(self._make_section_content_id(doc_path, section.index))
+
+        return content_ids
+
+    async def get_stats(self) -> dict[str, int]:
+        """Get statistics about documentation embedding coverage.
+
+        Counts sections (not documents) since each section gets its own embedding.
+        """
+        docs_root = self._get_docs_root()
+
+        if not docs_root.exists():
+            return {"total": 0, "with_embeddings": 0, "without_embeddings": 0}
+
+        # Get all section content IDs
+        all_section_ids = self._get_all_section_content_ids(docs_root)
+        total_sections = len(all_section_ids)
+
+        if total_sections == 0:
+            return {"total": 0, "with_embeddings": 0, "without_embeddings": 0}
+
+        # Count embeddings in database for DOCUMENTATION type
+        embedded_result = await query_raw_with_schema(
+            """
+            SELECT COUNT(*) as count
+            FROM {schema_prefix}"UnifiedContentEmbedding"
+            WHERE "contentType" = 'DOCUMENTATION'::{schema_prefix}"ContentType"
+            """
+        )
+
+        with_embeddings = embedded_result[0]["count"] if embedded_result else 0
+
+        return {
+            "total": total_sections,
+            "with_embeddings": with_embeddings,
+            "without_embeddings": total_sections - with_embeddings,
+        }
+
+
+# Content handler registry
+CONTENT_HANDLERS: dict[ContentType, ContentHandler] = {
+    ContentType.STORE_AGENT: StoreAgentHandler(),
+    ContentType.BLOCK: BlockHandler(),
+    ContentType.DOCUMENTATION: DocumentationHandler(),
+}
diff --git a/autogpt_platform/backend/backend/api/features/store/content_handlers_integration_test.py b/autogpt_platform/backend/backend/api/features/store/content_handlers_integration_test.py
new file mode 100644
index 0000000000..b53a9e80b0
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/store/content_handlers_integration_test.py
@@ -0,0 +1,215 @@
+"""
+Integration tests for content handlers using real DB.
+
+Run with: poetry run pytest backend/api/features/store/content_handlers_integration_test.py -xvs
+
+These tests use the real database but mock OpenAI calls.
+"""
+
+from unittest.mock import patch
+
+import pytest
+
+from backend.api.features.store.content_handlers import (
+    CONTENT_HANDLERS,
+    BlockHandler,
+    DocumentationHandler,
+    StoreAgentHandler,
+)
+from backend.api.features.store.embeddings import (
+    EMBEDDING_DIM,
+    backfill_all_content_types,
+    ensure_content_embedding,
+    get_embedding_stats,
+)
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_store_agent_handler_real_db():
+    """Test StoreAgentHandler with real database queries."""
+    handler = StoreAgentHandler()
+
+    # Get stats from real DB
+    stats = await handler.get_stats()
+
+    # Stats should have correct structure
+    assert "total" in stats
+    assert "with_embeddings" in stats
+    assert "without_embeddings" in stats
+    assert stats["total"] >= 0
+    assert stats["with_embeddings"] >= 0
+    assert stats["without_embeddings"] >= 0
+
+    # Get missing items (max 1 to keep test fast)
+    items = await handler.get_missing_items(batch_size=1)
+
+    # Items should be list (may be empty if all have embeddings)
+    assert isinstance(items, list)
+
+    if items:
+        item = items[0]
+        assert item.content_id is not None
+        assert item.content_type.value == "STORE_AGENT"
+        assert item.searchable_text != ""
+        assert item.user_id is None
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_block_handler_real_db():
+    """Test BlockHandler with real database queries."""
+    handler = BlockHandler()
+
+    # Get stats from real DB
+    stats = await handler.get_stats()
+
+    # Stats should have correct structure
+    assert "total" in stats
+    assert "with_embeddings" in stats
+    assert "without_embeddings" in stats
+    assert stats["total"] >= 0  # Should have at least some blocks
+    assert stats["with_embeddings"] >= 0
+    assert stats["without_embeddings"] >= 0
+
+    # Get missing items (max 1 to keep test fast)
+    items = await handler.get_missing_items(batch_size=1)
+
+    # Items should be list
+    assert isinstance(items, list)
+
+    if items:
+        item = items[0]
+        assert item.content_id is not None  # Should be block UUID
+        assert item.content_type.value == "BLOCK"
+        assert item.searchable_text != ""
+        assert item.user_id is None
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_documentation_handler_real_fs():
+    """Test DocumentationHandler with real filesystem."""
+    handler = DocumentationHandler()
+
+    # Get stats from real filesystem
+    stats = await handler.get_stats()
+
+    # Stats should have correct structure
+    assert "total" in stats
+    assert "with_embeddings" in stats
+    assert "without_embeddings" in stats
+    assert stats["total"] >= 0
+    assert stats["with_embeddings"] >= 0
+    assert stats["without_embeddings"] >= 0
+
+    # Get missing items (max 1 to keep test fast)
+    items = await handler.get_missing_items(batch_size=1)
+
+    # Items should be list
+    assert isinstance(items, list)
+
+    if items:
+        item = items[0]
+        assert item.content_id is not None  # Should be relative path
+        assert item.content_type.value == "DOCUMENTATION"
+        assert item.searchable_text != ""
+        assert item.user_id is None
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_get_embedding_stats_all_types():
+    """Test get_embedding_stats aggregates all content types."""
+    stats = await get_embedding_stats()
+
+    # Should have structure with by_type and totals
+    assert "by_type" in stats
+    assert "totals" in stats
+
+    # Check each content type is present
+    by_type = stats["by_type"]
+    assert "STORE_AGENT" in by_type
+    assert "BLOCK" in by_type
+    assert "DOCUMENTATION" in by_type
+
+    # Check totals are aggregated
+    totals = stats["totals"]
+    assert totals["total"] >= 0
+    assert totals["with_embeddings"] >= 0
+    assert totals["without_embeddings"] >= 0
+    assert "coverage_percent" in totals
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@patch("backend.api.features.store.embeddings.generate_embedding")
+async def test_ensure_content_embedding_blocks(mock_generate):
+    """Test creating embeddings for blocks (mocked OpenAI)."""
+    # Mock OpenAI to return fake embedding
+    mock_generate.return_value = [0.1] * EMBEDDING_DIM
+
+    # Get one block without embedding
+    handler = BlockHandler()
+    items = await handler.get_missing_items(batch_size=1)
+
+    if not items:
+        pytest.skip("No blocks without embeddings")
+
+    item = items[0]
+
+    # Try to create embedding (OpenAI mocked)
+    result = await ensure_content_embedding(
+        content_type=item.content_type,
+        content_id=item.content_id,
+        searchable_text=item.searchable_text,
+        metadata=item.metadata,
+        user_id=item.user_id,
+    )
+
+    # Should succeed with mocked OpenAI
+    assert result is True
+    mock_generate.assert_called_once()
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@patch("backend.api.features.store.embeddings.generate_embedding")
+async def test_backfill_all_content_types_dry_run(mock_generate):
+    """Test backfill_all_content_types processes all handlers in order."""
+    # Mock OpenAI to return fake embedding
+    mock_generate.return_value = [0.1] * EMBEDDING_DIM
+
+    # Run backfill with batch_size=1 to process max 1 per type
+    result = await backfill_all_content_types(batch_size=1)
+
+    # Should have results for all content types
+    assert "by_type" in result
+    assert "totals" in result
+
+    by_type = result["by_type"]
+    assert "BLOCK" in by_type
+    assert "STORE_AGENT" in by_type
+    assert "DOCUMENTATION" in by_type
+
+    # Each type should have correct structure
+    for content_type, type_result in by_type.items():
+        assert "processed" in type_result
+        assert "success" in type_result
+        assert "failed" in type_result
+
+    # Totals should aggregate
+    totals = result["totals"]
+    assert totals["processed"] >= 0
+    assert totals["success"] >= 0
+    assert totals["failed"] >= 0
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_content_handler_registry():
+    """Test all handlers are registered in correct order."""
+    from prisma.enums import ContentType
+
+    # All three types should be registered
+    assert ContentType.STORE_AGENT in CONTENT_HANDLERS
+    assert ContentType.BLOCK in CONTENT_HANDLERS
+    assert ContentType.DOCUMENTATION in CONTENT_HANDLERS
+
+    # Check handler types
+    assert isinstance(CONTENT_HANDLERS[ContentType.STORE_AGENT], StoreAgentHandler)
+    assert isinstance(CONTENT_HANDLERS[ContentType.BLOCK], BlockHandler)
+    assert isinstance(CONTENT_HANDLERS[ContentType.DOCUMENTATION], DocumentationHandler)
diff --git a/autogpt_platform/backend/backend/api/features/store/content_handlers_test.py b/autogpt_platform/backend/backend/api/features/store/content_handlers_test.py
new file mode 100644
index 0000000000..fee879fae0
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/store/content_handlers_test.py
@@ -0,0 +1,391 @@
+"""
+E2E tests for content handlers (blocks, store agents, documentation).
+
+Tests the full flow: discovering content → generating embeddings → storing.
+"""
+
+from pathlib import Path
+from unittest.mock import MagicMock, patch
+
+import pytest
+from prisma.enums import ContentType
+
+from backend.api.features.store.content_handlers import (
+    CONTENT_HANDLERS,
+    BlockHandler,
+    DocumentationHandler,
+    StoreAgentHandler,
+)
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_store_agent_handler_get_missing_items(mocker):
+    """Test StoreAgentHandler fetches approved agents without embeddings."""
+    handler = StoreAgentHandler()
+
+    # Mock database query
+    mock_missing = [
+        {
+            "id": "agent-1",
+            "name": "Test Agent",
+            "description": "A test agent",
+            "subHeading": "Test heading",
+            "categories": ["AI", "Testing"],
+        }
+    ]
+
+    with patch(
+        "backend.api.features.store.content_handlers.query_raw_with_schema",
+        return_value=mock_missing,
+    ):
+        items = await handler.get_missing_items(batch_size=10)
+
+        assert len(items) == 1
+        assert items[0].content_id == "agent-1"
+        assert items[0].content_type == ContentType.STORE_AGENT
+        assert "Test Agent" in items[0].searchable_text
+        assert "A test agent" in items[0].searchable_text
+        assert items[0].metadata["name"] == "Test Agent"
+        assert items[0].user_id is None
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_store_agent_handler_get_stats(mocker):
+    """Test StoreAgentHandler returns correct stats."""
+    handler = StoreAgentHandler()
+
+    # Mock approved count query
+    mock_approved = [{"count": 50}]
+    # Mock embedded count query
+    mock_embedded = [{"count": 30}]
+
+    with patch(
+        "backend.api.features.store.content_handlers.query_raw_with_schema",
+        side_effect=[mock_approved, mock_embedded],
+    ):
+        stats = await handler.get_stats()
+
+        assert stats["total"] == 50
+        assert stats["with_embeddings"] == 30
+        assert stats["without_embeddings"] == 20
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_block_handler_get_missing_items(mocker):
+    """Test BlockHandler discovers blocks without embeddings."""
+    handler = BlockHandler()
+
+    # Mock get_blocks to return test blocks
+    mock_block_class = MagicMock()
+    mock_block_instance = MagicMock()
+    mock_block_instance.name = "Calculator Block"
+    mock_block_instance.description = "Performs calculations"
+    mock_block_instance.categories = [MagicMock(value="MATH")]
+    mock_block_instance.disabled = False
+    mock_block_instance.input_schema.model_json_schema.return_value = {
+        "properties": {"expression": {"description": "Math expression to evaluate"}}
+    }
+    mock_block_class.return_value = mock_block_instance
+
+    mock_blocks = {"block-uuid-1": mock_block_class}
+
+    # Mock existing embeddings query (no embeddings exist)
+    mock_existing = []
+
+    with patch(
+        "backend.data.block.get_blocks",
+        return_value=mock_blocks,
+    ):
+        with patch(
+            "backend.api.features.store.content_handlers.query_raw_with_schema",
+            return_value=mock_existing,
+        ):
+            items = await handler.get_missing_items(batch_size=10)
+
+            assert len(items) == 1
+            assert items[0].content_id == "block-uuid-1"
+            assert items[0].content_type == ContentType.BLOCK
+            assert "Calculator Block" in items[0].searchable_text
+            assert "Performs calculations" in items[0].searchable_text
+            assert "MATH" in items[0].searchable_text
+            assert "expression: Math expression" in items[0].searchable_text
+            assert items[0].user_id is None
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_block_handler_get_stats(mocker):
+    """Test BlockHandler returns correct stats."""
+    handler = BlockHandler()
+
+    # Mock get_blocks - each block class returns an instance with disabled=False
+    def make_mock_block_class():
+        mock_class = MagicMock()
+        mock_instance = MagicMock()
+        mock_instance.disabled = False
+        mock_class.return_value = mock_instance
+        return mock_class
+
+    mock_blocks = {
+        "block-1": make_mock_block_class(),
+        "block-2": make_mock_block_class(),
+        "block-3": make_mock_block_class(),
+    }
+
+    # Mock embedded count query (2 blocks have embeddings)
+    mock_embedded = [{"count": 2}]
+
+    with patch(
+        "backend.data.block.get_blocks",
+        return_value=mock_blocks,
+    ):
+        with patch(
+            "backend.api.features.store.content_handlers.query_raw_with_schema",
+            return_value=mock_embedded,
+        ):
+            stats = await handler.get_stats()
+
+            assert stats["total"] == 3
+            assert stats["with_embeddings"] == 2
+            assert stats["without_embeddings"] == 1
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_documentation_handler_get_missing_items(tmp_path, mocker):
+    """Test DocumentationHandler discovers docs without embeddings."""
+    handler = DocumentationHandler()
+
+    # Create temporary docs directory with test files
+    docs_root = tmp_path / "docs"
+    docs_root.mkdir()
+
+    (docs_root / "guide.md").write_text("# Getting Started\n\nThis is a guide.")
+    (docs_root / "api.mdx").write_text("# API Reference\n\nAPI documentation.")
+
+    # Mock _get_docs_root to return temp dir
+    with patch.object(handler, "_get_docs_root", return_value=docs_root):
+        # Mock existing embeddings query (no embeddings exist)
+        with patch(
+            "backend.api.features.store.content_handlers.query_raw_with_schema",
+            return_value=[],
+        ):
+            items = await handler.get_missing_items(batch_size=10)
+
+            assert len(items) == 2
+
+            # Check guide.md (content_id format: doc_path::section_index)
+            guide_item = next(
+                (item for item in items if item.content_id == "guide.md::0"), None
+            )
+            assert guide_item is not None
+            assert guide_item.content_type == ContentType.DOCUMENTATION
+            assert "Getting Started" in guide_item.searchable_text
+            assert "This is a guide" in guide_item.searchable_text
+            assert guide_item.metadata["doc_title"] == "Getting Started"
+            assert guide_item.user_id is None
+
+            # Check api.mdx (content_id format: doc_path::section_index)
+            api_item = next(
+                (item for item in items if item.content_id == "api.mdx::0"), None
+            )
+            assert api_item is not None
+            assert "API Reference" in api_item.searchable_text
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_documentation_handler_get_stats(tmp_path, mocker):
+    """Test DocumentationHandler returns correct stats."""
+    handler = DocumentationHandler()
+
+    # Create temporary docs directory
+    docs_root = tmp_path / "docs"
+    docs_root.mkdir()
+    (docs_root / "doc1.md").write_text("# Doc 1")
+    (docs_root / "doc2.md").write_text("# Doc 2")
+    (docs_root / "doc3.mdx").write_text("# Doc 3")
+
+    # Mock embedded count query (1 doc has embedding)
+    mock_embedded = [{"count": 1}]
+
+    with patch.object(handler, "_get_docs_root", return_value=docs_root):
+        with patch(
+            "backend.api.features.store.content_handlers.query_raw_with_schema",
+            return_value=mock_embedded,
+        ):
+            stats = await handler.get_stats()
+
+            assert stats["total"] == 3
+            assert stats["with_embeddings"] == 1
+            assert stats["without_embeddings"] == 2
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_documentation_handler_title_extraction(tmp_path):
+    """Test DocumentationHandler extracts title from markdown heading."""
+    handler = DocumentationHandler()
+
+    # Test with heading
+    doc_with_heading = tmp_path / "with_heading.md"
+    doc_with_heading.write_text("# My Title\n\nContent here")
+    title = handler._extract_doc_title(doc_with_heading)
+    assert title == "My Title"
+
+    # Test without heading
+    doc_without_heading = tmp_path / "no-heading.md"
+    doc_without_heading.write_text("Just content, no heading")
+    title = handler._extract_doc_title(doc_without_heading)
+    assert title == "No Heading"  # Uses filename
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_documentation_handler_markdown_chunking(tmp_path):
+    """Test DocumentationHandler chunks markdown by headings."""
+    handler = DocumentationHandler()
+
+    # Test document with multiple sections
+    doc_with_sections = tmp_path / "sections.md"
+    doc_with_sections.write_text(
+        "# Document Title\n\n"
+        "Intro paragraph.\n\n"
+        "## Section One\n\n"
+        "Content for section one.\n\n"
+        "## Section Two\n\n"
+        "Content for section two.\n"
+    )
+    sections = handler._chunk_markdown_by_headings(doc_with_sections)
+
+    # Should have 3 sections: intro (with doc title), section one, section two
+    assert len(sections) == 3
+    assert sections[0].title == "Document Title"
+    assert sections[0].index == 0
+    assert "Intro paragraph" in sections[0].content
+
+    assert sections[1].title == "Section One"
+    assert sections[1].index == 1
+    assert "Content for section one" in sections[1].content
+
+    assert sections[2].title == "Section Two"
+    assert sections[2].index == 2
+    assert "Content for section two" in sections[2].content
+
+    # Test document without headings
+    doc_no_sections = tmp_path / "no-sections.md"
+    doc_no_sections.write_text("Just plain content without any headings.")
+    sections = handler._chunk_markdown_by_headings(doc_no_sections)
+    assert len(sections) == 1
+    assert sections[0].index == 0
+    assert "Just plain content" in sections[0].content
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_documentation_handler_section_content_ids():
+    """Test DocumentationHandler creates and parses section content IDs."""
+    handler = DocumentationHandler()
+
+    # Test making content ID
+    content_id = handler._make_section_content_id("docs/guide.md", 2)
+    assert content_id == "docs/guide.md::2"
+
+    # Test parsing content ID
+    doc_path, section_index = handler._parse_section_content_id("docs/guide.md::2")
+    assert doc_path == "docs/guide.md"
+    assert section_index == 2
+
+    # Test parsing legacy format (no section index)
+    doc_path, section_index = handler._parse_section_content_id("docs/old-format.md")
+    assert doc_path == "docs/old-format.md"
+    assert section_index == 0
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_content_handlers_registry():
+    """Test all content types are registered."""
+    assert ContentType.STORE_AGENT in CONTENT_HANDLERS
+    assert ContentType.BLOCK in CONTENT_HANDLERS
+    assert ContentType.DOCUMENTATION in CONTENT_HANDLERS
+
+    assert isinstance(CONTENT_HANDLERS[ContentType.STORE_AGENT], StoreAgentHandler)
+    assert isinstance(CONTENT_HANDLERS[ContentType.BLOCK], BlockHandler)
+    assert isinstance(CONTENT_HANDLERS[ContentType.DOCUMENTATION], DocumentationHandler)
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_block_handler_handles_missing_attributes():
+    """Test BlockHandler gracefully handles blocks with missing attributes."""
+    handler = BlockHandler()
+
+    # Mock block with minimal attributes
+    mock_block_class = MagicMock()
+    mock_block_instance = MagicMock()
+    mock_block_instance.name = "Minimal Block"
+    mock_block_instance.disabled = False
+    # No description, categories, or schema
+    del mock_block_instance.description
+    del mock_block_instance.categories
+    del mock_block_instance.input_schema
+    mock_block_class.return_value = mock_block_instance
+
+    mock_blocks = {"block-minimal": mock_block_class}
+
+    with patch(
+        "backend.data.block.get_blocks",
+        return_value=mock_blocks,
+    ):
+        with patch(
+            "backend.api.features.store.content_handlers.query_raw_with_schema",
+            return_value=[],
+        ):
+            items = await handler.get_missing_items(batch_size=10)
+
+            assert len(items) == 1
+            assert items[0].searchable_text == "Minimal Block"
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_block_handler_skips_failed_blocks():
+    """Test BlockHandler skips blocks that fail to instantiate."""
+    handler = BlockHandler()
+
+    # Mock one good block and one bad block
+    good_block = MagicMock()
+    good_instance = MagicMock()
+    good_instance.name = "Good Block"
+    good_instance.description = "Works fine"
+    good_instance.categories = []
+    good_instance.disabled = False
+    good_block.return_value = good_instance
+
+    bad_block = MagicMock()
+    bad_block.side_effect = Exception("Instantiation failed")
+
+    mock_blocks = {"good-block": good_block, "bad-block": bad_block}
+
+    with patch(
+        "backend.data.block.get_blocks",
+        return_value=mock_blocks,
+    ):
+        with patch(
+            "backend.api.features.store.content_handlers.query_raw_with_schema",
+            return_value=[],
+        ):
+            items = await handler.get_missing_items(batch_size=10)
+
+            # Should only get the good block
+            assert len(items) == 1
+            assert items[0].content_id == "good-block"
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_documentation_handler_missing_docs_directory():
+    """Test DocumentationHandler handles missing docs directory gracefully."""
+    handler = DocumentationHandler()
+
+    # Mock _get_docs_root to return non-existent path
+    fake_path = Path("/nonexistent/docs")
+    with patch.object(handler, "_get_docs_root", return_value=fake_path):
+        items = await handler.get_missing_items(batch_size=10)
+        assert items == []
+
+        stats = await handler.get_stats()
+        assert stats["total"] == 0
+        assert stats["with_embeddings"] == 0
+        assert stats["without_embeddings"] == 0
diff --git a/autogpt_platform/backend/backend/api/features/store/db.py b/autogpt_platform/backend/backend/api/features/store/db.py
index 8e5a39df89..850a2bc3e9 100644
--- a/autogpt_platform/backend/backend/api/features/store/db.py
+++ b/autogpt_platform/backend/backend/api/features/store/db.py
@@ -1,8 +1,7 @@
 import asyncio
 import logging
-import typing
 from datetime import datetime, timezone
-from typing import Literal
+from typing import Any, Literal
 
 import fastapi
 import prisma.enums
@@ -10,7 +9,7 @@ import prisma.errors
 import prisma.models
 import prisma.types
 
-from backend.data.db import query_raw_with_schema, transaction
+from backend.data.db import transaction
 from backend.data.graph import (
     GraphMeta,
     GraphModel,
@@ -30,6 +29,8 @@ from backend.util.settings import Settings
 
 from . import exceptions as store_exceptions
 from . import model as store_model
+from .embeddings import ensure_embedding
+from .hybrid_search import hybrid_search
 
 logger = logging.getLogger(__name__)
 settings = Settings()
@@ -50,128 +51,78 @@ async def get_store_agents(
     page_size: int = 20,
 ) -> store_model.StoreAgentsResponse:
     """
-    Get PUBLIC store agents from the StoreAgent view
+    Get PUBLIC store agents from the StoreAgent view.
+
+    Search behavior:
+    - With search_query: Uses hybrid search (semantic + lexical)
+    - Fallback: If embeddings unavailable, gracefully degrades to lexical-only
+    - Rationale: User-facing endpoint prioritizes availability over accuracy
+
+    Note: Admin operations (approval) use fail-fast to prevent inconsistent state.
     """
     logger.debug(
         f"Getting store agents. featured={featured}, creators={creators}, sorted_by={sorted_by}, search={search_query}, category={category}, page={page}"
     )
 
+    search_used_hybrid = False
+    store_agents: list[store_model.StoreAgent] = []
+    agents: list[dict[str, Any]] = []
+    total = 0
+    total_pages = 0
+
     try:
-        # If search_query is provided, use full-text search
+        # If search_query is provided, use hybrid search (embeddings + tsvector)
         if search_query:
-            offset = (page - 1) * page_size
+            # Try hybrid search combining semantic and lexical signals
+            # Falls back to lexical-only if OpenAI unavailable (user-facing, high SLA)
+            try:
+                agents, total = await hybrid_search(
+                    query=search_query,
+                    featured=featured,
+                    creators=creators,
+                    category=category,
+                    sorted_by="relevance",  # Use hybrid scoring for relevance
+                    page=page,
+                    page_size=page_size,
+                )
+                search_used_hybrid = True
+            except Exception as e:
+                # Log error but fall back to lexical search for better UX
+                logger.error(
+                    f"Hybrid search failed (likely OpenAI unavailable), "
+                    f"falling back to lexical search: {e}"
+                )
+                # search_used_hybrid remains False, will use fallback path below
 
-            # Whitelist allowed order_by columns
-            ALLOWED_ORDER_BY = {
-                "rating": "rating DESC, rank DESC",
-                "runs": "runs DESC, rank DESC",
-                "name": "agent_name ASC, rank ASC",
-                "updated_at": "updated_at DESC, rank DESC",
-            }
+            # Convert hybrid search results (dict format) if hybrid succeeded
+            if search_used_hybrid:
+                total_pages = (total + page_size - 1) // page_size
+                store_agents: list[store_model.StoreAgent] = []
+                for agent in agents:
+                    try:
+                        store_agent = store_model.StoreAgent(
+                            slug=agent["slug"],
+                            agent_name=agent["agent_name"],
+                            agent_image=(
+                                agent["agent_image"][0] if agent["agent_image"] else ""
+                            ),
+                            creator=agent["creator_username"] or "Needs Profile",
+                            creator_avatar=agent["creator_avatar"] or "",
+                            sub_heading=agent["sub_heading"],
+                            description=agent["description"],
+                            runs=agent["runs"],
+                            rating=agent["rating"],
+                            agent_graph_id=agent.get("agentGraphId", ""),
+                        )
+                        store_agents.append(store_agent)
+                    except Exception as e:
+                        logger.error(
+                            f"Error parsing Store agent from hybrid search results: {e}"
+                        )
+                        continue
 
-            # Validate and get order clause
-            if sorted_by and sorted_by in ALLOWED_ORDER_BY:
-                order_by_clause = ALLOWED_ORDER_BY[sorted_by]
-            else:
-                order_by_clause = "updated_at DESC, rank DESC"
-
-            # Build WHERE conditions and parameters list
-            where_parts: list[str] = []
-            params: list[typing.Any] = [search_query]  # $1 - search term
-            param_index = 2  # Start at $2 for next parameter
-
-            # Always filter for available agents
-            where_parts.append("is_available = true")
-
-            if featured:
-                where_parts.append("featured = true")
-
-            if creators and creators:
-                # Use ANY with array parameter
-                where_parts.append(f"creator_username = ANY(${param_index})")
-                params.append(creators)
-                param_index += 1
-
-            if category and category:
-                where_parts.append(f"${param_index} = ANY(categories)")
-                params.append(category)
-                param_index += 1
-
-            sql_where_clause: str = " AND ".join(where_parts) if where_parts else "1=1"
-
-            # Add pagination params
-            params.extend([page_size, offset])
-            limit_param = f"${param_index}"
-            offset_param = f"${param_index + 1}"
-
-            # Execute full-text search query with parameterized values
-            sql_query = f"""
-                SELECT
-                    slug,
-                    agent_name,
-                    agent_image,
-                    creator_username,
-                    creator_avatar,
-                    sub_heading,
-                    description,
-                    runs,
-                    rating,
-                    categories,
-                    featured,
-                    is_available,
-                    updated_at,
-                    ts_rank_cd(search, query) AS rank
-                FROM {{schema_prefix}}"StoreAgent",
-                    plainto_tsquery('english', $1) AS query
-                WHERE {sql_where_clause}
-                    AND search @@ query
-                ORDER BY {order_by_clause}
-                LIMIT {limit_param} OFFSET {offset_param}
-            """
-
-            # Count query for pagination - only uses search term parameter
-            count_query = f"""
-                SELECT COUNT(*) as count
-                FROM {{schema_prefix}}"StoreAgent",
-                    plainto_tsquery('english', $1) AS query
-                WHERE {sql_where_clause}
-                    AND search @@ query
-            """
-
-            # Execute both queries with parameters
-            agents = await query_raw_with_schema(sql_query, *params)
-
-            # For count, use params without pagination (last 2 params)
-            count_params = params[:-2]
-            count_result = await query_raw_with_schema(count_query, *count_params)
-
-            total = count_result[0]["count"] if count_result else 0
-            total_pages = (total + page_size - 1) // page_size
-
-            # Convert raw results to StoreAgent models
-            store_agents: list[store_model.StoreAgent] = []
-            for agent in agents:
-                try:
-                    store_agent = store_model.StoreAgent(
-                        slug=agent["slug"],
-                        agent_name=agent["agent_name"],
-                        agent_image=(
-                            agent["agent_image"][0] if agent["agent_image"] else ""
-                        ),
-                        creator=agent["creator_username"] or "Needs Profile",
-                        creator_avatar=agent["creator_avatar"] or "",
-                        sub_heading=agent["sub_heading"],
-                        description=agent["description"],
-                        runs=agent["runs"],
-                        rating=agent["rating"],
-                    )
-                    store_agents.append(store_agent)
-                except Exception as e:
-                    logger.error(f"Error parsing Store agent from search results: {e}")
-                    continue
-
-        else:
-            # Non-search query path (original logic)
+        if not search_used_hybrid:
+            # Fallback path - use basic search or no search
             where_clause: prisma.types.StoreAgentWhereInput = {"is_available": True}
             if featured:
                 where_clause["featured"] = featured
@@ -180,6 +131,14 @@ async def get_store_agents(
             if category:
                 where_clause["categories"] = {"has": category}
 
+            # Add basic text search if search_query provided but hybrid failed
+            if search_query:
+                where_clause["OR"] = [
+                    {"agent_name": {"contains": search_query, "mode": "insensitive"}},
+                    {"sub_heading": {"contains": search_query, "mode": "insensitive"}},
+                    {"description": {"contains": search_query, "mode": "insensitive"}},
+                ]
+
             order_by = []
             if sorted_by == "rating":
                 order_by.append({"rating": "desc"})
@@ -188,7 +147,7 @@ async def get_store_agents(
             elif sorted_by == "name":
                 order_by.append({"agent_name": "asc"})
 
-            agents = await prisma.models.StoreAgent.prisma().find_many(
+            db_agents = await prisma.models.StoreAgent.prisma().find_many(
                 where=where_clause,
                 order=order_by,
                 skip=(page - 1) * page_size,
@@ -199,7 +158,7 @@ async def get_store_agents(
             total_pages = (total + page_size - 1) // page_size
 
             store_agents: list[store_model.StoreAgent] = []
-            for agent in agents:
+            for agent in db_agents:
                 try:
                     # Create the StoreAgent object safely
                     store_agent = store_model.StoreAgent(
@@ -212,6 +171,7 @@ async def get_store_agents(
                         description=agent.description,
                         runs=agent.runs,
                         rating=agent.rating,
+                        agent_graph_id=agent.agentGraphId,
                     )
                     # Add to the list only if creation was successful
                     store_agents.append(store_agent)
@@ -614,6 +574,7 @@ async def get_store_submissions(
         submission_models = []
         for sub in submissions:
             submission_model = store_model.StoreSubmission(
+                listing_id=sub.listing_id,
                 agent_id=sub.agent_id,
                 agent_version=sub.agent_version,
                 name=sub.name,
@@ -667,35 +628,48 @@ async def delete_store_submission(
     submission_id: str,
 ) -> bool:
     """
-    Delete a store listing submission as the submitting user.
+    Delete a store submission version as the submitting user.
 
     Args:
         user_id: ID of the authenticated user
-        submission_id: ID of the submission to be deleted
+        submission_id: StoreListingVersion ID to delete
 
     Returns:
-        bool: True if the submission was successfully deleted, False otherwise
+        bool: True if successfully deleted
     """
-    logger.debug(f"Deleting store submission {submission_id} for user {user_id}")
-
     try:
-        # Verify the submission belongs to this user
-        submission = await prisma.models.StoreListing.prisma().find_first(
-            where={"agentGraphId": submission_id, "owningUserId": user_id}
+        # Find the submission version with ownership check
+        version = await prisma.models.StoreListingVersion.prisma().find_first(
+            where={"id": submission_id}, include={"StoreListing": True}
         )
 
-        if not submission:
-            logger.warning(f"Submission not found for user {user_id}: {submission_id}")
-            raise store_exceptions.SubmissionNotFoundError(
-                f"Submission not found for this user. User ID: {user_id}, Submission ID: {submission_id}"
+        if (
+            not version
+            or not version.StoreListing
+            or version.StoreListing.owningUserId != user_id
+        ):
+            raise store_exceptions.SubmissionNotFoundError("Submission not found")
+
+        # Prevent deletion of approved submissions
+        if version.submissionStatus == prisma.enums.SubmissionStatus.APPROVED:
+            raise store_exceptions.InvalidOperationError(
+                "Cannot delete approved submissions"
             )
 
-        # Delete the submission
-        await prisma.models.StoreListing.prisma().delete(where={"id": submission.id})
-
-        logger.debug(
-            f"Successfully deleted submission {submission_id} for user {user_id}"
+        # Delete the version
+        await prisma.models.StoreListingVersion.prisma().delete(
+            where={"id": version.id}
         )
+
+        # Clean up empty listing if this was the last version
+        remaining = await prisma.models.StoreListingVersion.prisma().count(
+            where={"storeListingId": version.storeListingId}
+        )
+        if remaining == 0:
+            await prisma.models.StoreListing.prisma().delete(
+                where={"id": version.storeListingId}
+            )
+
         return True
 
     except Exception as e:
@@ -759,9 +733,15 @@ async def create_store_submission(
             logger.warning(
                 f"Agent not found for user {user_id}: {agent_id} v{agent_version}"
             )
-            raise store_exceptions.AgentNotFoundError(
-                f"Agent not found for this user. User ID: {user_id}, Agent ID: {agent_id}, Version: {agent_version}"
-            )
+            # Provide more user-friendly error message when agent_id is empty
+            if not agent_id or agent_id.strip() == "":
+                raise store_exceptions.AgentNotFoundError(
+                    "No agent selected. Please select an agent before submitting to the store."
+                )
+            else:
+                raise store_exceptions.AgentNotFoundError(
+                    f"Agent not found for this user. User ID: {user_id}, Agent ID: {agent_id}, Version: {agent_version}"
+                )
 
         # Check if listing already exists for this agent
         existing_listing = await prisma.models.StoreListing.prisma().find_first(
@@ -833,6 +813,7 @@ async def create_store_submission(
         logger.debug(f"Created store listing for agent {agent_id}")
         # Return submission details
         return store_model.StoreSubmission(
+            listing_id=listing.id,
             agent_id=agent_id,
             agent_version=agent_version,
             name=name,
@@ -944,81 +925,56 @@ async def edit_store_submission(
         # Currently we are not allowing user to update the agent associated with a submission
         # If we allow it in future, then we need a check here to verify the agent belongs to this user.
 
-        # Check if we can edit this submission
-        if current_version.submissionStatus == prisma.enums.SubmissionStatus.REJECTED:
+        # Only allow editing of PENDING submissions
+        if current_version.submissionStatus != prisma.enums.SubmissionStatus.PENDING:
             raise store_exceptions.InvalidOperationError(
-                "Cannot edit a rejected submission"
-            )
-
-        # For APPROVED submissions, we need to create a new version
-        if current_version.submissionStatus == prisma.enums.SubmissionStatus.APPROVED:
-            # Create a new version for the existing listing
-            return await create_store_version(
-                user_id=user_id,
-                agent_id=current_version.agentGraphId,
-                agent_version=current_version.agentGraphVersion,
-                store_listing_id=current_version.storeListingId,
-                name=name,
-                video_url=video_url,
-                agent_output_demo_url=agent_output_demo_url,
-                image_urls=image_urls,
-                description=description,
-                sub_heading=sub_heading,
-                categories=categories,
-                changes_summary=changes_summary,
-                recommended_schedule_cron=recommended_schedule_cron,
-                instructions=instructions,
+                f"Cannot edit a {current_version.submissionStatus.value.lower()} submission. Only pending submissions can be edited."
             )
 
         # For PENDING submissions, we can update the existing version
-        elif current_version.submissionStatus == prisma.enums.SubmissionStatus.PENDING:
-            # Update the existing version
-            updated_version = await prisma.models.StoreListingVersion.prisma().update(
-                where={"id": store_listing_version_id},
-                data=prisma.types.StoreListingVersionUpdateInput(
-                    name=name,
-                    videoUrl=video_url,
-                    agentOutputDemoUrl=agent_output_demo_url,
-                    imageUrls=image_urls,
-                    description=description,
-                    categories=categories,
-                    subHeading=sub_heading,
-                    changesSummary=changes_summary,
-                    recommendedScheduleCron=recommended_schedule_cron,
-                    instructions=instructions,
-                ),
-            )
-
-            logger.debug(
-                f"Updated existing version {store_listing_version_id} for agent {current_version.agentGraphId}"
-            )
-
-            if not updated_version:
-                raise DatabaseError("Failed to update store listing version")
-            return store_model.StoreSubmission(
-                agent_id=current_version.agentGraphId,
-                agent_version=current_version.agentGraphVersion,
+        # Update the existing version
+        updated_version = await prisma.models.StoreListingVersion.prisma().update(
+            where={"id": store_listing_version_id},
+            data=prisma.types.StoreListingVersionUpdateInput(
                 name=name,
-                sub_heading=sub_heading,
-                slug=current_version.StoreListing.slug,
+                videoUrl=video_url,
+                agentOutputDemoUrl=agent_output_demo_url,
+                imageUrls=image_urls,
                 description=description,
-                instructions=instructions,
-                image_urls=image_urls,
-                date_submitted=updated_version.submittedAt or updated_version.createdAt,
-                status=updated_version.submissionStatus,
-                runs=0,
-                rating=0.0,
-                store_listing_version_id=updated_version.id,
-                changes_summary=changes_summary,
-                video_url=video_url,
                 categories=categories,
-                version=updated_version.version,
-            )
+                subHeading=sub_heading,
+                changesSummary=changes_summary,
+                recommendedScheduleCron=recommended_schedule_cron,
+                instructions=instructions,
+            ),
+        )
 
-        else:
-            raise store_exceptions.InvalidOperationError(
-                f"Cannot edit submission with status: {current_version.submissionStatus}"
-            )
+        logger.debug(
+            f"Updated existing version {store_listing_version_id} for agent {current_version.agentGraphId}"
+        )
+
+        if not updated_version:
+            raise DatabaseError("Failed to update store listing version")
+        return store_model.StoreSubmission(
+            listing_id=current_version.StoreListing.id,
+            agent_id=current_version.agentGraphId,
+            agent_version=current_version.agentGraphVersion,
+            name=name,
+            sub_heading=sub_heading,
+            slug=current_version.StoreListing.slug,
+            description=description,
+            instructions=instructions,
+            image_urls=image_urls,
+            date_submitted=updated_version.submittedAt or updated_version.createdAt,
+            status=updated_version.submissionStatus,
+            runs=0,
+            rating=0.0,
+            store_listing_version_id=updated_version.id,
+            changes_summary=changes_summary,
+            video_url=video_url,
+            categories=categories,
+            version=updated_version.version,
+        )
 
     except (
         store_exceptions.SubmissionNotFoundError,
@@ -1097,38 +1053,78 @@ async def create_store_version(
                 f"Agent not found for this user. User ID: {user_id}, Agent ID: {agent_id}, Version: {agent_version}"
             )
 
-        # Get the latest version number
-        latest_version = listing.Versions[0] if listing.Versions else None
-
-        next_version = (latest_version.version + 1) if latest_version else 1
-
-        # Create a new version for the existing listing
-        new_version = await prisma.models.StoreListingVersion.prisma().create(
-            data=prisma.types.StoreListingVersionCreateInput(
-                version=next_version,
-                agentGraphId=agent_id,
-                agentGraphVersion=agent_version,
-                name=name,
-                videoUrl=video_url,
-                agentOutputDemoUrl=agent_output_demo_url,
-                imageUrls=image_urls,
-                description=description,
-                instructions=instructions,
-                categories=categories,
-                subHeading=sub_heading,
-                submissionStatus=prisma.enums.SubmissionStatus.PENDING,
-                submittedAt=datetime.now(),
-                changesSummary=changes_summary,
-                recommendedScheduleCron=recommended_schedule_cron,
-                storeListingId=store_listing_id,
+        # Check if there's already a PENDING submission for this agent (any version)
+        existing_pending_submission = (
+            await prisma.models.StoreListingVersion.prisma().find_first(
+                where=prisma.types.StoreListingVersionWhereInput(
+                    storeListingId=store_listing_id,
+                    agentGraphId=agent_id,
+                    submissionStatus=prisma.enums.SubmissionStatus.PENDING,
+                    isDeleted=False,
+                )
             )
         )
 
+        # Handle existing pending submission and create new one atomically
+        async with transaction() as tx:
+            # Get the latest version number first
+            latest_listing = await prisma.models.StoreListing.prisma(tx).find_first(
+                where=prisma.types.StoreListingWhereInput(
+                    id=store_listing_id, owningUserId=user_id
+                ),
+                include={"Versions": {"order_by": {"version": "desc"}, "take": 1}},
+            )
+
+            if not latest_listing:
+                raise store_exceptions.ListingNotFoundError(
+                    f"Store listing not found. User ID: {user_id}, Listing ID: {store_listing_id}"
+                )
+
+            latest_version = (
+                latest_listing.Versions[0] if latest_listing.Versions else None
+            )
+            next_version = (latest_version.version + 1) if latest_version else 1
+
+            # If there's an existing pending submission, delete it atomically before creating new one
+            if existing_pending_submission:
+                logger.info(
+                    f"Found existing PENDING submission for agent {agent_id} (was v{existing_pending_submission.agentGraphVersion}, now v{agent_version}), replacing existing submission instead of creating duplicate"
+                )
+                await prisma.models.StoreListingVersion.prisma(tx).delete(
+                    where={"id": existing_pending_submission.id}
+                )
+                logger.debug(
+                    f"Deleted existing pending submission {existing_pending_submission.id}"
+                )
+
+            # Create a new version for the existing listing
+            new_version = await prisma.models.StoreListingVersion.prisma(tx).create(
+                data=prisma.types.StoreListingVersionCreateInput(
+                    version=next_version,
+                    agentGraphId=agent_id,
+                    agentGraphVersion=agent_version,
+                    name=name,
+                    videoUrl=video_url,
+                    agentOutputDemoUrl=agent_output_demo_url,
+                    imageUrls=image_urls,
+                    description=description,
+                    instructions=instructions,
+                    categories=categories,
+                    subHeading=sub_heading,
+                    submissionStatus=prisma.enums.SubmissionStatus.PENDING,
+                    submittedAt=datetime.now(),
+                    changesSummary=changes_summary,
+                    recommendedScheduleCron=recommended_schedule_cron,
+                    storeListingId=store_listing_id,
+                )
+            )
+
         logger.debug(
             f"Created new version for listing {store_listing_id} of agent {agent_id}"
         )
         # Return submission details
         return store_model.StoreSubmission(
+            listing_id=listing.id,
             agent_id=agent_id,
             agent_version=agent_version,
             name=name,
@@ -1541,7 +1537,7 @@ async def review_store_submission(
                 )
 
                 # Update the AgentGraph with store listing data
-                await prisma.models.AgentGraph.prisma().update(
+                await prisma.models.AgentGraph.prisma(tx).update(
                     where={
                         "graphVersionId": {
                             "id": store_listing_version.agentGraphId,
@@ -1556,6 +1552,17 @@ async def review_store_submission(
                     },
                 )
 
+                # Generate embedding for approved listing (blocking - admin operation)
+                # Inside transaction: if embedding fails, entire transaction rolls back
+                await ensure_embedding(
+                    version_id=store_listing_version_id,
+                    name=store_listing_version.name,
+                    description=store_listing_version.description,
+                    sub_heading=store_listing_version.subHeading,
+                    categories=store_listing_version.categories or [],
+                    tx=tx,
+                )
+
                 await prisma.models.StoreListing.prisma(tx).update(
                     where={"id": store_listing_version.StoreListing.id},
                     data={
@@ -1708,15 +1715,12 @@ async def review_store_submission(
 
         # Convert to Pydantic model for consistency
         return store_model.StoreSubmission(
+            listing_id=(submission.StoreListing.id if submission.StoreListing else ""),
             agent_id=submission.agentGraphId,
             agent_version=submission.agentGraphVersion,
             name=submission.name,
             sub_heading=submission.subHeading,
-            slug=(
-                submission.StoreListing.slug
-                if hasattr(submission, "storeListing") and submission.StoreListing
-                else ""
-            ),
+            slug=(submission.StoreListing.slug if submission.StoreListing else ""),
             description=submission.description,
             instructions=submission.instructions,
             image_urls=submission.imageUrls or [],
@@ -1818,9 +1822,7 @@ async def get_admin_listings_with_versions(
         where = prisma.types.StoreListingWhereInput(**where_dict)
         include = prisma.types.StoreListingInclude(
             Versions=prisma.types.FindManyStoreListingVersionArgsFromStoreListing(
-                order_by=prisma.types._StoreListingVersion_version_OrderByInput(
-                    version="desc"
-                )
+                order_by={"version": "desc"}
             ),
             OwningUser=True,
         )
@@ -1845,6 +1847,7 @@ async def get_admin_listings_with_versions(
             # If we have versions, turn them into StoreSubmission models
             for version in listing.Versions or []:
                 version_model = store_model.StoreSubmission(
+                    listing_id=listing.id,
                     agent_id=version.agentGraphId,
                     agent_version=version.agentGraphVersion,
                     name=version.name,
diff --git a/autogpt_platform/backend/backend/api/features/store/embeddings.py b/autogpt_platform/backend/backend/api/features/store/embeddings.py
new file mode 100644
index 0000000000..434f2fe2ce
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/store/embeddings.py
@@ -0,0 +1,965 @@
+"""
+Unified Content Embeddings Service
+
+Handles generation and storage of OpenAI embeddings for all content types
+(store listings, blocks, documentation, library agents) to enable semantic/hybrid search.
+"""
+
+import asyncio
+import logging
+import time
+from typing import Any
+
+import prisma
+from prisma.enums import ContentType
+from tiktoken import encoding_for_model
+
+from backend.api.features.store.content_handlers import CONTENT_HANDLERS
+from backend.data.db import execute_raw_with_schema, query_raw_with_schema
+from backend.util.clients import get_openai_client
+from backend.util.json import dumps
+
+logger = logging.getLogger(__name__)
+
+# OpenAI embedding model configuration
+EMBEDDING_MODEL = "text-embedding-3-small"
+# Embedding dimension for the model above
+# text-embedding-3-small: 1536, text-embedding-3-large: 3072
+EMBEDDING_DIM = 1536
+# OpenAI embedding token limit (8,191 with 1 token buffer for safety)
+EMBEDDING_MAX_TOKENS = 8191
+
+
+def build_searchable_text(
+    name: str,
+    description: str,
+    sub_heading: str,
+    categories: list[str],
+) -> str:
+    """
+    Build searchable text from listing version fields.
+
+    Combines relevant fields into a single string for embedding.
+    """
+    parts = []
+
+    # Name is important - include it
+    if name:
+        parts.append(name)
+
+    # Sub-heading provides context
+    if sub_heading:
+        parts.append(sub_heading)
+
+    # Description is the main content
+    if description:
+        parts.append(description)
+
+    # Categories help with semantic matching
+    if categories:
+        parts.append(" ".join(categories))
+
+    return " ".join(parts)
+
+
+async def generate_embedding(text: str) -> list[float]:
+    """
+    Generate embedding for text using OpenAI API.
+
+    Raises exceptions on failure - caller should handle.
+    """
+    client = get_openai_client()
+    if not client:
+        raise RuntimeError("openai_internal_api_key not set, cannot generate embedding")
+
+    # Truncate text to token limit using tiktoken
+    # Character-based truncation is insufficient because token ratios vary by content type
+    enc = encoding_for_model(EMBEDDING_MODEL)
+    tokens = enc.encode(text)
+    if len(tokens) > EMBEDDING_MAX_TOKENS:
+        tokens = tokens[:EMBEDDING_MAX_TOKENS]
+        truncated_text = enc.decode(tokens)
+        logger.info(
+            f"Truncated text from {len(enc.encode(text))} to {len(tokens)} tokens"
+        )
+    else:
+        truncated_text = text
+
+    start_time = time.time()
+    response = await client.embeddings.create(
+        model=EMBEDDING_MODEL,
+        input=truncated_text,
+    )
+    latency_ms = (time.time() - start_time) * 1000
+
+    embedding = response.data[0].embedding
+    logger.info(
+        f"Generated embedding: {len(embedding)} dims, "
+        f"{len(tokens)} tokens, {latency_ms:.0f}ms"
+    )
+    return embedding
+
+
+async def store_embedding(
+    version_id: str,
+    embedding: list[float],
+    tx: prisma.Prisma | None = None,
+) -> bool:
+    """
+    Store embedding in the database.
+
+    BACKWARD COMPATIBILITY: Maintained for existing store listing usage.
+    DEPRECATED: Use ensure_embedding() instead (includes searchable_text).
+    """
+    return await store_content_embedding(
+        content_type=ContentType.STORE_AGENT,
+        content_id=version_id,
+        embedding=embedding,
+        searchable_text="",  # Empty for backward compat; ensure_embedding() populates this
+        metadata=None,
+        user_id=None,  # Store agents are public
+        tx=tx,
+    )
+
+
+async def store_content_embedding(
+    content_type: ContentType,
+    content_id: str,
+    embedding: list[float],
+    searchable_text: str,
+    metadata: dict | None = None,
+    user_id: str | None = None,
+    tx: prisma.Prisma | None = None,
+) -> bool:
+    """
+    Store embedding in the unified content embeddings table.
+
+    New function for unified content embedding storage.
+    Uses raw SQL since Prisma doesn't natively support pgvector.
+
+    Raises exceptions on failure - caller should handle.
+    """
+    client = tx if tx else prisma.get_client()
+
+    # Convert embedding to PostgreSQL vector format
+    embedding_str = embedding_to_vector_string(embedding)
+    metadata_json = dumps(metadata or {})
+
+    # Upsert the embedding
+    # WHERE clause in DO UPDATE prevents PostgreSQL 15 bug with NULLS NOT DISTINCT
+    # Use unqualified ::vector - pgvector is in search_path on all environments
+    await execute_raw_with_schema(
+        """
+        INSERT INTO {schema_prefix}"UnifiedContentEmbedding" (
+            "id", "contentType", "contentId", "userId", "embedding", "searchableText", "metadata", "createdAt", "updatedAt"
+        )
+        VALUES (gen_random_uuid()::text, $1::{schema_prefix}"ContentType", $2, $3, $4::vector, $5, $6::jsonb, NOW(), NOW())
+        ON CONFLICT ("contentType", "contentId", "userId")
+        DO UPDATE SET
+            "embedding" = $4::vector,
+            "searchableText" = $5,
+            "metadata" = $6::jsonb,
+            "updatedAt" = NOW()
+        WHERE {schema_prefix}"UnifiedContentEmbedding"."contentType" = $1::{schema_prefix}"ContentType"
+            AND {schema_prefix}"UnifiedContentEmbedding"."contentId" = $2
+            AND ({schema_prefix}"UnifiedContentEmbedding"."userId" = $3 OR ($3 IS NULL AND {schema_prefix}"UnifiedContentEmbedding"."userId" IS NULL))
+        """,
+        content_type,
+        content_id,
+        user_id,
+        embedding_str,
+        searchable_text,
+        metadata_json,
+        client=client,
+    )
+
+    logger.info(f"Stored embedding for {content_type}:{content_id}")
+    return True
+
+
+async def get_embedding(version_id: str) -> dict[str, Any] | None:
+    """
+    Retrieve embedding record for a listing version.
+
+    BACKWARD COMPATIBILITY: Maintained for existing store listing usage.
+    Returns dict with storeListingVersionId, embedding, timestamps or None if not found.
+    """
+    result = await get_content_embedding(
+        ContentType.STORE_AGENT, version_id, user_id=None
+    )
+    if result:
+        # Transform to old format for backward compatibility
+        return {
+            "storeListingVersionId": result["contentId"],
+            "embedding": result["embedding"],
+            "createdAt": result["createdAt"],
+            "updatedAt": result["updatedAt"],
+        }
+    return None
+
+
+async def get_content_embedding(
+    content_type: ContentType, content_id: str, user_id: str | None = None
+) -> dict[str, Any] | None:
+    """
+    Retrieve embedding record for any content type.
+
+    New function for unified content embedding retrieval.
+    Returns dict with contentType, contentId, embedding, timestamps or None if not found.
+
+    Raises exceptions on failure - caller should handle.
+    """
+    result = await query_raw_with_schema(
+        """
+        SELECT
+            "contentType",
+            "contentId",
+            "userId",
+            "embedding"::text as "embedding",
+            "searchableText",
+            "metadata",
+            "createdAt",
+            "updatedAt"
+        FROM {schema_prefix}"UnifiedContentEmbedding"
+        WHERE "contentType" = $1::{schema_prefix}"ContentType" AND "contentId" = $2 AND ("userId" = $3 OR ($3 IS NULL AND "userId" IS NULL))
+        """,
+        content_type,
+        content_id,
+        user_id,
+    )
+
+    if result and len(result) > 0:
+        return result[0]
+    return None
+
+
+async def ensure_embedding(
+    version_id: str,
+    name: str,
+    description: str,
+    sub_heading: str,
+    categories: list[str],
+    force: bool = False,
+    tx: prisma.Prisma | None = None,
+) -> bool:
+    """
+    Ensure an embedding exists for the listing version.
+
+    Creates embedding if missing. Use force=True to regenerate.
+    Backward-compatible wrapper for store listings.
+
+    Args:
+        version_id: The StoreListingVersion ID
+        name: Agent name
+        description: Agent description
+        sub_heading: Agent sub-heading
+        categories: Agent categories
+        force: Force regeneration even if embedding exists
+        tx: Optional transaction client
+
+    Returns:
+        True if embedding exists/was created
+
+    Raises exceptions on failure - caller should handle.
+    """
+    # Check if embedding already exists
+    if not force:
+        existing = await get_embedding(version_id)
+        if existing and existing.get("embedding"):
+            logger.debug(f"Embedding for version {version_id} already exists")
+            return True
+
+    # Build searchable text for embedding
+    searchable_text = build_searchable_text(name, description, sub_heading, categories)
+
+    # Generate new embedding
+    embedding = await generate_embedding(searchable_text)
+
+    # Store the embedding with metadata using new function
+    metadata = {
+        "name": name,
+        "subHeading": sub_heading,
+        "categories": categories,
+    }
+    return await store_content_embedding(
+        content_type=ContentType.STORE_AGENT,
+        content_id=version_id,
+        embedding=embedding,
+        searchable_text=searchable_text,
+        metadata=metadata,
+        user_id=None,  # Store agents are public
+        tx=tx,
+    )
+
+
+async def delete_embedding(version_id: str) -> bool:
+    """
+    Delete embedding for a listing version.
+
+    BACKWARD COMPATIBILITY: Maintained for existing store listing usage.
+    Note: This is usually handled automatically by CASCADE delete,
+    but provided for manual cleanup if needed.
+    """
+    return await delete_content_embedding(ContentType.STORE_AGENT, version_id)
+
+
+async def delete_content_embedding(
+    content_type: ContentType, content_id: str, user_id: str | None = None
+) -> bool:
+    """
+    Delete embedding for any content type.
+
+    New function for unified content embedding deletion.
+    Note: This is usually handled automatically by CASCADE delete,
+    but provided for manual cleanup if needed.
+
+    Args:
+        content_type: The type of content (STORE_AGENT, LIBRARY_AGENT, etc.)
+        content_id: The unique identifier for the content
+        user_id: Optional user ID. For public content (STORE_AGENT, BLOCK), pass None.
+                 For user-scoped content (LIBRARY_AGENT), pass the user's ID to avoid
+                 deleting embeddings belonging to other users.
+
+    Returns:
+        True if deletion succeeded, False otherwise
+    """
+    try:
+        client = prisma.get_client()
+
+        await execute_raw_with_schema(
+            """
+            DELETE FROM {schema_prefix}"UnifiedContentEmbedding"
+            WHERE "contentType" = $1::{schema_prefix}"ContentType"
+              AND "contentId" = $2
+              AND ("userId" = $3 OR ($3 IS NULL AND "userId" IS NULL))
+            """,
+            content_type,
+            content_id,
+            user_id,
+            client=client,
+        )
+
+        user_str = f" (user: {user_id})" if user_id else ""
+        logger.info(f"Deleted embedding for {content_type}:{content_id}{user_str}")
+        return True
+
+    except Exception as e:
+        logger.error(f"Failed to delete embedding for {content_type}:{content_id}: {e}")
+        return False
+
+
+async def get_embedding_stats() -> dict[str, Any]:
+    """
+    Get statistics about embedding coverage for all content types.
+
+    Returns stats per content type and overall totals.
+    """
+    try:
+        stats_by_type = {}
+        total_items = 0
+        total_with_embeddings = 0
+        total_without_embeddings = 0
+
+        # Aggregate stats from all handlers
+        for content_type, handler in CONTENT_HANDLERS.items():
+            try:
+                stats = await handler.get_stats()
+                stats_by_type[content_type.value] = {
+                    "total": stats["total"],
+                    "with_embeddings": stats["with_embeddings"],
+                    "without_embeddings": stats["without_embeddings"],
+                    "coverage_percent": (
+                        round(stats["with_embeddings"] / stats["total"] * 100, 1)
+                        if stats["total"] > 0
+                        else 0
+                    ),
+                }
+
+                total_items += stats["total"]
+                total_with_embeddings += stats["with_embeddings"]
+                total_without_embeddings += stats["without_embeddings"]
+
+            except Exception as e:
+                logger.error(f"Failed to get stats for {content_type.value}: {e}")
+                stats_by_type[content_type.value] = {
+                    "total": 0,
+                    "with_embeddings": 0,
+                    "without_embeddings": 0,
+                    "coverage_percent": 0,
+                    "error": str(e),
+                }
+
+        return {
+            "by_type": stats_by_type,
+            "totals": {
+                "total": total_items,
+                "with_embeddings": total_with_embeddings,
+                "without_embeddings": total_without_embeddings,
+                "coverage_percent": (
+                    round(total_with_embeddings / total_items * 100, 1)
+                    if total_items > 0
+                    else 0
+                ),
+            },
+        }
+
+    except Exception as e:
+        logger.error(f"Failed to get embedding stats: {e}")
+        return {
+            "by_type": {},
+            "totals": {
+                "total": 0,
+                "with_embeddings": 0,
+                "without_embeddings": 0,
+                "coverage_percent": 0,
+            },
+            "error": str(e),
+        }
+
+
+async def backfill_missing_embeddings(batch_size: int = 10) -> dict[str, Any]:
+    """
+    Generate embeddings for approved listings that don't have them.
+
+    BACKWARD COMPATIBILITY: Maintained for existing usage.
+    This now delegates to backfill_all_content_types() to process all content types.
+
+    Args:
+        batch_size: Number of embeddings to generate per content type
+
+    Returns:
+        Dict with success/failure counts aggregated across all content types
+    """
+    # Delegate to the new generic backfill system
+    result = await backfill_all_content_types(batch_size)
+
+    # Return in the old format for backward compatibility
+    return result["totals"]
+
+
+async def backfill_all_content_types(batch_size: int = 10) -> dict[str, Any]:
+    """
+    Generate embeddings for all content types using registered handlers.
+
+    Processes content types in order: BLOCK → STORE_AGENT → DOCUMENTATION.
+    This ensures foundational content (blocks) are searchable first.
+
+    Args:
+        batch_size: Number of embeddings to generate per content type
+
+    Returns:
+        Dict with stats per content type and overall totals
+    """
+    results_by_type = {}
+    total_processed = 0
+    total_success = 0
+    total_failed = 0
+    all_errors: dict[str, int] = {}  # Aggregate errors across all content types
+
+    # Process content types in explicit order
+    processing_order = [
+        ContentType.BLOCK,
+        ContentType.STORE_AGENT,
+        ContentType.DOCUMENTATION,
+    ]
+
+    for content_type in processing_order:
+        handler = CONTENT_HANDLERS.get(content_type)
+        if not handler:
+            logger.warning(f"No handler registered for {content_type.value}")
+            continue
+        try:
+            logger.info(f"Processing {content_type.value} content type...")
+
+            # Get missing items from handler
+            missing_items = await handler.get_missing_items(batch_size)
+
+            if not missing_items:
+                results_by_type[content_type.value] = {
+                    "processed": 0,
+                    "success": 0,
+                    "failed": 0,
+                    "message": "No missing embeddings",
+                }
+                continue
+
+            # Process embeddings concurrently for better performance
+            embedding_tasks = [
+                ensure_content_embedding(
+                    content_type=item.content_type,
+                    content_id=item.content_id,
+                    searchable_text=item.searchable_text,
+                    metadata=item.metadata,
+                    user_id=item.user_id,
+                )
+                for item in missing_items
+            ]
+
+            results = await asyncio.gather(*embedding_tasks, return_exceptions=True)
+
+            success = sum(1 for result in results if result is True)
+            failed = len(results) - success
+
+            # Aggregate errors across all content types
+            if failed > 0:
+                for result in results:
+                    if isinstance(result, Exception):
+                        error_key = f"{type(result).__name__}: {str(result)}"
+                        all_errors[error_key] = all_errors.get(error_key, 0) + 1
+
+            results_by_type[content_type.value] = {
+                "processed": len(missing_items),
+                "success": success,
+                "failed": failed,
+                "message": f"Backfilled {success} embeddings, {failed} failed",
+            }
+
+            total_processed += len(missing_items)
+            total_success += success
+            total_failed += failed
+
+            logger.info(
+                f"{content_type.value}: processed {len(missing_items)}, "
+                f"success {success}, failed {failed}"
+            )
+
+        except Exception as e:
+            logger.error(f"Failed to process {content_type.value}: {e}")
+            results_by_type[content_type.value] = {
+                "processed": 0,
+                "success": 0,
+                "failed": 0,
+                "error": str(e),
+            }
+
+    # Log aggregated errors once at the end
+    if all_errors:
+        error_details = ", ".join(
+            f"{error} ({count}x)" for error, count in all_errors.items()
+        )
+        logger.error(f"Embedding backfill errors: {error_details}")
+
+    return {
+        "by_type": results_by_type,
+        "totals": {
+            "processed": total_processed,
+            "success": total_success,
+            "failed": total_failed,
+            "message": f"Overall: {total_success} succeeded, {total_failed} failed",
+        },
+    }
+
+
+async def embed_query(query: str) -> list[float]:
+    """
+    Generate embedding for a search query.
+
+    Same as generate_embedding but with clearer intent.
+    Raises exceptions on failure - caller should handle.
+    """
+    return await generate_embedding(query)
+
+
+def embedding_to_vector_string(embedding: list[float]) -> str:
+    """Convert embedding list to PostgreSQL vector string format."""
+    return "[" + ",".join(str(x) for x in embedding) + "]"
+
+
+async def ensure_content_embedding(
+    content_type: ContentType,
+    content_id: str,
+    searchable_text: str,
+    metadata: dict | None = None,
+    user_id: str | None = None,
+    force: bool = False,
+    tx: prisma.Prisma | None = None,
+) -> bool:
+    """
+    Ensure an embedding exists for any content type.
+
+    Generic function for creating embeddings for store agents, blocks, docs, etc.
+
+    Args:
+        content_type: ContentType enum value (STORE_AGENT, BLOCK, etc.)
+        content_id: Unique identifier for the content
+        searchable_text: Combined text for embedding generation
+        metadata: Optional metadata to store with embedding
+        force: Force regeneration even if embedding exists
+        tx: Optional transaction client
+
+    Returns:
+        True if embedding exists/was created
+
+    Raises exceptions on failure - caller should handle.
+    """
+    # Check if embedding already exists
+    if not force:
+        existing = await get_content_embedding(content_type, content_id, user_id)
+        if existing and existing.get("embedding"):
+            logger.debug(f"Embedding for {content_type}:{content_id} already exists")
+            return True
+
+    # Generate new embedding
+    embedding = await generate_embedding(searchable_text)
+
+    # Store the embedding
+    return await store_content_embedding(
+        content_type=content_type,
+        content_id=content_id,
+        embedding=embedding,
+        searchable_text=searchable_text,
+        metadata=metadata or {},
+        user_id=user_id,
+        tx=tx,
+    )
+
+
+async def cleanup_orphaned_embeddings() -> dict[str, Any]:
+    """
+    Clean up embeddings for content that no longer exists or is no longer valid.
+
+    Compares current content with embeddings in database and removes orphaned records:
+    - STORE_AGENT: Removes embeddings for rejected/deleted store listings
+    - BLOCK: Removes embeddings for blocks no longer registered
+    - DOCUMENTATION: Removes embeddings for deleted doc files
+
+    Returns:
+        Dict with cleanup statistics per content type
+    """
+    results_by_type = {}
+    total_deleted = 0
+
+    # Cleanup orphaned embeddings for all content types
+    cleanup_types = [
+        ContentType.STORE_AGENT,
+        ContentType.BLOCK,
+        ContentType.DOCUMENTATION,
+    ]
+
+    for content_type in cleanup_types:
+        try:
+            handler = CONTENT_HANDLERS.get(content_type)
+            if not handler:
+                logger.warning(f"No handler registered for {content_type}")
+                results_by_type[content_type.value] = {
+                    "deleted": 0,
+                    "error": "No handler registered",
+                }
+                continue
+
+            # Get all current content IDs from handler
+            if content_type == ContentType.STORE_AGENT:
+                # Get IDs of approved store listing versions from non-deleted listings
+                valid_agents = await query_raw_with_schema(
+                    """
+                    SELECT slv.id
+                    FROM {schema_prefix}"StoreListingVersion" slv
+                    JOIN {schema_prefix}"StoreListing" sl ON slv."storeListingId" = sl.id
+                    WHERE slv."submissionStatus" = 'APPROVED'
+                      AND slv."isDeleted" = false
+                      AND sl."isDeleted" = false
+                    """,
+                )
+                current_ids = {row["id"] for row in valid_agents}
+            elif content_type == ContentType.BLOCK:
+                from backend.data.block import get_blocks
+
+                current_ids = set(get_blocks().keys())
+            elif content_type == ContentType.DOCUMENTATION:
+                # Use DocumentationHandler to get section-based content IDs
+                from backend.api.features.store.content_handlers import (
+                    DocumentationHandler,
+                )
+
+                doc_handler = CONTENT_HANDLERS.get(ContentType.DOCUMENTATION)
+                if isinstance(doc_handler, DocumentationHandler):
+                    docs_root = doc_handler._get_docs_root()
+                    if docs_root.exists():
+                        current_ids = doc_handler._get_all_section_content_ids(
+                            docs_root
+                        )
+                    else:
+                        current_ids = set()
+                else:
+                    current_ids = set()
+            else:
+                # Skip unknown content types to avoid accidental deletion
+                logger.warning(
+                    f"Skipping cleanup for unknown content type: {content_type}"
+                )
+                results_by_type[content_type.value] = {
+                    "deleted": 0,
+                    "error": "Unknown content type - skipped for safety",
+                }
+                continue
+
+            # Get all embedding IDs from database
+            db_embeddings = await query_raw_with_schema(
+                """
+                SELECT "contentId"
+                FROM {schema_prefix}"UnifiedContentEmbedding"
+                WHERE "contentType" = $1::{schema_prefix}"ContentType"
+                """,
+                content_type,
+            )
+
+            db_ids = {row["contentId"] for row in db_embeddings}
+
+            # Find orphaned embeddings (in DB but not in current content)
+            orphaned_ids = db_ids - current_ids
+
+            if not orphaned_ids:
+                logger.info(f"{content_type.value}: No orphaned embeddings found")
+                results_by_type[content_type.value] = {
+                    "deleted": 0,
+                    "message": "No orphaned embeddings",
+                }
+                continue
+
+            # Delete orphaned embeddings in batch for better performance
+            orphaned_list = list(orphaned_ids)
+            try:
+                await execute_raw_with_schema(
+                    """
+                    DELETE FROM {schema_prefix}"UnifiedContentEmbedding"
+                    WHERE "contentType" = $1::{schema_prefix}"ContentType"
+                      AND "contentId" = ANY($2::text[])
+                    """,
+                    content_type,
+                    orphaned_list,
+                )
+                deleted = len(orphaned_list)
+            except Exception as e:
+                logger.error(f"Failed to batch delete orphaned embeddings: {e}")
+                deleted = 0
+
+            logger.info(
+                f"{content_type.value}: Deleted {deleted}/{len(orphaned_ids)} orphaned embeddings"
+            )
+            results_by_type[content_type.value] = {
+                "deleted": deleted,
+                "orphaned": len(orphaned_ids),
+                "message": f"Deleted {deleted} orphaned embeddings",
+            }
+
+            total_deleted += deleted
+
+        except Exception as e:
+            logger.error(f"Failed to cleanup {content_type.value}: {e}")
+            results_by_type[content_type.value] = {
+                "deleted": 0,
+                "error": str(e),
+            }
+
+    return {
+        "by_type": results_by_type,
+        "totals": {
+            "deleted": total_deleted,
+            "message": f"Deleted {total_deleted} orphaned embeddings",
+        },
+    }
+
+
+async def semantic_search(
+    query: str,
+    content_types: list[ContentType] | None = None,
+    user_id: str | None = None,
+    limit: int = 20,
+    min_similarity: float = 0.5,
+) -> list[dict[str, Any]]:
+    """
+    Semantic search across content types using embeddings.
+
+    Performs vector similarity search on UnifiedContentEmbedding table.
+    Used directly for blocks/docs/library agents, or as the semantic component
+    within hybrid_search for store agents.
+
+    If embedding generation fails, falls back to lexical search on searchableText.
+
+    Args:
+        query: Search query string
+        content_types: List of ContentType to search. Defaults to [BLOCK, STORE_AGENT, DOCUMENTATION]
+        user_id: Optional user ID for searching private content (library agents)
+        limit: Maximum number of results to return (default: 20)
+        min_similarity: Minimum cosine similarity threshold (0-1, default: 0.5)
+
+    Returns:
+        List of search results with the following structure:
+        [
+            {
+                "content_id": str,
+                "content_type": str,  # "BLOCK", "STORE_AGENT", "DOCUMENTATION", or "LIBRARY_AGENT"
+                "searchable_text": str,
+                "metadata": dict,
+                "similarity": float,  # Cosine similarity score (0-1)
+            },
+            ...
+        ]
+
+    Examples:
+        # Search blocks only
+        results = await semantic_search("calculate", content_types=[ContentType.BLOCK])
+
+        # Search blocks and documentation
+        results = await semantic_search(
+            "how to use API",
+            content_types=[ContentType.BLOCK, ContentType.DOCUMENTATION]
+        )
+
+        # Search all public content (default)
+        results = await semantic_search("AI agent")
+
+        # Search user's library agents
+        results = await semantic_search(
+            "my custom agent",
+            content_types=[ContentType.LIBRARY_AGENT],
+            user_id="user123"
+        )
+    """
+    # Default to searching all public content types
+    if content_types is None:
+        content_types = [
+            ContentType.BLOCK,
+            ContentType.STORE_AGENT,
+            ContentType.DOCUMENTATION,
+        ]
+
+    # Validate inputs
+    if not content_types:
+        return []  # Empty content_types would cause invalid SQL (IN ())
+
+    query = query.strip()
+    if not query:
+        return []
+
+    if limit < 1:
+        limit = 1
+    if limit > 100:
+        limit = 100
+
+    # Generate query embedding
+    try:
+        query_embedding = await embed_query(query)
+        # Semantic search with embeddings
+        embedding_str = embedding_to_vector_string(query_embedding)
+
+        # Build params in order: limit, then user_id (if provided), then content types
+        params: list[Any] = [limit]
+        user_filter = ""
+        if user_id is not None:
+            user_filter = 'AND "userId" = ${}'.format(len(params) + 1)
+            params.append(user_id)
+
+        # Add content type parameters and build placeholders dynamically
+        content_type_start_idx = len(params) + 1
+        content_type_placeholders = ", ".join(
+            "$" + str(content_type_start_idx + i) + '::{schema_prefix}"ContentType"'
+            for i in range(len(content_types))
+        )
+        params.extend([ct.value for ct in content_types])
+
+        # Build min_similarity param index before appending
+        min_similarity_idx = len(params) + 1
+        params.append(min_similarity)
+
+        # Use unqualified ::vector and <=> operator - pgvector is in search_path on all environments
+        sql = (
+            """
+            SELECT
+                "contentId" as content_id,
+                "contentType" as content_type,
+                "searchableText" as searchable_text,
+                metadata,
+                1 - (embedding <=> '"""
+            + embedding_str
+            + """'::vector) as similarity
+            FROM {schema_prefix}"UnifiedContentEmbedding"
+            WHERE "contentType" IN ("""
+            + content_type_placeholders
+            + """)
+            """
+            + user_filter
+            + """
+            AND 1 - (embedding <=> '"""
+            + embedding_str
+            + """'::vector) >= $"""
+            + str(min_similarity_idx)
+            + """
+            ORDER BY similarity DESC
+            LIMIT $1
+        """
+        )
+
+        results = await query_raw_with_schema(sql, *params)
+        return [
+            {
+                "content_id": row["content_id"],
+                "content_type": row["content_type"],
+                "searchable_text": row["searchable_text"],
+                "metadata": row["metadata"],
+                "similarity": float(row["similarity"]),
+            }
+            for row in results
+        ]
+    except Exception as e:
+        logger.warning(f"Semantic search failed, falling back to lexical search: {e}")
+
+    # Fallback to lexical search if embeddings unavailable
+
+    params_lexical: list[Any] = [limit]
+    user_filter = ""
+    if user_id is not None:
+        user_filter = 'AND "userId" = ${}'.format(len(params_lexical) + 1)
+        params_lexical.append(user_id)
+
+    # Add content type parameters and build placeholders dynamically
+    content_type_start_idx = len(params_lexical) + 1
+    content_type_placeholders_lexical = ", ".join(
+        "$" + str(content_type_start_idx + i) + '::{schema_prefix}"ContentType"'
+        for i in range(len(content_types))
+    )
+    params_lexical.extend([ct.value for ct in content_types])
+
+    # Build query param index before appending
+    query_param_idx = len(params_lexical) + 1
+    params_lexical.append(f"%{query}%")
+
+    # Use regular string (not f-string) for template to preserve {schema_prefix} placeholders
+    sql_lexical = (
+        """
+        SELECT
+            "contentId" as content_id,
+            "contentType" as content_type,
+            "searchableText" as searchable_text,
+            metadata,
+            0.0 as similarity
+        FROM {schema_prefix}"UnifiedContentEmbedding"
+        WHERE "contentType" IN ("""
+        + content_type_placeholders_lexical
+        + """)
+        """
+        + user_filter
+        + """
+        AND "searchableText" ILIKE $"""
+        + str(query_param_idx)
+        + """
+        ORDER BY "updatedAt" DESC
+        LIMIT $1
+    """
+    )
+
+    try:
+        results = await query_raw_with_schema(sql_lexical, *params_lexical)
+        return [
+            {
+                "content_id": row["content_id"],
+                "content_type": row["content_type"],
+                "searchable_text": row["searchable_text"],
+                "metadata": row["metadata"],
+                "similarity": 0.0,  # Lexical search doesn't provide similarity
+            }
+            for row in results
+        ]
+    except Exception as e:
+        logger.error(f"Lexical search failed: {e}")
+        return []
diff --git a/autogpt_platform/backend/backend/api/features/store/embeddings_e2e_test.py b/autogpt_platform/backend/backend/api/features/store/embeddings_e2e_test.py
new file mode 100644
index 0000000000..86af457f50
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/store/embeddings_e2e_test.py
@@ -0,0 +1,669 @@
+"""
+End-to-end database tests for embeddings and hybrid search.
+
+These tests hit the actual database to verify SQL queries work correctly.
+Tests cover:
+1. Embedding storage (store_content_embedding)
+2. Embedding retrieval (get_content_embedding)
+3. Embedding deletion (delete_content_embedding)
+4. Unified hybrid search across content types
+5. Store agent hybrid search
+"""
+
+import uuid
+from typing import AsyncGenerator
+
+import pytest
+from prisma.enums import ContentType
+
+from backend.api.features.store import embeddings
+from backend.api.features.store.embeddings import EMBEDDING_DIM
+from backend.api.features.store.hybrid_search import (
+    hybrid_search,
+    unified_hybrid_search,
+)
+
+# ============================================================================
+# Test Fixtures
+# ============================================================================
+
+
+@pytest.fixture
+def test_content_id() -> str:
+    """Generate unique content ID for test isolation."""
+    return f"test-content-{uuid.uuid4()}"
+
+
+@pytest.fixture
+def test_user_id() -> str:
+    """Generate unique user ID for test isolation."""
+    return f"test-user-{uuid.uuid4()}"
+
+
+@pytest.fixture
+def mock_embedding() -> list[float]:
+    """Generate a mock embedding vector."""
+    # Create a normalized embedding vector
+    import math
+
+    raw = [float(i % 10) / 10.0 for i in range(EMBEDDING_DIM)]
+    # Normalize to unit length (required for cosine similarity)
+    magnitude = math.sqrt(sum(x * x for x in raw))
+    return [x / magnitude for x in raw]
+
+
+@pytest.fixture
+def similar_embedding() -> list[float]:
+    """Generate an embedding similar to mock_embedding."""
+    import math
+
+    # Similar but slightly different values
+    raw = [float(i % 10) / 10.0 + 0.01 for i in range(EMBEDDING_DIM)]
+    magnitude = math.sqrt(sum(x * x for x in raw))
+    return [x / magnitude for x in raw]
+
+
+@pytest.fixture
+def different_embedding() -> list[float]:
+    """Generate an embedding very different from mock_embedding."""
+    import math
+
+    # Reversed pattern to be maximally different
+    raw = [float((EMBEDDING_DIM - i) % 10) / 10.0 for i in range(EMBEDDING_DIM)]
+    magnitude = math.sqrt(sum(x * x for x in raw))
+    return [x / magnitude for x in raw]
+
+
+@pytest.fixture
+async def cleanup_embeddings(
+    server,
+) -> AsyncGenerator[list[tuple[ContentType, str, str | None]], None]:
+    """
+    Fixture that tracks created embeddings and cleans them up after tests.
+
+    Yields a list to which tests can append (content_type, content_id, user_id) tuples.
+    """
+    created_embeddings: list[tuple[ContentType, str, str | None]] = []
+    yield created_embeddings
+
+    # Cleanup all created embeddings
+    for content_type, content_id, user_id in created_embeddings:
+        try:
+            await embeddings.delete_content_embedding(content_type, content_id, user_id)
+        except Exception:
+            pass  # Ignore cleanup errors
+
+
+# ============================================================================
+# store_content_embedding Tests
+# ============================================================================
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_store_content_embedding_store_agent(
+    server,
+    test_content_id: str,
+    mock_embedding: list[float],
+    cleanup_embeddings: list,
+):
+    """Test storing embedding for STORE_AGENT content type."""
+    # Track for cleanup
+    cleanup_embeddings.append((ContentType.STORE_AGENT, test_content_id, None))
+
+    result = await embeddings.store_content_embedding(
+        content_type=ContentType.STORE_AGENT,
+        content_id=test_content_id,
+        embedding=mock_embedding,
+        searchable_text="AI assistant for productivity tasks",
+        metadata={"name": "Test Agent", "categories": ["productivity"]},
+        user_id=None,  # Store agents are public
+    )
+
+    assert result is True
+
+    # Verify it was stored
+    stored = await embeddings.get_content_embedding(
+        ContentType.STORE_AGENT, test_content_id, user_id=None
+    )
+    assert stored is not None
+    assert stored["contentId"] == test_content_id
+    assert stored["contentType"] == "STORE_AGENT"
+    assert stored["searchableText"] == "AI assistant for productivity tasks"
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_store_content_embedding_block(
+    server,
+    test_content_id: str,
+    mock_embedding: list[float],
+    cleanup_embeddings: list,
+):
+    """Test storing embedding for BLOCK content type."""
+    cleanup_embeddings.append((ContentType.BLOCK, test_content_id, None))
+
+    result = await embeddings.store_content_embedding(
+        content_type=ContentType.BLOCK,
+        content_id=test_content_id,
+        embedding=mock_embedding,
+        searchable_text="HTTP request block for API calls",
+        metadata={"name": "HTTP Request Block"},
+        user_id=None,  # Blocks are public
+    )
+
+    assert result is True
+
+    stored = await embeddings.get_content_embedding(
+        ContentType.BLOCK, test_content_id, user_id=None
+    )
+    assert stored is not None
+    assert stored["contentType"] == "BLOCK"
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_store_content_embedding_documentation(
+    server,
+    test_content_id: str,
+    mock_embedding: list[float],
+    cleanup_embeddings: list,
+):
+    """Test storing embedding for DOCUMENTATION content type."""
+    cleanup_embeddings.append((ContentType.DOCUMENTATION, test_content_id, None))
+
+    result = await embeddings.store_content_embedding(
+        content_type=ContentType.DOCUMENTATION,
+        content_id=test_content_id,
+        embedding=mock_embedding,
+        searchable_text="Getting started guide for AutoGPT platform",
+        metadata={"title": "Getting Started", "url": "/docs/getting-started"},
+        user_id=None,  # Docs are public
+    )
+
+    assert result is True
+
+    stored = await embeddings.get_content_embedding(
+        ContentType.DOCUMENTATION, test_content_id, user_id=None
+    )
+    assert stored is not None
+    assert stored["contentType"] == "DOCUMENTATION"
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_store_content_embedding_upsert(
+    server,
+    test_content_id: str,
+    mock_embedding: list[float],
+    cleanup_embeddings: list,
+):
+    """Test that storing embedding twice updates instead of duplicates."""
+    cleanup_embeddings.append((ContentType.BLOCK, test_content_id, None))
+
+    # Store first time
+    result1 = await embeddings.store_content_embedding(
+        content_type=ContentType.BLOCK,
+        content_id=test_content_id,
+        embedding=mock_embedding,
+        searchable_text="Original text",
+        metadata={"version": 1},
+        user_id=None,
+    )
+    assert result1 is True
+
+    # Store again with different text (upsert)
+    result2 = await embeddings.store_content_embedding(
+        content_type=ContentType.BLOCK,
+        content_id=test_content_id,
+        embedding=mock_embedding,
+        searchable_text="Updated text",
+        metadata={"version": 2},
+        user_id=None,
+    )
+    assert result2 is True
+
+    # Verify only one record with updated text
+    stored = await embeddings.get_content_embedding(
+        ContentType.BLOCK, test_content_id, user_id=None
+    )
+    assert stored is not None
+    assert stored["searchableText"] == "Updated text"
+
+
+# ============================================================================
+# get_content_embedding Tests
+# ============================================================================
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_get_content_embedding_not_found(server):
+    """Test retrieving non-existent embedding returns None."""
+    result = await embeddings.get_content_embedding(
+        ContentType.STORE_AGENT, "non-existent-id", user_id=None
+    )
+    assert result is None
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_get_content_embedding_with_metadata(
+    server,
+    test_content_id: str,
+    mock_embedding: list[float],
+    cleanup_embeddings: list,
+):
+    """Test that metadata is correctly stored and retrieved."""
+    cleanup_embeddings.append((ContentType.STORE_AGENT, test_content_id, None))
+
+    metadata = {
+        "name": "Test Agent",
+        "subHeading": "A test agent",
+        "categories": ["ai", "productivity"],
+        "customField": 123,
+    }
+
+    await embeddings.store_content_embedding(
+        content_type=ContentType.STORE_AGENT,
+        content_id=test_content_id,
+        embedding=mock_embedding,
+        searchable_text="test",
+        metadata=metadata,
+        user_id=None,
+    )
+
+    stored = await embeddings.get_content_embedding(
+        ContentType.STORE_AGENT, test_content_id, user_id=None
+    )
+
+    assert stored is not None
+    assert stored["metadata"]["name"] == "Test Agent"
+    assert stored["metadata"]["categories"] == ["ai", "productivity"]
+    assert stored["metadata"]["customField"] == 123
+
+
+# ============================================================================
+# delete_content_embedding Tests
+# ============================================================================
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_delete_content_embedding(
+    server,
+    test_content_id: str,
+    mock_embedding: list[float],
+):
+    """Test deleting embedding removes it from database."""
+    # Store embedding
+    await embeddings.store_content_embedding(
+        content_type=ContentType.BLOCK,
+        content_id=test_content_id,
+        embedding=mock_embedding,
+        searchable_text="To be deleted",
+        metadata=None,
+        user_id=None,
+    )
+
+    # Verify it exists
+    stored = await embeddings.get_content_embedding(
+        ContentType.BLOCK, test_content_id, user_id=None
+    )
+    assert stored is not None
+
+    # Delete it
+    result = await embeddings.delete_content_embedding(
+        ContentType.BLOCK, test_content_id, user_id=None
+    )
+    assert result is True
+
+    # Verify it's gone
+    stored = await embeddings.get_content_embedding(
+        ContentType.BLOCK, test_content_id, user_id=None
+    )
+    assert stored is None
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_delete_content_embedding_not_found(server):
+    """Test deleting non-existent embedding doesn't error."""
+    result = await embeddings.delete_content_embedding(
+        ContentType.BLOCK, "non-existent-id", user_id=None
+    )
+    # Should succeed even if nothing to delete
+    assert result is True
+
+
+# ============================================================================
+# unified_hybrid_search Tests
+# ============================================================================
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_unified_hybrid_search_finds_matching_content(
+    server,
+    mock_embedding: list[float],
+    cleanup_embeddings: list,
+):
+    """Test unified search finds content matching the query."""
+    # Create unique content IDs
+    agent_id = f"test-agent-{uuid.uuid4()}"
+    block_id = f"test-block-{uuid.uuid4()}"
+    doc_id = f"test-doc-{uuid.uuid4()}"
+
+    cleanup_embeddings.append((ContentType.STORE_AGENT, agent_id, None))
+    cleanup_embeddings.append((ContentType.BLOCK, block_id, None))
+    cleanup_embeddings.append((ContentType.DOCUMENTATION, doc_id, None))
+
+    # Store embeddings for different content types
+    await embeddings.store_content_embedding(
+        content_type=ContentType.STORE_AGENT,
+        content_id=agent_id,
+        embedding=mock_embedding,
+        searchable_text="AI writing assistant for blog posts",
+        metadata={"name": "Writing Assistant"},
+        user_id=None,
+    )
+
+    await embeddings.store_content_embedding(
+        content_type=ContentType.BLOCK,
+        content_id=block_id,
+        embedding=mock_embedding,
+        searchable_text="Text generation block for creative writing",
+        metadata={"name": "Text Generator"},
+        user_id=None,
+    )
+
+    await embeddings.store_content_embedding(
+        content_type=ContentType.DOCUMENTATION,
+        content_id=doc_id,
+        embedding=mock_embedding,
+        searchable_text="How to use writing blocks in AutoGPT",
+        metadata={"title": "Writing Guide"},
+        user_id=None,
+    )
+
+    # Search for "writing" - should find all three
+    results, total = await unified_hybrid_search(
+        query="writing",
+        page=1,
+        page_size=20,
+    )
+
+    # Should find at least our test content (may find others too)
+    content_ids = [r["content_id"] for r in results]
+    assert agent_id in content_ids or total >= 1  # Lexical search should find it
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_unified_hybrid_search_filter_by_content_type(
+    server,
+    mock_embedding: list[float],
+    cleanup_embeddings: list,
+):
+    """Test unified search can filter by content type."""
+    agent_id = f"test-agent-{uuid.uuid4()}"
+    block_id = f"test-block-{uuid.uuid4()}"
+
+    cleanup_embeddings.append((ContentType.STORE_AGENT, agent_id, None))
+    cleanup_embeddings.append((ContentType.BLOCK, block_id, None))
+
+    # Store both types with same searchable text
+    await embeddings.store_content_embedding(
+        content_type=ContentType.STORE_AGENT,
+        content_id=agent_id,
+        embedding=mock_embedding,
+        searchable_text="unique_search_term_xyz123",
+        metadata={},
+        user_id=None,
+    )
+
+    await embeddings.store_content_embedding(
+        content_type=ContentType.BLOCK,
+        content_id=block_id,
+        embedding=mock_embedding,
+        searchable_text="unique_search_term_xyz123",
+        metadata={},
+        user_id=None,
+    )
+
+    # Search only for BLOCK type
+    results, total = await unified_hybrid_search(
+        query="unique_search_term_xyz123",
+        content_types=[ContentType.BLOCK],
+        page=1,
+        page_size=20,
+    )
+
+    # All results should be BLOCK type
+    for r in results:
+        assert r["content_type"] == "BLOCK"
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_unified_hybrid_search_empty_query(server):
+    """Test unified search with empty query returns empty results."""
+    results, total = await unified_hybrid_search(
+        query="",
+        page=1,
+        page_size=20,
+    )
+
+    assert results == []
+    assert total == 0
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_unified_hybrid_search_pagination(
+    server,
+    mock_embedding: list[float],
+    cleanup_embeddings: list,
+):
+    """Test unified search pagination works correctly."""
+    # Use a unique search term to avoid matching other test data
+    unique_term = f"xyzpagtest{uuid.uuid4().hex[:8]}"
+
+    # Create multiple items
+    content_ids = []
+    for i in range(5):
+        content_id = f"test-pagination-{uuid.uuid4()}"
+        content_ids.append(content_id)
+        cleanup_embeddings.append((ContentType.BLOCK, content_id, None))
+
+        await embeddings.store_content_embedding(
+            content_type=ContentType.BLOCK,
+            content_id=content_id,
+            embedding=mock_embedding,
+            searchable_text=f"{unique_term} item number {i}",
+            metadata={"index": i},
+            user_id=None,
+        )
+
+    # Get first page
+    page1_results, total1 = await unified_hybrid_search(
+        query=unique_term,
+        content_types=[ContentType.BLOCK],
+        page=1,
+        page_size=2,
+    )
+
+    # Get second page
+    page2_results, total2 = await unified_hybrid_search(
+        query=unique_term,
+        content_types=[ContentType.BLOCK],
+        page=2,
+        page_size=2,
+    )
+
+    # Total should be consistent
+    assert total1 == total2
+
+    # Pages should have different content (if we have enough results)
+    if len(page1_results) > 0 and len(page2_results) > 0:
+        page1_ids = {r["content_id"] for r in page1_results}
+        page2_ids = {r["content_id"] for r in page2_results}
+        # No overlap between pages
+        assert page1_ids.isdisjoint(page2_ids)
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_unified_hybrid_search_min_score_filtering(
+    server,
+    mock_embedding: list[float],
+    cleanup_embeddings: list,
+):
+    """Test unified search respects min_score threshold."""
+    content_id = f"test-minscore-{uuid.uuid4()}"
+    cleanup_embeddings.append((ContentType.BLOCK, content_id, None))
+
+    await embeddings.store_content_embedding(
+        content_type=ContentType.BLOCK,
+        content_id=content_id,
+        embedding=mock_embedding,
+        searchable_text="completely unrelated content about bananas",
+        metadata={},
+        user_id=None,
+    )
+
+    # Search with very high min_score - should filter out low relevance
+    results_high, _ = await unified_hybrid_search(
+        query="quantum computing algorithms",
+        content_types=[ContentType.BLOCK],
+        min_score=0.9,  # Very high threshold
+        page=1,
+        page_size=20,
+    )
+
+    # Search with low min_score
+    results_low, _ = await unified_hybrid_search(
+        query="quantum computing algorithms",
+        content_types=[ContentType.BLOCK],
+        min_score=0.01,  # Very low threshold
+        page=1,
+        page_size=20,
+    )
+
+    # High threshold should have fewer or equal results
+    assert len(results_high) <= len(results_low)
+
+
+# ============================================================================
+# hybrid_search (Store Agents) Tests
+# ============================================================================
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_hybrid_search_store_agents_sql_valid(server):
+    """Test that hybrid_search SQL executes without errors."""
+    # This test verifies the SQL is syntactically correct
+    # even if no results are found
+    results, total = await hybrid_search(
+        query="test agent",
+        page=1,
+        page_size=20,
+    )
+
+    # Should not raise - verifies SQL is valid
+    assert isinstance(results, list)
+    assert isinstance(total, int)
+    assert total >= 0
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_hybrid_search_with_filters(server):
+    """Test hybrid_search with various filter options."""
+    # Test with all filter types
+    results, total = await hybrid_search(
+        query="productivity",
+        featured=True,
+        creators=["test-creator"],
+        category="productivity",
+        page=1,
+        page_size=10,
+    )
+
+    # Should not raise - verifies filter SQL is valid
+    assert isinstance(results, list)
+    assert isinstance(total, int)
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_hybrid_search_pagination(server):
+    """Test hybrid_search pagination."""
+    # Page 1
+    results1, total1 = await hybrid_search(
+        query="agent",
+        page=1,
+        page_size=5,
+    )
+
+    # Page 2
+    results2, total2 = await hybrid_search(
+        query="agent",
+        page=2,
+        page_size=5,
+    )
+
+    # Verify SQL executes without error
+    assert isinstance(results1, list)
+    assert isinstance(results2, list)
+    assert isinstance(total1, int)
+    assert isinstance(total2, int)
+
+    # If page 1 has results, total should be > 0
+    # Note: total from page 2 may be 0 if no results on that page (COUNT(*) OVER limitation)
+    if results1:
+        assert total1 > 0
+
+
+# ============================================================================
+# SQL Validity Tests (verify queries don't break)
+# ============================================================================
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_all_content_types_searchable(server):
+    """Test that all content types can be searched without SQL errors."""
+    for content_type in [
+        ContentType.STORE_AGENT,
+        ContentType.BLOCK,
+        ContentType.DOCUMENTATION,
+    ]:
+        results, total = await unified_hybrid_search(
+            query="test",
+            content_types=[content_type],
+            page=1,
+            page_size=10,
+        )
+
+        # Should not raise
+        assert isinstance(results, list)
+        assert isinstance(total, int)
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_multiple_content_types_searchable(server):
+    """Test searching multiple content types at once."""
+    results, total = await unified_hybrid_search(
+        query="test",
+        content_types=[ContentType.BLOCK, ContentType.DOCUMENTATION],
+        page=1,
+        page_size=20,
+    )
+
+    # Should not raise
+    assert isinstance(results, list)
+    assert isinstance(total, int)
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_search_all_content_types_default(server):
+    """Test searching all content types (default behavior)."""
+    results, total = await unified_hybrid_search(
+        query="test",
+        content_types=None,  # Should search all
+        page=1,
+        page_size=20,
+    )
+
+    # Should not raise
+    assert isinstance(results, list)
+    assert isinstance(total, int)
+
+
+if __name__ == "__main__":
+    pytest.main([__file__, "-v", "-s"])
diff --git a/autogpt_platform/backend/backend/api/features/store/embeddings_schema_test.py b/autogpt_platform/backend/backend/api/features/store/embeddings_schema_test.py
new file mode 100644
index 0000000000..5aa13b4d23
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/store/embeddings_schema_test.py
@@ -0,0 +1,314 @@
+"""
+Integration tests for embeddings with schema handling.
+
+These tests verify that embeddings operations work correctly across different database schemas.
+"""
+
+from unittest.mock import AsyncMock, MagicMock, patch
+
+import pytest
+from prisma.enums import ContentType
+
+from backend.api.features.store import embeddings
+from backend.api.features.store.embeddings import EMBEDDING_DIM
+
+# Schema prefix tests removed - functionality moved to db.raw_with_schema() helper
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.integration
+async def test_store_content_embedding_with_schema():
+    """Test storing embeddings with proper schema handling."""
+    with patch("backend.data.db.get_database_schema") as mock_schema:
+        mock_schema.return_value = "platform"
+
+        with patch("prisma.get_client") as mock_get_client:
+            mock_client = AsyncMock()
+            mock_get_client.return_value = mock_client
+
+            result = await embeddings.store_content_embedding(
+                content_type=ContentType.STORE_AGENT,
+                content_id="test-id",
+                embedding=[0.1] * EMBEDDING_DIM,
+                searchable_text="test text",
+                metadata={"test": "data"},
+                user_id=None,
+            )
+
+            # Verify the query was called
+            assert mock_client.execute_raw.called
+
+            # Get the SQL query that was executed
+            call_args = mock_client.execute_raw.call_args
+            sql_query = call_args[0][0]
+
+            # Verify schema prefix is in the query
+            assert '"platform"."UnifiedContentEmbedding"' in sql_query
+
+            # Verify result
+            assert result is True
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.integration
+async def test_get_content_embedding_with_schema():
+    """Test retrieving embeddings with proper schema handling."""
+    with patch("backend.data.db.get_database_schema") as mock_schema:
+        mock_schema.return_value = "platform"
+
+        with patch("prisma.get_client") as mock_get_client:
+            mock_client = AsyncMock()
+            mock_client.query_raw.return_value = [
+                {
+                    "contentType": "STORE_AGENT",
+                    "contentId": "test-id",
+                    "userId": None,
+                    "embedding": "[0.1, 0.2]",
+                    "searchableText": "test",
+                    "metadata": {},
+                    "createdAt": "2024-01-01",
+                    "updatedAt": "2024-01-01",
+                }
+            ]
+            mock_get_client.return_value = mock_client
+
+            result = await embeddings.get_content_embedding(
+                ContentType.STORE_AGENT,
+                "test-id",
+                user_id=None,
+            )
+
+            # Verify the query was called
+            assert mock_client.query_raw.called
+
+            # Get the SQL query that was executed
+            call_args = mock_client.query_raw.call_args
+            sql_query = call_args[0][0]
+
+            # Verify schema prefix is in the query
+            assert '"platform"."UnifiedContentEmbedding"' in sql_query
+
+            # Verify result
+            assert result is not None
+            assert result["contentId"] == "test-id"
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.integration
+async def test_delete_content_embedding_with_schema():
+    """Test deleting embeddings with proper schema handling."""
+    with patch("backend.data.db.get_database_schema") as mock_schema:
+        mock_schema.return_value = "platform"
+
+        with patch("prisma.get_client") as mock_get_client:
+            mock_client = AsyncMock()
+            mock_get_client.return_value = mock_client
+
+            result = await embeddings.delete_content_embedding(
+                ContentType.STORE_AGENT,
+                "test-id",
+            )
+
+            # Verify the query was called
+            assert mock_client.execute_raw.called
+
+            # Get the SQL query that was executed
+            call_args = mock_client.execute_raw.call_args
+            sql_query = call_args[0][0]
+
+            # Verify schema prefix is in the query
+            assert '"platform"."UnifiedContentEmbedding"' in sql_query
+
+            # Verify result
+            assert result is True
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.integration
+async def test_get_embedding_stats_with_schema():
+    """Test embedding statistics with proper schema handling via content handlers."""
+    # Mock handler to return stats
+    mock_handler = MagicMock()
+    mock_handler.get_stats = AsyncMock(
+        return_value={
+            "total": 100,
+            "with_embeddings": 80,
+            "without_embeddings": 20,
+        }
+    )
+
+    with patch(
+        "backend.api.features.store.embeddings.CONTENT_HANDLERS",
+        {ContentType.STORE_AGENT: mock_handler},
+    ):
+        result = await embeddings.get_embedding_stats()
+
+        # Verify handler was called
+        mock_handler.get_stats.assert_called_once()
+
+        # Verify new result structure
+        assert "by_type" in result
+        assert "totals" in result
+        assert result["totals"]["total"] == 100
+        assert result["totals"]["with_embeddings"] == 80
+        assert result["totals"]["without_embeddings"] == 20
+        assert result["totals"]["coverage_percent"] == 80.0
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.integration
+async def test_backfill_missing_embeddings_with_schema():
+    """Test backfilling embeddings via content handlers."""
+    from backend.api.features.store.content_handlers import ContentItem
+
+    # Create mock content item
+    mock_item = ContentItem(
+        content_id="version-1",
+        content_type=ContentType.STORE_AGENT,
+        searchable_text="Test Agent Test description",
+        metadata={"name": "Test Agent"},
+    )
+
+    # Mock handler
+    mock_handler = MagicMock()
+    mock_handler.get_missing_items = AsyncMock(return_value=[mock_item])
+
+    with patch(
+        "backend.api.features.store.embeddings.CONTENT_HANDLERS",
+        {ContentType.STORE_AGENT: mock_handler},
+    ):
+        with patch(
+            "backend.api.features.store.embeddings.generate_embedding",
+            return_value=[0.1] * EMBEDDING_DIM,
+        ):
+            with patch(
+                "backend.api.features.store.embeddings.store_content_embedding",
+                return_value=True,
+            ):
+                result = await embeddings.backfill_missing_embeddings(batch_size=10)
+
+                # Verify handler was called
+                mock_handler.get_missing_items.assert_called_once_with(10)
+
+                # Verify results
+                assert result["processed"] == 1
+                assert result["success"] == 1
+                assert result["failed"] == 0
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.integration
+async def test_ensure_content_embedding_with_schema():
+    """Test ensuring embeddings exist with proper schema handling."""
+    with patch("backend.data.db.get_database_schema") as mock_schema:
+        mock_schema.return_value = "platform"
+
+        with patch(
+            "backend.api.features.store.embeddings.get_content_embedding"
+        ) as mock_get:
+            # Simulate no existing embedding
+            mock_get.return_value = None
+
+            with patch(
+                "backend.api.features.store.embeddings.generate_embedding"
+            ) as mock_generate:
+                mock_generate.return_value = [0.1] * EMBEDDING_DIM
+
+                with patch(
+                    "backend.api.features.store.embeddings.store_content_embedding"
+                ) as mock_store:
+                    mock_store.return_value = True
+
+                    result = await embeddings.ensure_content_embedding(
+                        content_type=ContentType.STORE_AGENT,
+                        content_id="test-id",
+                        searchable_text="test text",
+                        metadata={"test": "data"},
+                        user_id=None,
+                        force=False,
+                    )
+
+                    # Verify the flow
+                    assert mock_get.called
+                    assert mock_generate.called
+                    assert mock_store.called
+                    assert result is True
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.integration
+async def test_backward_compatibility_store_embedding():
+    """Test backward compatibility wrapper for store_embedding."""
+    with patch(
+        "backend.api.features.store.embeddings.store_content_embedding"
+    ) as mock_store:
+        mock_store.return_value = True
+
+        result = await embeddings.store_embedding(
+            version_id="test-version-id",
+            embedding=[0.1] * EMBEDDING_DIM,
+            tx=None,
+        )
+
+        # Verify it calls the new function with correct parameters
+        assert mock_store.called
+        call_args = mock_store.call_args
+
+        assert call_args[1]["content_type"] == ContentType.STORE_AGENT
+        assert call_args[1]["content_id"] == "test-version-id"
+        assert call_args[1]["user_id"] is None
+        assert result is True
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.integration
+async def test_backward_compatibility_get_embedding():
+    """Test backward compatibility wrapper for get_embedding."""
+    with patch(
+        "backend.api.features.store.embeddings.get_content_embedding"
+    ) as mock_get:
+        mock_get.return_value = {
+            "contentType": "STORE_AGENT",
+            "contentId": "test-version-id",
+            "embedding": "[0.1, 0.2]",
+            "createdAt": "2024-01-01",
+            "updatedAt": "2024-01-01",
+        }
+
+        result = await embeddings.get_embedding("test-version-id")
+
+        # Verify it calls the new function
+        assert mock_get.called
+
+        # Verify it transforms to old format
+        assert result is not None
+        assert result["storeListingVersionId"] == "test-version-id"
+        assert "embedding" in result
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.integration
+async def test_schema_handling_error_cases():
+    """Test error handling in schema-aware operations."""
+    with patch("backend.data.db.get_database_schema") as mock_schema:
+        mock_schema.return_value = "platform"
+
+        with patch("prisma.get_client") as mock_get_client:
+            mock_client = AsyncMock()
+            mock_client.execute_raw.side_effect = Exception("Database error")
+            mock_get_client.return_value = mock_client
+
+            # Should raise exception on error
+            with pytest.raises(Exception, match="Database error"):
+                await embeddings.store_content_embedding(
+                    content_type=ContentType.STORE_AGENT,
+                    content_id="test-id",
+                    embedding=[0.1] * EMBEDDING_DIM,
+                    searchable_text="test",
+                    metadata=None,
+                    user_id=None,
+                )
+
+
+if __name__ == "__main__":
+    pytest.main([__file__, "-v", "-s"])
diff --git a/autogpt_platform/backend/backend/api/features/store/embeddings_test.py b/autogpt_platform/backend/backend/api/features/store/embeddings_test.py
new file mode 100644
index 0000000000..0d5e5ce4a2
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/store/embeddings_test.py
@@ -0,0 +1,399 @@
+from unittest.mock import AsyncMock, MagicMock, patch
+
+import prisma
+import pytest
+from prisma import Prisma
+from prisma.enums import ContentType
+
+from backend.api.features.store import embeddings
+
+
+@pytest.fixture(autouse=True)
+async def setup_prisma():
+    """Setup Prisma client for tests."""
+    try:
+        Prisma()
+    except prisma.errors.ClientAlreadyRegisteredError:
+        pass
+    yield
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_build_searchable_text():
+    """Test searchable text building from listing fields."""
+    result = embeddings.build_searchable_text(
+        name="AI Assistant",
+        description="A helpful AI assistant for productivity",
+        sub_heading="Boost your productivity",
+        categories=["AI", "Productivity"],
+    )
+
+    expected = "AI Assistant Boost your productivity A helpful AI assistant for productivity AI Productivity"
+    assert result == expected
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_build_searchable_text_empty_fields():
+    """Test searchable text building with empty fields."""
+    result = embeddings.build_searchable_text(
+        name="", description="Test description", sub_heading="", categories=[]
+    )
+
+    assert result == "Test description"
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_generate_embedding_success():
+    """Test successful embedding generation."""
+    # Mock OpenAI response
+    mock_client = MagicMock()
+    mock_response = MagicMock()
+    mock_response.data = [MagicMock()]
+    mock_response.data[0].embedding = [0.1, 0.2, 0.3] * 512  # 1536 dimensions
+
+    # Use AsyncMock for async embeddings.create method
+    mock_client.embeddings.create = AsyncMock(return_value=mock_response)
+
+    # Patch at the point of use in embeddings.py
+    with patch(
+        "backend.api.features.store.embeddings.get_openai_client"
+    ) as mock_get_client:
+        mock_get_client.return_value = mock_client
+
+        result = await embeddings.generate_embedding("test text")
+
+        assert result is not None
+        assert len(result) == embeddings.EMBEDDING_DIM
+        assert result[0] == 0.1
+
+        mock_client.embeddings.create.assert_called_once_with(
+            model="text-embedding-3-small", input="test text"
+        )
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_generate_embedding_no_api_key():
+    """Test embedding generation without API key."""
+    # Patch at the point of use in embeddings.py
+    with patch(
+        "backend.api.features.store.embeddings.get_openai_client"
+    ) as mock_get_client:
+        mock_get_client.return_value = None
+
+        with pytest.raises(RuntimeError, match="openai_internal_api_key not set"):
+            await embeddings.generate_embedding("test text")
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_generate_embedding_api_error():
+    """Test embedding generation with API error."""
+    mock_client = MagicMock()
+    mock_client.embeddings.create = AsyncMock(side_effect=Exception("API Error"))
+
+    # Patch at the point of use in embeddings.py
+    with patch(
+        "backend.api.features.store.embeddings.get_openai_client"
+    ) as mock_get_client:
+        mock_get_client.return_value = mock_client
+
+        with pytest.raises(Exception, match="API Error"):
+            await embeddings.generate_embedding("test text")
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_generate_embedding_text_truncation():
+    """Test that long text is properly truncated using tiktoken."""
+    from tiktoken import encoding_for_model
+
+    mock_client = MagicMock()
+    mock_response = MagicMock()
+    mock_response.data = [MagicMock()]
+    mock_response.data[0].embedding = [0.1] * embeddings.EMBEDDING_DIM
+
+    # Use AsyncMock for async embeddings.create method
+    mock_client.embeddings.create = AsyncMock(return_value=mock_response)
+
+    # Patch at the point of use in embeddings.py
+    with patch(
+        "backend.api.features.store.embeddings.get_openai_client"
+    ) as mock_get_client:
+        mock_get_client.return_value = mock_client
+
+        # Create text that will exceed 8191 tokens
+        # Use varied characters to ensure token-heavy text: each word is ~1 token
+        words = [f"word{i}" for i in range(10000)]
+        long_text = " ".join(words)  # ~10000 tokens
+
+        await embeddings.generate_embedding(long_text)
+
+        # Verify text was truncated to 8191 tokens
+        call_args = mock_client.embeddings.create.call_args
+        truncated_text = call_args.kwargs["input"]
+
+        # Count actual tokens in truncated text
+        enc = encoding_for_model("text-embedding-3-small")
+        actual_tokens = len(enc.encode(truncated_text))
+
+        # Should be at or just under 8191 tokens
+        assert actual_tokens <= 8191
+        # Should be close to the limit (not over-truncated)
+        assert actual_tokens >= 8100
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_store_embedding_success(mocker):
+    """Test successful embedding storage."""
+    mock_client = mocker.AsyncMock()
+    mock_client.execute_raw = mocker.AsyncMock()
+
+    embedding = [0.1, 0.2, 0.3]
+
+    result = await embeddings.store_embedding(
+        version_id="test-version-id", embedding=embedding, tx=mock_client
+    )
+
+    assert result is True
+    # execute_raw is called once for INSERT (no separate SET search_path needed)
+    assert mock_client.execute_raw.call_count == 1
+
+    # Verify the INSERT query with the actual data
+    call_args = mock_client.execute_raw.call_args_list[0][0]
+    assert "test-version-id" in call_args
+    assert "[0.1,0.2,0.3]" in call_args
+    assert None in call_args  # userId should be None for store agents
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_store_embedding_database_error(mocker):
+    """Test embedding storage with database error."""
+    mock_client = mocker.AsyncMock()
+    mock_client.execute_raw.side_effect = Exception("Database error")
+
+    embedding = [0.1, 0.2, 0.3]
+
+    with pytest.raises(Exception, match="Database error"):
+        await embeddings.store_embedding(
+            version_id="test-version-id", embedding=embedding, tx=mock_client
+        )
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_get_embedding_success():
+    """Test successful embedding retrieval."""
+    mock_result = [
+        {
+            "contentType": "STORE_AGENT",
+            "contentId": "test-version-id",
+            "userId": None,
+            "embedding": "[0.1,0.2,0.3]",
+            "searchableText": "Test text",
+            "metadata": {},
+            "createdAt": "2024-01-01T00:00:00Z",
+            "updatedAt": "2024-01-01T00:00:00Z",
+        }
+    ]
+
+    with patch(
+        "backend.api.features.store.embeddings.query_raw_with_schema",
+        return_value=mock_result,
+    ):
+        result = await embeddings.get_embedding("test-version-id")
+
+        assert result is not None
+        assert result["storeListingVersionId"] == "test-version-id"
+        assert result["embedding"] == "[0.1,0.2,0.3]"
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_get_embedding_not_found():
+    """Test embedding retrieval when not found."""
+    with patch(
+        "backend.api.features.store.embeddings.query_raw_with_schema",
+        return_value=[],
+    ):
+        result = await embeddings.get_embedding("test-version-id")
+
+        assert result is None
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@patch("backend.api.features.store.embeddings.generate_embedding")
+@patch("backend.api.features.store.embeddings.store_embedding")
+@patch("backend.api.features.store.embeddings.get_embedding")
+async def test_ensure_embedding_already_exists(mock_get, mock_store, mock_generate):
+    """Test ensure_embedding when embedding already exists."""
+    mock_get.return_value = {"embedding": "[0.1,0.2,0.3]"}
+
+    result = await embeddings.ensure_embedding(
+        version_id="test-id",
+        name="Test",
+        description="Test description",
+        sub_heading="Test heading",
+        categories=["test"],
+    )
+
+    assert result is True
+    mock_generate.assert_not_called()
+    mock_store.assert_not_called()
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@patch("backend.api.features.store.embeddings.generate_embedding")
+@patch("backend.api.features.store.embeddings.store_content_embedding")
+@patch("backend.api.features.store.embeddings.get_embedding")
+async def test_ensure_embedding_create_new(mock_get, mock_store, mock_generate):
+    """Test ensure_embedding creating new embedding."""
+    mock_get.return_value = None
+    mock_generate.return_value = [0.1, 0.2, 0.3]
+    mock_store.return_value = True
+
+    result = await embeddings.ensure_embedding(
+        version_id="test-id",
+        name="Test",
+        description="Test description",
+        sub_heading="Test heading",
+        categories=["test"],
+    )
+
+    assert result is True
+    mock_generate.assert_called_once_with("Test Test heading Test description test")
+    mock_store.assert_called_once_with(
+        content_type=ContentType.STORE_AGENT,
+        content_id="test-id",
+        embedding=[0.1, 0.2, 0.3],
+        searchable_text="Test Test heading Test description test",
+        metadata={"name": "Test", "subHeading": "Test heading", "categories": ["test"]},
+        user_id=None,
+        tx=None,
+    )
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@patch("backend.api.features.store.embeddings.generate_embedding")
+@patch("backend.api.features.store.embeddings.get_embedding")
+async def test_ensure_embedding_generation_fails(mock_get, mock_generate):
+    """Test ensure_embedding when generation fails."""
+    mock_get.return_value = None
+    mock_generate.side_effect = Exception("Generation failed")
+
+    with pytest.raises(Exception, match="Generation failed"):
+        await embeddings.ensure_embedding(
+            version_id="test-id",
+            name="Test",
+            description="Test description",
+            sub_heading="Test heading",
+            categories=["test"],
+        )
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_get_embedding_stats():
+    """Test embedding statistics retrieval."""
+    # Mock handler stats for each content type
+    mock_handler = MagicMock()
+    mock_handler.get_stats = AsyncMock(
+        return_value={
+            "total": 100,
+            "with_embeddings": 75,
+            "without_embeddings": 25,
+        }
+    )
+
+    # Patch the CONTENT_HANDLERS where it's used (in embeddings module)
+    with patch(
+        "backend.api.features.store.embeddings.CONTENT_HANDLERS",
+        {ContentType.STORE_AGENT: mock_handler},
+    ):
+        result = await embeddings.get_embedding_stats()
+
+        assert "by_type" in result
+        assert "totals" in result
+        assert result["totals"]["total"] == 100
+        assert result["totals"]["with_embeddings"] == 75
+        assert result["totals"]["without_embeddings"] == 25
+        assert result["totals"]["coverage_percent"] == 75.0
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@patch("backend.api.features.store.embeddings.store_content_embedding")
+async def test_backfill_missing_embeddings_success(mock_store):
+    """Test backfill with successful embedding generation."""
+    # Mock ContentItem from handlers
+    from backend.api.features.store.content_handlers import ContentItem
+
+    mock_items = [
+        ContentItem(
+            content_id="version-1",
+            content_type=ContentType.STORE_AGENT,
+            searchable_text="Agent 1 Description 1",
+            metadata={"name": "Agent 1"},
+        ),
+        ContentItem(
+            content_id="version-2",
+            content_type=ContentType.STORE_AGENT,
+            searchable_text="Agent 2 Description 2",
+            metadata={"name": "Agent 2"},
+        ),
+    ]
+
+    # Mock handler to return missing items
+    mock_handler = MagicMock()
+    mock_handler.get_missing_items = AsyncMock(return_value=mock_items)
+
+    # Mock store_content_embedding to succeed for first, fail for second
+    mock_store.side_effect = [True, False]
+
+    with patch(
+        "backend.api.features.store.embeddings.CONTENT_HANDLERS",
+        {ContentType.STORE_AGENT: mock_handler},
+    ):
+        with patch(
+            "backend.api.features.store.embeddings.generate_embedding",
+            return_value=[0.1] * embeddings.EMBEDDING_DIM,
+        ):
+            result = await embeddings.backfill_missing_embeddings(batch_size=5)
+
+            assert result["processed"] == 2
+            assert result["success"] == 1
+            assert result["failed"] == 1
+            assert mock_store.call_count == 2
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_backfill_missing_embeddings_no_missing():
+    """Test backfill when no embeddings are missing."""
+    # Mock handler to return no missing items
+    mock_handler = MagicMock()
+    mock_handler.get_missing_items = AsyncMock(return_value=[])
+
+    with patch(
+        "backend.api.features.store.embeddings.CONTENT_HANDLERS",
+        {ContentType.STORE_AGENT: mock_handler},
+    ):
+        result = await embeddings.backfill_missing_embeddings(batch_size=5)
+
+        assert result["processed"] == 0
+        assert result["success"] == 0
+        assert result["failed"] == 0
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_embedding_to_vector_string():
+    """Test embedding to PostgreSQL vector string conversion."""
+    embedding = [0.1, 0.2, 0.3, -0.4]
+    result = embeddings.embedding_to_vector_string(embedding)
+    assert result == "[0.1,0.2,0.3,-0.4]"
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_embed_query():
+    """Test embed_query function (alias for generate_embedding)."""
+    with patch(
+        "backend.api.features.store.embeddings.generate_embedding"
+    ) as mock_generate:
+        mock_generate.return_value = [0.1, 0.2, 0.3]
+
+        result = await embeddings.embed_query("test query")
+
+        assert result == [0.1, 0.2, 0.3]
+        mock_generate.assert_called_once_with("test query")
diff --git a/autogpt_platform/backend/backend/api/features/store/hybrid_search.py b/autogpt_platform/backend/backend/api/features/store/hybrid_search.py
new file mode 100644
index 0000000000..e1b8f402c8
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/store/hybrid_search.py
@@ -0,0 +1,723 @@
+"""
+Unified Hybrid Search
+
+Combines semantic (embedding) search with lexical (tsvector) search
+for improved relevance across all content types (agents, blocks, docs).
+Includes BM25 reranking for improved lexical relevance.
+"""
+
+import logging
+import re
+from dataclasses import dataclass
+from typing import Any, Literal
+
+from prisma.enums import ContentType
+from rank_bm25 import BM25Okapi  # type: ignore[import-untyped]
+
+from backend.api.features.store.embeddings import (
+    EMBEDDING_DIM,
+    embed_query,
+    embedding_to_vector_string,
+)
+from backend.data.db import query_raw_with_schema
+
+logger = logging.getLogger(__name__)
+
+
+# ============================================================================
+# BM25 Reranking
+# ============================================================================
+
+
+def tokenize(text: str) -> list[str]:
+    """Simple tokenizer for BM25 - lowercase and split on non-alphanumeric."""
+    if not text:
+        return []
+    # Lowercase and split on non-alphanumeric characters
+    tokens = re.findall(r"\b\w+\b", text.lower())
+    return tokens
+
+
+def bm25_rerank(
+    query: str,
+    results: list[dict[str, Any]],
+    text_field: str = "searchable_text",
+    bm25_weight: float = 0.3,
+    original_score_field: str = "combined_score",
+) -> list[dict[str, Any]]:
+    """
+    Rerank search results using BM25.
+
+    Combines the original combined_score with BM25 score for improved
+    lexical relevance, especially for exact term matches.
+
+    Args:
+        query: The search query
+        results: List of result dicts with text_field and original_score_field
+        text_field: Field name containing the text to score
+        bm25_weight: Weight for BM25 score (0-1). Original score gets (1 - bm25_weight)
+        original_score_field: Field name containing the original score
+
+    Returns:
+        Results list sorted by combined score (BM25 + original)
+    """
+    if not results or not query:
+        return results
+
+    # Extract texts and tokenize
+    corpus = [tokenize(r.get(text_field, "") or "") for r in results]
+
+    # Handle edge case where all documents are empty
+    if all(len(doc) == 0 for doc in corpus):
+        return results
+
+    # Build BM25 index
+    bm25 = BM25Okapi(corpus)
+
+    # Score query against corpus
+    query_tokens = tokenize(query)
+    if not query_tokens:
+        return results
+
+    bm25_scores = bm25.get_scores(query_tokens)
+
+    # Normalize BM25 scores to 0-1 range
+    max_bm25 = max(bm25_scores) if max(bm25_scores) > 0 else 1.0
+    normalized_bm25 = [s / max_bm25 for s in bm25_scores]
+
+    # Combine scores
+    original_weight = 1.0 - bm25_weight
+    for i, result in enumerate(results):
+        original_score = result.get(original_score_field, 0) or 0
+        result["bm25_score"] = normalized_bm25[i]
+        final_score = (
+            original_weight * original_score + bm25_weight * normalized_bm25[i]
+        )
+        result["final_score"] = final_score
+        result["relevance"] = final_score
+
+    # Sort by relevance descending
+    results.sort(key=lambda x: x.get("relevance", 0), reverse=True)
+
+    return results
+
+
+@dataclass
+class UnifiedSearchWeights:
+    """Weights for unified search (no popularity signal)."""
+
+    semantic: float = 0.40  # Embedding cosine similarity
+    lexical: float = 0.40  # tsvector ts_rank_cd score
+    category: float = 0.10  # Category match boost (for types that have categories)
+    recency: float = 0.10  # Newer content ranked higher
+
+    def __post_init__(self):
+        """Validate weights are non-negative and sum to approximately 1.0."""
+        total = self.semantic + self.lexical + self.category + self.recency
+
+        if any(
+            w < 0 for w in [self.semantic, self.lexical, self.category, self.recency]
+        ):
+            raise ValueError("All weights must be non-negative")
+
+        if not (0.99 <= total <= 1.01):
+            raise ValueError(f"Weights must sum to ~1.0, got {total:.3f}")
+
+
+# Default weights for unified search
+DEFAULT_UNIFIED_WEIGHTS = UnifiedSearchWeights()
+
+# Minimum relevance score thresholds
+DEFAULT_MIN_SCORE = 0.15  # For unified search (more permissive)
+DEFAULT_STORE_AGENT_MIN_SCORE = 0.20  # For store agent search (original threshold)
+
+
+async def unified_hybrid_search(
+    query: str,
+    content_types: list[ContentType] | None = None,
+    category: str | None = None,
+    page: int = 1,
+    page_size: int = 20,
+    weights: UnifiedSearchWeights | None = None,
+    min_score: float | None = None,
+    user_id: str | None = None,
+) -> tuple[list[dict[str, Any]], int]:
+    """
+    Unified hybrid search across all content types.
+
+    Searches UnifiedContentEmbedding using both semantic (vector) and lexical (tsvector) signals.
+
+    Args:
+        query: Search query string
+        content_types: List of content types to search. Defaults to all public types.
+        category: Filter by category (for content types that support it)
+        page: Page number (1-indexed)
+        page_size: Results per page
+        weights: Custom weights for search signals
+        min_score: Minimum relevance score threshold (0-1)
+        user_id: User ID for searching private content (library agents)
+
+    Returns:
+        Tuple of (results list, total count)
+    """
+    # Validate inputs
+    query = query.strip()
+    if not query:
+        return [], 0
+
+    if page < 1:
+        page = 1
+    if page_size < 1:
+        page_size = 1
+    if page_size > 100:
+        page_size = 100
+
+    if content_types is None:
+        content_types = [
+            ContentType.STORE_AGENT,
+            ContentType.BLOCK,
+            ContentType.DOCUMENTATION,
+        ]
+
+    if weights is None:
+        weights = DEFAULT_UNIFIED_WEIGHTS
+    if min_score is None:
+        min_score = DEFAULT_MIN_SCORE
+
+    offset = (page - 1) * page_size
+
+    # Generate query embedding with graceful degradation
+    try:
+        query_embedding = await embed_query(query)
+    except Exception as e:
+        logger.warning(
+            f"Failed to generate query embedding - falling back to lexical-only search: {e}. "
+            "Check that openai_internal_api_key is configured and OpenAI API is accessible."
+        )
+        query_embedding = [0.0] * EMBEDDING_DIM
+        # Redistribute semantic weight to lexical
+        total_non_semantic = weights.lexical + weights.category + weights.recency
+        if total_non_semantic > 0:
+            factor = 1.0 / total_non_semantic
+            weights = UnifiedSearchWeights(
+                semantic=0.0,
+                lexical=weights.lexical * factor,
+                category=weights.category * factor,
+                recency=weights.recency * factor,
+            )
+        else:
+            weights = UnifiedSearchWeights(
+                semantic=0.0, lexical=1.0, category=0.0, recency=0.0
+            )
+
+    # Build parameters
+    params: list[Any] = []
+    param_idx = 1
+
+    # Query for lexical search
+    params.append(query)
+    query_param = f"${param_idx}"
+    param_idx += 1
+
+    # Query lowercase for category matching
+    params.append(query.lower())
+    query_lower_param = f"${param_idx}"
+    param_idx += 1
+
+    # Embedding
+    embedding_str = embedding_to_vector_string(query_embedding)
+    params.append(embedding_str)
+    embedding_param = f"${param_idx}"
+    param_idx += 1
+
+    # Content types
+    content_type_values = [ct.value for ct in content_types]
+    params.append(content_type_values)
+    content_types_param = f"${param_idx}"
+    param_idx += 1
+
+    # User ID filter (for private content)
+    user_filter = ""
+    if user_id is not None:
+        params.append(user_id)
+        user_filter = f'AND (uce."userId" = ${param_idx} OR uce."userId" IS NULL)'
+        param_idx += 1
+    else:
+        user_filter = 'AND uce."userId" IS NULL'
+
+    # Weights
+    params.append(weights.semantic)
+    w_semantic = f"${param_idx}"
+    param_idx += 1
+
+    params.append(weights.lexical)
+    w_lexical = f"${param_idx}"
+    param_idx += 1
+
+    params.append(weights.category)
+    w_category = f"${param_idx}"
+    param_idx += 1
+
+    params.append(weights.recency)
+    w_recency = f"${param_idx}"
+    param_idx += 1
+
+    # Min score
+    params.append(min_score)
+    min_score_param = f"${param_idx}"
+    param_idx += 1
+
+    # Pagination
+    params.append(page_size)
+    limit_param = f"${param_idx}"
+    param_idx += 1
+
+    params.append(offset)
+    offset_param = f"${param_idx}"
+    param_idx += 1
+
+    # Unified search query on UnifiedContentEmbedding
+    sql_query = f"""
+        WITH candidates AS (
+            -- Lexical matches (uses GIN index on search column)
+            SELECT uce.id, uce."contentType", uce."contentId"
+            FROM {{schema_prefix}}"UnifiedContentEmbedding" uce
+            WHERE uce."contentType" = ANY({content_types_param}::{{schema_prefix}}"ContentType"[])
+            {user_filter}
+            AND uce.search @@ plainto_tsquery('english', {query_param})
+
+            UNION
+
+            -- Semantic matches (uses HNSW index on embedding)
+            (
+                SELECT uce.id, uce."contentType", uce."contentId"
+                FROM {{schema_prefix}}"UnifiedContentEmbedding" uce
+                WHERE uce."contentType" = ANY({content_types_param}::{{schema_prefix}}"ContentType"[])
+                {user_filter}
+                ORDER BY uce.embedding <=> {embedding_param}::vector
+                LIMIT 200
+            )
+        ),
+        search_scores AS (
+            SELECT
+                uce."contentType" as content_type,
+                uce."contentId" as content_id,
+                uce."searchableText" as searchable_text,
+                uce.metadata,
+                uce."updatedAt" as updated_at,
+                -- Semantic score: cosine similarity (1 - distance)
+                COALESCE(1 - (uce.embedding <=> {embedding_param}::vector), 0) as semantic_score,
+                -- Lexical score: ts_rank_cd
+                COALESCE(ts_rank_cd(uce.search, plainto_tsquery('english', {query_param})), 0) as lexical_raw,
+                -- Category match from metadata
+                CASE
+                    WHEN uce.metadata ? 'categories' AND EXISTS (
+                        SELECT 1 FROM jsonb_array_elements_text(uce.metadata->'categories') cat
+                        WHERE LOWER(cat) LIKE '%' || {query_lower_param} || '%'
+                    )
+                    THEN 1.0
+                    ELSE 0.0
+                END as category_score,
+                -- Recency score: linear decay over 90 days
+                GREATEST(0, 1 - EXTRACT(EPOCH FROM (NOW() - uce."updatedAt")) / (90 * 24 * 3600)) as recency_score
+            FROM candidates c
+            INNER JOIN {{schema_prefix}}"UnifiedContentEmbedding" uce ON c.id = uce.id
+        ),
+        max_lexical AS (
+            SELECT GREATEST(MAX(lexical_raw), 0.001) as max_val FROM search_scores
+        ),
+        normalized AS (
+            SELECT
+                ss.*,
+                ss.lexical_raw / ml.max_val as lexical_score
+            FROM search_scores ss
+            CROSS JOIN max_lexical ml
+        ),
+        scored AS (
+            SELECT
+                content_type,
+                content_id,
+                searchable_text,
+                metadata,
+                updated_at,
+                semantic_score,
+                lexical_score,
+                category_score,
+                recency_score,
+                (
+                    {w_semantic} * semantic_score +
+                    {w_lexical} * lexical_score +
+                    {w_category} * category_score +
+                    {w_recency} * recency_score
+                ) as combined_score
+            FROM normalized
+        ),
+        filtered AS (
+            SELECT *, COUNT(*) OVER () as total_count
+            FROM scored
+            WHERE combined_score >= {min_score_param}
+        )
+        SELECT * FROM filtered
+        ORDER BY combined_score DESC
+        LIMIT {limit_param} OFFSET {offset_param}
+    """
+
+    results = await query_raw_with_schema(sql_query, *params)
+
+    total = results[0]["total_count"] if results else 0
+    # Apply BM25 reranking
+    if results:
+        results = bm25_rerank(
+            query=query,
+            results=results,
+            text_field="searchable_text",
+            bm25_weight=0.3,
+            original_score_field="combined_score",
+        )
+
+    # Clean up results
+    for result in results:
+        result.pop("total_count", None)
+
+    logger.info(f"Unified hybrid search: {len(results)} results, {total} total")
+
+    return results, total
+
+
+# ============================================================================
+# Store Agent specific search (with full metadata)
+# ============================================================================
+
+
+@dataclass
+class StoreAgentSearchWeights:
+    """Weights for store agent search including popularity."""
+
+    semantic: float = 0.30
+    lexical: float = 0.30
+    category: float = 0.20
+    recency: float = 0.10
+    popularity: float = 0.10
+
+    def __post_init__(self):
+        total = (
+            self.semantic
+            + self.lexical
+            + self.category
+            + self.recency
+            + self.popularity
+        )
+        if any(
+            w < 0
+            for w in [
+                self.semantic,
+                self.lexical,
+                self.category,
+                self.recency,
+                self.popularity,
+            ]
+        ):
+            raise ValueError("All weights must be non-negative")
+        if not (0.99 <= total <= 1.01):
+            raise ValueError(f"Weights must sum to ~1.0, got {total:.3f}")
+
+
+DEFAULT_STORE_AGENT_WEIGHTS = StoreAgentSearchWeights()
+
+
+async def hybrid_search(
+    query: str,
+    featured: bool = False,
+    creators: list[str] | None = None,
+    category: str | None = None,
+    sorted_by: (
+        Literal["relevance", "rating", "runs", "name", "updated_at"] | None
+    ) = None,
+    page: int = 1,
+    page_size: int = 20,
+    weights: StoreAgentSearchWeights | None = None,
+    min_score: float | None = None,
+) -> tuple[list[dict[str, Any]], int]:
+    """
+    Hybrid search for store agents with full metadata.
+
+    Uses UnifiedContentEmbedding for search, joins to StoreAgent for metadata.
+    """
+    query = query.strip()
+    if not query:
+        return [], 0
+
+    if page < 1:
+        page = 1
+    if page_size < 1:
+        page_size = 1
+    if page_size > 100:
+        page_size = 100
+
+    if weights is None:
+        weights = DEFAULT_STORE_AGENT_WEIGHTS
+    if min_score is None:
+        min_score = (
+            DEFAULT_STORE_AGENT_MIN_SCORE  # Use original threshold for store agents
+        )
+
+    offset = (page - 1) * page_size
+
+    # Generate query embedding with graceful degradation
+    try:
+        query_embedding = await embed_query(query)
+    except Exception as e:
+        logger.warning(
+            f"Failed to generate query embedding - falling back to lexical-only search: {e}"
+        )
+        query_embedding = [0.0] * EMBEDDING_DIM
+        total_non_semantic = (
+            weights.lexical + weights.category + weights.recency + weights.popularity
+        )
+        if total_non_semantic > 0:
+            factor = 1.0 / total_non_semantic
+            weights = StoreAgentSearchWeights(
+                semantic=0.0,
+                lexical=weights.lexical * factor,
+                category=weights.category * factor,
+                recency=weights.recency * factor,
+                popularity=weights.popularity * factor,
+            )
+        else:
+            weights = StoreAgentSearchWeights(
+                semantic=0.0, lexical=1.0, category=0.0, recency=0.0, popularity=0.0
+            )
+
+    # Build parameters
+    params: list[Any] = []
+    param_idx = 1
+
+    params.append(query)
+    query_param = f"${param_idx}"
+    param_idx += 1
+
+    params.append(query.lower())
+    query_lower_param = f"${param_idx}"
+    param_idx += 1
+
+    embedding_str = embedding_to_vector_string(query_embedding)
+    params.append(embedding_str)
+    embedding_param = f"${param_idx}"
+    param_idx += 1
+
+    # Build WHERE clause for StoreAgent filters
+    where_parts = ["sa.is_available = true"]
+
+    if featured:
+        where_parts.append("sa.featured = true")
+
+    if creators:
+        params.append(creators)
+        where_parts.append(f"sa.creator_username = ANY(${param_idx})")
+        param_idx += 1
+
+    if category:
+        params.append(category)
+        where_parts.append(f"${param_idx} = ANY(sa.categories)")
+        param_idx += 1
+
+    where_clause = " AND ".join(where_parts)
+
+    # Weights
+    params.append(weights.semantic)
+    w_semantic = f"${param_idx}"
+    param_idx += 1
+
+    params.append(weights.lexical)
+    w_lexical = f"${param_idx}"
+    param_idx += 1
+
+    params.append(weights.category)
+    w_category = f"${param_idx}"
+    param_idx += 1
+
+    params.append(weights.recency)
+    w_recency = f"${param_idx}"
+    param_idx += 1
+
+    params.append(weights.popularity)
+    w_popularity = f"${param_idx}"
+    param_idx += 1
+
+    params.append(min_score)
+    min_score_param = f"${param_idx}"
+    param_idx += 1
+
+    params.append(page_size)
+    limit_param = f"${param_idx}"
+    param_idx += 1
+
+    params.append(offset)
+    offset_param = f"${param_idx}"
+    param_idx += 1
+
+    # Query using UnifiedContentEmbedding for search, StoreAgent for metadata
+    sql_query = f"""
+        WITH candidates AS (
+            -- Lexical matches via UnifiedContentEmbedding.search
+            SELECT uce."contentId" as "storeListingVersionId"
+            FROM {{schema_prefix}}"UnifiedContentEmbedding" uce
+            INNER JOIN {{schema_prefix}}"StoreAgent" sa
+                ON uce."contentId" = sa."storeListingVersionId"
+            WHERE uce."contentType" = 'STORE_AGENT'::{{schema_prefix}}"ContentType"
+            AND uce."userId" IS NULL
+            AND uce.search @@ plainto_tsquery('english', {query_param})
+            AND {where_clause}
+
+            UNION
+
+            -- Semantic matches via UnifiedContentEmbedding.embedding
+            SELECT uce."contentId" as "storeListingVersionId"
+            FROM (
+                SELECT uce."contentId", uce.embedding
+                FROM {{schema_prefix}}"UnifiedContentEmbedding" uce
+                INNER JOIN {{schema_prefix}}"StoreAgent" sa
+                    ON uce."contentId" = sa."storeListingVersionId"
+                WHERE uce."contentType" = 'STORE_AGENT'::{{schema_prefix}}"ContentType"
+                AND uce."userId" IS NULL
+                AND {where_clause}
+                ORDER BY uce.embedding <=> {embedding_param}::vector
+                LIMIT 200
+            ) uce
+        ),
+        search_scores AS (
+            SELECT
+                sa.slug,
+                sa.agent_name,
+                sa.agent_image,
+                sa.creator_username,
+                sa.creator_avatar,
+                sa.sub_heading,
+                sa.description,
+                sa.runs,
+                sa.rating,
+                sa.categories,
+                sa.featured,
+                sa.is_available,
+                sa.updated_at,
+                sa."agentGraphId",
+                -- Searchable text for BM25 reranking
+                COALESCE(sa.agent_name, '') || ' ' || COALESCE(sa.sub_heading, '') || ' ' || COALESCE(sa.description, '') as searchable_text,
+                -- Semantic score
+                COALESCE(1 - (uce.embedding <=> {embedding_param}::vector), 0) as semantic_score,
+                -- Lexical score (raw, will normalize)
+                COALESCE(ts_rank_cd(uce.search, plainto_tsquery('english', {query_param})), 0) as lexical_raw,
+                -- Category match
+                CASE
+                    WHEN EXISTS (
+                        SELECT 1 FROM unnest(sa.categories) cat
+                        WHERE LOWER(cat) LIKE '%' || {query_lower_param} || '%'
+                    )
+                    THEN 1.0
+                    ELSE 0.0
+                END as category_score,
+                -- Recency
+                GREATEST(0, 1 - EXTRACT(EPOCH FROM (NOW() - sa.updated_at)) / (90 * 24 * 3600)) as recency_score,
+                -- Popularity (raw)
+                sa.runs as popularity_raw
+            FROM candidates c
+            INNER JOIN {{schema_prefix}}"StoreAgent" sa
+                ON c."storeListingVersionId" = sa."storeListingVersionId"
+            INNER JOIN {{schema_prefix}}"UnifiedContentEmbedding" uce
+                ON sa."storeListingVersionId" = uce."contentId"
+                AND uce."contentType" = 'STORE_AGENT'::{{schema_prefix}}"ContentType"
+        ),
+        max_vals AS (
+            SELECT
+                GREATEST(MAX(lexical_raw), 0.001) as max_lexical,
+                GREATEST(MAX(popularity_raw), 1) as max_popularity
+            FROM search_scores
+        ),
+        normalized AS (
+            SELECT
+                ss.*,
+                ss.lexical_raw / mv.max_lexical as lexical_score,
+                CASE
+                    WHEN ss.popularity_raw > 0
+                    THEN LN(1 + ss.popularity_raw) / LN(1 + mv.max_popularity)
+                    ELSE 0
+                END as popularity_score
+            FROM search_scores ss
+            CROSS JOIN max_vals mv
+        ),
+        scored AS (
+            SELECT
+                slug,
+                agent_name,
+                agent_image,
+                creator_username,
+                creator_avatar,
+                sub_heading,
+                description,
+                runs,
+                rating,
+                categories,
+                featured,
+                is_available,
+                updated_at,
+                "agentGraphId",
+                searchable_text,
+                semantic_score,
+                lexical_score,
+                category_score,
+                recency_score,
+                popularity_score,
+                (
+                    {w_semantic} * semantic_score +
+                    {w_lexical} * lexical_score +
+                    {w_category} * category_score +
+                    {w_recency} * recency_score +
+                    {w_popularity} * popularity_score
+                ) as combined_score
+            FROM normalized
+        ),
+        filtered AS (
+            SELECT *, COUNT(*) OVER () as total_count
+            FROM scored
+            WHERE combined_score >= {min_score_param}
+        )
+        SELECT * FROM filtered
+        ORDER BY combined_score DESC
+        LIMIT {limit_param} OFFSET {offset_param}
+    """
+
+    results = await query_raw_with_schema(sql_query, *params)
+
+    total = results[0]["total_count"] if results else 0
+
+    # Apply BM25 reranking
+    if results:
+        results = bm25_rerank(
+            query=query,
+            results=results,
+            text_field="searchable_text",
+            bm25_weight=0.3,
+            original_score_field="combined_score",
+        )
+
+    for result in results:
+        result.pop("total_count", None)
+        result.pop("searchable_text", None)
+
+    logger.info(f"Hybrid search (store agents): {len(results)} results, {total} total")
+
+    return results, total
+
+
+async def hybrid_search_simple(
+    query: str,
+    page: int = 1,
+    page_size: int = 20,
+) -> tuple[list[dict[str, Any]], int]:
+    """Simplified hybrid search for store agents."""
+    return await hybrid_search(query=query, page=page, page_size=page_size)
+
+
+# Backward compatibility alias - HybridSearchWeights maps to StoreAgentSearchWeights
+# for existing code that expects the popularity parameter
+HybridSearchWeights = StoreAgentSearchWeights
diff --git a/autogpt_platform/backend/backend/api/features/store/hybrid_search_test.py b/autogpt_platform/backend/backend/api/features/store/hybrid_search_test.py
new file mode 100644
index 0000000000..58989fbb41
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/store/hybrid_search_test.py
@@ -0,0 +1,728 @@
+"""
+Integration tests for hybrid search with schema handling.
+
+These tests verify that hybrid search works correctly across different database schemas.
+"""
+
+from unittest.mock import patch
+
+import pytest
+from prisma.enums import ContentType
+
+from backend.api.features.store import embeddings
+from backend.api.features.store.hybrid_search import (
+    HybridSearchWeights,
+    UnifiedSearchWeights,
+    hybrid_search,
+    unified_hybrid_search,
+)
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.integration
+async def test_hybrid_search_with_schema_handling():
+    """Test that hybrid search correctly handles database schema prefixes."""
+    # Test with a mock query to ensure schema handling works
+    query = "test agent"
+
+    with patch(
+        "backend.api.features.store.hybrid_search.query_raw_with_schema"
+    ) as mock_query:
+        # Mock the query result
+        mock_query.return_value = [
+            {
+                "slug": "test/agent",
+                "agent_name": "Test Agent",
+                "agent_image": "test.png",
+                "creator_username": "test",
+                "creator_avatar": "avatar.png",
+                "sub_heading": "Test sub-heading",
+                "description": "Test description",
+                "runs": 10,
+                "rating": 4.5,
+                "categories": ["test"],
+                "featured": False,
+                "is_available": True,
+                "updated_at": "2024-01-01T00:00:00Z",
+                "combined_score": 0.8,
+                "semantic_score": 0.7,
+                "lexical_score": 0.6,
+                "category_score": 0.5,
+                "recency_score": 0.4,
+                "total_count": 1,
+            }
+        ]
+
+        with patch(
+            "backend.api.features.store.hybrid_search.embed_query"
+        ) as mock_embed:
+            mock_embed.return_value = [0.1] * embeddings.EMBEDDING_DIM  # Mock embedding
+
+            results, total = await hybrid_search(
+                query=query,
+                page=1,
+                page_size=20,
+            )
+
+            # Verify the query was called
+            assert mock_query.called
+            # Verify the SQL template uses schema_prefix placeholder
+            call_args = mock_query.call_args
+            sql_template = call_args[0][0]
+            assert "{schema_prefix}" in sql_template
+
+            # Verify results
+            assert len(results) == 1
+            assert total == 1
+            assert results[0]["slug"] == "test/agent"
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.integration
+async def test_hybrid_search_with_public_schema():
+    """Test hybrid search when using public schema (no prefix needed)."""
+    with patch("backend.data.db.get_database_schema") as mock_schema:
+        mock_schema.return_value = "public"
+
+        with patch(
+            "backend.api.features.store.hybrid_search.query_raw_with_schema"
+        ) as mock_query:
+            mock_query.return_value = []
+
+            with patch(
+                "backend.api.features.store.hybrid_search.embed_query"
+            ) as mock_embed:
+                mock_embed.return_value = [0.1] * embeddings.EMBEDDING_DIM
+
+                results, total = await hybrid_search(
+                    query="test",
+                    page=1,
+                    page_size=20,
+                )
+
+                # Verify the mock was set up correctly
+                assert mock_schema.return_value == "public"
+
+                # Results should work even with empty results
+                assert results == []
+                assert total == 0
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.integration
+async def test_hybrid_search_with_custom_schema():
+    """Test hybrid search when using custom schema (e.g., 'platform')."""
+    with patch("backend.data.db.get_database_schema") as mock_schema:
+        mock_schema.return_value = "platform"
+
+        with patch(
+            "backend.api.features.store.hybrid_search.query_raw_with_schema"
+        ) as mock_query:
+            mock_query.return_value = []
+
+            with patch(
+                "backend.api.features.store.hybrid_search.embed_query"
+            ) as mock_embed:
+                mock_embed.return_value = [0.1] * embeddings.EMBEDDING_DIM
+
+                results, total = await hybrid_search(
+                    query="test",
+                    page=1,
+                    page_size=20,
+                )
+
+                # Verify the mock was set up correctly
+                assert mock_schema.return_value == "platform"
+
+                assert results == []
+                assert total == 0
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.integration
+async def test_hybrid_search_without_embeddings():
+    """Test hybrid search gracefully degrades when embeddings are unavailable."""
+    # Mock database to return some results
+    mock_results = [
+        {
+            "slug": "test-agent",
+            "agent_name": "Test Agent",
+            "agent_image": "test.png",
+            "creator_username": "creator",
+            "creator_avatar": "avatar.png",
+            "sub_heading": "Test heading",
+            "description": "Test description",
+            "runs": 100,
+            "rating": 4.5,
+            "categories": ["AI"],
+            "featured": False,
+            "is_available": True,
+            "updated_at": "2025-01-01T00:00:00Z",
+            "semantic_score": 0.0,  # Zero because no embedding
+            "lexical_score": 0.5,
+            "category_score": 0.0,
+            "recency_score": 0.1,
+            "popularity_score": 0.2,
+            "combined_score": 0.3,
+            "total_count": 1,
+        }
+    ]
+
+    with patch("backend.api.features.store.hybrid_search.embed_query") as mock_embed:
+        with patch(
+            "backend.api.features.store.hybrid_search.query_raw_with_schema"
+        ) as mock_query:
+            # Simulate embedding failure by raising exception
+            mock_embed.side_effect = Exception("Embedding generation failed")
+            mock_query.return_value = mock_results
+
+            # Should NOT raise - graceful degradation
+            results, total = await hybrid_search(
+                query="test",
+                page=1,
+                page_size=20,
+            )
+
+            # Verify it returns results even without embeddings
+            assert len(results) == 1
+            assert results[0]["slug"] == "test-agent"
+            assert total == 1
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.integration
+async def test_hybrid_search_with_filters():
+    """Test hybrid search with various filters."""
+    with patch(
+        "backend.api.features.store.hybrid_search.query_raw_with_schema"
+    ) as mock_query:
+        mock_query.return_value = []
+
+        with patch(
+            "backend.api.features.store.hybrid_search.embed_query"
+        ) as mock_embed:
+            mock_embed.return_value = [0.1] * embeddings.EMBEDDING_DIM
+
+            # Test with featured filter
+            results, total = await hybrid_search(
+                query="test",
+                featured=True,
+                creators=["user1", "user2"],
+                category="productivity",
+                page=1,
+                page_size=10,
+            )
+
+            # Verify filters were applied in the query
+            call_args = mock_query.call_args
+            params = call_args[0][1:]  # Skip SQL template
+
+            # Should have query, query_lower, creators array, category
+            assert len(params) >= 4
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.integration
+async def test_hybrid_search_weights():
+    """Test hybrid search with custom weights."""
+    custom_weights = HybridSearchWeights(
+        semantic=0.5,
+        lexical=0.3,
+        category=0.1,
+        recency=0.1,
+        popularity=0.0,
+    )
+
+    with patch(
+        "backend.api.features.store.hybrid_search.query_raw_with_schema"
+    ) as mock_query:
+        mock_query.return_value = []
+
+        with patch(
+            "backend.api.features.store.hybrid_search.embed_query"
+        ) as mock_embed:
+            mock_embed.return_value = [0.1] * embeddings.EMBEDDING_DIM
+
+            results, total = await hybrid_search(
+                query="test",
+                weights=custom_weights,
+                page=1,
+                page_size=20,
+            )
+
+            # Verify custom weights were used in the query
+            call_args = mock_query.call_args
+            sql_template = call_args[0][0]
+            params = call_args[0][1:]  # Get all parameters passed
+
+            # Check that SQL uses parameterized weights (not f-string interpolation)
+            assert "$" in sql_template  # Verify parameterization is used
+
+            # Check that custom weights are in the params
+            assert 0.5 in params  # semantic weight
+            assert 0.3 in params  # lexical weight
+            assert 0.1 in params  # category and recency weights
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.integration
+async def test_hybrid_search_min_score_filtering():
+    """Test hybrid search minimum score threshold."""
+    with patch(
+        "backend.api.features.store.hybrid_search.query_raw_with_schema"
+    ) as mock_query:
+        # Return results with varying scores
+        mock_query.return_value = [
+            {
+                "slug": "high-score/agent",
+                "agent_name": "High Score Agent",
+                "combined_score": 0.8,
+                "total_count": 1,
+                # ... other fields
+            }
+        ]
+
+        with patch(
+            "backend.api.features.store.hybrid_search.embed_query"
+        ) as mock_embed:
+            mock_embed.return_value = [0.1] * embeddings.EMBEDDING_DIM
+
+            # Test with custom min_score
+            results, total = await hybrid_search(
+                query="test",
+                min_score=0.5,  # High threshold
+                page=1,
+                page_size=20,
+            )
+
+            # Verify min_score was applied in query
+            call_args = mock_query.call_args
+            sql_template = call_args[0][0]
+            params = call_args[0][1:]  # Get all parameters
+
+            # Check that SQL uses parameterized min_score
+            assert "combined_score >=" in sql_template
+            assert "$" in sql_template  # Verify parameterization
+
+            # Check that custom min_score is in the params
+            assert 0.5 in params
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.integration
+async def test_hybrid_search_pagination():
+    """Test hybrid search pagination.
+
+    Pagination happens in SQL (LIMIT/OFFSET), then BM25 reranking is applied
+    to the paginated results.
+    """
+    # Create mock results that SQL would return for a page
+    mock_results = [
+        {
+            "slug": f"agent-{i}",
+            "agent_name": f"Agent {i}",
+            "agent_image": "test.png",
+            "creator_username": "test",
+            "creator_avatar": "avatar.png",
+            "sub_heading": "Test",
+            "description": "Test description",
+            "runs": 100 - i,
+            "rating": 4.5,
+            "categories": ["test"],
+            "featured": False,
+            "is_available": True,
+            "updated_at": "2024-01-01T00:00:00Z",
+            "searchable_text": f"Agent {i} test description",
+            "combined_score": 0.9 - (i * 0.01),
+            "semantic_score": 0.7,
+            "lexical_score": 0.6,
+            "category_score": 0.5,
+            "recency_score": 0.4,
+            "popularity_score": 0.3,
+            "total_count": 25,
+        }
+        for i in range(10)  # SQL returns page_size results
+    ]
+
+    with patch(
+        "backend.api.features.store.hybrid_search.query_raw_with_schema"
+    ) as mock_query:
+        mock_query.return_value = mock_results
+
+        with patch(
+            "backend.api.features.store.hybrid_search.embed_query"
+        ) as mock_embed:
+            mock_embed.return_value = [0.1] * embeddings.EMBEDDING_DIM
+
+            # Test page 2 with page_size 10
+            results, total = await hybrid_search(
+                query="test",
+                page=2,
+                page_size=10,
+            )
+
+            # Verify results returned
+            assert len(results) == 10
+            assert total == 25  # Total from SQL COUNT(*) OVER()
+
+            # Verify the SQL query uses page_size and offset
+            call_args = mock_query.call_args
+            params = call_args[0]
+            # Last two params are page_size and offset
+            page_size_param = params[-2]
+            offset_param = params[-1]
+            assert page_size_param == 10
+            assert offset_param == 10  # (page 2 - 1) * 10
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.integration
+async def test_hybrid_search_error_handling():
+    """Test hybrid search error handling."""
+    with patch(
+        "backend.api.features.store.hybrid_search.query_raw_with_schema"
+    ) as mock_query:
+        # Simulate database error
+        mock_query.side_effect = Exception("Database connection error")
+
+        with patch(
+            "backend.api.features.store.hybrid_search.embed_query"
+        ) as mock_embed:
+            mock_embed.return_value = [0.1] * embeddings.EMBEDDING_DIM
+
+            # Should raise exception
+            with pytest.raises(Exception) as exc_info:
+                await hybrid_search(
+                    query="test",
+                    page=1,
+                    page_size=20,
+                )
+
+            assert "Database connection error" in str(exc_info.value)
+
+
+# =============================================================================
+# Unified Hybrid Search Tests
+# =============================================================================
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.integration
+async def test_unified_hybrid_search_basic():
+    """Test basic unified hybrid search across all content types."""
+    mock_results = [
+        {
+            "content_type": "STORE_AGENT",
+            "content_id": "agent-1",
+            "searchable_text": "Test Agent Description",
+            "metadata": {"name": "Test Agent"},
+            "updated_at": "2025-01-01T00:00:00Z",
+            "semantic_score": 0.7,
+            "lexical_score": 0.8,
+            "category_score": 0.5,
+            "recency_score": 0.3,
+            "combined_score": 0.6,
+            "total_count": 2,
+        },
+        {
+            "content_type": "BLOCK",
+            "content_id": "block-1",
+            "searchable_text": "Test Block Description",
+            "metadata": {"name": "Test Block"},
+            "updated_at": "2025-01-01T00:00:00Z",
+            "semantic_score": 0.6,
+            "lexical_score": 0.7,
+            "category_score": 0.4,
+            "recency_score": 0.2,
+            "combined_score": 0.5,
+            "total_count": 2,
+        },
+    ]
+
+    with patch(
+        "backend.api.features.store.hybrid_search.query_raw_with_schema"
+    ) as mock_query:
+        with patch(
+            "backend.api.features.store.hybrid_search.embed_query"
+        ) as mock_embed:
+            mock_query.return_value = mock_results
+            mock_embed.return_value = [0.1] * embeddings.EMBEDDING_DIM
+
+            results, total = await unified_hybrid_search(
+                query="test",
+                page=1,
+                page_size=20,
+            )
+
+            assert len(results) == 2
+            assert total == 2
+            assert results[0]["content_type"] == "STORE_AGENT"
+            assert results[1]["content_type"] == "BLOCK"
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.integration
+async def test_unified_hybrid_search_filter_by_content_type():
+    """Test unified search filtering by specific content types."""
+    mock_results = [
+        {
+            "content_type": "BLOCK",
+            "content_id": "block-1",
+            "searchable_text": "Test Block",
+            "metadata": {},
+            "updated_at": "2025-01-01T00:00:00Z",
+            "semantic_score": 0.7,
+            "lexical_score": 0.8,
+            "category_score": 0.0,
+            "recency_score": 0.3,
+            "combined_score": 0.5,
+            "total_count": 1,
+        },
+    ]
+
+    with patch(
+        "backend.api.features.store.hybrid_search.query_raw_with_schema"
+    ) as mock_query:
+        with patch(
+            "backend.api.features.store.hybrid_search.embed_query"
+        ) as mock_embed:
+            mock_query.return_value = mock_results
+            mock_embed.return_value = [0.1] * embeddings.EMBEDDING_DIM
+
+            results, total = await unified_hybrid_search(
+                query="test",
+                content_types=[ContentType.BLOCK],
+                page=1,
+                page_size=20,
+            )
+
+            # Verify content_types parameter was passed correctly
+            call_args = mock_query.call_args
+            params = call_args[0][1:]
+            # The content types should be in the params as a list
+            assert ["BLOCK"] in params
+
+            assert len(results) == 1
+            assert total == 1
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.integration
+async def test_unified_hybrid_search_with_user_id():
+    """Test unified search with user_id for private content."""
+    mock_results = [
+        {
+            "content_type": "STORE_AGENT",
+            "content_id": "agent-1",
+            "searchable_text": "My Private Agent",
+            "metadata": {},
+            "updated_at": "2025-01-01T00:00:00Z",
+            "semantic_score": 0.7,
+            "lexical_score": 0.8,
+            "category_score": 0.0,
+            "recency_score": 0.3,
+            "combined_score": 0.6,
+            "total_count": 1,
+        },
+    ]
+
+    with patch(
+        "backend.api.features.store.hybrid_search.query_raw_with_schema"
+    ) as mock_query:
+        with patch(
+            "backend.api.features.store.hybrid_search.embed_query"
+        ) as mock_embed:
+            mock_query.return_value = mock_results
+            mock_embed.return_value = [0.1] * embeddings.EMBEDDING_DIM
+
+            results, total = await unified_hybrid_search(
+                query="test",
+                user_id="user-123",
+                page=1,
+                page_size=20,
+            )
+
+            # Verify SQL contains user_id filter
+            call_args = mock_query.call_args
+            sql_template = call_args[0][0]
+            params = call_args[0][1:]
+
+            assert 'uce."userId"' in sql_template
+            assert "user-123" in params
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.integration
+async def test_unified_hybrid_search_custom_weights():
+    """Test unified search with custom weights."""
+    custom_weights = UnifiedSearchWeights(
+        semantic=0.6,
+        lexical=0.2,
+        category=0.1,
+        recency=0.1,
+    )
+
+    with patch(
+        "backend.api.features.store.hybrid_search.query_raw_with_schema"
+    ) as mock_query:
+        with patch(
+            "backend.api.features.store.hybrid_search.embed_query"
+        ) as mock_embed:
+            mock_query.return_value = []
+            mock_embed.return_value = [0.1] * embeddings.EMBEDDING_DIM
+
+            results, total = await unified_hybrid_search(
+                query="test",
+                weights=custom_weights,
+                page=1,
+                page_size=20,
+            )
+
+            # Verify custom weights are in parameters
+            call_args = mock_query.call_args
+            params = call_args[0][1:]
+
+            assert 0.6 in params  # semantic weight
+            assert 0.2 in params  # lexical weight
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.integration
+async def test_unified_hybrid_search_graceful_degradation():
+    """Test unified search gracefully degrades when embeddings unavailable."""
+    mock_results = [
+        {
+            "content_type": "DOCUMENTATION",
+            "content_id": "doc-1",
+            "searchable_text": "API Documentation",
+            "metadata": {},
+            "updated_at": "2025-01-01T00:00:00Z",
+            "semantic_score": 0.0,  # Zero because no embedding
+            "lexical_score": 0.8,
+            "category_score": 0.0,
+            "recency_score": 0.2,
+            "combined_score": 0.5,
+            "total_count": 1,
+        },
+    ]
+
+    with patch(
+        "backend.api.features.store.hybrid_search.query_raw_with_schema"
+    ) as mock_query:
+        with patch(
+            "backend.api.features.store.hybrid_search.embed_query"
+        ) as mock_embed:
+            mock_query.return_value = mock_results
+            mock_embed.side_effect = Exception(
+                "Embedding generation failed"
+            )  # Embedding failure
+
+            # Should NOT raise - graceful degradation
+            results, total = await unified_hybrid_search(
+                query="test",
+                page=1,
+                page_size=20,
+            )
+
+            assert len(results) == 1
+            assert total == 1
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.integration
+async def test_unified_hybrid_search_empty_query():
+    """Test unified search with empty query returns empty results."""
+    results, total = await unified_hybrid_search(
+        query="",
+        page=1,
+        page_size=20,
+    )
+
+    assert results == []
+    assert total == 0
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.integration
+async def test_unified_hybrid_search_pagination():
+    """Test unified search pagination with BM25 reranking.
+
+    Pagination happens in SQL (LIMIT/OFFSET), then BM25 reranking is applied
+    to the paginated results.
+    """
+    # Create mock results that SQL would return for a page
+    mock_results = [
+        {
+            "content_type": "STORE_AGENT",
+            "content_id": f"agent-{i}",
+            "searchable_text": f"Agent {i} description",
+            "metadata": {"name": f"Agent {i}"},
+            "updated_at": "2025-01-01T00:00:00Z",
+            "semantic_score": 0.7,
+            "lexical_score": 0.8 - (i * 0.01),
+            "category_score": 0.5,
+            "recency_score": 0.3,
+            "combined_score": 0.6 - (i * 0.01),
+            "total_count": 50,
+        }
+        for i in range(15)  # SQL returns page_size results
+    ]
+
+    with patch(
+        "backend.api.features.store.hybrid_search.query_raw_with_schema"
+    ) as mock_query:
+        with patch(
+            "backend.api.features.store.hybrid_search.embed_query"
+        ) as mock_embed:
+            mock_query.return_value = mock_results
+            mock_embed.return_value = [0.1] * embeddings.EMBEDDING_DIM
+
+            results, total = await unified_hybrid_search(
+                query="test",
+                page=3,
+                page_size=15,
+            )
+
+            # Verify results returned
+            assert len(results) == 15
+            assert total == 50  # Total from SQL COUNT(*) OVER()
+
+            # Verify the SQL query uses page_size and offset
+            call_args = mock_query.call_args
+            params = call_args[0]
+            # Last two params are page_size and offset
+            page_size_param = params[-2]
+            offset_param = params[-1]
+            assert page_size_param == 15
+            assert offset_param == 30  # (page 3 - 1) * 15
+
+
+@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.integration
+async def test_unified_hybrid_search_schema_prefix():
+    """Test unified search uses schema_prefix placeholder."""
+    with patch(
+        "backend.api.features.store.hybrid_search.query_raw_with_schema"
+    ) as mock_query:
+        with patch(
+            "backend.api.features.store.hybrid_search.embed_query"
+        ) as mock_embed:
+            mock_query.return_value = []
+            mock_embed.return_value = [0.1] * embeddings.EMBEDDING_DIM
+
+            await unified_hybrid_search(
+                query="test",
+                page=1,
+                page_size=20,
+            )
+
+            call_args = mock_query.call_args
+            sql_template = call_args[0][0]
+
+            # Verify schema_prefix placeholder is used for table references
+            assert "{schema_prefix}" in sql_template
+            assert '"UnifiedContentEmbedding"' in sql_template
+
+
+if __name__ == "__main__":
+    pytest.main([__file__, "-v", "-s"])
diff --git a/autogpt_platform/backend/backend/api/features/store/model.py b/autogpt_platform/backend/backend/api/features/store/model.py
index 972898b296..d66b91807d 100644
--- a/autogpt_platform/backend/backend/api/features/store/model.py
+++ b/autogpt_platform/backend/backend/api/features/store/model.py
@@ -38,6 +38,7 @@ class StoreAgent(pydantic.BaseModel):
     description: str
     runs: int
     rating: float
+    agent_graph_id: str
 
 
 class StoreAgentsResponse(pydantic.BaseModel):
@@ -110,6 +111,7 @@ class Profile(pydantic.BaseModel):
 
 
 class StoreSubmission(pydantic.BaseModel):
+    listing_id: str
     agent_id: str
     agent_version: int
     name: str
@@ -164,8 +166,12 @@ class StoreListingsWithVersionsResponse(pydantic.BaseModel):
 
 
 class StoreSubmissionRequest(pydantic.BaseModel):
-    agent_id: str
-    agent_version: int
+    agent_id: str = pydantic.Field(
+        ..., min_length=1, description="Agent ID cannot be empty"
+    )
+    agent_version: int = pydantic.Field(
+        ..., gt=0, description="Agent version must be greater than 0"
+    )
     slug: str
     name: str
     sub_heading: str
@@ -216,3 +222,23 @@ class ReviewSubmissionRequest(pydantic.BaseModel):
     is_approved: bool
     comments: str  # External comments visible to creator
     internal_comments: str | None = None  # Private admin notes
+
+
+class UnifiedSearchResult(pydantic.BaseModel):
+    """A single result from unified hybrid search across all content types."""
+
+    content_type: str  # STORE_AGENT, BLOCK, DOCUMENTATION
+    content_id: str
+    searchable_text: str
+    metadata: dict | None = None
+    updated_at: datetime.datetime | None = None
+    combined_score: float | None = None
+    semantic_score: float | None = None
+    lexical_score: float | None = None
+
+
+class UnifiedSearchResponse(pydantic.BaseModel):
+    """Response model for unified search across all content types."""
+
+    results: list[UnifiedSearchResult]
+    pagination: Pagination
diff --git a/autogpt_platform/backend/backend/api/features/store/model_test.py b/autogpt_platform/backend/backend/api/features/store/model_test.py
index a37966601b..c4109f4603 100644
--- a/autogpt_platform/backend/backend/api/features/store/model_test.py
+++ b/autogpt_platform/backend/backend/api/features/store/model_test.py
@@ -26,11 +26,13 @@ def test_store_agent():
         description="Test description",
         runs=50,
         rating=4.5,
+        agent_graph_id="test-graph-id",
     )
     assert agent.slug == "test-agent"
     assert agent.agent_name == "Test Agent"
     assert agent.runs == 50
     assert agent.rating == 4.5
+    assert agent.agent_graph_id == "test-graph-id"
 
 
 def test_store_agents_response():
@@ -46,6 +48,7 @@ def test_store_agents_response():
                 description="Test description",
                 runs=50,
                 rating=4.5,
+                agent_graph_id="test-graph-id",
             )
         ],
         pagination=store_model.Pagination(
@@ -138,6 +141,7 @@ def test_creator_details():
 
 def test_store_submission():
     submission = store_model.StoreSubmission(
+        listing_id="listing123",
         agent_id="agent123",
         agent_version=1,
         sub_heading="Test subheading",
@@ -159,6 +163,7 @@ def test_store_submissions_response():
     response = store_model.StoreSubmissionsResponse(
         submissions=[
             store_model.StoreSubmission(
+                listing_id="listing123",
                 agent_id="agent123",
                 agent_version=1,
                 sub_heading="Test subheading",
diff --git a/autogpt_platform/backend/backend/api/features/store/routes.py b/autogpt_platform/backend/backend/api/features/store/routes.py
index 7816b25d5a..2f3c7bfb04 100644
--- a/autogpt_platform/backend/backend/api/features/store/routes.py
+++ b/autogpt_platform/backend/backend/api/features/store/routes.py
@@ -7,12 +7,15 @@ from typing import Literal
 import autogpt_libs.auth
 import fastapi
 import fastapi.responses
+import prisma.enums
 
 import backend.data.graph
 import backend.util.json
+from backend.util.models import Pagination
 
 from . import cache as store_cache
 from . import db as store_db
+from . import hybrid_search as store_hybrid_search
 from . import image_gen as store_image_gen
 from . import media as store_media
 from . import model as store_model
@@ -146,6 +149,102 @@ async def get_agents(
     return agents
 
 
+##############################################
+############### Search Endpoints #############
+##############################################
+
+
+@router.get(
+    "/search",
+    summary="Unified search across all content types",
+    tags=["store", "public"],
+    response_model=store_model.UnifiedSearchResponse,
+)
+async def unified_search(
+    query: str,
+    content_types: list[str] | None = fastapi.Query(
+        default=None,
+        description="Content types to search: STORE_AGENT, BLOCK, DOCUMENTATION. If not specified, searches all.",
+    ),
+    page: int = 1,
+    page_size: int = 20,
+    user_id: str | None = fastapi.Security(
+        autogpt_libs.auth.get_optional_user_id, use_cache=False
+    ),
+):
+    """
+    Search across all content types (store agents, blocks, documentation) using hybrid search.
+
+    Combines semantic (embedding-based) and lexical (text-based) search for best results.
+
+    Args:
+        query: The search query string
+        content_types: Optional list of content types to filter by (STORE_AGENT, BLOCK, DOCUMENTATION)
+        page: Page number for pagination (default 1)
+        page_size: Number of results per page (default 20)
+        user_id: Optional authenticated user ID (for user-scoped content in future)
+
+    Returns:
+        UnifiedSearchResponse: Paginated list of search results with relevance scores
+    """
+    if page < 1:
+        raise fastapi.HTTPException(
+            status_code=422, detail="Page must be greater than 0"
+        )
+
+    if page_size < 1:
+        raise fastapi.HTTPException(
+            status_code=422, detail="Page size must be greater than 0"
+        )
+
+    # Convert string content types to enum
+    content_type_enums: list[prisma.enums.ContentType] | None = None
+    if content_types:
+        try:
+            content_type_enums = [prisma.enums.ContentType(ct) for ct in content_types]
+        except ValueError as e:
+            raise fastapi.HTTPException(
+                status_code=422,
+                detail=f"Invalid content type. Valid values: STORE_AGENT, BLOCK, DOCUMENTATION. Error: {e}",
+            )
+
+    # Perform unified hybrid search
+    results, total = await store_hybrid_search.unified_hybrid_search(
+        query=query,
+        content_types=content_type_enums,
+        user_id=user_id,
+        page=page,
+        page_size=page_size,
+    )
+
+    # Convert results to response model
+    search_results = [
+        store_model.UnifiedSearchResult(
+            content_type=r["content_type"],
+            content_id=r["content_id"],
+            searchable_text=r.get("searchable_text", ""),
+            metadata=r.get("metadata"),
+            updated_at=r.get("updated_at"),
+            combined_score=r.get("combined_score"),
+            semantic_score=r.get("semantic_score"),
+            lexical_score=r.get("lexical_score"),
+        )
+        for r in results
+    ]
+
+    total_pages = (total + page_size - 1) // page_size if total > 0 else 0
+
+    return store_model.UnifiedSearchResponse(
+        results=search_results,
+        pagination=Pagination(
+            total_items=total,
+            total_pages=total_pages,
+            current_page=page,
+            page_size=page_size,
+        ),
+    )
+
+
 @router.get(
     "/agents/{username}/{agent_name}",
     summary="Get specific agent",
diff --git a/autogpt_platform/backend/backend/api/features/store/routes_test.py b/autogpt_platform/backend/backend/api/features/store/routes_test.py
index 7fdc0b9ebb..fcef3f845a 100644
--- a/autogpt_platform/backend/backend/api/features/store/routes_test.py
+++ b/autogpt_platform/backend/backend/api/features/store/routes_test.py
@@ -82,6 +82,7 @@ def test_get_agents_featured(
                 description="Featured agent description",
                 runs=100,
                 rating=4.5,
+                agent_graph_id="test-graph-1",
             )
         ],
         pagination=store_model.Pagination(
@@ -127,6 +128,7 @@ def test_get_agents_by_creator(
                 description="Creator agent description",
                 runs=50,
                 rating=4.0,
+                agent_graph_id="test-graph-2",
             )
         ],
         pagination=store_model.Pagination(
@@ -172,6 +174,7 @@ def test_get_agents_sorted(
                 description="Top agent description",
                 runs=1000,
                 rating=5.0,
+                agent_graph_id="test-graph-3",
             )
         ],
         pagination=store_model.Pagination(
@@ -217,6 +220,7 @@ def test_get_agents_search(
                 description="Specific search term description",
                 runs=75,
                 rating=4.2,
+                agent_graph_id="test-graph-search",
             )
         ],
         pagination=store_model.Pagination(
@@ -262,6 +266,7 @@ def test_get_agents_category(
                 description="Category agent description",
                 runs=60,
                 rating=4.1,
+                agent_graph_id="test-graph-category",
             )
         ],
         pagination=store_model.Pagination(
@@ -306,6 +311,7 @@ def test_get_agents_pagination(
                 description=f"Agent {i} description",
                 runs=i * 10,
                 rating=4.0,
+                agent_graph_id="test-graph-2",
             )
             for i in range(5)
         ],
@@ -521,6 +527,7 @@ def test_get_submissions_success(
     mocked_value = store_model.StoreSubmissionsResponse(
         submissions=[
             store_model.StoreSubmission(
+                listing_id="test-listing-id",
                 name="Test Agent",
                 description="Test agent description",
                 image_urls=["test.jpg"],
diff --git a/autogpt_platform/backend/backend/api/features/store/semantic_search_test.py b/autogpt_platform/backend/backend/api/features/store/semantic_search_test.py
new file mode 100644
index 0000000000..b52f924ee8
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/store/semantic_search_test.py
@@ -0,0 +1,272 @@
+"""Tests for the semantic_search function."""
+
+import pytest
+from prisma.enums import ContentType
+
+from backend.api.features.store.embeddings import EMBEDDING_DIM, semantic_search
+
+
+@pytest.mark.asyncio
+async def test_search_blocks_only(mocker):
+    """Test searching only BLOCK content type."""
+    # Mock embed_query to return a test embedding
+    mock_embedding = [0.1] * EMBEDDING_DIM
+    mocker.patch(
+        "backend.api.features.store.embeddings.embed_query",
+        return_value=mock_embedding,
+    )
+
+    # Mock query_raw_with_schema to return test results
+    mock_results = [
+        {
+            "content_id": "block-123",
+            "content_type": "BLOCK",
+            "searchable_text": "Calculator Block - Performs arithmetic operations",
+            "metadata": {"name": "Calculator", "categories": ["Math"]},
+            "similarity": 0.85,
+        }
+    ]
+    mocker.patch(
+        "backend.api.features.store.embeddings.query_raw_with_schema",
+        return_value=mock_results,
+    )
+
+    results = await semantic_search(
+        query="calculate numbers",
+        content_types=[ContentType.BLOCK],
+    )
+
+    assert len(results) == 1
+    assert results[0]["content_type"] == "BLOCK"
+    assert results[0]["content_id"] == "block-123"
+    assert results[0]["similarity"] == 0.85
+
+
+@pytest.mark.asyncio
+async def test_search_multiple_content_types(mocker):
+    """Test searching multiple content types simultaneously."""
+    mock_embedding = [0.1] * EMBEDDING_DIM
+    mocker.patch(
+        "backend.api.features.store.embeddings.embed_query",
+        return_value=mock_embedding,
+    )
+
+    mock_results = [
+        {
+            "content_id": "block-123",
+            "content_type": "BLOCK",
+            "searchable_text": "Calculator Block",
+            "metadata": {},
+            "similarity": 0.85,
+        },
+        {
+            "content_id": "doc-456",
+            "content_type": "DOCUMENTATION",
+            "searchable_text": "How to use Calculator",
+            "metadata": {},
+            "similarity": 0.75,
+        },
+    ]
+    mocker.patch(
+        "backend.api.features.store.embeddings.query_raw_with_schema",
+        return_value=mock_results,
+    )
+
+    results = await semantic_search(
+        query="calculator",
+        content_types=[ContentType.BLOCK, ContentType.DOCUMENTATION],
+    )
+
+    assert len(results) == 2
+    assert results[0]["content_type"] == "BLOCK"
+    assert results[1]["content_type"] == "DOCUMENTATION"
+
+
+@pytest.mark.asyncio
+async def test_search_with_min_similarity_threshold(mocker):
+    """Test that results below min_similarity are filtered out."""
+    mock_embedding = [0.1] * EMBEDDING_DIM
+    mocker.patch(
+        "backend.api.features.store.embeddings.embed_query",
+        return_value=mock_embedding,
+    )
+
+    # Only return results above 0.7 similarity
+    mock_results = [
+        {
+            "content_id": "block-123",
+            "content_type": "BLOCK",
+            "searchable_text": "Calculator Block",
+            "metadata": {},
+            "similarity": 0.85,
+        }
+    ]
+    mocker.patch(
+        "backend.api.features.store.embeddings.query_raw_with_schema",
+        return_value=mock_results,
+    )
+
+    results = await semantic_search(
+        query="calculate",
+        content_types=[ContentType.BLOCK],
+        min_similarity=0.7,
+    )
+
+    assert len(results) == 1
+    assert results[0]["similarity"] >= 0.7
+
+
+@pytest.mark.asyncio
+async def test_search_fallback_to_lexical(mocker):
+    """Test fallback to lexical search when embeddings fail."""
+    # Mock embed_query to return None (embeddings unavailable)
+    mocker.patch(
+        "backend.api.features.store.embeddings.embed_query",
+        return_value=None,
+    )
+
+    mock_lexical_results = [
+        {
+            "content_id": "block-123",
+            "content_type": "BLOCK",
+            "searchable_text": "Calculator Block performs calculations",
+            "metadata": {},
+            "similarity": 0.0,
+        }
+    ]
+    mocker.patch(
+        "backend.api.features.store.embeddings.query_raw_with_schema",
+        return_value=mock_lexical_results,
+    )
+
+    results = await semantic_search(
+        query="calculator",
+        content_types=[ContentType.BLOCK],
+    )
+
+    assert len(results) == 1
+    assert results[0]["similarity"] == 0.0  # Lexical search returns 0 similarity
+
+
+@pytest.mark.asyncio
+async def test_search_empty_query():
+    """Test that empty query returns no results."""
+    results = await semantic_search(query="")
+    assert results == []
+
+    results = await semantic_search(query="   ")
+    assert results == []
+
+
+@pytest.mark.asyncio
+async def test_search_with_user_id_filter(mocker):
+    """Test searching with user_id filter for private content."""
+    mock_embedding = [0.1] * EMBEDDING_DIM
+    mocker.patch(
+        "backend.api.features.store.embeddings.embed_query",
+        return_value=mock_embedding,
+    )
+
+    mock_results = [
+        {
+            "content_id": "agent-789",
+            "content_type": "LIBRARY_AGENT",
+            "searchable_text": "My Custom Agent",
+            "metadata": {},
+            "similarity": 0.9,
+        }
+    ]
+    mocker.patch(
+        "backend.api.features.store.embeddings.query_raw_with_schema",
+        return_value=mock_results,
+    )
+
+    results = await semantic_search(
+        query="custom agent",
+        content_types=[ContentType.LIBRARY_AGENT],
+        user_id="user-123",
+    )
+
+    assert len(results) == 1
+    assert results[0]["content_type"] == "LIBRARY_AGENT"
+
+
+@pytest.mark.asyncio
+async def test_search_limit_parameter(mocker):
+    """Test that limit parameter correctly limits results."""
+    mock_embedding = [0.1] * EMBEDDING_DIM
+    mocker.patch(
+        "backend.api.features.store.embeddings.embed_query",
+        return_value=mock_embedding,
+    )
+
+    # Return 5 results
+    mock_results = [
+        {
+            "content_id": f"block-{i}",
+            "content_type": "BLOCK",
+            "searchable_text": f"Block {i}",
+            "metadata": {},
+            "similarity": 0.8,
+        }
+        for i in range(5)
+    ]
+    mocker.patch(
+        "backend.api.features.store.embeddings.query_raw_with_schema",
+        return_value=mock_results,
+    )
+
+    results = await semantic_search(
+        query="block",
+        content_types=[ContentType.BLOCK],
+        limit=5,
+    )
+
+    assert len(results) == 5
+
+
+@pytest.mark.asyncio
+async def test_search_default_content_types(mocker):
+    """Test that default content_types includes BLOCK, STORE_AGENT, and DOCUMENTATION."""
+    mock_embedding = [0.1] * EMBEDDING_DIM
+    mocker.patch(
+        "backend.api.features.store.embeddings.embed_query",
+        return_value=mock_embedding,
+    )
+
+    mock_query_raw = mocker.patch(
+        "backend.api.features.store.embeddings.query_raw_with_schema",
+        return_value=[],
+    )
+
+    await semantic_search(query="test")
+
+    # Check that the SQL query includes all three default content types
+    call_args = mock_query_raw.call_args
+    assert "BLOCK" in str(call_args)
+    assert "STORE_AGENT" in str(call_args)
+    assert "DOCUMENTATION" in str(call_args)
+
+
+@pytest.mark.asyncio
+async def test_search_handles_database_error(mocker):
+    """Test that database errors are handled gracefully."""
+    mock_embedding = [0.1] * EMBEDDING_DIM
+    mocker.patch(
+        "backend.api.features.store.embeddings.embed_query",
+        return_value=mock_embedding,
+    )
+
+    # Simulate database error
+    mocker.patch(
+        "backend.api.features.store.embeddings.query_raw_with_schema",
+        side_effect=Exception("Database connection failed"),
+    )
+
+    results = await semantic_search(
+        query="test",
+        content_types=[ContentType.BLOCK],
+    )
+
+    # Should return empty list on error
+    assert results == []
diff --git a/autogpt_platform/backend/backend/api/features/store/test_cache_delete.py b/autogpt_platform/backend/backend/api/features/store/test_cache_delete.py
index dd9be1f4ab..298c51d47c 100644
--- a/autogpt_platform/backend/backend/api/features/store/test_cache_delete.py
+++ b/autogpt_platform/backend/backend/api/features/store/test_cache_delete.py
@@ -33,6 +33,7 @@ class TestCacheDeletion:
                     description="Test description",
                     runs=100,
                     rating=4.5,
+                    agent_graph_id="test-graph-id",
                 )
             ],
             pagination=Pagination(
diff --git a/autogpt_platform/backend/backend/api/features/v1.py b/autogpt_platform/backend/backend/api/features/v1.py
index 9b05b4755f..09d3759a65 100644
--- a/autogpt_platform/backend/backend/api/features/v1.py
+++ b/autogpt_platform/backend/backend/api/features/v1.py
@@ -64,7 +64,6 @@ from backend.data.onboarding import (
     complete_re_run_agent,
     get_recommended_agents,
     get_user_onboarding,
-    increment_runs,
     onboarding_enabled,
     reset_user_onboarding,
     update_user_onboarding,
@@ -262,14 +261,36 @@ async def get_onboarding_agents(
     return await get_recommended_agents(user_id)
 
 
+class OnboardingStatusResponse(pydantic.BaseModel):
+    """Response for onboarding status check."""
+
+    is_onboarding_enabled: bool
+    is_chat_enabled: bool
+
+
 @v1_router.get(
     "/onboarding/enabled",
     summary="Is onboarding enabled",
     tags=["onboarding", "public"],
-    dependencies=[Security(requires_user)],
+    response_model=OnboardingStatusResponse,
 )
-async def is_onboarding_enabled() -> bool:
-    return await onboarding_enabled()
+async def is_onboarding_enabled(
+    user_id: Annotated[str, Security(get_user_id)],
+) -> OnboardingStatusResponse:
+    # Check if chat is enabled for user
+    is_chat_enabled = await is_feature_enabled(Flag.CHAT, user_id, False)
+
+    # If chat is enabled, skip legacy onboarding
+    if is_chat_enabled:
+        return OnboardingStatusResponse(
+            is_onboarding_enabled=False,
+            is_chat_enabled=True,
+        )
+
+    return OnboardingStatusResponse(
+        is_onboarding_enabled=await onboarding_enabled(),
+        is_chat_enabled=False,
+    )
 
 
 @v1_router.post(
@@ -365,6 +386,8 @@ async def execute_graph_block(
     obj = get_block(block_id)
     if not obj:
         raise HTTPException(status_code=404, detail=f"Block #{block_id} not found.")
+    if obj.disabled:
+        raise HTTPException(status_code=403, detail=f"Block #{block_id} is disabled.")
 
     user = await get_user_by_id(user_id)
     if not user:
@@ -762,10 +785,8 @@ async def create_new_graph(
     graph.reassign_ids(user_id=user_id, reassign_graph_id=True)
     graph.validate_graph(for_run=False)
 
-    # The return value of the create graph & library function is intentionally not used here,
-    # as the graph already valid and no sub-graphs are returned back.
     await graph_db.create_graph(graph, user_id=user_id)
-    await library_db.create_library_agent(graph, user_id=user_id)
+    await library_db.create_library_agent(graph, user_id)
     activated_graph = await on_graph_activate(graph, user_id=user_id)
 
     if create_graph.source == "builder":
@@ -889,21 +910,19 @@ async def set_graph_active_version(
 async def _update_library_agent_version_and_settings(
     user_id: str, agent_graph: graph_db.GraphModel
 ) -> library_model.LibraryAgent:
-    # Keep the library agent up to date with the new active version
     library = await library_db.update_agent_version_in_library(
         user_id, agent_graph.id, agent_graph.version
     )
-    # If the graph has HITL node, initialize the setting if it's not already set.
-    if (
-        agent_graph.has_human_in_the_loop
-        and library.settings.human_in_the_loop_safe_mode is None
-    ):
-        await library_db.update_library_agent_settings(
+    updated_settings = GraphSettings.from_graph(
+        graph=agent_graph,
+        hitl_safe_mode=library.settings.human_in_the_loop_safe_mode,
+        sensitive_action_safe_mode=library.settings.sensitive_action_safe_mode,
+    )
+    if updated_settings != library.settings:
+        library = await library_db.update_library_agent(
+            library_agent_id=library.id,
             user_id=user_id,
-            agent_id=library.id,
-            settings=library.settings.model_copy(
-                update={"human_in_the_loop_safe_mode": True}
-            ),
+            settings=updated_settings,
         )
     return library
 
@@ -920,21 +939,18 @@ async def update_graph_settings(
     user_id: Annotated[str, Security(get_user_id)],
 ) -> GraphSettings:
     """Update graph settings for the user's library agent."""
-    # Get the library agent for this graph
     library_agent = await library_db.get_library_agent_by_graph_id(
         graph_id=graph_id, user_id=user_id
     )
     if not library_agent:
         raise HTTPException(404, f"Graph #{graph_id} not found in user's library")
 
-    # Update the library agent settings
-    updated_agent = await library_db.update_library_agent_settings(
+    updated_agent = await library_db.update_library_agent(
+        library_agent_id=library_agent.id,
         user_id=user_id,
-        agent_id=library_agent.id,
         settings=settings,
     )
 
-    # Return the updated settings
     return GraphSettings.model_validate(updated_agent.settings)
 
 
@@ -975,7 +991,6 @@ async def execute_graph(
         # Record successful graph execution
         record_graph_execution(graph_id=graph_id, status="success", user_id=user_id)
         record_graph_operation(operation="execute", status="success")
-        await increment_runs(user_id)
         await complete_re_run_agent(user_id, graph_id)
         if source == "library":
             await complete_onboarding_step(
diff --git a/autogpt_platform/backend/backend/api/features/v1_test.py b/autogpt_platform/backend/backend/api/features/v1_test.py
index a186d38810..d57ad49949 100644
--- a/autogpt_platform/backend/backend/api/features/v1_test.py
+++ b/autogpt_platform/backend/backend/api/features/v1_test.py
@@ -138,6 +138,7 @@ def test_execute_graph_block(
     """Test execute block endpoint"""
     # Mock block
     mock_block = Mock()
+    mock_block.disabled = False
 
     async def mock_execute(*args, **kwargs):
         yield "output1", {"data": "result1"}
diff --git a/autogpt_platform/backend/backend/api/features/workspace/__init__.py b/autogpt_platform/backend/backend/api/features/workspace/__init__.py
new file mode 100644
index 0000000000..688ada9937
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/workspace/__init__.py
@@ -0,0 +1 @@
+# Workspace API feature module
diff --git a/autogpt_platform/backend/backend/api/features/workspace/routes.py b/autogpt_platform/backend/backend/api/features/workspace/routes.py
new file mode 100644
index 0000000000..b6d0c84572
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/workspace/routes.py
@@ -0,0 +1,122 @@
+"""
+Workspace API routes for managing user file storage.
+"""
+
+import logging
+import re
+from typing import Annotated
+from urllib.parse import quote
+
+import fastapi
+from autogpt_libs.auth.dependencies import get_user_id, requires_user
+from fastapi.responses import Response
+
+from backend.data.workspace import get_workspace, get_workspace_file
+from backend.util.workspace_storage import get_workspace_storage
+
+
+def _sanitize_filename_for_header(filename: str) -> str:
+    """
+    Sanitize filename for Content-Disposition header to prevent header injection.
+
+    Removes/replaces characters that could break the header or inject new headers.
+    Uses RFC5987 encoding for non-ASCII characters.
+    """
+    # Remove CR, LF, and null bytes (header injection prevention)
+    sanitized = re.sub(r"[\r\n\x00]", "", filename)
+    # Escape quotes
+    sanitized = sanitized.replace('"', '\\"')
+    # For non-ASCII, use RFC5987 filename* parameter
+    # Check if filename has non-ASCII characters
+    try:
+        sanitized.encode("ascii")
+        return f'attachment; filename="{sanitized}"'
+    except UnicodeEncodeError:
+        # Use RFC5987 encoding for UTF-8 filenames
+        encoded = quote(sanitized, safe="")
+        return f"attachment; filename*=UTF-8''{encoded}"
+
+
+logger = logging.getLogger(__name__)
+
+router = fastapi.APIRouter(
+    dependencies=[fastapi.Security(requires_user)],
+)
+
+
+def _create_streaming_response(content: bytes, file) -> Response:
+    """Create a streaming response for file content."""
+    return Response(
+        content=content,
+        media_type=file.mimeType,
+        headers={
+            "Content-Disposition": _sanitize_filename_for_header(file.name),
+            "Content-Length": str(len(content)),
+        },
+    )
+
+
+async def _create_file_download_response(file) -> Response:
+    """
+    Create a download response for a workspace file.
+
+    Handles both local storage (direct streaming) and GCS (signed URL redirect
+    with fallback to streaming).
+    """
+    storage = await get_workspace_storage()
+
+    # For local storage, stream the file directly
+    if file.storagePath.startswith("local://"):
+        content = await storage.retrieve(file.storagePath)
+        return _create_streaming_response(content, file)
+
+    # For GCS, try to redirect to signed URL, fall back to streaming
+    try:
+        url = await storage.get_download_url(file.storagePath, expires_in=300)
+        # If we got back an API path (fallback), stream directly instead
+        if url.startswith("/api/"):
+            content = await storage.retrieve(file.storagePath)
+            return _create_streaming_response(content, file)
+        return fastapi.responses.RedirectResponse(url=url, status_code=302)
+    except Exception as e:
+        # Log the signed URL failure with context
+        logger.error(
+            f"Failed to get signed URL for file {file.id} "
+            f"(storagePath={file.storagePath}): {e}",
+            exc_info=True,
+        )
+        # Fall back to streaming directly from GCS
+        try:
+            content = await storage.retrieve(file.storagePath)
+            return _create_streaming_response(content, file)
+        except Exception as fallback_error:
+            logger.error(
+                f"Fallback streaming also failed for file {file.id} "
+                f"(storagePath={file.storagePath}): {fallback_error}",
+                exc_info=True,
+            )
+            raise
+
+
+@router.get(
+    "/files/{file_id}/download",
+    summary="Download file by ID",
+)
+async def download_file(
+    user_id: Annotated[str, fastapi.Security(get_user_id)],
+    file_id: str,
+) -> Response:
+    """
+    Download a file by its ID.
+
+    Returns the file content directly or redirects to a signed URL for GCS.
+    """
+    workspace = await get_workspace(user_id)
+    if workspace is None:
+        raise fastapi.HTTPException(status_code=404, detail="Workspace not found")
+
+    file = await get_workspace_file(file_id, workspace.id)
+    if file is None:
+        raise fastapi.HTTPException(status_code=404, detail="File not found")
+
+    return await _create_file_download_response(file)
diff --git a/autogpt_platform/backend/backend/api/rest_api.py b/autogpt_platform/backend/backend/api/rest_api.py
index e9556e992f..0eef76193e 100644
--- a/autogpt_platform/backend/backend/api/rest_api.py
+++ b/autogpt_platform/backend/backend/api/rest_api.py
@@ -32,6 +32,7 @@ import backend.api.features.postmark.postmark
 import backend.api.features.store.model
 import backend.api.features.store.routes
 import backend.api.features.v1
+import backend.api.features.workspace.routes as workspace_routes
 import backend.data.block
 import backend.data.db
 import backend.data.graph
@@ -39,6 +40,10 @@ import backend.data.user
 import backend.integrations.webhooks.utils
 import backend.util.service
 import backend.util.settings
+from backend.api.features.chat.completion_consumer import (
+    start_completion_consumer,
+    stop_completion_consumer,
+)
 from backend.blocks.llm import DEFAULT_LLM_MODEL
 from backend.data.model import Credentials
 from backend.integrations.providers import ProviderName
@@ -52,6 +57,7 @@ from backend.util.exceptions import (
 )
 from backend.util.feature_flag import initialize_launchdarkly, shutdown_launchdarkly
 from backend.util.service import UnhealthyServiceError
+from backend.util.workspace_storage import shutdown_workspace_storage
 
 from .external.fastapi_app import external_api
 from .features.analytics import router as analytics_router
@@ -116,14 +122,31 @@ async def lifespan_context(app: fastapi.FastAPI):
     await backend.data.graph.migrate_llm_models(DEFAULT_LLM_MODEL)
     await backend.integrations.webhooks.utils.migrate_legacy_triggered_graphs()
 
+    # Start chat completion consumer for Redis Streams notifications
+    try:
+        await start_completion_consumer()
+    except Exception as e:
+        logger.warning(f"Could not start chat completion consumer: {e}")
+
     with launch_darkly_context():
         yield
 
+    # Stop chat completion consumer
+    try:
+        await stop_completion_consumer()
+    except Exception as e:
+        logger.warning(f"Error stopping chat completion consumer: {e}")
+
     try:
         await shutdown_cloud_storage_handler()
     except Exception as e:
         logger.warning(f"Error shutting down cloud storage handler: {e}")
 
+    try:
+        await shutdown_workspace_storage()
+    except Exception as e:
+        logger.warning(f"Error shutting down workspace storage: {e}")
+
     await backend.data.db.disconnect()
 
 
@@ -315,6 +338,11 @@ app.include_router(
     tags=["v2", "chat"],
     prefix="/api/chat",
 )
+app.include_router(
+    workspace_routes.router,
+    tags=["workspace"],
+    prefix="/api/workspace",
+)
 app.include_router(
     backend.api.features.oauth.router,
     tags=["oauth"],
diff --git a/autogpt_platform/backend/backend/api/ws_api.py b/autogpt_platform/backend/backend/api/ws_api.py
index b71fdb3526..e254d4b4db 100644
--- a/autogpt_platform/backend/backend/api/ws_api.py
+++ b/autogpt_platform/backend/backend/api/ws_api.py
@@ -66,18 +66,24 @@ async def event_broadcaster(manager: ConnectionManager):
     execution_bus = AsyncRedisExecutionEventBus()
     notification_bus = AsyncRedisNotificationEventBus()
 
-    async def execution_worker():
-        async for event in execution_bus.listen("*"):
-            await manager.send_execution_update(event)
+    try:
 
-    async def notification_worker():
-        async for notification in notification_bus.listen("*"):
-            await manager.send_notification(
-                user_id=notification.user_id,
-                payload=notification.payload,
-            )
+        async def execution_worker():
+            async for event in execution_bus.listen("*"):
+                await manager.send_execution_update(event)
 
-    await asyncio.gather(execution_worker(), notification_worker())
+        async def notification_worker():
+            async for notification in notification_bus.listen("*"):
+                await manager.send_notification(
+                    user_id=notification.user_id,
+                    payload=notification.payload,
+                )
+
+        await asyncio.gather(execution_worker(), notification_worker())
+    finally:
+        # Ensure PubSub connections are closed on any exit to prevent leaks
+        await execution_bus.close()
+        await notification_bus.close()
 
 
 async def authenticate_websocket(websocket: WebSocket) -> str:
diff --git a/autogpt_platform/backend/backend/blocks/ai_image_customizer.py b/autogpt_platform/backend/backend/blocks/ai_image_customizer.py
index 83178e924d..91be33a60e 100644
--- a/autogpt_platform/backend/backend/blocks/ai_image_customizer.py
+++ b/autogpt_platform/backend/backend/blocks/ai_image_customizer.py
@@ -13,6 +13,7 @@ from backend.data.block import (
     BlockSchemaInput,
     BlockSchemaOutput,
 )
+from backend.data.execution import ExecutionContext
 from backend.data.model import (
     APIKeyCredentials,
     CredentialsField,
@@ -117,11 +118,13 @@ class AIImageCustomizerBlock(Block):
                 "credentials": TEST_CREDENTIALS_INPUT,
             },
             test_output=[
-                ("image_url", "https://replicate.delivery/generated-image.jpg"),
+                # Output will be a workspace ref or data URI depending on context
+                ("image_url", lambda x: x.startswith(("workspace://", "data:"))),
             ],
             test_mock={
+                # Use data URI to avoid HTTP requests during tests
                 "run_model": lambda *args, **kwargs: MediaFileType(
-                    "https://replicate.delivery/generated-image.jpg"
+                    "data:image/jpeg;base64,/9j/4AAQSkZJRgABAgAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCAABAAEDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iiigD//2Q=="
                 ),
             },
             test_credentials=TEST_CREDENTIALS,
@@ -132,8 +135,7 @@ class AIImageCustomizerBlock(Block):
         input_data: Input,
         *,
         credentials: APIKeyCredentials,
-        graph_exec_id: str,
-        user_id: str,
+        execution_context: ExecutionContext,
         **kwargs,
     ) -> BlockOutput:
         try:
@@ -141,10 +143,9 @@ class AIImageCustomizerBlock(Block):
             processed_images = await asyncio.gather(
                 *(
                     store_media_file(
-                        graph_exec_id=graph_exec_id,
                         file=img,
-                        user_id=user_id,
-                        return_content=True,
+                        execution_context=execution_context,
+                        return_format="for_external_api",  # Get content for Replicate API
                     )
                     for img in input_data.images
                 )
@@ -158,7 +159,14 @@ class AIImageCustomizerBlock(Block):
                 aspect_ratio=input_data.aspect_ratio.value,
                 output_format=input_data.output_format.value,
             )
-            yield "image_url", result
+
+            # Store the generated image to the user's workspace for persistence
+            stored_url = await store_media_file(
+                file=result,
+                execution_context=execution_context,
+                return_format="for_block_output",
+            )
+            yield "image_url", stored_url
         except Exception as e:
             yield "error", str(e)
 
diff --git a/autogpt_platform/backend/backend/blocks/ai_image_generator_block.py b/autogpt_platform/backend/backend/blocks/ai_image_generator_block.py
index 8c7b6e6102..e40731cd97 100644
--- a/autogpt_platform/backend/backend/blocks/ai_image_generator_block.py
+++ b/autogpt_platform/backend/backend/blocks/ai_image_generator_block.py
@@ -6,6 +6,7 @@ from replicate.client import Client as ReplicateClient
 from replicate.helpers import FileOutput
 
 from backend.data.block import Block, BlockCategory, BlockSchemaInput, BlockSchemaOutput
+from backend.data.execution import ExecutionContext
 from backend.data.model import (
     APIKeyCredentials,
     CredentialsField,
@@ -13,6 +14,8 @@ from backend.data.model import (
     SchemaField,
 )
 from backend.integrations.providers import ProviderName
+from backend.util.file import store_media_file
+from backend.util.type import MediaFileType
 
 
 class ImageSize(str, Enum):
@@ -165,11 +168,13 @@ class AIImageGeneratorBlock(Block):
             test_output=[
                 (
                     "image_url",
-                    "https://replicate.delivery/generated-image.webp",
+                    # Test output is a data URI since we now store images
+                    lambda x: x.startswith("data:image/"),
                 ),
             ],
             test_mock={
-                "_run_client": lambda *args, **kwargs: "https://replicate.delivery/generated-image.webp"
+                # Return a data URI directly so store_media_file doesn't need to download
+                "_run_client": lambda *args, **kwargs: "data:image/webp;base64,UklGRiQAAABXRUJQVlA4IBgAAAAwAQCdASoBAAEAAQAcJYgCdAEO"
             },
         )
 
@@ -318,11 +323,24 @@ class AIImageGeneratorBlock(Block):
         style_text = style_map.get(style, "")
         return f"{style_text} of" if style_text else ""
 
-    async def run(self, input_data: Input, *, credentials: APIKeyCredentials, **kwargs):
+    async def run(
+        self,
+        input_data: Input,
+        *,
+        credentials: APIKeyCredentials,
+        execution_context: ExecutionContext,
+        **kwargs,
+    ):
         try:
             url = await self.generate_image(input_data, credentials)
             if url:
-                yield "image_url", url
+                # Store the generated image to the user's workspace/execution folder
+                stored_url = await store_media_file(
+                    file=MediaFileType(url),
+                    execution_context=execution_context,
+                    return_format="for_block_output",
+                )
+                yield "image_url", stored_url
             else:
                 yield "error", "Image generation returned an empty result."
         except Exception as e:
diff --git a/autogpt_platform/backend/backend/blocks/ai_shortform_video_block.py b/autogpt_platform/backend/backend/blocks/ai_shortform_video_block.py
index 7242ff8304..eb60843185 100644
--- a/autogpt_platform/backend/backend/blocks/ai_shortform_video_block.py
+++ b/autogpt_platform/backend/backend/blocks/ai_shortform_video_block.py
@@ -13,6 +13,7 @@ from backend.data.block import (
     BlockSchemaInput,
     BlockSchemaOutput,
 )
+from backend.data.execution import ExecutionContext
 from backend.data.model import (
     APIKeyCredentials,
     CredentialsField,
@@ -21,7 +22,9 @@ from backend.data.model import (
 )
 from backend.integrations.providers import ProviderName
 from backend.util.exceptions import BlockExecutionError
+from backend.util.file import store_media_file
 from backend.util.request import Requests
+from backend.util.type import MediaFileType
 
 TEST_CREDENTIALS = APIKeyCredentials(
     id="01234567-89ab-cdef-0123-456789abcdef",
@@ -174,7 +177,7 @@ class AIShortformVideoCreatorBlock(Block):
         )
         frame_rate: int = SchemaField(description="Frame rate of the video", default=60)
         generation_preset: GenerationPreset = SchemaField(
-            description="Generation preset for visual style - only effects AI generated visuals",
+            description="Generation preset for visual style - only affects AI-generated visuals",
             default=GenerationPreset.LEONARDO,
             placeholder=GenerationPreset.LEONARDO,
         )
@@ -271,7 +274,10 @@ class AIShortformVideoCreatorBlock(Block):
                 "voice": Voice.LILY,
                 "video_style": VisualMediaType.STOCK_VIDEOS,
             },
-            test_output=("video_url", "https://example.com/video.mp4"),
+            test_output=(
+                "video_url",
+                lambda x: x.startswith(("workspace://", "data:")),
+            ),
             test_mock={
                 "create_webhook": lambda *args, **kwargs: (
                     "test_uuid",
@@ -280,15 +286,21 @@ class AIShortformVideoCreatorBlock(Block):
                 "create_video": lambda *args, **kwargs: {"pid": "test_pid"},
                 "check_video_status": lambda *args, **kwargs: {
                     "status": "ready",
-                    "videoUrl": "https://example.com/video.mp4",
+                    "videoUrl": "data:video/mp4;base64,AAAA",
                 },
-                "wait_for_video": lambda *args, **kwargs: "https://example.com/video.mp4",
+                # Use data URI to avoid HTTP requests during tests
+                "wait_for_video": lambda *args, **kwargs: "data:video/mp4;base64,AAAA",
             },
             test_credentials=TEST_CREDENTIALS,
         )
 
     async def run(
-        self, input_data: Input, *, credentials: APIKeyCredentials, **kwargs
+        self,
+        input_data: Input,
+        *,
+        credentials: APIKeyCredentials,
+        execution_context: ExecutionContext,
+        **kwargs,
     ) -> BlockOutput:
         # Create a new Webhook.site URL
         webhook_token, webhook_url = await self.create_webhook()
@@ -340,7 +352,13 @@ class AIShortformVideoCreatorBlock(Block):
             )
             video_url = await self.wait_for_video(credentials.api_key, pid)
             logger.debug(f"Video ready: {video_url}")
-            yield "video_url", video_url
+            # Store the generated video to the user's workspace for persistence
+            stored_url = await store_media_file(
+                file=MediaFileType(video_url),
+                execution_context=execution_context,
+                return_format="for_block_output",
+            )
+            yield "video_url", stored_url
 
 
 class AIAdMakerVideoCreatorBlock(Block):
@@ -447,7 +465,10 @@ class AIAdMakerVideoCreatorBlock(Block):
                     "https://cdn.revid.ai/uploads/1747076315114-image.png",
                 ],
             },
-            test_output=("video_url", "https://example.com/ad.mp4"),
+            test_output=(
+                "video_url",
+                lambda x: x.startswith(("workspace://", "data:")),
+            ),
             test_mock={
                 "create_webhook": lambda *args, **kwargs: (
                     "test_uuid",
@@ -456,14 +477,21 @@ class AIAdMakerVideoCreatorBlock(Block):
                 "create_video": lambda *args, **kwargs: {"pid": "test_pid"},
                 "check_video_status": lambda *args, **kwargs: {
                     "status": "ready",
-                    "videoUrl": "https://example.com/ad.mp4",
+                    "videoUrl": "data:video/mp4;base64,AAAA",
                 },
-                "wait_for_video": lambda *args, **kwargs: "https://example.com/ad.mp4",
+                "wait_for_video": lambda *args, **kwargs: "data:video/mp4;base64,AAAA",
             },
             test_credentials=TEST_CREDENTIALS,
         )
 
-    async def run(self, input_data: Input, *, credentials: APIKeyCredentials, **kwargs):
+    async def run(
+        self,
+        input_data: Input,
+        *,
+        credentials: APIKeyCredentials,
+        execution_context: ExecutionContext,
+        **kwargs,
+    ):
         webhook_token, webhook_url = await self.create_webhook()
 
         payload = {
@@ -531,7 +559,13 @@ class AIAdMakerVideoCreatorBlock(Block):
             raise RuntimeError("Failed to create video: No project ID returned")
 
         video_url = await self.wait_for_video(credentials.api_key, pid)
-        yield "video_url", video_url
+        # Store the generated video to the user's workspace for persistence
+        stored_url = await store_media_file(
+            file=MediaFileType(video_url),
+            execution_context=execution_context,
+            return_format="for_block_output",
+        )
+        yield "video_url", stored_url
 
 
 class AIScreenshotToVideoAdBlock(Block):
@@ -626,7 +660,10 @@ class AIScreenshotToVideoAdBlock(Block):
                 "script": "Amazing numbers!",
                 "screenshot_url": "https://cdn.revid.ai/uploads/1747080376028-image.png",
             },
-            test_output=("video_url", "https://example.com/screenshot.mp4"),
+            test_output=(
+                "video_url",
+                lambda x: x.startswith(("workspace://", "data:")),
+            ),
             test_mock={
                 "create_webhook": lambda *args, **kwargs: (
                     "test_uuid",
@@ -635,14 +672,21 @@ class AIScreenshotToVideoAdBlock(Block):
                 "create_video": lambda *args, **kwargs: {"pid": "test_pid"},
                 "check_video_status": lambda *args, **kwargs: {
                     "status": "ready",
-                    "videoUrl": "https://example.com/screenshot.mp4",
+                    "videoUrl": "data:video/mp4;base64,AAAA",
                 },
-                "wait_for_video": lambda *args, **kwargs: "https://example.com/screenshot.mp4",
+                "wait_for_video": lambda *args, **kwargs: "data:video/mp4;base64,AAAA",
             },
             test_credentials=TEST_CREDENTIALS,
         )
 
-    async def run(self, input_data: Input, *, credentials: APIKeyCredentials, **kwargs):
+    async def run(
+        self,
+        input_data: Input,
+        *,
+        credentials: APIKeyCredentials,
+        execution_context: ExecutionContext,
+        **kwargs,
+    ):
         webhook_token, webhook_url = await self.create_webhook()
 
         payload = {
@@ -710,4 +754,10 @@ class AIScreenshotToVideoAdBlock(Block):
             raise RuntimeError("Failed to create video: No project ID returned")
 
         video_url = await self.wait_for_video(credentials.api_key, pid)
-        yield "video_url", video_url
+        # Store the generated video to the user's workspace for persistence
+        stored_url = await store_media_file(
+            file=MediaFileType(video_url),
+            execution_context=execution_context,
+            return_format="for_block_output",
+        )
+        yield "video_url", stored_url
diff --git a/autogpt_platform/backend/backend/blocks/airtable/_webhook.py b/autogpt_platform/backend/backend/blocks/airtable/_webhook.py
index 58e6f95d0c..452630953e 100644
--- a/autogpt_platform/backend/backend/blocks/airtable/_webhook.py
+++ b/autogpt_platform/backend/backend/blocks/airtable/_webhook.py
@@ -6,6 +6,9 @@ import hashlib
 import hmac
 import logging
 from enum import Enum
+from typing import cast
+
+from prisma.types import Serializable
 
 from backend.sdk import (
     BaseWebhooksManager,
@@ -84,7 +87,9 @@ class AirtableWebhookManager(BaseWebhooksManager):
         # update webhook config
         await update_webhook(
             webhook.id,
-            config={"base_id": base_id, "cursor": response.cursor},
+            config=cast(
+                dict[str, Serializable], {"base_id": base_id, "cursor": response.cursor}
+            ),
         )
 
         event_type = "notification"
diff --git a/autogpt_platform/backend/backend/blocks/apollo/models.py b/autogpt_platform/backend/backend/blocks/apollo/models.py
index 4dde8f29b1..9a710151b4 100644
--- a/autogpt_platform/backend/backend/blocks/apollo/models.py
+++ b/autogpt_platform/backend/backend/blocks/apollo/models.py
@@ -381,7 +381,7 @@ Each range you add needs to be a string, with the upper and lower numbers of the
     organization_locations: Optional[list[str]] = SchemaField(
         description="""The location of the company headquarters. You can search across cities, US states, and countries.
 
-If a company has several office locations, results are still based on the headquarters location. For example, if you search chicago but a company's HQ location is in boston, any Boston-based companies will not appearch in your search results, even if they match other parameters.
+If a company has several office locations, results are still based on the headquarters location. For example, if you search chicago but a company's HQ location is in boston, any Boston-based companies will not appear in your search results, even if they match other parameters.
 
 To exclude companies based on location, use the organization_not_locations parameter.
 """,
diff --git a/autogpt_platform/backend/backend/blocks/apollo/organization.py b/autogpt_platform/backend/backend/blocks/apollo/organization.py
index b6f8a7e06a..93acbff0b8 100644
--- a/autogpt_platform/backend/backend/blocks/apollo/organization.py
+++ b/autogpt_platform/backend/backend/blocks/apollo/organization.py
@@ -34,7 +34,7 @@ Each range you add needs to be a string, with the upper and lower numbers of the
         organization_locations: list[str] = SchemaField(
             description="""The location of the company headquarters. You can search across cities, US states, and countries.
 
-If a company has several office locations, results are still based on the headquarters location. For example, if you search chicago but a company's HQ location is in boston, any Boston-based companies will not appearch in your search results, even if they match other parameters.
+If a company has several office locations, results are still based on the headquarters location. For example, if you search chicago but a company's HQ location is in boston, any Boston-based companies will not appear in your search results, even if they match other parameters.
 
 To exclude companies based on location, use the organization_not_locations parameter.
 """,
diff --git a/autogpt_platform/backend/backend/blocks/bannerbear/text_overlay.py b/autogpt_platform/backend/backend/blocks/bannerbear/text_overlay.py
index 16d46c0d99..62aaf63d88 100644
--- a/autogpt_platform/backend/backend/blocks/bannerbear/text_overlay.py
+++ b/autogpt_platform/backend/backend/blocks/bannerbear/text_overlay.py
@@ -6,6 +6,7 @@ if TYPE_CHECKING:
 
 from pydantic import SecretStr
 
+from backend.data.execution import ExecutionContext
 from backend.sdk import (
     APIKeyCredentials,
     Block,
@@ -17,6 +18,8 @@ from backend.sdk import (
     Requests,
     SchemaField,
 )
+from backend.util.file import store_media_file
+from backend.util.type import MediaFileType
 
 from ._config import bannerbear
 
@@ -135,15 +138,17 @@ class BannerbearTextOverlayBlock(Block):
             },
             test_output=[
                 ("success", True),
-                ("image_url", "https://cdn.bannerbear.com/test-image.jpg"),
+                # Output will be a workspace ref or data URI depending on context
+                ("image_url", lambda x: x.startswith(("workspace://", "data:"))),
                 ("uid", "test-uid-123"),
                 ("status", "completed"),
             ],
             test_mock={
+                # Use data URI to avoid HTTP requests during tests
                 "_make_api_request": lambda *args, **kwargs: {
                     "uid": "test-uid-123",
                     "status": "completed",
-                    "image_url": "https://cdn.bannerbear.com/test-image.jpg",
+                    "image_url": "data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/wAALCAABAAEBAREA/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/9oACAEBAAA/APn+v//Z",
                 }
             },
             test_credentials=TEST_CREDENTIALS,
@@ -177,7 +182,12 @@ class BannerbearTextOverlayBlock(Block):
             raise Exception(error_msg)
 
     async def run(
-        self, input_data: Input, *, credentials: APIKeyCredentials, **kwargs
+        self,
+        input_data: Input,
+        *,
+        credentials: APIKeyCredentials,
+        execution_context: ExecutionContext,
+        **kwargs,
     ) -> BlockOutput:
         # Build the modifications array
         modifications = []
@@ -234,6 +244,18 @@ class BannerbearTextOverlayBlock(Block):
 
         # Synchronous request - image should be ready
         yield "success", True
-        yield "image_url", data.get("image_url", "")
+
+        # Store the generated image to workspace for persistence
+        image_url = data.get("image_url", "")
+        if image_url:
+            stored_url = await store_media_file(
+                file=MediaFileType(image_url),
+                execution_context=execution_context,
+                return_format="for_block_output",
+            )
+            yield "image_url", stored_url
+        else:
+            yield "image_url", ""
+
         yield "uid", data.get("uid", "")
         yield "status", data.get("status", "completed")
diff --git a/autogpt_platform/backend/backend/blocks/basic.py b/autogpt_platform/backend/backend/blocks/basic.py
index a5f558f5c5..95193b3feb 100644
--- a/autogpt_platform/backend/backend/blocks/basic.py
+++ b/autogpt_platform/backend/backend/blocks/basic.py
@@ -9,6 +9,7 @@ from backend.data.block import (
     BlockSchemaOutput,
     BlockType,
 )
+from backend.data.execution import ExecutionContext
 from backend.data.model import SchemaField
 from backend.util.file import store_media_file
 from backend.util.type import MediaFileType, convert
@@ -17,10 +18,10 @@ from backend.util.type import MediaFileType, convert
 class FileStoreBlock(Block):
     class Input(BlockSchemaInput):
         file_in: MediaFileType = SchemaField(
-            description="The file to store in the temporary directory, it can be a URL, data URI, or local path."
+            description="The file to download and store. Can be a URL (https://...), data URI, or local path."
         )
         base_64: bool = SchemaField(
-            description="Whether produce an output in base64 format (not recommended, you can pass the string path just fine accross blocks).",
+            description="Whether to produce output in base64 format (not recommended, you can pass the file reference across blocks).",
             default=False,
             advanced=True,
             title="Produce Base64 Output",
@@ -28,13 +29,18 @@ class FileStoreBlock(Block):
 
     class Output(BlockSchemaOutput):
         file_out: MediaFileType = SchemaField(
-            description="The relative path to the stored file in the temporary directory."
+            description="Reference to the stored file. In CoPilot: workspace:// URI (visible in list_workspace_files). In graphs: data URI for passing to other blocks."
         )
 
     def __init__(self):
         super().__init__(
             id="cbb50872-625b-42f0-8203-a2ae78242d8a",
-            description="Stores the input file in the temporary directory.",
+            description=(
+                "Downloads and stores a file from a URL, data URI, or local path. "
+                "Use this to fetch images, documents, or other files for processing. "
+                "In CoPilot: saves to workspace (use list_workspace_files to see it). "
+                "In graphs: outputs a data URI to pass to other blocks."
+            ),
             categories={BlockCategory.BASIC, BlockCategory.MULTIMEDIA},
             input_schema=FileStoreBlock.Input,
             output_schema=FileStoreBlock.Output,
@@ -45,15 +51,18 @@ class FileStoreBlock(Block):
         self,
         input_data: Input,
         *,
-        graph_exec_id: str,
-        user_id: str,
+        execution_context: ExecutionContext,
         **kwargs,
     ) -> BlockOutput:
+        # Determine return format based on user preference
+        # for_external_api: always returns data URI (base64) - honors "Produce Base64 Output"
+        # for_block_output: smart format - workspace:// in CoPilot, data URI in graphs
+        return_format = "for_external_api" if input_data.base_64 else "for_block_output"
+
         yield "file_out", await store_media_file(
-            graph_exec_id=graph_exec_id,
             file=input_data.file_in,
-            user_id=user_id,
-            return_content=input_data.base_64,
+            execution_context=execution_context,
+            return_format=return_format,
         )
 
 
@@ -81,7 +90,7 @@ class StoreValueBlock(Block):
     def __init__(self):
         super().__init__(
             id="1ff065e9-88e8-4358-9d82-8dc91f622ba9",
-            description="This block forwards an input value as output, allowing reuse without change.",
+            description="A basic block that stores and forwards a value throughout workflows, allowing it to be reused without changes across multiple blocks.",
             categories={BlockCategory.BASIC},
             input_schema=StoreValueBlock.Input,
             output_schema=StoreValueBlock.Output,
@@ -111,11 +120,12 @@ class PrintToConsoleBlock(Block):
     def __init__(self):
         super().__init__(
             id="f3b1c1b2-4c4f-4f0d-8d2f-4c4f0d8d2f4c",
-            description="Print the given text to the console, this is used for a debugging purpose.",
+            description="A debugging block that outputs text to the console for monitoring and troubleshooting workflow execution.",
             categories={BlockCategory.BASIC},
             input_schema=PrintToConsoleBlock.Input,
             output_schema=PrintToConsoleBlock.Output,
             test_input={"text": "Hello, World!"},
+            is_sensitive_action=True,
             test_output=[
                 ("output", "Hello, World!"),
                 ("status", "printed"),
@@ -137,7 +147,7 @@ class NoteBlock(Block):
     def __init__(self):
         super().__init__(
             id="cc10ff7b-7753-4ff2-9af6-9399b1a7eddc",
-            description="This block is used to display a sticky note with the given text.",
+            description="A visual annotation block that displays a sticky note in the workflow editor for documentation and organization purposes.",
             categories={BlockCategory.BASIC},
             input_schema=NoteBlock.Input,
             output_schema=NoteBlock.Output,
diff --git a/autogpt_platform/backend/backend/blocks/claude_code.py b/autogpt_platform/backend/backend/blocks/claude_code.py
new file mode 100644
index 0000000000..4ef44603b2
--- /dev/null
+++ b/autogpt_platform/backend/backend/blocks/claude_code.py
@@ -0,0 +1,659 @@
+import json
+import shlex
+import uuid
+from typing import Literal, Optional
+
+from e2b import AsyncSandbox as BaseAsyncSandbox
+from pydantic import BaseModel, SecretStr
+
+from backend.data.block import (
+    Block,
+    BlockCategory,
+    BlockOutput,
+    BlockSchemaInput,
+    BlockSchemaOutput,
+)
+from backend.data.model import (
+    APIKeyCredentials,
+    CredentialsField,
+    CredentialsMetaInput,
+    SchemaField,
+)
+from backend.integrations.providers import ProviderName
+
+
+class ClaudeCodeExecutionError(Exception):
+    """Exception raised when Claude Code execution fails.
+
+    Carries the sandbox_id so it can be returned to the user for cleanup
+    when dispose_sandbox=False.
+    """
+
+    def __init__(self, message: str, sandbox_id: str = ""):
+        super().__init__(message)
+        self.sandbox_id = sandbox_id
+
+
+# Test credentials for E2B
+TEST_E2B_CREDENTIALS = APIKeyCredentials(
+    id="01234567-89ab-cdef-0123-456789abcdef",
+    provider="e2b",
+    api_key=SecretStr("mock-e2b-api-key"),
+    title="Mock E2B API key",
+    expires_at=None,
+)
+TEST_E2B_CREDENTIALS_INPUT = {
+    "provider": TEST_E2B_CREDENTIALS.provider,
+    "id": TEST_E2B_CREDENTIALS.id,
+    "type": TEST_E2B_CREDENTIALS.type,
+    "title": TEST_E2B_CREDENTIALS.title,
+}
+
+# Test credentials for Anthropic
+TEST_ANTHROPIC_CREDENTIALS = APIKeyCredentials(
+    id="2e568a2b-b2ea-475a-8564-9a676bf31c56",
+    provider="anthropic",
+    api_key=SecretStr("mock-anthropic-api-key"),
+    title="Mock Anthropic API key",
+    expires_at=None,
+)
+TEST_ANTHROPIC_CREDENTIALS_INPUT = {
+    "provider": TEST_ANTHROPIC_CREDENTIALS.provider,
+    "id": TEST_ANTHROPIC_CREDENTIALS.id,
+    "type": TEST_ANTHROPIC_CREDENTIALS.type,
+    "title": TEST_ANTHROPIC_CREDENTIALS.title,
+}
+
+
+class ClaudeCodeBlock(Block):
+    """
+    Execute tasks using Claude Code (Anthropic's AI coding assistant) in an E2B sandbox.
+
+    Claude Code can create files, install tools, run commands, and perform complex
+    coding tasks autonomously within a secure sandbox environment.
+    """
+
+    # Use base template - we'll install Claude Code ourselves for latest version
+    DEFAULT_TEMPLATE = "base"
+
+    class Input(BlockSchemaInput):
+        e2b_credentials: CredentialsMetaInput[
+            Literal[ProviderName.E2B], Literal["api_key"]
+        ] = CredentialsField(
+            description=(
+                "API key for the E2B platform to create the sandbox. "
+                "Get one on the [e2b website](https://e2b.dev/docs)"
+            ),
+        )
+
+        anthropic_credentials: CredentialsMetaInput[
+            Literal[ProviderName.ANTHROPIC], Literal["api_key"]
+        ] = CredentialsField(
+            description=(
+                "API key for Anthropic to power Claude Code. "
+                "Get one at [Anthropic's website](https://console.anthropic.com)"
+            ),
+        )
+
+        prompt: str = SchemaField(
+            description=(
+                "The task or instruction for Claude Code to execute. "
+                "Claude Code can create files, install packages, run commands, "
+                "and perform complex coding tasks."
+            ),
+            placeholder="Create a hello world index.html file",
+            default="",
+            advanced=False,
+        )
+
+        timeout: int = SchemaField(
+            description=(
+                "Sandbox timeout in seconds. Claude Code tasks can take "
+                "a while, so set this appropriately for your task complexity. "
+                "Note: This only applies when creating a new sandbox. "
+                "When reconnecting to an existing sandbox via sandbox_id, "
+                "the original timeout is retained."
+            ),
+            default=300,  # 5 minutes default
+            advanced=True,
+        )
+
+        setup_commands: list[str] = SchemaField(
+            description=(
+                "Optional shell commands to run before executing Claude Code. "
+                "Useful for installing dependencies or setting up the environment."
+            ),
+            default_factory=list,
+            advanced=True,
+        )
+
+        working_directory: str = SchemaField(
+            description="Working directory for Claude Code to operate in.",
+            default="/home/user",
+            advanced=True,
+        )
+
+        # Session/continuation support
+        session_id: str = SchemaField(
+            description=(
+                "Session ID to resume a previous conversation. "
+                "Leave empty for a new conversation. "
+                "Use the session_id from a previous run to continue that conversation."
+            ),
+            default="",
+            advanced=True,
+        )
+
+        sandbox_id: str = SchemaField(
+            description=(
+                "Sandbox ID to reconnect to an existing sandbox. "
+                "Required when resuming a session (along with session_id). "
+                "Use the sandbox_id from a previous run where dispose_sandbox was False."
+            ),
+            default="",
+            advanced=True,
+        )
+
+        conversation_history: str = SchemaField(
+            description=(
+                "Previous conversation history to continue from. "
+                "Use this to restore context on a fresh sandbox if the previous one timed out. "
+                "Pass the conversation_history output from a previous run."
+            ),
+            default="",
+            advanced=True,
+        )
+
+        dispose_sandbox: bool = SchemaField(
+            description=(
+                "Whether to dispose of the sandbox immediately after execution. "
+                "Set to False if you want to continue the conversation later "
+                "(you'll need both sandbox_id and session_id from the output)."
+            ),
+            default=True,
+            advanced=True,
+        )
+
+    class FileOutput(BaseModel):
+        """A file extracted from the sandbox."""
+
+        path: str
+        relative_path: str  # Path relative to working directory (for GitHub, etc.)
+        name: str
+        content: str
+
+    class Output(BlockSchemaOutput):
+        response: str = SchemaField(
+            description="The output/response from Claude Code execution"
+        )
+        files: list["ClaudeCodeBlock.FileOutput"] = SchemaField(
+            description=(
+                "List of text files created/modified by Claude Code during this execution. "
+                "Each file has 'path', 'relative_path', 'name', and 'content' fields."
+            )
+        )
+        conversation_history: str = SchemaField(
+            description=(
+                "Full conversation history including this turn. "
+                "Pass this to conversation_history input to continue on a fresh sandbox "
+                "if the previous sandbox timed out."
+            )
+        )
+        session_id: str = SchemaField(
+            description=(
+                "Session ID for this conversation. "
+                "Pass this back along with sandbox_id to continue the conversation."
+            )
+        )
+        sandbox_id: Optional[str] = SchemaField(
+            description=(
+                "ID of the sandbox instance. "
+                "Pass this back along with session_id to continue the conversation. "
+                "This is None if dispose_sandbox was True (sandbox was disposed)."
+            ),
+            default=None,
+        )
+        error: str = SchemaField(description="Error message if execution failed")
+
+    def __init__(self):
+        super().__init__(
+            id="4e34f4a5-9b89-4326-ba77-2dd6750b7194",
+            description=(
+                "Execute tasks using Claude Code in an E2B sandbox. "
+                "Claude Code can create files, install tools, run commands, "
+                "and perform complex coding tasks autonomously."
+            ),
+            categories={BlockCategory.DEVELOPER_TOOLS, BlockCategory.AI},
+            input_schema=ClaudeCodeBlock.Input,
+            output_schema=ClaudeCodeBlock.Output,
+            test_credentials={
+                "e2b_credentials": TEST_E2B_CREDENTIALS,
+                "anthropic_credentials": TEST_ANTHROPIC_CREDENTIALS,
+            },
+            test_input={
+                "e2b_credentials": TEST_E2B_CREDENTIALS_INPUT,
+                "anthropic_credentials": TEST_ANTHROPIC_CREDENTIALS_INPUT,
+                "prompt": "Create a hello world HTML file",
+                "timeout": 300,
+                "setup_commands": [],
+                "working_directory": "/home/user",
+                "session_id": "",
+                "sandbox_id": "",
+                "conversation_history": "",
+                "dispose_sandbox": True,
+            },
+            test_output=[
+                ("response", "Created index.html with hello world content"),
+                (
+                    "files",
+                    [
+                        {
+                            "path": "/home/user/index.html",
+                            "relative_path": "index.html",
+                            "name": "index.html",
+                            "content": "<html>Hello World</html>",
+                        }
+                    ],
+                ),
+                (
+                    "conversation_history",
+                    "User: Create a hello world HTML file\n"
+                    "Claude: Created index.html with hello world content",
+                ),
+                ("session_id", str),
+                ("sandbox_id", None),  # None because dispose_sandbox=True in test_input
+            ],
+            test_mock={
+                "execute_claude_code": lambda *args, **kwargs: (
+                    "Created index.html with hello world content",  # response
+                    [
+                        ClaudeCodeBlock.FileOutput(
+                            path="/home/user/index.html",
+                            relative_path="index.html",
+                            name="index.html",
+                            content="<html>Hello World</html>",
+                        )
+                    ],  # files
+                    "User: Create a hello world HTML file\n"
+                    "Claude: Created index.html with hello world content",  # conversation_history
+                    "test-session-id",  # session_id
+                    "sandbox_id",  # sandbox_id
+                ),
+            },
+        )
+
+    async def execute_claude_code(
+        self,
+        e2b_api_key: str,
+        anthropic_api_key: str,
+        prompt: str,
+        timeout: int,
+        setup_commands: list[str],
+        working_directory: str,
+        session_id: str,
+        existing_sandbox_id: str,
+        conversation_history: str,
+        dispose_sandbox: bool,
+    ) -> tuple[str, list["ClaudeCodeBlock.FileOutput"], str, str, str]:
+        """
+        Execute Claude Code in an E2B sandbox.
+
+        Returns:
+            Tuple of (response, files, conversation_history, session_id, sandbox_id)
+        """
+
+        # Validate that sandbox_id is provided when resuming a session
+        if session_id and not existing_sandbox_id:
+            raise ValueError(
+                "sandbox_id is required when resuming a session with session_id. "
+                "The session state is stored in the original sandbox. "
+                "If the sandbox has timed out, use conversation_history instead "
+                "to restore context on a fresh sandbox."
+            )
+
+        sandbox = None
+        sandbox_id = ""
+
+        try:
+            # Either reconnect to existing sandbox or create a new one
+            if existing_sandbox_id:
+                # Reconnect to existing sandbox for conversation continuation
+                sandbox = await BaseAsyncSandbox.connect(
+                    sandbox_id=existing_sandbox_id,
+                    api_key=e2b_api_key,
+                )
+            else:
+                # Create new sandbox
+                sandbox = await BaseAsyncSandbox.create(
+                    template=self.DEFAULT_TEMPLATE,
+                    api_key=e2b_api_key,
+                    timeout=timeout,
+                    envs={"ANTHROPIC_API_KEY": anthropic_api_key},
+                )
+
+                # Install Claude Code from npm (ensures we get the latest version)
+                install_result = await sandbox.commands.run(
+                    "npm install -g @anthropic-ai/claude-code@latest",
+                    timeout=120,  # 2 min timeout for install
+                )
+                if install_result.exit_code != 0:
+                    raise Exception(
+                        f"Failed to install Claude Code: {install_result.stderr}"
+                    )
+
+                # Run any user-provided setup commands
+                for cmd in setup_commands:
+                    setup_result = await sandbox.commands.run(cmd)
+                    if setup_result.exit_code != 0:
+                        raise Exception(
+                            f"Setup command failed: {cmd}\n"
+                            f"Exit code: {setup_result.exit_code}\n"
+                            f"Stdout: {setup_result.stdout}\n"
+                            f"Stderr: {setup_result.stderr}"
+                        )
+
+            # Capture sandbox_id immediately after creation/connection
+            # so it's available for error recovery if dispose_sandbox=False
+            sandbox_id = sandbox.sandbox_id
+
+            # Generate or use provided session ID
+            current_session_id = session_id if session_id else str(uuid.uuid4())
+
+            # Build base Claude flags
+            base_flags = "-p --dangerously-skip-permissions --output-format json"
+
+            # Add conversation history context if provided (for fresh sandbox continuation)
+            history_flag = ""
+            if conversation_history and not session_id:
+                # Inject previous conversation as context via system prompt
+                # Use consistent escaping via _escape_prompt helper
+                escaped_history = self._escape_prompt(
+                    f"Previous conversation context: {conversation_history}"
+                )
+                history_flag = f" --append-system-prompt {escaped_history}"
+
+            # Build Claude command based on whether we're resuming or starting new
+            # Use shlex.quote for working_directory and session IDs to prevent injection
+            safe_working_dir = shlex.quote(working_directory)
+            if session_id:
+                # Resuming existing session (sandbox still alive)
+                safe_session_id = shlex.quote(session_id)
+                claude_command = (
+                    f"cd {safe_working_dir} && "
+                    f"echo {self._escape_prompt(prompt)} | "
+                    f"claude --resume {safe_session_id} {base_flags}"
+                )
+            else:
+                # New session with specific ID
+                safe_current_session_id = shlex.quote(current_session_id)
+                claude_command = (
+                    f"cd {safe_working_dir} && "
+                    f"echo {self._escape_prompt(prompt)} | "
+                    f"claude --session-id {safe_current_session_id} {base_flags}{history_flag}"
+                )
+
+            # Capture timestamp before running Claude Code to filter files later
+            # Capture timestamp 1 second in the past to avoid race condition with file creation
+            timestamp_result = await sandbox.commands.run(
+                "date -u -d '1 second ago' +%Y-%m-%dT%H:%M:%S"
+            )
+            if timestamp_result.exit_code != 0:
+                raise RuntimeError(
+                    f"Failed to capture timestamp: {timestamp_result.stderr}"
+                )
+            start_timestamp = (
+                timestamp_result.stdout.strip() if timestamp_result.stdout else None
+            )
+
+            result = await sandbox.commands.run(
+                claude_command,
+                timeout=0,  # No command timeout - let sandbox timeout handle it
+            )
+
+            # Check for command failure
+            if result.exit_code != 0:
+                error_msg = result.stderr or result.stdout or "Unknown error"
+                raise Exception(
+                    f"Claude Code command failed with exit code {result.exit_code}:\n"
+                    f"{error_msg}"
+                )
+
+            raw_output = result.stdout or ""
+
+            # Parse JSON output to extract response and build conversation history
+            response = ""
+            new_conversation_history = conversation_history or ""
+
+            try:
+                # The JSON output contains the result
+                output_data = json.loads(raw_output)
+                response = output_data.get("result", raw_output)
+
+                # Build conversation history entry
+                turn_entry = f"User: {prompt}\nClaude: {response}"
+                if new_conversation_history:
+                    new_conversation_history = (
+                        f"{new_conversation_history}\n\n{turn_entry}"
+                    )
+                else:
+                    new_conversation_history = turn_entry
+
+            except json.JSONDecodeError:
+                # If not valid JSON, use raw output
+                response = raw_output
+                turn_entry = f"User: {prompt}\nClaude: {response}"
+                if new_conversation_history:
+                    new_conversation_history = (
+                        f"{new_conversation_history}\n\n{turn_entry}"
+                    )
+                else:
+                    new_conversation_history = turn_entry
+
+            # Extract files created/modified during this run
+            files = await self._extract_files(
+                sandbox, working_directory, start_timestamp
+            )
+
+            return (
+                response,
+                files,
+                new_conversation_history,
+                current_session_id,
+                sandbox_id,
+            )
+
+        except Exception as e:
+            # Wrap exception with sandbox_id so caller can access/cleanup
+            # the preserved sandbox when dispose_sandbox=False
+            raise ClaudeCodeExecutionError(str(e), sandbox_id) from e
+
+        finally:
+            if dispose_sandbox and sandbox:
+                await sandbox.kill()
+
+    async def _extract_files(
+        self,
+        sandbox: BaseAsyncSandbox,
+        working_directory: str,
+        since_timestamp: str | None = None,
+    ) -> list["ClaudeCodeBlock.FileOutput"]:
+        """
+        Extract text files created/modified during this Claude Code execution.
+
+        Args:
+            sandbox: The E2B sandbox instance
+            working_directory: Directory to search for files
+            since_timestamp: ISO timestamp - only return files modified after this time
+
+        Returns:
+            List of FileOutput objects with path, relative_path, name, and content
+        """
+        files: list[ClaudeCodeBlock.FileOutput] = []
+
+        # Text file extensions we can safely read as text
+        text_extensions = {
+            ".txt",
+            ".md",
+            ".html",
+            ".htm",
+            ".css",
+            ".js",
+            ".ts",
+            ".jsx",
+            ".tsx",
+            ".json",
+            ".xml",
+            ".yaml",
+            ".yml",
+            ".toml",
+            ".ini",
+            ".cfg",
+            ".conf",
+            ".py",
+            ".rb",
+            ".php",
+            ".java",
+            ".c",
+            ".cpp",
+            ".h",
+            ".hpp",
+            ".cs",
+            ".go",
+            ".rs",
+            ".swift",
+            ".kt",
+            ".scala",
+            ".sh",
+            ".bash",
+            ".zsh",
+            ".sql",
+            ".graphql",
+            ".env",
+            ".gitignore",
+            ".dockerfile",
+            "Dockerfile",
+            ".vue",
+            ".svelte",
+            ".astro",
+            ".mdx",
+            ".rst",
+            ".tex",
+            ".csv",
+            ".log",
+        }
+
+        try:
+            # List files recursively using find command
+            # Exclude node_modules and .git directories, but allow hidden files
+            # like .env and .gitignore (they're filtered by text_extensions later)
+            # Filter by timestamp to only get files created/modified during this run
+            safe_working_dir = shlex.quote(working_directory)
+            timestamp_filter = ""
+            if since_timestamp:
+                timestamp_filter = f"-newermt {shlex.quote(since_timestamp)} "
+            find_result = await sandbox.commands.run(
+                f"find {safe_working_dir} -type f "
+                f"{timestamp_filter}"
+                f"-not -path '*/node_modules/*' "
+                f"-not -path '*/.git/*' "
+                f"2>/dev/null"
+            )
+
+            if find_result.stdout:
+                for file_path in find_result.stdout.strip().split("\n"):
+                    if not file_path:
+                        continue
+
+                    # Check if it's a text file we can read
+                    is_text = any(
+                        file_path.endswith(ext) for ext in text_extensions
+                    ) or file_path.endswith("Dockerfile")
+
+                    if is_text:
+                        try:
+                            content = await sandbox.files.read(file_path)
+                            # Handle bytes or string
+                            if isinstance(content, bytes):
+                                content = content.decode("utf-8", errors="replace")
+
+                            # Extract filename from path
+                            file_name = file_path.split("/")[-1]
+
+                            # Calculate relative path by stripping working directory
+                            relative_path = file_path
+                            if file_path.startswith(working_directory):
+                                relative_path = file_path[len(working_directory) :]
+                                # Remove leading slash if present
+                                if relative_path.startswith("/"):
+                                    relative_path = relative_path[1:]
+
+                            files.append(
+                                ClaudeCodeBlock.FileOutput(
+                                    path=file_path,
+                                    relative_path=relative_path,
+                                    name=file_name,
+                                    content=content,
+                                )
+                            )
+                        except Exception:
+                            # Skip files that can't be read
+                            pass
+
+        except Exception:
+            # If file extraction fails, return empty results
+            pass
+
+        return files
+
+    def _escape_prompt(self, prompt: str) -> str:
+        """Escape the prompt for safe shell execution."""
+        # Use single quotes and escape any single quotes in the prompt
+        escaped = prompt.replace("'", "'\"'\"'")
+        return f"'{escaped}'"
+
+    async def run(
+        self,
+        input_data: Input,
+        *,
+        e2b_credentials: APIKeyCredentials,
+        anthropic_credentials: APIKeyCredentials,
+        **kwargs,
+    ) -> BlockOutput:
+        try:
+            (
+                response,
+                files,
+                conversation_history,
+                session_id,
+                sandbox_id,
+            ) = await self.execute_claude_code(
+                e2b_api_key=e2b_credentials.api_key.get_secret_value(),
+                anthropic_api_key=anthropic_credentials.api_key.get_secret_value(),
+                prompt=input_data.prompt,
+                timeout=input_data.timeout,
+                setup_commands=input_data.setup_commands,
+                working_directory=input_data.working_directory,
+                session_id=input_data.session_id,
+                existing_sandbox_id=input_data.sandbox_id,
+                conversation_history=input_data.conversation_history,
+                dispose_sandbox=input_data.dispose_sandbox,
+            )
+
+            yield "response", response
+            # Always yield files (empty list if none) to match Output schema
+            yield "files", [f.model_dump() for f in files]
+            # Always yield conversation_history so user can restore context on fresh sandbox
+            yield "conversation_history", conversation_history
+            # Always yield session_id so user can continue conversation
+            yield "session_id", session_id
+            # Always yield sandbox_id (None if disposed) to match Output schema
+            yield "sandbox_id", sandbox_id if not input_data.dispose_sandbox else None
+
+        except ClaudeCodeExecutionError as e:
+            yield "error", str(e)
+            # If sandbox was preserved (dispose_sandbox=False), yield sandbox_id
+            # so user can reconnect to or clean up the orphaned sandbox
+            if not input_data.dispose_sandbox and e.sandbox_id:
+                yield "sandbox_id", e.sandbox_id
+        except Exception as e:
+            yield "error", str(e)
diff --git a/autogpt_platform/backend/backend/blocks/data_manipulation.py b/autogpt_platform/backend/backend/blocks/data_manipulation.py
index 94921e26c0..1014236b8c 100644
--- a/autogpt_platform/backend/backend/blocks/data_manipulation.py
+++ b/autogpt_platform/backend/backend/blocks/data_manipulation.py
@@ -159,7 +159,7 @@ class FindInDictionaryBlock(Block):
     def __init__(self):
         super().__init__(
             id="0e50422c-6dee-4145-83d6-3a5a392f65de",
-            description="Lookup the given key in the input dictionary/object/list and return the value.",
+            description="A block that looks up a value in a dictionary, list, or object by key or index and returns the corresponding value.",
             input_schema=FindInDictionaryBlock.Input,
             output_schema=FindInDictionaryBlock.Output,
             test_input=[
@@ -680,3 +680,58 @@ class ListIsEmptyBlock(Block):
 
     async def run(self, input_data: Input, **kwargs) -> BlockOutput:
         yield "is_empty", len(input_data.list) == 0
+
+
+class ConcatenateListsBlock(Block):
+    class Input(BlockSchemaInput):
+        lists: List[List[Any]] = SchemaField(
+            description="A list of lists to concatenate together. All lists will be combined in order into a single list.",
+            placeholder="e.g., [[1, 2], [3, 4], [5, 6]]",
+        )
+
+    class Output(BlockSchemaOutput):
+        concatenated_list: List[Any] = SchemaField(
+            description="The concatenated list containing all elements from all input lists in order."
+        )
+        error: str = SchemaField(
+            description="Error message if concatenation failed due to invalid input types."
+        )
+
+    def __init__(self):
+        super().__init__(
+            id="3cf9298b-5817-4141-9d80-7c2cc5199c8e",
+            description="Concatenates multiple lists into a single list. All elements from all input lists are combined in order.",
+            categories={BlockCategory.BASIC},
+            input_schema=ConcatenateListsBlock.Input,
+            output_schema=ConcatenateListsBlock.Output,
+            test_input=[
+                {"lists": [[1, 2, 3], [4, 5, 6]]},
+                {"lists": [["a", "b"], ["c"], ["d", "e", "f"]]},
+                {"lists": [[1, 2], []]},
+                {"lists": []},
+            ],
+            test_output=[
+                ("concatenated_list", [1, 2, 3, 4, 5, 6]),
+                ("concatenated_list", ["a", "b", "c", "d", "e", "f"]),
+                ("concatenated_list", [1, 2]),
+                ("concatenated_list", []),
+            ],
+        )
+
+    async def run(self, input_data: Input, **kwargs) -> BlockOutput:
+        concatenated = []
+        for idx, lst in enumerate(input_data.lists):
+            if lst is None:
+                # Skip None values to avoid errors
+                continue
+            if not isinstance(lst, list):
+                # Type validation: each item must be a list
+                # Strings are iterable and would cause extend() to iterate character-by-character
+                # Non-iterable types would raise TypeError
+                yield "error", (
+                    f"Invalid input at index {idx}: expected a list, got {type(lst).__name__}. "
+                    f"All items in 'lists' must be lists (e.g., [[1, 2], [3, 4]])."
+                )
+                return
+            concatenated.extend(lst)
+        yield "concatenated_list", concatenated
diff --git a/autogpt_platform/backend/backend/blocks/discord/bot_blocks.py b/autogpt_platform/backend/backend/blocks/discord/bot_blocks.py
index 5ecd730f47..4438af1955 100644
--- a/autogpt_platform/backend/backend/blocks/discord/bot_blocks.py
+++ b/autogpt_platform/backend/backend/blocks/discord/bot_blocks.py
@@ -15,6 +15,7 @@ from backend.data.block import (
     BlockSchemaInput,
     BlockSchemaOutput,
 )
+from backend.data.execution import ExecutionContext
 from backend.data.model import APIKeyCredentials, SchemaField
 from backend.util.file import store_media_file
 from backend.util.request import Requests
@@ -666,8 +667,7 @@ class SendDiscordFileBlock(Block):
         file: MediaFileType,
         filename: str,
         message_content: str,
-        graph_exec_id: str,
-        user_id: str,
+        execution_context: ExecutionContext,
     ) -> dict:
         intents = discord.Intents.default()
         intents.guilds = True
@@ -731,10 +731,9 @@ class SendDiscordFileBlock(Block):
                     # Local file path - read from stored media file
                     # This would be a path from a previous block's output
                     stored_file = await store_media_file(
-                        graph_exec_id=graph_exec_id,
                         file=file,
-                        user_id=user_id,
-                        return_content=True,  # Get as data URI
+                        execution_context=execution_context,
+                        return_format="for_external_api",  # Get content to send to Discord
                     )
                     # Now process as data URI
                     header, encoded = stored_file.split(",", 1)
@@ -781,8 +780,7 @@ class SendDiscordFileBlock(Block):
         input_data: Input,
         *,
         credentials: APIKeyCredentials,
-        graph_exec_id: str,
-        user_id: str,
+        execution_context: ExecutionContext,
         **kwargs,
     ) -> BlockOutput:
         try:
@@ -793,8 +791,7 @@ class SendDiscordFileBlock(Block):
                 file=input_data.file,
                 filename=input_data.filename,
                 message_content=input_data.message_content,
-                graph_exec_id=graph_exec_id,
-                user_id=user_id,
+                execution_context=execution_context,
             )
 
             yield "status", result.get("status", "Unknown error")
diff --git a/autogpt_platform/backend/backend/blocks/fal/ai_video_generator.py b/autogpt_platform/backend/backend/blocks/fal/ai_video_generator.py
index 2a71548dcc..c2079ef159 100644
--- a/autogpt_platform/backend/backend/blocks/fal/ai_video_generator.py
+++ b/autogpt_platform/backend/backend/blocks/fal/ai_video_generator.py
@@ -17,8 +17,11 @@ from backend.data.block import (
     BlockSchemaInput,
     BlockSchemaOutput,
 )
+from backend.data.execution import ExecutionContext
 from backend.data.model import SchemaField
+from backend.util.file import store_media_file
 from backend.util.request import ClientResponseError, Requests
+from backend.util.type import MediaFileType
 
 logger = logging.getLogger(__name__)
 
@@ -64,9 +67,13 @@ class AIVideoGeneratorBlock(Block):
                 "credentials": TEST_CREDENTIALS_INPUT,
             },
             test_credentials=TEST_CREDENTIALS,
-            test_output=[("video_url", "https://fal.media/files/example/video.mp4")],
+            test_output=[
+                # Output will be a workspace ref or data URI depending on context
+                ("video_url", lambda x: x.startswith(("workspace://", "data:"))),
+            ],
             test_mock={
-                "generate_video": lambda *args, **kwargs: "https://fal.media/files/example/video.mp4"
+                # Use data URI to avoid HTTP requests during tests
+                "generate_video": lambda *args, **kwargs: "data:video/mp4;base64,AAAA"
             },
         )
 
@@ -208,11 +215,22 @@ class AIVideoGeneratorBlock(Block):
             raise RuntimeError(f"API request failed: {str(e)}")
 
     async def run(
-        self, input_data: Input, *, credentials: FalCredentials, **kwargs
+        self,
+        input_data: Input,
+        *,
+        credentials: FalCredentials,
+        execution_context: ExecutionContext,
+        **kwargs,
     ) -> BlockOutput:
         try:
             video_url = await self.generate_video(input_data, credentials)
-            yield "video_url", video_url
+            # Store the generated video to the user's workspace for persistence
+            stored_url = await store_media_file(
+                file=MediaFileType(video_url),
+                execution_context=execution_context,
+                return_format="for_block_output",
+            )
+            yield "video_url", stored_url
         except Exception as e:
             error_message = str(e)
             yield "error", error_message
diff --git a/autogpt_platform/backend/backend/blocks/flux_kontext.py b/autogpt_platform/backend/backend/blocks/flux_kontext.py
index dd8375c4ce..d56baa6d92 100644
--- a/autogpt_platform/backend/backend/blocks/flux_kontext.py
+++ b/autogpt_platform/backend/backend/blocks/flux_kontext.py
@@ -12,6 +12,7 @@ from backend.data.block import (
     BlockSchemaInput,
     BlockSchemaOutput,
 )
+from backend.data.execution import ExecutionContext
 from backend.data.model import (
     APIKeyCredentials,
     CredentialsField,
@@ -121,10 +122,12 @@ class AIImageEditorBlock(Block):
                 "credentials": TEST_CREDENTIALS_INPUT,
             },
             test_output=[
-                ("output_image", "https://replicate.com/output/edited-image.png"),
+                # Output will be a workspace ref or data URI depending on context
+                ("output_image", lambda x: x.startswith(("workspace://", "data:"))),
             ],
             test_mock={
-                "run_model": lambda *args, **kwargs: "https://replicate.com/output/edited-image.png",
+                # Use data URI to avoid HTTP requests during tests
+                "run_model": lambda *args, **kwargs: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==",
             },
             test_credentials=TEST_CREDENTIALS,
         )
@@ -134,8 +137,7 @@ class AIImageEditorBlock(Block):
         input_data: Input,
         *,
         credentials: APIKeyCredentials,
-        graph_exec_id: str,
-        user_id: str,
+        execution_context: ExecutionContext,
         **kwargs,
     ) -> BlockOutput:
         result = await self.run_model(
@@ -144,20 +146,25 @@ class AIImageEditorBlock(Block):
             prompt=input_data.prompt,
             input_image_b64=(
                 await store_media_file(
-                    graph_exec_id=graph_exec_id,
                     file=input_data.input_image,
-                    user_id=user_id,
-                    return_content=True,
+                    execution_context=execution_context,
+                    return_format="for_external_api",  # Get content for Replicate API
                 )
                 if input_data.input_image
                 else None
             ),
             aspect_ratio=input_data.aspect_ratio.value,
             seed=input_data.seed,
-            user_id=user_id,
-            graph_exec_id=graph_exec_id,
+            user_id=execution_context.user_id or "",
+            graph_exec_id=execution_context.graph_exec_id or "",
         )
-        yield "output_image", result
+        # Store the generated image to the user's workspace for persistence
+        stored_url = await store_media_file(
+            file=result,
+            execution_context=execution_context,
+            return_format="for_block_output",
+        )
+        yield "output_image", stored_url
 
     async def run_model(
         self,
diff --git a/autogpt_platform/backend/backend/blocks/github/issues.py b/autogpt_platform/backend/backend/blocks/github/issues.py
index b8187ac1f5..22b4149663 100644
--- a/autogpt_platform/backend/backend/blocks/github/issues.py
+++ b/autogpt_platform/backend/backend/blocks/github/issues.py
@@ -51,7 +51,7 @@ class GithubCommentBlock(Block):
     def __init__(self):
         super().__init__(
             id="a8db4d8d-db1c-4a25-a1b0-416a8c33602b",
-            description="This block posts a comment on a specified GitHub issue or pull request.",
+            description="A block that posts comments on GitHub issues or pull requests using the GitHub API.",
             categories={BlockCategory.DEVELOPER_TOOLS},
             input_schema=GithubCommentBlock.Input,
             output_schema=GithubCommentBlock.Output,
@@ -151,7 +151,7 @@ class GithubUpdateCommentBlock(Block):
     def __init__(self):
         super().__init__(
             id="b3f4d747-10e3-4e69-8c51-f2be1d99c9a7",
-            description="This block updates a comment on a specified GitHub issue or pull request.",
+            description="A block that updates an existing comment on a GitHub issue or pull request.",
             categories={BlockCategory.DEVELOPER_TOOLS},
             input_schema=GithubUpdateCommentBlock.Input,
             output_schema=GithubUpdateCommentBlock.Output,
@@ -249,7 +249,7 @@ class GithubListCommentsBlock(Block):
     def __init__(self):
         super().__init__(
             id="c4b5fb63-0005-4a11-b35a-0c2467bd6b59",
-            description="This block lists all comments for a specified GitHub issue or pull request.",
+            description="A block that retrieves all comments from a GitHub issue or pull request, including comment metadata and content.",
             categories={BlockCategory.DEVELOPER_TOOLS},
             input_schema=GithubListCommentsBlock.Input,
             output_schema=GithubListCommentsBlock.Output,
@@ -363,7 +363,7 @@ class GithubMakeIssueBlock(Block):
     def __init__(self):
         super().__init__(
             id="691dad47-f494-44c3-a1e8-05b7990f2dab",
-            description="This block creates a new issue on a specified GitHub repository.",
+            description="A block that creates new issues on GitHub repositories with a title and body content.",
             categories={BlockCategory.DEVELOPER_TOOLS},
             input_schema=GithubMakeIssueBlock.Input,
             output_schema=GithubMakeIssueBlock.Output,
@@ -433,7 +433,7 @@ class GithubReadIssueBlock(Block):
     def __init__(self):
         super().__init__(
             id="6443c75d-032a-4772-9c08-230c707c8acc",
-            description="This block reads the body, title, and user of a specified GitHub issue.",
+            description="A block that retrieves information about a specific GitHub issue, including its title, body content, and creator.",
             categories={BlockCategory.DEVELOPER_TOOLS},
             input_schema=GithubReadIssueBlock.Input,
             output_schema=GithubReadIssueBlock.Output,
@@ -510,7 +510,7 @@ class GithubListIssuesBlock(Block):
     def __init__(self):
         super().__init__(
             id="c215bfd7-0e57-4573-8f8c-f7d4963dcd74",
-            description="This block lists all issues for a specified GitHub repository.",
+            description="A block that retrieves a list of issues from a GitHub repository with their titles and URLs.",
             categories={BlockCategory.DEVELOPER_TOOLS},
             input_schema=GithubListIssuesBlock.Input,
             output_schema=GithubListIssuesBlock.Output,
@@ -597,7 +597,7 @@ class GithubAddLabelBlock(Block):
     def __init__(self):
         super().__init__(
             id="98bd6b77-9506-43d5-b669-6b9733c4b1f1",
-            description="This block adds a label to a specified GitHub issue or pull request.",
+            description="A block that adds a label to a GitHub issue or pull request for categorization and organization.",
             categories={BlockCategory.DEVELOPER_TOOLS},
             input_schema=GithubAddLabelBlock.Input,
             output_schema=GithubAddLabelBlock.Output,
@@ -657,7 +657,7 @@ class GithubRemoveLabelBlock(Block):
     def __init__(self):
         super().__init__(
             id="78f050c5-3e3a-48c0-9e5b-ef1ceca5589c",
-            description="This block removes a label from a specified GitHub issue or pull request.",
+            description="A block that removes a label from a GitHub issue or pull request.",
             categories={BlockCategory.DEVELOPER_TOOLS},
             input_schema=GithubRemoveLabelBlock.Input,
             output_schema=GithubRemoveLabelBlock.Output,
@@ -720,7 +720,7 @@ class GithubAssignIssueBlock(Block):
     def __init__(self):
         super().__init__(
             id="90507c72-b0ff-413a-886a-23bbbd66f542",
-            description="This block assigns a user to a specified GitHub issue.",
+            description="A block that assigns a GitHub user to an issue for task ownership and tracking.",
             categories={BlockCategory.DEVELOPER_TOOLS},
             input_schema=GithubAssignIssueBlock.Input,
             output_schema=GithubAssignIssueBlock.Output,
@@ -786,7 +786,7 @@ class GithubUnassignIssueBlock(Block):
     def __init__(self):
         super().__init__(
             id="d154002a-38f4-46c2-962d-2488f2b05ece",
-            description="This block unassigns a user from a specified GitHub issue.",
+            description="A block that removes a user's assignment from a GitHub issue.",
             categories={BlockCategory.DEVELOPER_TOOLS},
             input_schema=GithubUnassignIssueBlock.Input,
             output_schema=GithubUnassignIssueBlock.Output,
diff --git a/autogpt_platform/backend/backend/blocks/google/gmail.py b/autogpt_platform/backend/backend/blocks/google/gmail.py
index bded362314..2040cabe3f 100644
--- a/autogpt_platform/backend/backend/blocks/google/gmail.py
+++ b/autogpt_platform/backend/backend/blocks/google/gmail.py
@@ -21,6 +21,7 @@ from backend.data.block import (
     BlockSchemaInput,
     BlockSchemaOutput,
 )
+from backend.data.execution import ExecutionContext
 from backend.data.model import SchemaField
 from backend.util.file import MediaFileType, get_exec_file_path, store_media_file
 from backend.util.settings import Settings
@@ -95,8 +96,7 @@ def _make_mime_text(
 
 async def create_mime_message(
     input_data,
-    graph_exec_id: str,
-    user_id: str,
+    execution_context: ExecutionContext,
 ) -> str:
     """Create a MIME message with attachments and return base64-encoded raw message."""
 
@@ -117,12 +117,12 @@ async def create_mime_message(
     if input_data.attachments:
         for attach in input_data.attachments:
             local_path = await store_media_file(
-                user_id=user_id,
-                graph_exec_id=graph_exec_id,
                 file=attach,
-                return_content=False,
+                execution_context=execution_context,
+                return_format="for_local_processing",
             )
-            abs_path = get_exec_file_path(graph_exec_id, local_path)
+            assert execution_context.graph_exec_id  # Validated by store_media_file
+            abs_path = get_exec_file_path(execution_context.graph_exec_id, local_path)
             part = MIMEBase("application", "octet-stream")
             with open(abs_path, "rb") as f:
                 part.set_payload(f.read())
@@ -353,7 +353,7 @@ class GmailReadBlock(GmailBase):
     def __init__(self):
         super().__init__(
             id="25310c70-b89b-43ba-b25c-4dfa7e2a481c",
-            description="This block reads emails from Gmail.",
+            description="A block that retrieves and reads emails from a Gmail account based on search criteria, returning detailed message information including subject, sender, body, and attachments.",
             categories={BlockCategory.COMMUNICATION},
             disabled=not GOOGLE_OAUTH_IS_CONFIGURED,
             input_schema=GmailReadBlock.Input,
@@ -582,27 +582,25 @@ class GmailSendBlock(GmailBase):
         input_data: Input,
         *,
         credentials: GoogleCredentials,
-        graph_exec_id: str,
-        user_id: str,
+        execution_context: ExecutionContext,
         **kwargs,
     ) -> BlockOutput:
         service = self._build_service(credentials, **kwargs)
         result = await self._send_email(
             service,
             input_data,
-            graph_exec_id,
-            user_id,
+            execution_context,
         )
         yield "result", result
 
     async def _send_email(
-        self, service, input_data: Input, graph_exec_id: str, user_id: str
+        self, service, input_data: Input, execution_context: ExecutionContext
     ) -> dict:
         if not input_data.to or not input_data.subject or not input_data.body:
             raise ValueError(
                 "At least one recipient, subject, and body are required for sending an email"
             )
-        raw_message = await create_mime_message(input_data, graph_exec_id, user_id)
+        raw_message = await create_mime_message(input_data, execution_context)
         sent_message = await asyncio.to_thread(
             lambda: service.users()
             .messages()
@@ -692,30 +690,28 @@ class GmailCreateDraftBlock(GmailBase):
         input_data: Input,
         *,
         credentials: GoogleCredentials,
-        graph_exec_id: str,
-        user_id: str,
+        execution_context: ExecutionContext,
         **kwargs,
     ) -> BlockOutput:
         service = self._build_service(credentials, **kwargs)
         result = await self._create_draft(
             service,
             input_data,
-            graph_exec_id,
-            user_id,
+            execution_context,
         )
         yield "result", GmailDraftResult(
             id=result["id"], message_id=result["message"]["id"], status="draft_created"
         )
 
     async def _create_draft(
-        self, service, input_data: Input, graph_exec_id: str, user_id: str
+        self, service, input_data: Input, execution_context: ExecutionContext
     ) -> dict:
         if not input_data.to or not input_data.subject:
             raise ValueError(
                 "At least one recipient and subject are required for creating a draft"
             )
 
-        raw_message = await create_mime_message(input_data, graph_exec_id, user_id)
+        raw_message = await create_mime_message(input_data, execution_context)
         draft = await asyncio.to_thread(
             lambda: service.users()
             .drafts()
@@ -743,7 +739,7 @@ class GmailListLabelsBlock(GmailBase):
     def __init__(self):
         super().__init__(
             id="3e1c2c1c-c689-4520-b956-1f3bf4e02bb7",
-            description="This block lists all labels in Gmail.",
+            description="A block that retrieves all labels (categories) from a Gmail account for organizing and categorizing emails.",
             categories={BlockCategory.COMMUNICATION},
             input_schema=GmailListLabelsBlock.Input,
             output_schema=GmailListLabelsBlock.Output,
@@ -807,7 +803,7 @@ class GmailAddLabelBlock(GmailBase):
     def __init__(self):
         super().__init__(
             id="f884b2fb-04f4-4265-9658-14f433926ac9",
-            description="This block adds a label to a Gmail message.",
+            description="A block that adds a label to a specific email message in Gmail, creating the label if it doesn't exist.",
             categories={BlockCategory.COMMUNICATION},
             input_schema=GmailAddLabelBlock.Input,
             output_schema=GmailAddLabelBlock.Output,
@@ -893,7 +889,7 @@ class GmailRemoveLabelBlock(GmailBase):
     def __init__(self):
         super().__init__(
             id="0afc0526-aba1-4b2b-888e-a22b7c3f359d",
-            description="This block removes a label from a Gmail message.",
+            description="A block that removes a label from a specific email message in a Gmail account.",
             categories={BlockCategory.COMMUNICATION},
             input_schema=GmailRemoveLabelBlock.Input,
             output_schema=GmailRemoveLabelBlock.Output,
@@ -961,7 +957,7 @@ class GmailGetThreadBlock(GmailBase):
     def __init__(self):
         super().__init__(
             id="21a79166-9df7-4b5f-9f36-96f639d86112",
-            description="Get a full Gmail thread by ID",
+            description="A block that retrieves an entire Gmail thread (email conversation) by ID, returning all messages with decoded bodies for reading complete conversations.",
             categories={BlockCategory.COMMUNICATION},
             input_schema=GmailGetThreadBlock.Input,
             output_schema=GmailGetThreadBlock.Output,
@@ -1100,7 +1096,7 @@ class GmailGetThreadBlock(GmailBase):
 
 
 async def _build_reply_message(
-    service, input_data, graph_exec_id: str, user_id: str
+    service, input_data, execution_context: ExecutionContext
 ) -> tuple[str, str]:
     """
     Builds a reply MIME message for Gmail threads.
@@ -1190,12 +1186,12 @@ async def _build_reply_message(
     # Handle attachments
     for attach in input_data.attachments:
         local_path = await store_media_file(
-            user_id=user_id,
-            graph_exec_id=graph_exec_id,
             file=attach,
-            return_content=False,
+            execution_context=execution_context,
+            return_format="for_local_processing",
         )
-        abs_path = get_exec_file_path(graph_exec_id, local_path)
+        assert execution_context.graph_exec_id  # Validated by store_media_file
+        abs_path = get_exec_file_path(execution_context.graph_exec_id, local_path)
         part = MIMEBase("application", "octet-stream")
         with open(abs_path, "rb") as f:
             part.set_payload(f.read())
@@ -1311,16 +1307,14 @@ class GmailReplyBlock(GmailBase):
         input_data: Input,
         *,
         credentials: GoogleCredentials,
-        graph_exec_id: str,
-        user_id: str,
+        execution_context: ExecutionContext,
         **kwargs,
     ) -> BlockOutput:
         service = self._build_service(credentials, **kwargs)
         message = await self._reply(
             service,
             input_data,
-            graph_exec_id,
-            user_id,
+            execution_context,
         )
         yield "messageId", message["id"]
         yield "threadId", message.get("threadId", input_data.threadId)
@@ -1343,11 +1337,11 @@ class GmailReplyBlock(GmailBase):
         yield "email", email
 
     async def _reply(
-        self, service, input_data: Input, graph_exec_id: str, user_id: str
+        self, service, input_data: Input, execution_context: ExecutionContext
     ) -> dict:
         # Build the reply message using the shared helper
         raw, thread_id = await _build_reply_message(
-            service, input_data, graph_exec_id, user_id
+            service, input_data, execution_context
         )
 
         # Send the message
@@ -1441,16 +1435,14 @@ class GmailDraftReplyBlock(GmailBase):
         input_data: Input,
         *,
         credentials: GoogleCredentials,
-        graph_exec_id: str,
-        user_id: str,
+        execution_context: ExecutionContext,
         **kwargs,
     ) -> BlockOutput:
         service = self._build_service(credentials, **kwargs)
         draft = await self._create_draft_reply(
             service,
             input_data,
-            graph_exec_id,
-            user_id,
+            execution_context,
         )
         yield "draftId", draft["id"]
         yield "messageId", draft["message"]["id"]
@@ -1458,11 +1450,11 @@ class GmailDraftReplyBlock(GmailBase):
         yield "status", "draft_created"
 
     async def _create_draft_reply(
-        self, service, input_data: Input, graph_exec_id: str, user_id: str
+        self, service, input_data: Input, execution_context: ExecutionContext
     ) -> dict:
         # Build the reply message using the shared helper
         raw, thread_id = await _build_reply_message(
-            service, input_data, graph_exec_id, user_id
+            service, input_data, execution_context
         )
 
         # Create draft with proper thread association
@@ -1629,23 +1621,21 @@ class GmailForwardBlock(GmailBase):
         input_data: Input,
         *,
         credentials: GoogleCredentials,
-        graph_exec_id: str,
-        user_id: str,
+        execution_context: ExecutionContext,
         **kwargs,
     ) -> BlockOutput:
         service = self._build_service(credentials, **kwargs)
         result = await self._forward_message(
             service,
             input_data,
-            graph_exec_id,
-            user_id,
+            execution_context,
         )
         yield "messageId", result["id"]
         yield "threadId", result.get("threadId", "")
         yield "status", "forwarded"
 
     async def _forward_message(
-        self, service, input_data: Input, graph_exec_id: str, user_id: str
+        self, service, input_data: Input, execution_context: ExecutionContext
     ) -> dict:
         if not input_data.to:
             raise ValueError("At least one recipient is required for forwarding")
@@ -1727,12 +1717,12 @@ To: {original_to}
         # Add any additional attachments
         for attach in input_data.additionalAttachments:
             local_path = await store_media_file(
-                user_id=user_id,
-                graph_exec_id=graph_exec_id,
                 file=attach,
-                return_content=False,
+                execution_context=execution_context,
+                return_format="for_local_processing",
             )
-            abs_path = get_exec_file_path(graph_exec_id, local_path)
+            assert execution_context.graph_exec_id  # Validated by store_media_file
+            abs_path = get_exec_file_path(execution_context.graph_exec_id, local_path)
             part = MIMEBase("application", "octet-stream")
             with open(abs_path, "rb") as f:
                 part.set_payload(f.read())
diff --git a/autogpt_platform/backend/backend/blocks/google/sheets.py b/autogpt_platform/backend/backend/blocks/google/sheets.py
index 7b9ba2161e..da541d3bf5 100644
--- a/autogpt_platform/backend/backend/blocks/google/sheets.py
+++ b/autogpt_platform/backend/backend/blocks/google/sheets.py
@@ -282,7 +282,7 @@ class GoogleSheetsReadBlock(Block):
     def __init__(self):
         super().__init__(
             id="5724e902-3635-47e9-a108-aaa0263a4988",
-            description="This block reads data from a Google Sheets spreadsheet.",
+            description="A block that reads data from a Google Sheets spreadsheet using A1 notation range selection.",
             categories={BlockCategory.DATA},
             input_schema=GoogleSheetsReadBlock.Input,
             output_schema=GoogleSheetsReadBlock.Output,
@@ -409,7 +409,7 @@ class GoogleSheetsWriteBlock(Block):
     def __init__(self):
         super().__init__(
             id="d9291e87-301d-47a8-91fe-907fb55460e5",
-            description="This block writes data to a Google Sheets spreadsheet.",
+            description="A block that writes data to a Google Sheets spreadsheet at a specified A1 notation range.",
             categories={BlockCategory.DATA},
             input_schema=GoogleSheetsWriteBlock.Input,
             output_schema=GoogleSheetsWriteBlock.Output,
diff --git a/autogpt_platform/backend/backend/blocks/helpers/review.py b/autogpt_platform/backend/backend/blocks/helpers/review.py
new file mode 100644
index 0000000000..4bd85e424b
--- /dev/null
+++ b/autogpt_platform/backend/backend/blocks/helpers/review.py
@@ -0,0 +1,215 @@
+"""
+Shared helpers for Human-In-The-Loop (HITL) review functionality.
+Used by both the dedicated HumanInTheLoopBlock and blocks that require human review.
+"""
+
+import logging
+from typing import Any, Optional
+
+from prisma.enums import ReviewStatus
+from pydantic import BaseModel
+
+from backend.data.execution import ExecutionStatus
+from backend.data.human_review import ReviewResult
+from backend.executor.manager import async_update_node_execution_status
+from backend.util.clients import get_database_manager_async_client
+
+logger = logging.getLogger(__name__)
+
+
+class ReviewDecision(BaseModel):
+    """Result of a review decision."""
+
+    should_proceed: bool
+    message: str
+    review_result: ReviewResult
+
+
+class HITLReviewHelper:
+    """Helper class for Human-In-The-Loop review operations."""
+
+    @staticmethod
+    async def check_approval(**kwargs) -> Optional[ReviewResult]:
+        """Check if there's an existing approval for this node execution."""
+        return await get_database_manager_async_client().check_approval(**kwargs)
+
+    @staticmethod
+    async def get_or_create_human_review(**kwargs) -> Optional[ReviewResult]:
+        """Create or retrieve a human review from the database."""
+        return await get_database_manager_async_client().get_or_create_human_review(
+            **kwargs
+        )
+
+    @staticmethod
+    async def update_node_execution_status(**kwargs) -> None:
+        """Update the execution status of a node."""
+        await async_update_node_execution_status(
+            db_client=get_database_manager_async_client(), **kwargs
+        )
+
+    @staticmethod
+    async def update_review_processed_status(
+        node_exec_id: str, processed: bool
+    ) -> None:
+        """Update the processed status of a review."""
+        return await get_database_manager_async_client().update_review_processed_status(
+            node_exec_id, processed
+        )
+
+    @staticmethod
+    async def _handle_review_request(
+        input_data: Any,
+        user_id: str,
+        node_id: str,
+        node_exec_id: str,
+        graph_exec_id: str,
+        graph_id: str,
+        graph_version: int,
+        block_name: str = "Block",
+        editable: bool = False,
+    ) -> Optional[ReviewResult]:
+        """
+        Handle a review request for a block that requires human review.
+
+        Args:
+            input_data: The input data to be reviewed
+            user_id: ID of the user requesting the review
+            node_id: ID of the node in the graph definition
+            node_exec_id: ID of the node execution
+            graph_exec_id: ID of the graph execution
+            graph_id: ID of the graph
+            graph_version: Version of the graph
+            block_name: Name of the block requesting review
+            editable: Whether the reviewer can edit the data
+
+        Returns:
+            ReviewResult if review is complete, None if waiting for human input
+
+        Raises:
+            Exception: If review creation or status update fails
+        """
+        # Note: Safe mode checks (human_in_the_loop_safe_mode, sensitive_action_safe_mode)
+        # are handled by the caller:
+        # - HITL blocks check human_in_the_loop_safe_mode in their run() method
+        # - Sensitive action blocks check sensitive_action_safe_mode in is_block_exec_need_review()
+        # This function only handles checking for existing approvals.
+
+        # Check if this node has already been approved (normal or auto-approval)
+        if approval_result := await HITLReviewHelper.check_approval(
+            node_exec_id=node_exec_id,
+            graph_exec_id=graph_exec_id,
+            node_id=node_id,
+            user_id=user_id,
+            input_data=input_data,
+        ):
+            logger.info(
+                f"Block {block_name} skipping review for node {node_exec_id} - "
+                f"found existing approval"
+            )
+            # Return a new ReviewResult with the current node_exec_id but approved status
+            # For auto-approvals, always use current input_data
+            # For normal approvals, use approval_result.data unless it's None
+            is_auto_approval = approval_result.node_exec_id != node_exec_id
+            approved_data = (
+                input_data
+                if is_auto_approval
+                else (
+                    approval_result.data
+                    if approval_result.data is not None
+                    else input_data
+                )
+            )
+            return ReviewResult(
+                data=approved_data,
+                status=ReviewStatus.APPROVED,
+                message=approval_result.message,
+                processed=True,
+                node_exec_id=node_exec_id,
+            )
+
+        result = await HITLReviewHelper.get_or_create_human_review(
+            user_id=user_id,
+            node_exec_id=node_exec_id,
+            graph_exec_id=graph_exec_id,
+            graph_id=graph_id,
+            graph_version=graph_version,
+            input_data=input_data,
+            message=block_name,  # Use block_name directly as the message
+            editable=editable,
+        )
+
+        if result is None:
+            logger.info(
+                f"Block {block_name} pausing execution for node {node_exec_id} - awaiting human review"
+            )
+            await HITLReviewHelper.update_node_execution_status(
+                exec_id=node_exec_id,
+                status=ExecutionStatus.REVIEW,
+            )
+            return None  # Signal that execution should pause
+
+        # Mark review as processed if not already done
+        if not result.processed:
+            await HITLReviewHelper.update_review_processed_status(
+                node_exec_id=node_exec_id, processed=True
+            )
+
+        return result
+
+    @staticmethod
+    async def handle_review_decision(
+        input_data: Any,
+        user_id: str,
+        node_id: str,
+        node_exec_id: str,
+        graph_exec_id: str,
+        graph_id: str,
+        graph_version: int,
+        block_name: str = "Block",
+        editable: bool = False,
+    ) -> Optional[ReviewDecision]:
+        """
+        Handle a review request and return the decision in a single call.
+
+        Args:
+            input_data: The input data to be reviewed
+            user_id: ID of the user requesting the review
+            node_id: ID of the node in the graph definition
+            node_exec_id: ID of the node execution
+            graph_exec_id: ID of the graph execution
+            graph_id: ID of the graph
+            graph_version: Version of the graph
+            block_name: Name of the block requesting review
+            editable: Whether the reviewer can edit the data
+
+        Returns:
+            ReviewDecision if review is complete (approved/rejected),
+            None if execution should pause (awaiting review)
+        """
+        review_result = await HITLReviewHelper._handle_review_request(
+            input_data=input_data,
+            user_id=user_id,
+            node_id=node_id,
+            node_exec_id=node_exec_id,
+            graph_exec_id=graph_exec_id,
+            graph_id=graph_id,
+            graph_version=graph_version,
+            block_name=block_name,
+            editable=editable,
+        )
+
+        if review_result is None:
+            # Still awaiting review - return None to pause execution
+            return None
+
+        # Review is complete, determine outcome
+        should_proceed = review_result.status == ReviewStatus.APPROVED
+        message = review_result.message or (
+            "Execution approved by reviewer"
+            if should_proceed
+            else "Execution rejected by reviewer"
+        )
+
+        return ReviewDecision(
+            should_proceed=should_proceed, message=message, review_result=review_result
+        )
diff --git a/autogpt_platform/backend/backend/blocks/http.py b/autogpt_platform/backend/backend/blocks/http.py
index 9b27a3b129..77e7fe243f 100644
--- a/autogpt_platform/backend/backend/blocks/http.py
+++ b/autogpt_platform/backend/backend/blocks/http.py
@@ -15,6 +15,7 @@ from backend.data.block import (
     BlockSchemaInput,
     BlockSchemaOutput,
 )
+from backend.data.execution import ExecutionContext
 from backend.data.model import (
     CredentialsField,
     CredentialsMetaInput,
@@ -116,10 +117,9 @@ class SendWebRequestBlock(Block):
 
     @staticmethod
     async def _prepare_files(
-        graph_exec_id: str,
+        execution_context: ExecutionContext,
         files_name: str,
         files: list[MediaFileType],
-        user_id: str,
     ) -> list[tuple[str, tuple[str, BytesIO, str]]]:
         """
         Prepare files for the request by storing them and reading their content.
@@ -127,11 +127,16 @@ class SendWebRequestBlock(Block):
         (files_name, (filename, BytesIO, mime_type))
         """
         files_payload: list[tuple[str, tuple[str, BytesIO, str]]] = []
+        graph_exec_id = execution_context.graph_exec_id
+        if graph_exec_id is None:
+            raise ValueError("graph_exec_id is required for file operations")
 
         for media in files:
             # Normalise to a list so we can repeat the same key
             rel_path = await store_media_file(
-                graph_exec_id, media, user_id, return_content=False
+                file=media,
+                execution_context=execution_context,
+                return_format="for_local_processing",
             )
             abs_path = get_exec_file_path(graph_exec_id, rel_path)
             async with aiofiles.open(abs_path, "rb") as f:
@@ -143,7 +148,7 @@ class SendWebRequestBlock(Block):
         return files_payload
 
     async def run(
-        self, input_data: Input, *, graph_exec_id: str, user_id: str, **kwargs
+        self, input_data: Input, *, execution_context: ExecutionContext, **kwargs
     ) -> BlockOutput:
         # ─── Parse/normalise body ────────────────────────────────────
         body = input_data.body
@@ -174,7 +179,7 @@ class SendWebRequestBlock(Block):
         files_payload: list[tuple[str, tuple[str, BytesIO, str]]] = []
         if use_files:
             files_payload = await self._prepare_files(
-                graph_exec_id, input_data.files_name, input_data.files, user_id
+                execution_context, input_data.files_name, input_data.files
             )
 
         # Enforce body format rules
@@ -238,9 +243,8 @@ class SendAuthenticatedWebRequestBlock(SendWebRequestBlock):
         self,
         input_data: Input,
         *,
-        graph_exec_id: str,
+        execution_context: ExecutionContext,
         credentials: HostScopedCredentials,
-        user_id: str,
         **kwargs,
     ) -> BlockOutput:
         # Create SendWebRequestBlock.Input from our input (removing credentials field)
@@ -271,6 +275,6 @@ class SendAuthenticatedWebRequestBlock(SendWebRequestBlock):
 
         # Use parent class run method
         async for output_name, output_data in super().run(
-            base_input, graph_exec_id=graph_exec_id, user_id=user_id, **kwargs
+            base_input, execution_context=execution_context, **kwargs
         ):
             yield output_name, output_data
diff --git a/autogpt_platform/backend/backend/blocks/human_in_the_loop.py b/autogpt_platform/backend/backend/blocks/human_in_the_loop.py
index 13c9fb31db..568ac4b33f 100644
--- a/autogpt_platform/backend/backend/blocks/human_in_the_loop.py
+++ b/autogpt_platform/backend/backend/blocks/human_in_the_loop.py
@@ -3,6 +3,7 @@ from typing import Any
 
 from prisma.enums import ReviewStatus
 
+from backend.blocks.helpers.review import HITLReviewHelper
 from backend.data.block import (
     Block,
     BlockCategory,
@@ -11,11 +12,9 @@ from backend.data.block import (
     BlockSchemaOutput,
     BlockType,
 )
-from backend.data.execution import ExecutionContext, ExecutionStatus
+from backend.data.execution import ExecutionContext
 from backend.data.human_review import ReviewResult
 from backend.data.model import SchemaField
-from backend.executor.manager import async_update_node_execution_status
-from backend.util.clients import get_database_manager_async_client
 
 logger = logging.getLogger(__name__)
 
@@ -72,46 +71,41 @@ class HumanInTheLoopBlock(Block):
                 ("approved_data", {"name": "John Doe", "age": 30}),
             ],
             test_mock={
-                "get_or_create_human_review": lambda *_args, **_kwargs: ReviewResult(
-                    data={"name": "John Doe", "age": 30},
-                    status=ReviewStatus.APPROVED,
-                    message="",
-                    processed=False,
-                    node_exec_id="test-node-exec-id",
-                ),
-                "update_node_execution_status": lambda *_args, **_kwargs: None,
-                "update_review_processed_status": lambda *_args, **_kwargs: None,
+                "handle_review_decision": lambda **kwargs: type(
+                    "ReviewDecision",
+                    (),
+                    {
+                        "should_proceed": True,
+                        "message": "Test approval message",
+                        "review_result": ReviewResult(
+                            data={"name": "John Doe", "age": 30},
+                            status=ReviewStatus.APPROVED,
+                            message="",
+                            processed=False,
+                            node_exec_id="test-node-exec-id",
+                        ),
+                    },
+                )(),
             },
         )
 
-    async def get_or_create_human_review(self, **kwargs):
-        return await get_database_manager_async_client().get_or_create_human_review(
-            **kwargs
-        )
-
-    async def update_node_execution_status(self, **kwargs):
-        return await async_update_node_execution_status(
-            db_client=get_database_manager_async_client(), **kwargs
-        )
-
-    async def update_review_processed_status(self, node_exec_id: str, processed: bool):
-        return await get_database_manager_async_client().update_review_processed_status(
-            node_exec_id, processed
-        )
+    async def handle_review_decision(self, **kwargs):
+        return await HITLReviewHelper.handle_review_decision(**kwargs)
 
     async def run(
         self,
         input_data: Input,
         *,
         user_id: str,
+        node_id: str,
         node_exec_id: str,
         graph_exec_id: str,
         graph_id: str,
         graph_version: int,
         execution_context: ExecutionContext,
-        **kwargs,
+        **_kwargs,
     ) -> BlockOutput:
-        if not execution_context.safe_mode:
+        if not execution_context.human_in_the_loop_safe_mode:
             logger.info(
                 f"HITL block skipping review for node {node_exec_id} - safe mode disabled"
             )
@@ -119,48 +113,28 @@ class HumanInTheLoopBlock(Block):
             yield "review_message", "Auto-approved (safe mode disabled)"
             return
 
-        try:
-            result = await self.get_or_create_human_review(
-                user_id=user_id,
-                node_exec_id=node_exec_id,
-                graph_exec_id=graph_exec_id,
-                graph_id=graph_id,
-                graph_version=graph_version,
-                input_data=input_data.data,
-                message=input_data.name,
-                editable=input_data.editable,
-            )
-        except Exception as e:
-            logger.error(f"Error in HITL block for node {node_exec_id}: {str(e)}")
-            raise
+        decision = await self.handle_review_decision(
+            input_data=input_data.data,
+            user_id=user_id,
+            node_id=node_id,
+            node_exec_id=node_exec_id,
+            graph_exec_id=graph_exec_id,
+            graph_id=graph_id,
+            graph_version=graph_version,
+            block_name=input_data.name,  # Use user-provided name instead of block type
+            editable=input_data.editable,
+        )
 
-        if result is None:
-            logger.info(
-                f"HITL block pausing execution for node {node_exec_id} - awaiting human review"
-            )
-            try:
-                await self.update_node_execution_status(
-                    exec_id=node_exec_id,
-                    status=ExecutionStatus.REVIEW,
-                )
-                return
-            except Exception as e:
-                logger.error(
-                    f"Failed to update node status for HITL block {node_exec_id}: {str(e)}"
-                )
-                raise
+        if decision is None:
+            return
 
-        if not result.processed:
-            await self.update_review_processed_status(
-                node_exec_id=node_exec_id, processed=True
-            )
+        status = decision.review_result.status
+        if status == ReviewStatus.APPROVED:
+            yield "approved_data", decision.review_result.data
+        elif status == ReviewStatus.REJECTED:
+            yield "rejected_data", decision.review_result.data
+        else:
+            raise RuntimeError(f"Unexpected review status: {status}")
 
-            if result.status == ReviewStatus.APPROVED:
-                yield "approved_data", result.data
-                if result.message:
-                    yield "review_message", result.message
-
-            elif result.status == ReviewStatus.REJECTED:
-                yield "rejected_data", result.data
-                if result.message:
-                    yield "review_message", result.message
+        if decision.message:
+            yield "review_message", decision.message
diff --git a/autogpt_platform/backend/backend/blocks/io.py b/autogpt_platform/backend/backend/blocks/io.py
index 07f09eb349..a9c3859490 100644
--- a/autogpt_platform/backend/backend/blocks/io.py
+++ b/autogpt_platform/backend/backend/blocks/io.py
@@ -12,6 +12,7 @@ from backend.data.block import (
     BlockSchemaInput,
     BlockType,
 )
+from backend.data.execution import ExecutionContext
 from backend.data.model import SchemaField
 from backend.util.file import store_media_file
 from backend.util.mock import MockObject
@@ -76,7 +77,7 @@ class AgentInputBlock(Block):
         super().__init__(
             **{
                 "id": "c0a8e994-ebf1-4a9c-a4d8-89d09c86741b",
-                "description": "Base block for user inputs.",
+                "description": "A block that accepts and processes user input values within a workflow, supporting various input types and validation.",
                 "input_schema": AgentInputBlock.Input,
                 "output_schema": AgentInputBlock.Output,
                 "test_input": [
@@ -168,7 +169,7 @@ class AgentOutputBlock(Block):
     def __init__(self):
         super().__init__(
             id="363ae599-353e-4804-937e-b2ee3cef3da4",
-            description="Stores the output of the graph for users to see.",
+            description="A block that records and formats workflow results for display to users, with optional Jinja2 template formatting support.",
             input_schema=AgentOutputBlock.Input,
             output_schema=AgentOutputBlock.Output,
             test_input=[
@@ -462,18 +463,21 @@ class AgentFileInputBlock(AgentInputBlock):
         self,
         input_data: Input,
         *,
-        graph_exec_id: str,
-        user_id: str,
+        execution_context: ExecutionContext,
         **kwargs,
     ) -> BlockOutput:
         if not input_data.value:
             return
 
+        # Determine return format based on user preference
+        # for_external_api: always returns data URI (base64) - honors "Produce Base64 Output"
+        # for_block_output: smart format - workspace:// in CoPilot, data URI in graphs
+        return_format = "for_external_api" if input_data.base_64 else "for_block_output"
+
         yield "result", await store_media_file(
-            graph_exec_id=graph_exec_id,
             file=input_data.value,
-            user_id=user_id,
-            return_content=input_data.base_64,
+            execution_context=execution_context,
+            return_format=return_format,
         )
 
 
diff --git a/autogpt_platform/backend/backend/blocks/linear/_api.py b/autogpt_platform/backend/backend/blocks/linear/_api.py
index 477b8a209c..ea609d515a 100644
--- a/autogpt_platform/backend/backend/blocks/linear/_api.py
+++ b/autogpt_platform/backend/backend/blocks/linear/_api.py
@@ -162,8 +162,16 @@ class LinearClient:
                 "searchTerm": team_name,
             }
 
-            team_id = await self.query(query, variables)
-            return team_id["teams"]["nodes"][0]["id"]
+            result = await self.query(query, variables)
+            nodes = result["teams"]["nodes"]
+
+            if not nodes:
+                raise LinearAPIException(
+                    f"Team '{team_name}' not found. Check the team name or key and try again.",
+                    status_code=404,
+                )
+
+            return nodes[0]["id"]
         except LinearAPIException as e:
             raise e
 
@@ -240,17 +248,44 @@ class LinearClient:
         except LinearAPIException as e:
             raise e
 
-    async def try_search_issues(self, term: str) -> list[Issue]:
+    async def try_search_issues(
+        self,
+        term: str,
+        max_results: int = 10,
+        team_id: str | None = None,
+    ) -> list[Issue]:
         try:
             query = """
-                query SearchIssues($term: String!, $includeComments: Boolean!) {
-                    searchIssues(term: $term, includeComments: $includeComments) {
+                query SearchIssues(
+                    $term: String!,
+                    $first: Int,
+                    $teamId: String
+                ) {
+                    searchIssues(
+                        term: $term,
+                        first: $first,
+                        teamId: $teamId
+                    ) {
                         nodes {
                             id
                             identifier
                             title
                             description
                             priority
+                            createdAt
+                            state {
+                                id
+                                name
+                                type
+                            }
+                            project {
+                                id
+                                name
+                            }
+                            assignee {
+                                id
+                                name
+                            }
                         }
                     }
                 }
@@ -258,7 +293,8 @@ class LinearClient:
 
             variables: dict[str, Any] = {
                 "term": term,
-                "includeComments": True,
+                "first": max_results,
+                "teamId": team_id,
             }
 
             issues = await self.query(query, variables)
diff --git a/autogpt_platform/backend/backend/blocks/linear/issues.py b/autogpt_platform/backend/backend/blocks/linear/issues.py
index baac01214c..165178f8ee 100644
--- a/autogpt_platform/backend/backend/blocks/linear/issues.py
+++ b/autogpt_platform/backend/backend/blocks/linear/issues.py
@@ -17,7 +17,7 @@ from ._config import (
     LinearScope,
     linear,
 )
-from .models import CreateIssueResponse, Issue
+from .models import CreateIssueResponse, Issue, State
 
 
 class LinearCreateIssueBlock(Block):
@@ -135,9 +135,20 @@ class LinearSearchIssuesBlock(Block):
             description="Linear credentials with read permissions",
             required_scopes={LinearScope.READ},
         )
+        max_results: int = SchemaField(
+            description="Maximum number of results to return",
+            default=10,
+            ge=1,
+            le=100,
+        )
+        team_name: str | None = SchemaField(
+            description="Optional team name to filter results (e.g., 'Internal', 'Open Source')",
+            default=None,
+        )
 
     class Output(BlockSchemaOutput):
         issues: list[Issue] = SchemaField(description="List of issues")
+        error: str = SchemaField(description="Error message if the search failed")
 
     def __init__(self):
         super().__init__(
@@ -145,8 +156,11 @@ class LinearSearchIssuesBlock(Block):
             description="Searches for issues on Linear",
             input_schema=self.Input,
             output_schema=self.Output,
+            categories={BlockCategory.PRODUCTIVITY, BlockCategory.ISSUE_TRACKING},
             test_input={
                 "term": "Test issue",
+                "max_results": 10,
+                "team_name": None,
                 "credentials": TEST_CREDENTIALS_INPUT_OAUTH,
             },
             test_credentials=TEST_CREDENTIALS_OAUTH,
@@ -156,10 +170,14 @@ class LinearSearchIssuesBlock(Block):
                     [
                         Issue(
                             id="abc123",
-                            identifier="abc123",
+                            identifier="TST-123",
                             title="Test issue",
                             description="Test description",
                             priority=1,
+                            state=State(
+                                id="state1", name="In Progress", type="started"
+                            ),
+                            createdAt="2026-01-15T10:00:00.000Z",
                         )
                     ],
                 )
@@ -168,10 +186,12 @@ class LinearSearchIssuesBlock(Block):
                 "search_issues": lambda *args, **kwargs: [
                     Issue(
                         id="abc123",
-                        identifier="abc123",
+                        identifier="TST-123",
                         title="Test issue",
                         description="Test description",
                         priority=1,
+                        state=State(id="state1", name="In Progress", type="started"),
+                        createdAt="2026-01-15T10:00:00.000Z",
                     )
                 ]
             },
@@ -181,10 +201,22 @@ class LinearSearchIssuesBlock(Block):
     async def search_issues(
         credentials: OAuth2Credentials | APIKeyCredentials,
         term: str,
+        max_results: int = 10,
+        team_name: str | None = None,
     ) -> list[Issue]:
         client = LinearClient(credentials=credentials)
-        response: list[Issue] = await client.try_search_issues(term=term)
-        return response
+
+        # Resolve team name to ID if provided
+        # Raises LinearAPIException with descriptive message if team not found
+        team_id: str | None = None
+        if team_name:
+            team_id = await client.try_get_team_by_name(team_name=team_name)
+
+        return await client.try_search_issues(
+            term=term,
+            max_results=max_results,
+            team_id=team_id,
+        )
 
     async def run(
         self,
@@ -196,7 +228,10 @@ class LinearSearchIssuesBlock(Block):
         """Execute the issue search"""
         try:
             issues = await self.search_issues(
-                credentials=credentials, term=input_data.term
+                credentials=credentials,
+                term=input_data.term,
+                max_results=input_data.max_results,
+                team_name=input_data.team_name,
             )
             yield "issues", issues
         except LinearAPIException as e:
diff --git a/autogpt_platform/backend/backend/blocks/linear/models.py b/autogpt_platform/backend/backend/blocks/linear/models.py
index bfeaa13656..dd1f603459 100644
--- a/autogpt_platform/backend/backend/blocks/linear/models.py
+++ b/autogpt_platform/backend/backend/blocks/linear/models.py
@@ -36,12 +36,21 @@ class Project(BaseModel):
     content: str | None = None
 
 
+class State(BaseModel):
+    id: str
+    name: str
+    type: str | None = (
+        None  # Workflow state type (e.g., "triage", "backlog", "started", "completed", "canceled")
+    )
+
+
 class Issue(BaseModel):
     id: str
     identifier: str
     title: str
     description: str | None
     priority: int
+    state: State | None = None
     project: Project | None = None
     createdAt: str | None = None
     comments: list[Comment] | None = None
diff --git a/autogpt_platform/backend/backend/blocks/llm.py b/autogpt_platform/backend/backend/blocks/llm.py
index 7fc1a69038..54295da1f1 100644
--- a/autogpt_platform/backend/backend/blocks/llm.py
+++ b/autogpt_platform/backend/backend/blocks/llm.py
@@ -32,7 +32,7 @@ from backend.data.model import (
 from backend.integrations.providers import ProviderName
 from backend.util import json
 from backend.util.logging import TruncatedLogger
-from backend.util.prompt import compress_prompt, estimate_token_count
+from backend.util.prompt import compress_context, estimate_token_count
 from backend.util.text import TextFormatter
 
 logger = TruncatedLogger(logging.getLogger(__name__), "[LLM-Block]")
@@ -79,6 +79,10 @@ class ModelMetadata(NamedTuple):
     provider: str
     context_window: int
     max_output_tokens: int | None
+    display_name: str
+    provider_name: str
+    creator_name: str
+    price_tier: Literal[1, 2, 3]
 
 
 class LlmModelMeta(EnumMeta):
@@ -111,7 +115,6 @@ class LlmModel(str, Enum, metaclass=LlmModelMeta):
     CLAUDE_4_5_OPUS = "claude-opus-4-5-20251101"
     CLAUDE_4_5_SONNET = "claude-sonnet-4-5-20250929"
     CLAUDE_4_5_HAIKU = "claude-haiku-4-5-20251001"
-    CLAUDE_3_7_SONNET = "claude-3-7-sonnet-20250219"
     CLAUDE_3_HAIKU = "claude-3-haiku-20240307"
     # AI/ML API models
     AIML_API_QWEN2_5_72B = "Qwen/Qwen2.5-72B-Instruct-Turbo"
@@ -171,6 +174,26 @@ class LlmModel(str, Enum, metaclass=LlmModelMeta):
     V0_1_5_LG = "v0-1.5-lg"
     V0_1_0_MD = "v0-1.0-md"
 
+    @classmethod
+    def __get_pydantic_json_schema__(cls, schema, handler):
+        json_schema = handler(schema)
+        llm_model_metadata = {}
+        for model in cls:
+            model_name = model.value
+            metadata = model.metadata
+            llm_model_metadata[model_name] = {
+                "creator": metadata.creator_name,
+                "creator_name": metadata.creator_name,
+                "title": metadata.display_name,
+                "provider": metadata.provider,
+                "provider_name": metadata.provider_name,
+                "name": model_name,
+                "price_tier": metadata.price_tier,
+            }
+        json_schema["llm_model"] = True
+        json_schema["llm_model_metadata"] = llm_model_metadata
+        return json_schema
+
     @property
     def metadata(self) -> ModelMetadata:
         return MODEL_METADATA[self]
@@ -190,119 +213,288 @@ class LlmModel(str, Enum, metaclass=LlmModelMeta):
 
 MODEL_METADATA = {
     # https://platform.openai.com/docs/models
-    LlmModel.O3: ModelMetadata("openai", 200000, 100000),
-    LlmModel.O3_MINI: ModelMetadata("openai", 200000, 100000),  # o3-mini-2025-01-31
-    LlmModel.O1: ModelMetadata("openai", 200000, 100000),  # o1-2024-12-17
-    LlmModel.O1_MINI: ModelMetadata("openai", 128000, 65536),  # o1-mini-2024-09-12
+    LlmModel.O3: ModelMetadata("openai", 200000, 100000, "O3", "OpenAI", "OpenAI", 2),
+    LlmModel.O3_MINI: ModelMetadata(
+        "openai", 200000, 100000, "O3 Mini", "OpenAI", "OpenAI", 1
+    ),  # o3-mini-2025-01-31
+    LlmModel.O1: ModelMetadata(
+        "openai", 200000, 100000, "O1", "OpenAI", "OpenAI", 3
+    ),  # o1-2024-12-17
+    LlmModel.O1_MINI: ModelMetadata(
+        "openai", 128000, 65536, "O1 Mini", "OpenAI", "OpenAI", 2
+    ),  # o1-mini-2024-09-12
     # GPT-5 models
-    LlmModel.GPT5_2: ModelMetadata("openai", 400000, 128000),
-    LlmModel.GPT5_1: ModelMetadata("openai", 400000, 128000),
-    LlmModel.GPT5: ModelMetadata("openai", 400000, 128000),
-    LlmModel.GPT5_MINI: ModelMetadata("openai", 400000, 128000),
-    LlmModel.GPT5_NANO: ModelMetadata("openai", 400000, 128000),
-    LlmModel.GPT5_CHAT: ModelMetadata("openai", 400000, 16384),
-    LlmModel.GPT41: ModelMetadata("openai", 1047576, 32768),
-    LlmModel.GPT41_MINI: ModelMetadata("openai", 1047576, 32768),
+    LlmModel.GPT5_2: ModelMetadata(
+        "openai", 400000, 128000, "GPT-5.2", "OpenAI", "OpenAI", 3
+    ),
+    LlmModel.GPT5_1: ModelMetadata(
+        "openai", 400000, 128000, "GPT-5.1", "OpenAI", "OpenAI", 2
+    ),
+    LlmModel.GPT5: ModelMetadata(
+        "openai", 400000, 128000, "GPT-5", "OpenAI", "OpenAI", 1
+    ),
+    LlmModel.GPT5_MINI: ModelMetadata(
+        "openai", 400000, 128000, "GPT-5 Mini", "OpenAI", "OpenAI", 1
+    ),
+    LlmModel.GPT5_NANO: ModelMetadata(
+        "openai", 400000, 128000, "GPT-5 Nano", "OpenAI", "OpenAI", 1
+    ),
+    LlmModel.GPT5_CHAT: ModelMetadata(
+        "openai", 400000, 16384, "GPT-5 Chat Latest", "OpenAI", "OpenAI", 2
+    ),
+    LlmModel.GPT41: ModelMetadata(
+        "openai", 1047576, 32768, "GPT-4.1", "OpenAI", "OpenAI", 1
+    ),
+    LlmModel.GPT41_MINI: ModelMetadata(
+        "openai", 1047576, 32768, "GPT-4.1 Mini", "OpenAI", "OpenAI", 1
+    ),
     LlmModel.GPT4O_MINI: ModelMetadata(
-        "openai", 128000, 16384
+        "openai", 128000, 16384, "GPT-4o Mini", "OpenAI", "OpenAI", 1
     ),  # gpt-4o-mini-2024-07-18
-    LlmModel.GPT4O: ModelMetadata("openai", 128000, 16384),  # gpt-4o-2024-08-06
+    LlmModel.GPT4O: ModelMetadata(
+        "openai", 128000, 16384, "GPT-4o", "OpenAI", "OpenAI", 2
+    ),  # gpt-4o-2024-08-06
     LlmModel.GPT4_TURBO: ModelMetadata(
-        "openai", 128000, 4096
+        "openai", 128000, 4096, "GPT-4 Turbo", "OpenAI", "OpenAI", 3
     ),  # gpt-4-turbo-2024-04-09
-    LlmModel.GPT3_5_TURBO: ModelMetadata("openai", 16385, 4096),  # gpt-3.5-turbo-0125
+    LlmModel.GPT3_5_TURBO: ModelMetadata(
+        "openai", 16385, 4096, "GPT-3.5 Turbo", "OpenAI", "OpenAI", 1
+    ),  # gpt-3.5-turbo-0125
     # https://docs.anthropic.com/en/docs/about-claude/models
     LlmModel.CLAUDE_4_1_OPUS: ModelMetadata(
-        "anthropic", 200000, 32000
+        "anthropic", 200000, 32000, "Claude Opus 4.1", "Anthropic", "Anthropic", 3
     ),  # claude-opus-4-1-20250805
     LlmModel.CLAUDE_4_OPUS: ModelMetadata(
-        "anthropic", 200000, 32000
+        "anthropic", 200000, 32000, "Claude Opus 4", "Anthropic", "Anthropic", 3
     ),  # claude-4-opus-20250514
     LlmModel.CLAUDE_4_SONNET: ModelMetadata(
-        "anthropic", 200000, 64000
+        "anthropic", 200000, 64000, "Claude Sonnet 4", "Anthropic", "Anthropic", 2
     ),  # claude-4-sonnet-20250514
     LlmModel.CLAUDE_4_5_OPUS: ModelMetadata(
-        "anthropic", 200000, 64000
+        "anthropic", 200000, 64000, "Claude Opus 4.5", "Anthropic", "Anthropic", 3
     ),  # claude-opus-4-5-20251101
     LlmModel.CLAUDE_4_5_SONNET: ModelMetadata(
-        "anthropic", 200000, 64000
+        "anthropic", 200000, 64000, "Claude Sonnet 4.5", "Anthropic", "Anthropic", 3
     ),  # claude-sonnet-4-5-20250929
     LlmModel.CLAUDE_4_5_HAIKU: ModelMetadata(
-        "anthropic", 200000, 64000
+        "anthropic", 200000, 64000, "Claude Haiku 4.5", "Anthropic", "Anthropic", 2
     ),  # claude-haiku-4-5-20251001
-    LlmModel.CLAUDE_3_7_SONNET: ModelMetadata(
-        "anthropic", 200000, 64000
-    ),  # claude-3-7-sonnet-20250219
     LlmModel.CLAUDE_3_HAIKU: ModelMetadata(
-        "anthropic", 200000, 4096
+        "anthropic", 200000, 4096, "Claude 3 Haiku", "Anthropic", "Anthropic", 1
     ),  # claude-3-haiku-20240307
     # https://docs.aimlapi.com/api-overview/model-database/text-models
-    LlmModel.AIML_API_QWEN2_5_72B: ModelMetadata("aiml_api", 32000, 8000),
-    LlmModel.AIML_API_LLAMA3_1_70B: ModelMetadata("aiml_api", 128000, 40000),
-    LlmModel.AIML_API_LLAMA3_3_70B: ModelMetadata("aiml_api", 128000, None),
-    LlmModel.AIML_API_META_LLAMA_3_1_70B: ModelMetadata("aiml_api", 131000, 2000),
-    LlmModel.AIML_API_LLAMA_3_2_3B: ModelMetadata("aiml_api", 128000, None),
-    # https://console.groq.com/docs/models
-    LlmModel.LLAMA3_3_70B: ModelMetadata("groq", 128000, 32768),
-    LlmModel.LLAMA3_1_8B: ModelMetadata("groq", 128000, 8192),
-    # https://ollama.com/library
-    LlmModel.OLLAMA_LLAMA3_3: ModelMetadata("ollama", 8192, None),
-    LlmModel.OLLAMA_LLAMA3_2: ModelMetadata("ollama", 8192, None),
-    LlmModel.OLLAMA_LLAMA3_8B: ModelMetadata("ollama", 8192, None),
-    LlmModel.OLLAMA_LLAMA3_405B: ModelMetadata("ollama", 8192, None),
-    LlmModel.OLLAMA_DOLPHIN: ModelMetadata("ollama", 32768, None),
-    # https://openrouter.ai/models
-    LlmModel.GEMINI_2_5_PRO: ModelMetadata("open_router", 1050000, 8192),
-    LlmModel.GEMINI_3_PRO_PREVIEW: ModelMetadata("open_router", 1048576, 65535),
-    LlmModel.GEMINI_2_5_FLASH: ModelMetadata("open_router", 1048576, 65535),
-    LlmModel.GEMINI_2_0_FLASH: ModelMetadata("open_router", 1048576, 8192),
-    LlmModel.GEMINI_2_5_FLASH_LITE_PREVIEW: ModelMetadata(
-        "open_router", 1048576, 65535
+    LlmModel.AIML_API_QWEN2_5_72B: ModelMetadata(
+        "aiml_api", 32000, 8000, "Qwen 2.5 72B Instruct Turbo", "AI/ML", "Qwen", 1
+    ),
+    LlmModel.AIML_API_LLAMA3_1_70B: ModelMetadata(
+        "aiml_api",
+        128000,
+        40000,
+        "Llama 3.1 Nemotron 70B Instruct",
+        "AI/ML",
+        "Nvidia",
+        1,
+    ),
+    LlmModel.AIML_API_LLAMA3_3_70B: ModelMetadata(
+        "aiml_api", 128000, None, "Llama 3.3 70B Instruct Turbo", "AI/ML", "Meta", 1
+    ),
+    LlmModel.AIML_API_META_LLAMA_3_1_70B: ModelMetadata(
+        "aiml_api", 131000, 2000, "Llama 3.1 70B Instruct Turbo", "AI/ML", "Meta", 1
+    ),
+    LlmModel.AIML_API_LLAMA_3_2_3B: ModelMetadata(
+        "aiml_api", 128000, None, "Llama 3.2 3B Instruct Turbo", "AI/ML", "Meta", 1
+    ),
+    # https://console.groq.com/docs/models
+    LlmModel.LLAMA3_3_70B: ModelMetadata(
+        "groq", 128000, 32768, "Llama 3.3 70B Versatile", "Groq", "Meta", 1
+    ),
+    LlmModel.LLAMA3_1_8B: ModelMetadata(
+        "groq", 128000, 8192, "Llama 3.1 8B Instant", "Groq", "Meta", 1
+    ),
+    # https://ollama.com/library
+    LlmModel.OLLAMA_LLAMA3_3: ModelMetadata(
+        "ollama", 8192, None, "Llama 3.3", "Ollama", "Meta", 1
+    ),
+    LlmModel.OLLAMA_LLAMA3_2: ModelMetadata(
+        "ollama", 8192, None, "Llama 3.2", "Ollama", "Meta", 1
+    ),
+    LlmModel.OLLAMA_LLAMA3_8B: ModelMetadata(
+        "ollama", 8192, None, "Llama 3", "Ollama", "Meta", 1
+    ),
+    LlmModel.OLLAMA_LLAMA3_405B: ModelMetadata(
+        "ollama", 8192, None, "Llama 3.1 405B", "Ollama", "Meta", 1
+    ),
+    LlmModel.OLLAMA_DOLPHIN: ModelMetadata(
+        "ollama", 32768, None, "Dolphin Mistral Latest", "Ollama", "Mistral AI", 1
+    ),
+    # https://openrouter.ai/models
+    LlmModel.GEMINI_2_5_PRO: ModelMetadata(
+        "open_router",
+        1050000,
+        8192,
+        "Gemini 2.5 Pro Preview 03.25",
+        "OpenRouter",
+        "Google",
+        2,
+    ),
+    LlmModel.GEMINI_3_PRO_PREVIEW: ModelMetadata(
+        "open_router", 1048576, 65535, "Gemini 3 Pro Preview", "OpenRouter", "Google", 2
+    ),
+    LlmModel.GEMINI_2_5_FLASH: ModelMetadata(
+        "open_router", 1048576, 65535, "Gemini 2.5 Flash", "OpenRouter", "Google", 1
+    ),
+    LlmModel.GEMINI_2_0_FLASH: ModelMetadata(
+        "open_router", 1048576, 8192, "Gemini 2.0 Flash 001", "OpenRouter", "Google", 1
+    ),
+    LlmModel.GEMINI_2_5_FLASH_LITE_PREVIEW: ModelMetadata(
+        "open_router",
+        1048576,
+        65535,
+        "Gemini 2.5 Flash Lite Preview 06.17",
+        "OpenRouter",
+        "Google",
+        1,
+    ),
+    LlmModel.GEMINI_2_0_FLASH_LITE: ModelMetadata(
+        "open_router",
+        1048576,
+        8192,
+        "Gemini 2.0 Flash Lite 001",
+        "OpenRouter",
+        "Google",
+        1,
+    ),
+    LlmModel.MISTRAL_NEMO: ModelMetadata(
+        "open_router", 128000, 4096, "Mistral Nemo", "OpenRouter", "Mistral AI", 1
+    ),
+    LlmModel.COHERE_COMMAND_R_08_2024: ModelMetadata(
+        "open_router", 128000, 4096, "Command R 08.2024", "OpenRouter", "Cohere", 1
+    ),
+    LlmModel.COHERE_COMMAND_R_PLUS_08_2024: ModelMetadata(
+        "open_router", 128000, 4096, "Command R Plus 08.2024", "OpenRouter", "Cohere", 2
+    ),
+    LlmModel.DEEPSEEK_CHAT: ModelMetadata(
+        "open_router", 64000, 2048, "DeepSeek Chat", "OpenRouter", "DeepSeek", 1
+    ),
+    LlmModel.DEEPSEEK_R1_0528: ModelMetadata(
+        "open_router", 163840, 163840, "DeepSeek R1 0528", "OpenRouter", "DeepSeek", 1
+    ),
+    LlmModel.PERPLEXITY_SONAR: ModelMetadata(
+        "open_router", 127000, 8000, "Sonar", "OpenRouter", "Perplexity", 1
+    ),
+    LlmModel.PERPLEXITY_SONAR_PRO: ModelMetadata(
+        "open_router", 200000, 8000, "Sonar Pro", "OpenRouter", "Perplexity", 2
     ),
-    LlmModel.GEMINI_2_0_FLASH_LITE: ModelMetadata("open_router", 1048576, 8192),
-    LlmModel.MISTRAL_NEMO: ModelMetadata("open_router", 128000, 4096),
-    LlmModel.COHERE_COMMAND_R_08_2024: ModelMetadata("open_router", 128000, 4096),
-    LlmModel.COHERE_COMMAND_R_PLUS_08_2024: ModelMetadata("open_router", 128000, 4096),
-    LlmModel.DEEPSEEK_CHAT: ModelMetadata("open_router", 64000, 2048),
-    LlmModel.DEEPSEEK_R1_0528: ModelMetadata("open_router", 163840, 163840),
-    LlmModel.PERPLEXITY_SONAR: ModelMetadata("open_router", 127000, 8000),
-    LlmModel.PERPLEXITY_SONAR_PRO: ModelMetadata("open_router", 200000, 8000),
     LlmModel.PERPLEXITY_SONAR_DEEP_RESEARCH: ModelMetadata(
         "open_router",
         128000,
         16000,
+        "Sonar Deep Research",
+        "OpenRouter",
+        "Perplexity",
+        3,
     ),
     LlmModel.NOUSRESEARCH_HERMES_3_LLAMA_3_1_405B: ModelMetadata(
-        "open_router", 131000, 4096
+        "open_router",
+        131000,
+        4096,
+        "Hermes 3 Llama 3.1 405B",
+        "OpenRouter",
+        "Nous Research",
+        1,
     ),
     LlmModel.NOUSRESEARCH_HERMES_3_LLAMA_3_1_70B: ModelMetadata(
-        "open_router", 12288, 12288
+        "open_router",
+        12288,
+        12288,
+        "Hermes 3 Llama 3.1 70B",
+        "OpenRouter",
+        "Nous Research",
+        1,
+    ),
+    LlmModel.OPENAI_GPT_OSS_120B: ModelMetadata(
+        "open_router", 131072, 131072, "GPT-OSS 120B", "OpenRouter", "OpenAI", 1
+    ),
+    LlmModel.OPENAI_GPT_OSS_20B: ModelMetadata(
+        "open_router", 131072, 32768, "GPT-OSS 20B", "OpenRouter", "OpenAI", 1
+    ),
+    LlmModel.AMAZON_NOVA_LITE_V1: ModelMetadata(
+        "open_router", 300000, 5120, "Nova Lite V1", "OpenRouter", "Amazon", 1
+    ),
+    LlmModel.AMAZON_NOVA_MICRO_V1: ModelMetadata(
+        "open_router", 128000, 5120, "Nova Micro V1", "OpenRouter", "Amazon", 1
+    ),
+    LlmModel.AMAZON_NOVA_PRO_V1: ModelMetadata(
+        "open_router", 300000, 5120, "Nova Pro V1", "OpenRouter", "Amazon", 1
+    ),
+    LlmModel.MICROSOFT_WIZARDLM_2_8X22B: ModelMetadata(
+        "open_router", 65536, 4096, "WizardLM 2 8x22B", "OpenRouter", "Microsoft", 1
+    ),
+    LlmModel.GRYPHE_MYTHOMAX_L2_13B: ModelMetadata(
+        "open_router", 4096, 4096, "MythoMax L2 13B", "OpenRouter", "Gryphe", 1
+    ),
+    LlmModel.META_LLAMA_4_SCOUT: ModelMetadata(
+        "open_router", 131072, 131072, "Llama 4 Scout", "OpenRouter", "Meta", 1
+    ),
+    LlmModel.META_LLAMA_4_MAVERICK: ModelMetadata(
+        "open_router", 1048576, 1000000, "Llama 4 Maverick", "OpenRouter", "Meta", 1
+    ),
+    LlmModel.GROK_4: ModelMetadata(
+        "open_router", 256000, 256000, "Grok 4", "OpenRouter", "xAI", 3
+    ),
+    LlmModel.GROK_4_FAST: ModelMetadata(
+        "open_router", 2000000, 30000, "Grok 4 Fast", "OpenRouter", "xAI", 1
+    ),
+    LlmModel.GROK_4_1_FAST: ModelMetadata(
+        "open_router", 2000000, 30000, "Grok 4.1 Fast", "OpenRouter", "xAI", 1
+    ),
+    LlmModel.GROK_CODE_FAST_1: ModelMetadata(
+        "open_router", 256000, 10000, "Grok Code Fast 1", "OpenRouter", "xAI", 1
+    ),
+    LlmModel.KIMI_K2: ModelMetadata(
+        "open_router", 131000, 131000, "Kimi K2", "OpenRouter", "Moonshot AI", 1
+    ),
+    LlmModel.QWEN3_235B_A22B_THINKING: ModelMetadata(
+        "open_router",
+        262144,
+        262144,
+        "Qwen 3 235B A22B Thinking 2507",
+        "OpenRouter",
+        "Qwen",
+        1,
+    ),
+    LlmModel.QWEN3_CODER: ModelMetadata(
+        "open_router", 262144, 262144, "Qwen 3 Coder", "OpenRouter", "Qwen", 3
     ),
-    LlmModel.OPENAI_GPT_OSS_120B: ModelMetadata("open_router", 131072, 131072),
-    LlmModel.OPENAI_GPT_OSS_20B: ModelMetadata("open_router", 131072, 32768),
-    LlmModel.AMAZON_NOVA_LITE_V1: ModelMetadata("open_router", 300000, 5120),
-    LlmModel.AMAZON_NOVA_MICRO_V1: ModelMetadata("open_router", 128000, 5120),
-    LlmModel.AMAZON_NOVA_PRO_V1: ModelMetadata("open_router", 300000, 5120),
-    LlmModel.MICROSOFT_WIZARDLM_2_8X22B: ModelMetadata("open_router", 65536, 4096),
-    LlmModel.GRYPHE_MYTHOMAX_L2_13B: ModelMetadata("open_router", 4096, 4096),
-    LlmModel.META_LLAMA_4_SCOUT: ModelMetadata("open_router", 131072, 131072),
-    LlmModel.META_LLAMA_4_MAVERICK: ModelMetadata("open_router", 1048576, 1000000),
-    LlmModel.GROK_4: ModelMetadata("open_router", 256000, 256000),
-    LlmModel.GROK_4_FAST: ModelMetadata("open_router", 2000000, 30000),
-    LlmModel.GROK_4_1_FAST: ModelMetadata("open_router", 2000000, 30000),
-    LlmModel.GROK_CODE_FAST_1: ModelMetadata("open_router", 256000, 10000),
-    LlmModel.KIMI_K2: ModelMetadata("open_router", 131000, 131000),
-    LlmModel.QWEN3_235B_A22B_THINKING: ModelMetadata("open_router", 262144, 262144),
-    LlmModel.QWEN3_CODER: ModelMetadata("open_router", 262144, 262144),
     # Llama API models
-    LlmModel.LLAMA_API_LLAMA_4_SCOUT: ModelMetadata("llama_api", 128000, 4028),
-    LlmModel.LLAMA_API_LLAMA4_MAVERICK: ModelMetadata("llama_api", 128000, 4028),
-    LlmModel.LLAMA_API_LLAMA3_3_8B: ModelMetadata("llama_api", 128000, 4028),
-    LlmModel.LLAMA_API_LLAMA3_3_70B: ModelMetadata("llama_api", 128000, 4028),
+    LlmModel.LLAMA_API_LLAMA_4_SCOUT: ModelMetadata(
+        "llama_api",
+        128000,
+        4028,
+        "Llama 4 Scout 17B 16E Instruct FP8",
+        "Llama API",
+        "Meta",
+        1,
+    ),
+    LlmModel.LLAMA_API_LLAMA4_MAVERICK: ModelMetadata(
+        "llama_api",
+        128000,
+        4028,
+        "Llama 4 Maverick 17B 128E Instruct FP8",
+        "Llama API",
+        "Meta",
+        1,
+    ),
+    LlmModel.LLAMA_API_LLAMA3_3_8B: ModelMetadata(
+        "llama_api", 128000, 4028, "Llama 3.3 8B Instruct", "Llama API", "Meta", 1
+    ),
+    LlmModel.LLAMA_API_LLAMA3_3_70B: ModelMetadata(
+        "llama_api", 128000, 4028, "Llama 3.3 70B Instruct", "Llama API", "Meta", 1
+    ),
     # v0 by Vercel models
-    LlmModel.V0_1_5_MD: ModelMetadata("v0", 128000, 64000),
-    LlmModel.V0_1_5_LG: ModelMetadata("v0", 512000, 64000),
-    LlmModel.V0_1_0_MD: ModelMetadata("v0", 128000, 64000),
+    LlmModel.V0_1_5_MD: ModelMetadata("v0", 128000, 64000, "v0 1.5 MD", "V0", "V0", 1),
+    LlmModel.V0_1_5_LG: ModelMetadata("v0", 512000, 64000, "v0 1.5 LG", "V0", "V0", 1),
+    LlmModel.V0_1_0_MD: ModelMetadata("v0", 128000, 64000, "v0 1.0 MD", "V0", "V0", 1),
 }
 
 DEFAULT_LLM_MODEL = LlmModel.GPT5_2
@@ -442,11 +634,18 @@ async def llm_call(
     context_window = llm_model.context_window
 
     if compress_prompt_to_fit:
-        prompt = compress_prompt(
+        result = await compress_context(
             messages=prompt,
             target_tokens=llm_model.context_window // 2,
-            lossy_ok=True,
+            client=None,  # Truncation-only, no LLM summarization
+            reserve=0,  # Caller handles response token budget separately
         )
+        if result.error:
+            logger.warning(
+                f"Prompt compression did not meet target: {result.error}. "
+                f"Proceeding with {result.token_count} tokens."
+            )
+        prompt = result.messages
 
     # Calculate available tokens based on context window and input length
     estimated_input_tokens = estimate_token_count(prompt)
@@ -854,7 +1053,7 @@ class AIStructuredResponseGeneratorBlock(AIBlockBase):
     def __init__(self):
         super().__init__(
             id="ed55ac19-356e-4243-a6cb-bc599e9b716f",
-            description="Call a Large Language Model (LLM) to generate formatted object based on the given prompt.",
+            description="A block that generates structured JSON responses using a Large Language Model (LLM), with schema validation and format enforcement.",
             categories={BlockCategory.AI},
             input_schema=AIStructuredResponseGeneratorBlock.Input,
             output_schema=AIStructuredResponseGeneratorBlock.Output,
@@ -1265,7 +1464,7 @@ class AITextGeneratorBlock(AIBlockBase):
     def __init__(self):
         super().__init__(
             id="1f292d4a-41a4-4977-9684-7c8d560b9f91",
-            description="Call a Large Language Model (LLM) to generate a string based on the given prompt.",
+            description="A block that produces text responses using a Large Language Model (LLM) based on customizable prompts and system instructions.",
             categories={BlockCategory.AI},
             input_schema=AITextGeneratorBlock.Input,
             output_schema=AITextGeneratorBlock.Output,
@@ -1361,7 +1560,7 @@ class AITextSummarizerBlock(AIBlockBase):
     def __init__(self):
         super().__init__(
             id="a0a69be1-4528-491c-a85a-a4ab6873e3f0",
-            description="Utilize a Large Language Model (LLM) to summarize a long text.",
+            description="A block that summarizes long texts using a Large Language Model (LLM), with configurable focus topics and summary styles.",
             categories={BlockCategory.AI, BlockCategory.TEXT},
             input_schema=AITextSummarizerBlock.Input,
             output_schema=AITextSummarizerBlock.Output,
@@ -1562,7 +1761,7 @@ class AIConversationBlock(AIBlockBase):
     def __init__(self):
         super().__init__(
             id="32a87eab-381e-4dd4-bdb8-4c47151be35a",
-            description="Advanced LLM call that takes a list of messages and sends them to the language model.",
+            description="A block that facilitates multi-turn conversations with a Large Language Model (LLM), maintaining context across message exchanges.",
             categories={BlockCategory.AI},
             input_schema=AIConversationBlock.Input,
             output_schema=AIConversationBlock.Output,
@@ -1682,7 +1881,7 @@ class AIListGeneratorBlock(AIBlockBase):
     def __init__(self):
         super().__init__(
             id="9c0b0450-d199-458b-a731-072189dd6593",
-            description="Generate a list of values based on the given prompt using a Large Language Model (LLM).",
+            description="A block that creates lists of items based on prompts using a Large Language Model (LLM), with optional source data for context.",
             categories={BlockCategory.AI, BlockCategory.TEXT},
             input_schema=AIListGeneratorBlock.Input,
             output_schema=AIListGeneratorBlock.Output,
diff --git a/autogpt_platform/backend/backend/blocks/media.py b/autogpt_platform/backend/backend/blocks/media.py
index c8d4b4768f..a8d145bc64 100644
--- a/autogpt_platform/backend/backend/blocks/media.py
+++ b/autogpt_platform/backend/backend/blocks/media.py
@@ -1,6 +1,6 @@
 import os
 import tempfile
-from typing import Literal, Optional
+from typing import Optional
 
 from moviepy.audio.io.AudioFileClip import AudioFileClip
 from moviepy.video.fx.Loop import Loop
@@ -13,6 +13,7 @@ from backend.data.block import (
     BlockSchemaInput,
     BlockSchemaOutput,
 )
+from backend.data.execution import ExecutionContext
 from backend.data.model import SchemaField
 from backend.util.file import MediaFileType, get_exec_file_path, store_media_file
 
@@ -46,18 +47,19 @@ class MediaDurationBlock(Block):
         self,
         input_data: Input,
         *,
-        graph_exec_id: str,
-        user_id: str,
+        execution_context: ExecutionContext,
         **kwargs,
     ) -> BlockOutput:
         # 1) Store the input media locally
         local_media_path = await store_media_file(
-            graph_exec_id=graph_exec_id,
             file=input_data.media_in,
-            user_id=user_id,
-            return_content=False,
+            execution_context=execution_context,
+            return_format="for_local_processing",
+        )
+        assert execution_context.graph_exec_id is not None
+        media_abspath = get_exec_file_path(
+            execution_context.graph_exec_id, local_media_path
         )
-        media_abspath = get_exec_file_path(graph_exec_id, local_media_path)
 
         # 2) Load the clip
         if input_data.is_video:
@@ -88,10 +90,6 @@ class LoopVideoBlock(Block):
             default=None,
             ge=1,
         )
-        output_return_type: Literal["file_path", "data_uri"] = SchemaField(
-            description="How to return the output video. Either a relative path or base64 data URI.",
-            default="file_path",
-        )
 
     class Output(BlockSchemaOutput):
         video_out: str = SchemaField(
@@ -111,17 +109,19 @@ class LoopVideoBlock(Block):
         self,
         input_data: Input,
         *,
-        node_exec_id: str,
-        graph_exec_id: str,
-        user_id: str,
+        execution_context: ExecutionContext,
         **kwargs,
     ) -> BlockOutput:
+        assert execution_context.graph_exec_id is not None
+        assert execution_context.node_exec_id is not None
+        graph_exec_id = execution_context.graph_exec_id
+        node_exec_id = execution_context.node_exec_id
+
         # 1) Store the input video locally
         local_video_path = await store_media_file(
-            graph_exec_id=graph_exec_id,
             file=input_data.video_in,
-            user_id=user_id,
-            return_content=False,
+            execution_context=execution_context,
+            return_format="for_local_processing",
         )
         input_abspath = get_exec_file_path(graph_exec_id, local_video_path)
 
@@ -149,12 +149,11 @@ class LoopVideoBlock(Block):
         looped_clip = looped_clip.with_audio(clip.audio)
         looped_clip.write_videofile(output_abspath, codec="libx264", audio_codec="aac")
 
-        # Return as data URI
+        # Return output - for_block_output returns workspace:// if available, else data URI
         video_out = await store_media_file(
-            graph_exec_id=graph_exec_id,
             file=output_filename,
-            user_id=user_id,
-            return_content=input_data.output_return_type == "data_uri",
+            execution_context=execution_context,
+            return_format="for_block_output",
         )
 
         yield "video_out", video_out
@@ -177,10 +176,6 @@ class AddAudioToVideoBlock(Block):
             description="Volume scale for the newly attached audio track (1.0 = original).",
             default=1.0,
         )
-        output_return_type: Literal["file_path", "data_uri"] = SchemaField(
-            description="Return the final output as a relative path or base64 data URI.",
-            default="file_path",
-        )
 
     class Output(BlockSchemaOutput):
         video_out: MediaFileType = SchemaField(
@@ -200,23 +195,24 @@ class AddAudioToVideoBlock(Block):
         self,
         input_data: Input,
         *,
-        node_exec_id: str,
-        graph_exec_id: str,
-        user_id: str,
+        execution_context: ExecutionContext,
         **kwargs,
     ) -> BlockOutput:
+        assert execution_context.graph_exec_id is not None
+        assert execution_context.node_exec_id is not None
+        graph_exec_id = execution_context.graph_exec_id
+        node_exec_id = execution_context.node_exec_id
+
         # 1) Store the inputs locally
         local_video_path = await store_media_file(
-            graph_exec_id=graph_exec_id,
             file=input_data.video_in,
-            user_id=user_id,
-            return_content=False,
+            execution_context=execution_context,
+            return_format="for_local_processing",
         )
         local_audio_path = await store_media_file(
-            graph_exec_id=graph_exec_id,
             file=input_data.audio_in,
-            user_id=user_id,
-            return_content=False,
+            execution_context=execution_context,
+            return_format="for_local_processing",
         )
 
         abs_temp_dir = os.path.join(tempfile.gettempdir(), "exec_file", graph_exec_id)
@@ -240,12 +236,11 @@ class AddAudioToVideoBlock(Block):
         output_abspath = os.path.join(abs_temp_dir, output_filename)
         final_clip.write_videofile(output_abspath, codec="libx264", audio_codec="aac")
 
-        # 5) Return either path or data URI
+        # 5) Return output - for_block_output returns workspace:// if available, else data URI
         video_out = await store_media_file(
-            graph_exec_id=graph_exec_id,
             file=output_filename,
-            user_id=user_id,
-            return_content=input_data.output_return_type == "data_uri",
+            execution_context=execution_context,
+            return_format="for_block_output",
         )
 
         yield "video_out", video_out
diff --git a/autogpt_platform/backend/backend/blocks/medium.py b/autogpt_platform/backend/backend/blocks/medium.py
index 713a8274f9..d54062d3ab 100644
--- a/autogpt_platform/backend/backend/blocks/medium.py
+++ b/autogpt_platform/backend/backend/blocks/medium.py
@@ -46,7 +46,7 @@ class PublishToMediumBlock(Block):
     class Input(BlockSchemaInput):
         author_id: BlockSecret = SecretField(
             key="medium_author_id",
-            description="""The Medium AuthorID of the user. You can get this by calling the /me endpoint of the Medium API.\n\ncurl -H "Authorization: Bearer YOUR_ACCESS_TOKEN" https://api.medium.com/v1/me" the response will contain the authorId field.""",
+            description="""The Medium AuthorID of the user. You can get this by calling the /me endpoint of the Medium API.\n\ncurl -H "Authorization: Bearer YOUR_ACCESS_TOKEN" https://api.medium.com/v1/me\n\nThe response will contain the authorId field.""",
             placeholder="Enter the author's Medium AuthorID",
         )
         title: str = SchemaField(
diff --git a/autogpt_platform/backend/backend/blocks/reddit.py b/autogpt_platform/backend/backend/blocks/reddit.py
index 231e7affef..1109d568db 100644
--- a/autogpt_platform/backend/backend/blocks/reddit.py
+++ b/autogpt_platform/backend/backend/blocks/reddit.py
@@ -3,6 +3,7 @@ from datetime import datetime, timezone
 from typing import Iterator, Literal
 
 import praw
+from praw.models import Comment, MoreComments, Submission
 from pydantic import BaseModel, SecretStr
 
 from backend.data.block import (
@@ -15,33 +16,51 @@ from backend.data.block import (
 from backend.data.model import (
     CredentialsField,
     CredentialsMetaInput,
+    OAuth2Credentials,
     SchemaField,
-    UserPasswordCredentials,
 )
 from backend.integrations.providers import ProviderName
 from backend.util.mock import MockObject
 from backend.util.settings import Settings
 
-RedditCredentials = UserPasswordCredentials
+# Type aliases for Reddit API options
+UserPostSort = Literal["new", "hot", "top", "controversial"]
+SearchSort = Literal["relevance", "hot", "top", "new", "comments"]
+TimeFilter = Literal["all", "day", "hour", "month", "week", "year"]
+CommentSort = Literal["best", "top", "new", "controversial", "old", "qa"]
+InboxType = Literal["all", "unread", "messages", "mentions", "comment_replies"]
+
+RedditCredentials = OAuth2Credentials
 RedditCredentialsInput = CredentialsMetaInput[
     Literal[ProviderName.REDDIT],
-    Literal["user_password"],
+    Literal["oauth2"],
 ]
 
 
 def RedditCredentialsField() -> RedditCredentialsInput:
     """Creates a Reddit credentials input on a block."""
     return CredentialsField(
-        description="The Reddit integration requires a username and password.",
+        description="Connect your Reddit account to access Reddit features.",
     )
 
 
-TEST_CREDENTIALS = UserPasswordCredentials(
+TEST_CREDENTIALS = OAuth2Credentials(
     id="01234567-89ab-cdef-0123-456789abcdef",
     provider="reddit",
-    username=SecretStr("mock-reddit-username"),
-    password=SecretStr("mock-reddit-password"),
+    access_token=SecretStr("mock-reddit-access-token"),
+    refresh_token=SecretStr("mock-reddit-refresh-token"),
+    access_token_expires_at=9999999999,
+    scopes=[
+        "identity",
+        "read",
+        "submit",
+        "edit",
+        "history",
+        "privatemessages",
+        "flair",
+    ],
     title="Mock Reddit credentials",
+    username="mock-reddit-username",
 )
 
 TEST_CREDENTIALS_INPUT = {
@@ -53,27 +72,29 @@ TEST_CREDENTIALS_INPUT = {
 
 
 class RedditPost(BaseModel):
-    id: str
+    post_id: str
     subreddit: str
     title: str
     body: str
 
 
-class RedditComment(BaseModel):
-    post_id: str
-    comment: str
-
-
 settings = Settings()
 logger = logging.getLogger(__name__)
 
 
 def get_praw(creds: RedditCredentials) -> praw.Reddit:
+    """
+    Create a PRAW Reddit client using OAuth2 credentials.
+
+    Uses the refresh_token for authentication, which allows the client
+    to automatically refresh the access token when needed.
+    """
     client = praw.Reddit(
         client_id=settings.secrets.reddit_client_id,
         client_secret=settings.secrets.reddit_client_secret,
-        username=creds.username.get_secret_value(),
-        password=creds.password.get_secret_value(),
+        refresh_token=(
+            creds.refresh_token.get_secret_value() if creds.refresh_token else None
+        ),
         user_agent=settings.config.reddit_user_agent,
     )
     me = client.user.me()
@@ -83,11 +104,36 @@ def get_praw(creds: RedditCredentials) -> praw.Reddit:
     return client
 
 
+def strip_reddit_prefix(id_str: str) -> str:
+    """
+    Strip Reddit type prefix (t1_, t3_, etc.) from an ID if present.
+
+    Reddit uses type prefixes like t1_ for comments, t3_ for posts, etc.
+    This helper normalizes IDs by removing these prefixes when present,
+    allowing blocks to accept both 'abc123' and 't3_abc123' formats.
+
+    Args:
+        id_str: The ID string that may have a Reddit type prefix.
+
+    Returns:
+        The ID without the type prefix.
+    """
+    if (
+        len(id_str) > 3
+        and id_str[0] == "t"
+        and id_str[1].isdigit()
+        and id_str[2] == "_"
+    ):
+        return id_str[3:]
+    return id_str
+
+
 class GetRedditPostsBlock(Block):
     class Input(BlockSchemaInput):
         subreddit: str = SchemaField(
             description="Subreddit name, excluding the /r/ prefix",
             default="writingprompts",
+            advanced=False,
         )
         credentials: RedditCredentialsInput = RedditCredentialsField()
         last_minutes: int | None = SchemaField(
@@ -128,26 +174,32 @@ class GetRedditPostsBlock(Block):
                 (
                     "post",
                     RedditPost(
-                        id="id1", subreddit="subreddit", title="title1", body="body1"
+                        post_id="id1",
+                        subreddit="subreddit",
+                        title="title1",
+                        body="body1",
                     ),
                 ),
                 (
                     "post",
                     RedditPost(
-                        id="id2", subreddit="subreddit", title="title2", body="body2"
+                        post_id="id2",
+                        subreddit="subreddit",
+                        title="title2",
+                        body="body2",
                     ),
                 ),
                 (
                     "posts",
                     [
                         RedditPost(
-                            id="id1",
+                            post_id="id1",
                             subreddit="subreddit",
                             title="title1",
                             body="body1",
                         ),
                         RedditPost(
-                            id="id2",
+                            post_id="id2",
                             subreddit="subreddit",
                             title="title2",
                             body="body2",
@@ -184,13 +236,14 @@ class GetRedditPostsBlock(Block):
                 )
                 time_difference = current_time - post_datetime
                 if time_difference.total_seconds() / 60 > input_data.last_minutes:
-                    continue
+                    # Posts are ordered newest-first, so all subsequent posts will also be older
+                    break
 
             if input_data.last_post and post.id == input_data.last_post:
                 break
 
             reddit_post = RedditPost(
-                id=post.id,
+                post_id=post.id,
                 subreddit=input_data.subreddit,
                 title=post.title,
                 body=post.selftext,
@@ -204,10 +257,18 @@ class GetRedditPostsBlock(Block):
 class PostRedditCommentBlock(Block):
     class Input(BlockSchemaInput):
         credentials: RedditCredentialsInput = RedditCredentialsField()
-        data: RedditComment = SchemaField(description="Reddit comment")
+        post_id: str = SchemaField(
+            description="The ID of the post to comment on",
+        )
+        comment: str = SchemaField(
+            description="The content of the comment to post",
+        )
 
     class Output(BlockSchemaOutput):
         comment_id: str = SchemaField(description="Posted comment ID")
+        post_id: str = SchemaField(
+            description="The post ID (pass-through for chaining)"
+        )
 
     def __init__(self):
         super().__init__(
@@ -223,17 +284,24 @@ class PostRedditCommentBlock(Block):
             test_credentials=TEST_CREDENTIALS,
             test_input={
                 "credentials": TEST_CREDENTIALS_INPUT,
-                "data": {"post_id": "id", "comment": "comment"},
+                "post_id": "test_post_id",
+                "comment": "comment",
+            },
+            test_output=[
+                ("comment_id", "dummy_comment_id"),
+                ("post_id", "test_post_id"),
+            ],
+            test_mock={
+                "reply_post": lambda creds, post_id, comment: "dummy_comment_id"
             },
-            test_output=[("comment_id", "dummy_comment_id")],
-            test_mock={"reply_post": lambda creds, comment: "dummy_comment_id"},
         )
 
     @staticmethod
-    def reply_post(creds: RedditCredentials, comment: RedditComment) -> str:
+    def reply_post(creds: RedditCredentials, post_id: str, comment: str) -> str:
         client = get_praw(creds)
-        submission = client.submission(id=comment.post_id)
-        new_comment = submission.reply(comment.comment)
+        post_id = strip_reddit_prefix(post_id)
+        submission = client.submission(id=post_id)
+        new_comment = submission.reply(comment)
         if not new_comment:
             raise ValueError("Failed to post comment.")
         return new_comment.id
@@ -241,4 +309,2230 @@ class PostRedditCommentBlock(Block):
     async def run(
         self, input_data: Input, *, credentials: RedditCredentials, **kwargs
     ) -> BlockOutput:
-        yield "comment_id", self.reply_post(credentials, input_data.data)
+        yield "comment_id", self.reply_post(
+            credentials,
+            post_id=input_data.post_id,
+            comment=input_data.comment,
+        )
+        yield "post_id", input_data.post_id
+
+
+class CreateRedditPostBlock(Block):
+    class Input(BlockSchemaInput):
+        credentials: RedditCredentialsInput = RedditCredentialsField()
+        subreddit: str = SchemaField(
+            description="Subreddit to post to, excluding the /r/ prefix",
+        )
+        title: str = SchemaField(
+            description="Title of the post",
+        )
+        content: str = SchemaField(
+            description="Body text of the post (for text posts)",
+            default="",
+        )
+        url: str | None = SchemaField(
+            description="URL to submit (for link posts). If provided, content is ignored.",
+            default=None,
+        )
+        flair_id: str | None = SchemaField(
+            description="Flair template ID to apply to the post (from GetSubredditFlairsBlock)",
+            default=None,
+        )
+        flair_text: str | None = SchemaField(
+            description="Custom flair text (only used if the flair template allows editing)",
+            default=None,
+        )
+
+    class Output(BlockSchemaOutput):
+        post_id: str = SchemaField(description="ID of the created post")
+        post_url: str = SchemaField(description="URL of the created post")
+        subreddit: str = SchemaField(
+            description="The subreddit name (pass-through for chaining)"
+        )
+
+    def __init__(self):
+        super().__init__(
+            id="f3a2b1c0-8d7e-4f6a-9b5c-1234567890ab",
+            description="Create a new post on a subreddit. Can create text posts or link posts.",
+            categories={BlockCategory.SOCIAL},
+            input_schema=CreateRedditPostBlock.Input,
+            output_schema=CreateRedditPostBlock.Output,
+            disabled=(
+                not settings.secrets.reddit_client_id
+                or not settings.secrets.reddit_client_secret
+            ),
+            test_credentials=TEST_CREDENTIALS,
+            test_input={
+                "credentials": TEST_CREDENTIALS_INPUT,
+                "subreddit": "test",
+                "title": "Test Post",
+                "content": "This is a test post body.",
+            },
+            test_output=[
+                ("post_id", "abc123"),
+                ("post_url", "https://reddit.com/r/test/comments/abc123/test_post/"),
+                ("subreddit", "test"),
+            ],
+            test_mock={
+                "create_post": lambda creds, subreddit, title, content, url, flair_id, flair_text: (
+                    "abc123",
+                    "https://reddit.com/r/test/comments/abc123/test_post/",
+                )
+            },
+        )
+
+    @staticmethod
+    def create_post(
+        creds: RedditCredentials,
+        subreddit: str,
+        title: str,
+        content: str = "",
+        url: str | None = None,
+        flair_id: str | None = None,
+        flair_text: str | None = None,
+    ) -> tuple[str, str]:
+        """
+        Create a new post on a subreddit.
+
+        Args:
+            creds: Reddit OAuth2 credentials
+            subreddit: Subreddit name (without /r/ prefix)
+            title: Post title
+            content: Post body text (for text posts)
+            url: URL to submit (for link posts, overrides content)
+            flair_id: Optional flair template ID to apply
+            flair_text: Optional custom flair text (for editable flairs)
+
+        Returns:
+            Tuple of (post_id, post_url)
+        """
+        client = get_praw(creds)
+        sub = client.subreddit(subreddit)
+
+        if url:
+            submission = sub.submit(
+                title=title, url=url, flair_id=flair_id, flair_text=flair_text
+            )
+        else:
+            submission = sub.submit(
+                title=title, selftext=content, flair_id=flair_id, flair_text=flair_text
+            )
+
+        return submission.id, f"https://reddit.com{submission.permalink}"
+
+    async def run(
+        self, input_data: Input, *, credentials: RedditCredentials, **kwargs
+    ) -> BlockOutput:
+        post_id, post_url = self.create_post(
+            credentials,
+            input_data.subreddit,
+            input_data.title,
+            input_data.content,
+            input_data.url,
+            input_data.flair_id,
+            input_data.flair_text,
+        )
+        yield "post_id", post_id
+        yield "post_url", post_url
+        yield "subreddit", input_data.subreddit
+
+
+class RedditPostDetails(BaseModel):
+    """Detailed information about a Reddit post."""
+
+    id: str
+    subreddit: str
+    title: str
+    body: str
+    author: str
+    score: int
+    upvote_ratio: float
+    num_comments: int
+    created_utc: float
+    url: str
+    permalink: str
+    is_self: bool
+    over_18: bool
+
+
+class GetRedditPostBlock(Block):
+    """Get detailed information about a specific Reddit post."""
+
+    class Input(BlockSchemaInput):
+        credentials: RedditCredentialsInput = RedditCredentialsField()
+        post_id: str = SchemaField(
+            description="The ID of the post to fetch (e.g., 'abc123' or full ID 't3_abc123')",
+        )
+
+    class Output(BlockSchemaOutput):
+        post: RedditPostDetails = SchemaField(description="Detailed post information")
+        error: str = SchemaField(
+            description="Error message if the post couldn't be fetched"
+        )
+
+    def __init__(self):
+        super().__init__(
+            id="36e6a259-168c-4032-83ec-b2935d0e4584",
+            description="Get detailed information about a specific Reddit post by its ID.",
+            categories={BlockCategory.SOCIAL},
+            input_schema=GetRedditPostBlock.Input,
+            output_schema=GetRedditPostBlock.Output,
+            disabled=(
+                not settings.secrets.reddit_client_id
+                or not settings.secrets.reddit_client_secret
+            ),
+            test_credentials=TEST_CREDENTIALS,
+            test_input={
+                "credentials": TEST_CREDENTIALS_INPUT,
+                "post_id": "abc123",
+            },
+            test_output=[
+                (
+                    "post",
+                    RedditPostDetails(
+                        id="abc123",
+                        subreddit="test",
+                        title="Test Post",
+                        body="Test body",
+                        author="testuser",
+                        score=100,
+                        upvote_ratio=0.95,
+                        num_comments=10,
+                        created_utc=1234567890.0,
+                        url="https://reddit.com/r/test/comments/abc123/test_post/",
+                        permalink="/r/test/comments/abc123/test_post/",
+                        is_self=True,
+                        over_18=False,
+                    ),
+                ),
+            ],
+            test_mock={
+                "get_post": lambda creds, post_id: RedditPostDetails(
+                    id="abc123",
+                    subreddit="test",
+                    title="Test Post",
+                    body="Test body",
+                    author="testuser",
+                    score=100,
+                    upvote_ratio=0.95,
+                    num_comments=10,
+                    created_utc=1234567890.0,
+                    url="https://reddit.com/r/test/comments/abc123/test_post/",
+                    permalink="/r/test/comments/abc123/test_post/",
+                    is_self=True,
+                    over_18=False,
+                )
+            },
+        )
+
+    @staticmethod
+    def get_post(creds: RedditCredentials, post_id: str) -> RedditPostDetails:
+        client = get_praw(creds)
+        post_id = strip_reddit_prefix(post_id)
+        submission = client.submission(id=post_id)
+
+        return RedditPostDetails(
+            id=submission.id,
+            subreddit=submission.subreddit.display_name,
+            title=submission.title,
+            body=submission.selftext,
+            author=str(submission.author) if submission.author else "[deleted]",
+            score=submission.score,
+            upvote_ratio=submission.upvote_ratio,
+            num_comments=submission.num_comments,
+            created_utc=submission.created_utc,
+            url=submission.url,
+            permalink=submission.permalink,
+            is_self=submission.is_self,
+            over_18=submission.over_18,
+        )
+
+    async def run(
+        self, input_data: Input, *, credentials: RedditCredentials, **kwargs
+    ) -> BlockOutput:
+        try:
+            post = self.get_post(credentials, input_data.post_id)
+            yield "post", post
+        except Exception as e:
+            yield "error", str(e)
+
+
+class GetUserPostsBlock(Block):
+    """Get posts by a specific Reddit user."""
+
+    class Input(BlockSchemaInput):
+        credentials: RedditCredentialsInput = RedditCredentialsField()
+        username: str = SchemaField(
+            description="Reddit username to fetch posts from (without /u/ prefix)",
+        )
+        post_limit: int = SchemaField(
+            description="Maximum number of posts to fetch",
+            default=10,
+        )
+        sort: UserPostSort = SchemaField(
+            description="Sort order for user posts",
+            default="new",
+        )
+
+    class Output(BlockSchemaOutput):
+        post: RedditPost = SchemaField(description="A post by the user")
+        posts: list[RedditPost] = SchemaField(description="All posts by the user")
+        error: str = SchemaField(
+            description="Error message if posts couldn't be fetched"
+        )
+
+    def __init__(self):
+        super().__init__(
+            id="6fbe6329-d13e-4d2e-bd4d-b4d921b56161",
+            description="Fetch posts by a specific Reddit user.",
+            categories={BlockCategory.SOCIAL},
+            input_schema=GetUserPostsBlock.Input,
+            output_schema=GetUserPostsBlock.Output,
+            disabled=(
+                not settings.secrets.reddit_client_id
+                or not settings.secrets.reddit_client_secret
+            ),
+            test_credentials=TEST_CREDENTIALS,
+            test_input={
+                "credentials": TEST_CREDENTIALS_INPUT,
+                "username": "testuser",
+                "post_limit": 2,
+            },
+            test_output=[
+                (
+                    "post",
+                    RedditPost(
+                        post_id="id1", subreddit="sub1", title="title1", body="body1"
+                    ),
+                ),
+                (
+                    "post",
+                    RedditPost(
+                        post_id="id2", subreddit="sub2", title="title2", body="body2"
+                    ),
+                ),
+                (
+                    "posts",
+                    [
+                        RedditPost(
+                            post_id="id1",
+                            subreddit="sub1",
+                            title="title1",
+                            body="body1",
+                        ),
+                        RedditPost(
+                            post_id="id2",
+                            subreddit="sub2",
+                            title="title2",
+                            body="body2",
+                        ),
+                    ],
+                ),
+            ],
+            test_mock={
+                "get_user_posts": lambda creds, username, limit, sort: [
+                    MockObject(
+                        id="id1",
+                        subreddit=MockObject(display_name="sub1"),
+                        title="title1",
+                        selftext="body1",
+                    ),
+                    MockObject(
+                        id="id2",
+                        subreddit=MockObject(display_name="sub2"),
+                        title="title2",
+                        selftext="body2",
+                    ),
+                ]
+            },
+        )
+
+    @staticmethod
+    def get_user_posts(
+        creds: RedditCredentials, username: str, limit: int, sort: UserPostSort
+    ) -> list[Submission]:
+        client = get_praw(creds)
+        redditor = client.redditor(username)
+
+        if sort == "new":
+            submissions = redditor.submissions.new(limit=limit)
+        elif sort == "hot":
+            submissions = redditor.submissions.hot(limit=limit)
+        elif sort == "top":
+            submissions = redditor.submissions.top(limit=limit)
+        elif sort == "controversial":
+            submissions = redditor.submissions.controversial(limit=limit)
+        else:
+            submissions = redditor.submissions.new(limit=limit)
+
+        return list(submissions)
+
+    async def run(
+        self, input_data: Input, *, credentials: RedditCredentials, **kwargs
+    ) -> BlockOutput:
+        try:
+            submissions = self.get_user_posts(
+                credentials,
+                input_data.username,
+                input_data.post_limit,
+                input_data.sort,
+            )
+            all_posts = []
+            for submission in submissions:
+                post = RedditPost(
+                    post_id=submission.id,
+                    subreddit=submission.subreddit.display_name,
+                    title=submission.title,
+                    body=submission.selftext,
+                )
+                all_posts.append(post)
+                yield "post", post
+            yield "posts", all_posts
+        except Exception as e:
+            yield "error", str(e)
+
+
+class RedditGetMyPostsBlock(Block):
+    """Get posts by the authenticated Reddit user."""
+
+    class Input(BlockSchemaInput):
+        credentials: RedditCredentialsInput = RedditCredentialsField()
+        post_limit: int = SchemaField(
+            description="Maximum number of posts to fetch",
+            default=10,
+        )
+        sort: UserPostSort = SchemaField(
+            description="Sort order for posts",
+            default="new",
+        )
+
+    class Output(BlockSchemaOutput):
+        post: RedditPost = SchemaField(description="A post by you")
+        posts: list[RedditPost] = SchemaField(description="All your posts")
+        error: str = SchemaField(
+            description="Error message if posts couldn't be fetched"
+        )
+
+    def __init__(self):
+        super().__init__(
+            id="4ab3381b-0c07-4201-89b3-fa2ec264f154",
+            description="Fetch posts created by the authenticated Reddit user (you).",
+            categories={BlockCategory.SOCIAL},
+            input_schema=RedditGetMyPostsBlock.Input,
+            output_schema=RedditGetMyPostsBlock.Output,
+            disabled=(
+                not settings.secrets.reddit_client_id
+                or not settings.secrets.reddit_client_secret
+            ),
+            test_credentials=TEST_CREDENTIALS,
+            test_input={
+                "credentials": TEST_CREDENTIALS_INPUT,
+                "post_limit": 2,
+            },
+            test_output=[
+                (
+                    "post",
+                    RedditPost(
+                        post_id="id1", subreddit="sub1", title="title1", body="body1"
+                    ),
+                ),
+                (
+                    "post",
+                    RedditPost(
+                        post_id="id2", subreddit="sub2", title="title2", body="body2"
+                    ),
+                ),
+                (
+                    "posts",
+                    [
+                        RedditPost(
+                            post_id="id1",
+                            subreddit="sub1",
+                            title="title1",
+                            body="body1",
+                        ),
+                        RedditPost(
+                            post_id="id2",
+                            subreddit="sub2",
+                            title="title2",
+                            body="body2",
+                        ),
+                    ],
+                ),
+            ],
+            test_mock={
+                "get_my_posts": lambda creds, limit, sort: [
+                    MockObject(
+                        id="id1",
+                        subreddit=MockObject(display_name="sub1"),
+                        title="title1",
+                        selftext="body1",
+                    ),
+                    MockObject(
+                        id="id2",
+                        subreddit=MockObject(display_name="sub2"),
+                        title="title2",
+                        selftext="body2",
+                    ),
+                ]
+            },
+        )
+
+    @staticmethod
+    def get_my_posts(
+        creds: RedditCredentials, limit: int, sort: UserPostSort
+    ) -> list[Submission]:
+        client = get_praw(creds)
+        me = client.user.me()
+        if not me:
+            raise ValueError("Could not get authenticated user.")
+
+        if sort == "new":
+            submissions = me.submissions.new(limit=limit)
+        elif sort == "hot":
+            submissions = me.submissions.hot(limit=limit)
+        elif sort == "top":
+            submissions = me.submissions.top(limit=limit)
+        elif sort == "controversial":
+            submissions = me.submissions.controversial(limit=limit)
+        else:
+            submissions = me.submissions.new(limit=limit)
+
+        return list(submissions)
+
+    async def run(
+        self, input_data: Input, *, credentials: RedditCredentials, **kwargs
+    ) -> BlockOutput:
+        try:
+            submissions = self.get_my_posts(
+                credentials,
+                input_data.post_limit,
+                input_data.sort,
+            )
+            all_posts = []
+            for submission in submissions:
+                post = RedditPost(
+                    post_id=submission.id,
+                    subreddit=submission.subreddit.display_name,
+                    title=submission.title,
+                    body=submission.selftext,
+                )
+                all_posts.append(post)
+                yield "post", post
+            yield "posts", all_posts
+        except Exception as e:
+            yield "error", str(e)
+
+
+class RedditSearchResult(BaseModel):
+    """A search result from Reddit."""
+
+    id: str
+    subreddit: str
+    title: str
+    body: str
+    author: str
+    score: int
+    num_comments: int
+    created_utc: float
+    permalink: str
+
+
+class SearchRedditBlock(Block):
+    """Search Reddit for posts matching a query."""
+
+    class Input(BlockSchemaInput):
+        credentials: RedditCredentialsInput = RedditCredentialsField()
+        query: str = SchemaField(
+            description="Search query string",
+        )
+        subreddit: str | None = SchemaField(
+            description="Limit search to a specific subreddit (without /r/ prefix)",
+            default=None,
+        )
+        sort: SearchSort = SchemaField(
+            description="Sort order for search results",
+            default="relevance",
+        )
+        time_filter: TimeFilter = SchemaField(
+            description="Time filter for search results",
+            default="all",
+        )
+        limit: int = SchemaField(
+            description="Maximum number of results to return",
+            default=10,
+        )
+
+    class Output(BlockSchemaOutput):
+        result: RedditSearchResult = SchemaField(description="A search result")
+        results: list[RedditSearchResult] = SchemaField(
+            description="All search results"
+        )
+        error: str = SchemaField(description="Error message if search failed")
+
+    def __init__(self):
+        super().__init__(
+            id="4a0c975e-807b-4d5e-83c9-1619864a4b1a",
+            description="Search Reddit for posts matching a query. Can search all of Reddit or a specific subreddit.",
+            categories={BlockCategory.SOCIAL},
+            input_schema=SearchRedditBlock.Input,
+            output_schema=SearchRedditBlock.Output,
+            disabled=(
+                not settings.secrets.reddit_client_id
+                or not settings.secrets.reddit_client_secret
+            ),
+            test_credentials=TEST_CREDENTIALS,
+            test_input={
+                "credentials": TEST_CREDENTIALS_INPUT,
+                "query": "test query",
+                "limit": 2,
+            },
+            test_output=[
+                (
+                    "result",
+                    RedditSearchResult(
+                        id="id1",
+                        subreddit="sub1",
+                        title="title1",
+                        body="body1",
+                        author="author1",
+                        score=100,
+                        num_comments=10,
+                        created_utc=1234567890.0,
+                        permalink="/r/sub1/comments/id1/title1/",
+                    ),
+                ),
+                (
+                    "result",
+                    RedditSearchResult(
+                        id="id2",
+                        subreddit="sub2",
+                        title="title2",
+                        body="body2",
+                        author="author2",
+                        score=50,
+                        num_comments=5,
+                        created_utc=1234567891.0,
+                        permalink="/r/sub2/comments/id2/title2/",
+                    ),
+                ),
+                (
+                    "results",
+                    [
+                        RedditSearchResult(
+                            id="id1",
+                            subreddit="sub1",
+                            title="title1",
+                            body="body1",
+                            author="author1",
+                            score=100,
+                            num_comments=10,
+                            created_utc=1234567890.0,
+                            permalink="/r/sub1/comments/id1/title1/",
+                        ),
+                        RedditSearchResult(
+                            id="id2",
+                            subreddit="sub2",
+                            title="title2",
+                            body="body2",
+                            author="author2",
+                            score=50,
+                            num_comments=5,
+                            created_utc=1234567891.0,
+                            permalink="/r/sub2/comments/id2/title2/",
+                        ),
+                    ],
+                ),
+            ],
+            test_mock={
+                "search_reddit": lambda creds, query, subreddit, sort, time_filter, limit: [
+                    MockObject(
+                        id="id1",
+                        subreddit=MockObject(display_name="sub1"),
+                        title="title1",
+                        selftext="body1",
+                        author="author1",
+                        score=100,
+                        num_comments=10,
+                        created_utc=1234567890.0,
+                        permalink="/r/sub1/comments/id1/title1/",
+                    ),
+                    MockObject(
+                        id="id2",
+                        subreddit=MockObject(display_name="sub2"),
+                        title="title2",
+                        selftext="body2",
+                        author="author2",
+                        score=50,
+                        num_comments=5,
+                        created_utc=1234567891.0,
+                        permalink="/r/sub2/comments/id2/title2/",
+                    ),
+                ]
+            },
+        )
+
+    @staticmethod
+    def search_reddit(
+        creds: RedditCredentials,
+        query: str,
+        subreddit: str | None,
+        sort: SearchSort,
+        time_filter: TimeFilter,
+        limit: int,
+    ) -> list[Submission]:
+        client = get_praw(creds)
+
+        if subreddit:
+            sub = client.subreddit(subreddit)
+            results = sub.search(query, sort=sort, time_filter=time_filter, limit=limit)
+        else:
+            results = client.subreddit("all").search(
+                query, sort=sort, time_filter=time_filter, limit=limit
+            )
+
+        return list(results)
+
+    async def run(
+        self, input_data: Input, *, credentials: RedditCredentials, **kwargs
+    ) -> BlockOutput:
+        try:
+            submissions = self.search_reddit(
+                credentials,
+                input_data.query,
+                input_data.subreddit,
+                input_data.sort,
+                input_data.time_filter,
+                input_data.limit,
+            )
+            all_results = []
+            for submission in submissions:
+                result = RedditSearchResult(
+                    id=submission.id,
+                    subreddit=submission.subreddit.display_name,
+                    title=submission.title,
+                    body=submission.selftext,
+                    author=str(submission.author) if submission.author else "[deleted]",
+                    score=submission.score,
+                    num_comments=submission.num_comments,
+                    created_utc=submission.created_utc,
+                    permalink=submission.permalink,
+                )
+                all_results.append(result)
+                yield "result", result
+            yield "results", all_results
+        except Exception as e:
+            yield "error", str(e)
+
+
+class EditRedditPostBlock(Block):
+    """Edit an existing Reddit post that you own."""
+
+    class Input(BlockSchemaInput):
+        credentials: RedditCredentialsInput = RedditCredentialsField()
+        post_id: str = SchemaField(
+            description="The ID of the post to edit (must be your own post)",
+        )
+        new_content: str = SchemaField(
+            description="The new body text for the post",
+        )
+
+    class Output(BlockSchemaOutput):
+        success: bool = SchemaField(description="Whether the edit was successful")
+        post_id: str = SchemaField(
+            description="The post ID (pass-through for chaining)"
+        )
+        post_url: str = SchemaField(description="URL of the edited post")
+        error: str = SchemaField(description="Error message if the edit failed")
+
+    def __init__(self):
+        super().__init__(
+            id="cdb9df0f-8b1d-433e-873a-ededc1b6479d",
+            description="Edit the body text of an existing Reddit post that you own. Only works for self/text posts.",
+            categories={BlockCategory.SOCIAL},
+            input_schema=EditRedditPostBlock.Input,
+            output_schema=EditRedditPostBlock.Output,
+            disabled=(
+                not settings.secrets.reddit_client_id
+                or not settings.secrets.reddit_client_secret
+            ),
+            test_credentials=TEST_CREDENTIALS,
+            test_input={
+                "credentials": TEST_CREDENTIALS_INPUT,
+                "post_id": "abc123",
+                "new_content": "Updated post content",
+            },
+            test_output=[
+                ("success", True),
+                ("post_id", "abc123"),
+                ("post_url", "https://reddit.com/r/test/comments/abc123/test_post/"),
+            ],
+            test_mock={
+                "edit_post": lambda creds, post_id, new_content: (
+                    True,
+                    "https://reddit.com/r/test/comments/abc123/test_post/",
+                )
+            },
+        )
+
+    @staticmethod
+    def edit_post(
+        creds: RedditCredentials, post_id: str, new_content: str
+    ) -> tuple[bool, str]:
+        client = get_praw(creds)
+        post_id = strip_reddit_prefix(post_id)
+        submission = client.submission(id=post_id)
+        submission.edit(new_content)
+        return True, f"https://reddit.com{submission.permalink}"
+
+    async def run(
+        self, input_data: Input, *, credentials: RedditCredentials, **kwargs
+    ) -> BlockOutput:
+        try:
+            success, post_url = self.edit_post(
+                credentials, input_data.post_id, input_data.new_content
+            )
+            yield "success", success
+            yield "post_id", input_data.post_id
+            yield "post_url", post_url
+        except Exception as e:
+            error_msg = str(e)
+            if "403" in error_msg:
+                error_msg = (
+                    "Permission denied (403): You can only edit your own posts. "
+                    "Make sure the post belongs to the authenticated Reddit account."
+                )
+            yield "error", error_msg
+
+
+class SubredditInfo(BaseModel):
+    """Information about a subreddit."""
+
+    name: str
+    display_name: str
+    title: str
+    description: str
+    public_description: str
+    subscribers: int
+    created_utc: float
+    over_18: bool
+    url: str
+
+
+class GetSubredditInfoBlock(Block):
+    """Get information about a subreddit."""
+
+    class Input(BlockSchemaInput):
+        credentials: RedditCredentialsInput = RedditCredentialsField()
+        subreddit: str = SchemaField(
+            description="Subreddit name (without /r/ prefix)",
+        )
+
+    class Output(BlockSchemaOutput):
+        info: SubredditInfo = SchemaField(description="Subreddit information")
+        subreddit: str = SchemaField(
+            description="The subreddit name (pass-through for chaining)"
+        )
+        error: str = SchemaField(
+            description="Error message if the subreddit couldn't be fetched"
+        )
+
+    def __init__(self):
+        super().__init__(
+            id="5a2d1f0c-01fb-43ea-bad7-2260d269c930",
+            description="Get information about a subreddit including subscriber count, description, and rules.",
+            categories={BlockCategory.SOCIAL},
+            input_schema=GetSubredditInfoBlock.Input,
+            output_schema=GetSubredditInfoBlock.Output,
+            disabled=(
+                not settings.secrets.reddit_client_id
+                or not settings.secrets.reddit_client_secret
+            ),
+            test_credentials=TEST_CREDENTIALS,
+            test_input={
+                "credentials": TEST_CREDENTIALS_INPUT,
+                "subreddit": "python",
+            },
+            test_output=[
+                (
+                    "info",
+                    SubredditInfo(
+                        name="t5_2qh0y",
+                        display_name="python",
+                        title="Python",
+                        description="News about the Python programming language",
+                        public_description="News about Python",
+                        subscribers=1000000,
+                        created_utc=1234567890.0,
+                        over_18=False,
+                        url="/r/python/",
+                    ),
+                ),
+                ("subreddit", "python"),
+            ],
+            test_mock={
+                "get_subreddit_info": lambda creds, subreddit: SubredditInfo(
+                    name="t5_2qh0y",
+                    display_name="python",
+                    title="Python",
+                    description="News about the Python programming language",
+                    public_description="News about Python",
+                    subscribers=1000000,
+                    created_utc=1234567890.0,
+                    over_18=False,
+                    url="/r/python/",
+                )
+            },
+        )
+
+    @staticmethod
+    def get_subreddit_info(creds: RedditCredentials, subreddit: str) -> SubredditInfo:
+        client = get_praw(creds)
+        sub = client.subreddit(subreddit)
+
+        return SubredditInfo(
+            name=sub.name,
+            display_name=sub.display_name,
+            title=sub.title,
+            description=sub.description,
+            public_description=sub.public_description,
+            subscribers=sub.subscribers,
+            created_utc=sub.created_utc,
+            over_18=sub.over18,
+            url=sub.url,
+        )
+
+    async def run(
+        self, input_data: Input, *, credentials: RedditCredentials, **kwargs
+    ) -> BlockOutput:
+        try:
+            info = self.get_subreddit_info(credentials, input_data.subreddit)
+            yield "info", info
+            yield "subreddit", input_data.subreddit
+        except Exception as e:
+            yield "error", str(e)
+
+
+class RedditComment(BaseModel):
+    """A Reddit comment."""
+
+    comment_id: str
+    post_id: str
+    parent_comment_id: str | None
+    author: str
+    body: str
+    score: int
+    created_utc: float
+    edited: bool
+    is_submitter: bool
+    permalink: str
+    depth: int
+
+
+class GetRedditPostCommentsBlock(Block):
+    """Get comments on a Reddit post."""
+
+    class Input(BlockSchemaInput):
+        credentials: RedditCredentialsInput = RedditCredentialsField()
+        post_id: str = SchemaField(
+            description="The ID of the post to get comments from",
+        )
+        limit: int = SchemaField(
+            description="Maximum number of top-level comments to fetch (max 100)",
+            default=25,
+        )
+        sort: CommentSort = SchemaField(
+            description="Sort order for comments",
+            default="best",
+        )
+
+    class Output(BlockSchemaOutput):
+        comment: RedditComment = SchemaField(description="A comment on the post")
+        comments: list[RedditComment] = SchemaField(description="All fetched comments")
+        post_id: str = SchemaField(
+            description="The post ID (pass-through for chaining)"
+        )
+        error: str = SchemaField(
+            description="Error message if comments couldn't be fetched"
+        )
+
+    def __init__(self):
+        super().__init__(
+            id="98422b2c-c3b0-4d70-871f-56bd966f46da",
+            description="Get top-level comments on a Reddit post.",
+            categories={BlockCategory.SOCIAL},
+            input_schema=GetRedditPostCommentsBlock.Input,
+            output_schema=GetRedditPostCommentsBlock.Output,
+            disabled=(
+                not settings.secrets.reddit_client_id
+                or not settings.secrets.reddit_client_secret
+            ),
+            test_credentials=TEST_CREDENTIALS,
+            test_input={
+                "credentials": TEST_CREDENTIALS_INPUT,
+                "post_id": "abc123",
+                "limit": 2,
+            },
+            test_output=[
+                (
+                    "comment",
+                    RedditComment(
+                        comment_id="comment1",
+                        post_id="abc123",
+                        parent_comment_id=None,
+                        author="user1",
+                        body="Comment body 1",
+                        score=10,
+                        created_utc=1234567890.0,
+                        edited=False,
+                        is_submitter=False,
+                        permalink="/r/test/comments/abc123/test/comment1/",
+                        depth=0,
+                    ),
+                ),
+                (
+                    "comment",
+                    RedditComment(
+                        comment_id="comment2",
+                        post_id="abc123",
+                        parent_comment_id=None,
+                        author="user2",
+                        body="Comment body 2",
+                        score=5,
+                        created_utc=1234567891.0,
+                        edited=False,
+                        is_submitter=True,
+                        permalink="/r/test/comments/abc123/test/comment2/",
+                        depth=0,
+                    ),
+                ),
+                (
+                    "comments",
+                    [
+                        RedditComment(
+                            comment_id="comment1",
+                            post_id="abc123",
+                            parent_comment_id=None,
+                            author="user1",
+                            body="Comment body 1",
+                            score=10,
+                            created_utc=1234567890.0,
+                            edited=False,
+                            is_submitter=False,
+                            permalink="/r/test/comments/abc123/test/comment1/",
+                            depth=0,
+                        ),
+                        RedditComment(
+                            comment_id="comment2",
+                            post_id="abc123",
+                            parent_comment_id=None,
+                            author="user2",
+                            body="Comment body 2",
+                            score=5,
+                            created_utc=1234567891.0,
+                            edited=False,
+                            is_submitter=True,
+                            permalink="/r/test/comments/abc123/test/comment2/",
+                            depth=0,
+                        ),
+                    ],
+                ),
+                ("post_id", "abc123"),
+            ],
+            test_mock={
+                "get_comments": lambda creds, post_id, limit, sort: [
+                    MockObject(
+                        id="comment1",
+                        link_id="t3_abc123",
+                        parent_id="t3_abc123",
+                        author="user1",
+                        body="Comment body 1",
+                        score=10,
+                        created_utc=1234567890.0,
+                        edited=False,
+                        is_submitter=False,
+                        permalink="/r/test/comments/abc123/test/comment1/",
+                        depth=0,
+                    ),
+                    MockObject(
+                        id="comment2",
+                        link_id="t3_abc123",
+                        parent_id="t3_abc123",
+                        author="user2",
+                        body="Comment body 2",
+                        score=5,
+                        created_utc=1234567891.0,
+                        edited=False,
+                        is_submitter=True,
+                        permalink="/r/test/comments/abc123/test/comment2/",
+                        depth=0,
+                    ),
+                ]
+            },
+        )
+
+    @staticmethod
+    def get_comments(
+        creds: RedditCredentials, post_id: str, limit: int, sort: CommentSort
+    ) -> list[Comment]:
+        client = get_praw(creds)
+        post_id = strip_reddit_prefix(post_id)
+        submission = client.submission(id=post_id)
+        submission.comment_sort = sort
+        # Replace MoreComments with actual comments up to limit
+        submission.comments.replace_more(limit=0)
+        # Return only top-level comments (depth=0), limited
+        # CommentForest supports indexing, so use slicing directly
+        max_comments = min(limit, 100)
+        return [
+            submission.comments[i]
+            for i in range(min(len(submission.comments), max_comments))
+        ]
+
+    async def run(
+        self, input_data: Input, *, credentials: RedditCredentials, **kwargs
+    ) -> BlockOutput:
+        try:
+            comments = self.get_comments(
+                credentials,
+                input_data.post_id,
+                input_data.limit,
+                input_data.sort,
+            )
+            all_comments = []
+            for comment in comments:
+                # Extract post_id from link_id (format: t3_xxxxx)
+                comment_post_id = strip_reddit_prefix(comment.link_id)
+
+                # parent_comment_id is None for top-level comments (parent is a post: t3_)
+                # For replies, extract the comment ID from t1_xxxxx
+                parent_comment_id = None
+                if comment.parent_id.startswith("t1_"):
+                    parent_comment_id = strip_reddit_prefix(comment.parent_id)
+
+                comment_data = RedditComment(
+                    comment_id=comment.id,
+                    post_id=comment_post_id,
+                    parent_comment_id=parent_comment_id,
+                    author=str(comment.author) if comment.author else "[deleted]",
+                    body=comment.body,
+                    score=comment.score,
+                    created_utc=comment.created_utc,
+                    edited=bool(comment.edited),
+                    is_submitter=comment.is_submitter,
+                    permalink=comment.permalink,
+                    depth=comment.depth,
+                )
+                all_comments.append(comment_data)
+                yield "comment", comment_data
+            yield "comments", all_comments
+            yield "post_id", input_data.post_id
+        except Exception as e:
+            yield "error", str(e)
+
+
+class GetRedditCommentRepliesBlock(Block):
+    """Get replies to a specific Reddit comment."""
+
+    class Input(BlockSchemaInput):
+        credentials: RedditCredentialsInput = RedditCredentialsField()
+        comment_id: str = SchemaField(
+            description="The ID of the comment to get replies from",
+        )
+        post_id: str = SchemaField(
+            description="The ID of the post containing the comment",
+        )
+        limit: int = SchemaField(
+            description="Maximum number of replies to fetch (max 50)",
+            default=10,
+        )
+
+    class Output(BlockSchemaOutput):
+        reply: RedditComment = SchemaField(description="A reply to the comment")
+        replies: list[RedditComment] = SchemaField(description="All replies")
+        comment_id: str = SchemaField(
+            description="The parent comment ID (pass-through for chaining)"
+        )
+        post_id: str = SchemaField(
+            description="The post ID (pass-through for chaining)"
+        )
+        error: str = SchemaField(
+            description="Error message if replies couldn't be fetched"
+        )
+
+    def __init__(self):
+        super().__init__(
+            id="7fa83965-7289-432f-98a9-1575f5bcc8f1",
+            description="Get replies to a specific Reddit comment.",
+            categories={BlockCategory.SOCIAL},
+            input_schema=GetRedditCommentRepliesBlock.Input,
+            output_schema=GetRedditCommentRepliesBlock.Output,
+            disabled=(
+                not settings.secrets.reddit_client_id
+                or not settings.secrets.reddit_client_secret
+            ),
+            test_credentials=TEST_CREDENTIALS,
+            test_input={
+                "credentials": TEST_CREDENTIALS_INPUT,
+                "comment_id": "comment1",
+                "post_id": "abc123",
+                "limit": 2,
+            },
+            test_output=[
+                (
+                    "reply",
+                    RedditComment(
+                        comment_id="reply1",
+                        post_id="abc123",
+                        parent_comment_id="comment1",
+                        author="replier1",
+                        body="Reply body 1",
+                        score=3,
+                        created_utc=1234567892.0,
+                        edited=False,
+                        is_submitter=False,
+                        permalink="/r/test/comments/abc123/test/reply1/",
+                        depth=1,
+                    ),
+                ),
+                (
+                    "replies",
+                    [
+                        RedditComment(
+                            comment_id="reply1",
+                            post_id="abc123",
+                            parent_comment_id="comment1",
+                            author="replier1",
+                            body="Reply body 1",
+                            score=3,
+                            created_utc=1234567892.0,
+                            edited=False,
+                            is_submitter=False,
+                            permalink="/r/test/comments/abc123/test/reply1/",
+                            depth=1,
+                        ),
+                    ],
+                ),
+                ("comment_id", "comment1"),
+                ("post_id", "abc123"),
+            ],
+            test_mock={
+                "get_replies": lambda creds, comment_id, post_id, limit: [
+                    MockObject(
+                        id="reply1",
+                        link_id="t3_abc123",
+                        parent_id="t1_comment1",
+                        author="replier1",
+                        body="Reply body 1",
+                        score=3,
+                        created_utc=1234567892.0,
+                        edited=False,
+                        is_submitter=False,
+                        permalink="/r/test/comments/abc123/test/reply1/",
+                        depth=1,
+                    ),
+                ]
+            },
+        )
+
+    @staticmethod
+    def get_replies(
+        creds: RedditCredentials, comment_id: str, post_id: str, limit: int
+    ) -> list[Comment]:
+        client = get_praw(creds)
+        post_id = strip_reddit_prefix(post_id)
+        comment_id = strip_reddit_prefix(comment_id)
+
+        # Get the submission and find the comment
+        submission = client.submission(id=post_id)
+        submission.comments.replace_more(limit=0)
+
+        # Find the target comment - filter out MoreComments which don't have .id
+        comment = None
+        for c in submission.comments.list():
+            if isinstance(c, MoreComments):
+                continue
+            if c.id == comment_id:
+                comment = c
+                break
+
+        if not comment:
+            return []
+
+        # Get direct replies - filter out MoreComments objects
+        replies = []
+        # CommentForest supports indexing
+        for i in range(len(comment.replies)):
+            reply = comment.replies[i]
+            if isinstance(reply, MoreComments):
+                continue
+            replies.append(reply)
+            if len(replies) >= min(limit, 50):
+                break
+
+        return replies
+
+    async def run(
+        self, input_data: Input, *, credentials: RedditCredentials, **kwargs
+    ) -> BlockOutput:
+        try:
+            replies = self.get_replies(
+                credentials,
+                input_data.comment_id,
+                input_data.post_id,
+                input_data.limit,
+            )
+            all_replies = []
+            for reply in replies:
+                reply_post_id = strip_reddit_prefix(reply.link_id)
+
+                # parent_comment_id is the parent comment (always present for replies)
+                parent_comment_id = None
+                if reply.parent_id.startswith("t1_"):
+                    parent_comment_id = strip_reddit_prefix(reply.parent_id)
+
+                reply_data = RedditComment(
+                    comment_id=reply.id,
+                    post_id=reply_post_id,
+                    parent_comment_id=parent_comment_id,
+                    author=str(reply.author) if reply.author else "[deleted]",
+                    body=reply.body,
+                    score=reply.score,
+                    created_utc=reply.created_utc,
+                    edited=bool(reply.edited),
+                    is_submitter=reply.is_submitter,
+                    permalink=reply.permalink,
+                    depth=reply.depth,
+                )
+                all_replies.append(reply_data)
+                yield "reply", reply_data
+            yield "replies", all_replies
+            yield "comment_id", input_data.comment_id
+            yield "post_id", input_data.post_id
+        except Exception as e:
+            yield "error", str(e)
+
+
+class GetRedditCommentBlock(Block):
+    """Get details about a specific Reddit comment."""
+
+    class Input(BlockSchemaInput):
+        credentials: RedditCredentialsInput = RedditCredentialsField()
+        comment_id: str = SchemaField(
+            description="The ID of the comment to fetch",
+        )
+
+    class Output(BlockSchemaOutput):
+        comment: RedditComment = SchemaField(description="The comment details")
+        error: str = SchemaField(
+            description="Error message if comment couldn't be fetched"
+        )
+
+    def __init__(self):
+        super().__init__(
+            id="72cb311a-5998-4e0a-9bc4-f1b67a97284e",
+            description="Get details about a specific Reddit comment by its ID.",
+            categories={BlockCategory.SOCIAL},
+            input_schema=GetRedditCommentBlock.Input,
+            output_schema=GetRedditCommentBlock.Output,
+            disabled=(
+                not settings.secrets.reddit_client_id
+                or not settings.secrets.reddit_client_secret
+            ),
+            test_credentials=TEST_CREDENTIALS,
+            test_input={
+                "credentials": TEST_CREDENTIALS_INPUT,
+                "comment_id": "comment1",
+            },
+            test_output=[
+                (
+                    "comment",
+                    RedditComment(
+                        comment_id="comment1",
+                        post_id="abc123",
+                        parent_comment_id=None,
+                        author="user1",
+                        body="Comment body",
+                        score=10,
+                        created_utc=1234567890.0,
+                        edited=False,
+                        is_submitter=False,
+                        permalink="/r/test/comments/abc123/test/comment1/",
+                        depth=0,
+                    ),
+                ),
+            ],
+            test_mock={
+                "get_comment": lambda creds, comment_id: MockObject(
+                    id="comment1",
+                    link_id="t3_abc123",
+                    parent_id="t3_abc123",
+                    author="user1",
+                    body="Comment body",
+                    score=10,
+                    created_utc=1234567890.0,
+                    edited=False,
+                    is_submitter=False,
+                    permalink="/r/test/comments/abc123/test/comment1/",
+                    depth=0,
+                )
+            },
+        )
+
+    @staticmethod
+    def get_comment(creds: RedditCredentials, comment_id: str):
+        client = get_praw(creds)
+        comment_id = strip_reddit_prefix(comment_id)
+        return client.comment(id=comment_id)
+
+    async def run(
+        self, input_data: Input, *, credentials: RedditCredentials, **kwargs
+    ) -> BlockOutput:
+        try:
+            comment = self.get_comment(credentials, input_data.comment_id)
+
+            post_id = strip_reddit_prefix(comment.link_id)
+
+            # parent_comment_id is None for top-level comments (parent is a post: t3_)
+            parent_comment_id = None
+            if comment.parent_id.startswith("t1_"):
+                parent_comment_id = strip_reddit_prefix(comment.parent_id)
+
+            comment_data = RedditComment(
+                comment_id=comment.id,
+                post_id=post_id,
+                parent_comment_id=parent_comment_id,
+                author=str(comment.author) if comment.author else "[deleted]",
+                body=comment.body,
+                score=comment.score,
+                created_utc=comment.created_utc,
+                edited=bool(comment.edited),
+                is_submitter=comment.is_submitter,
+                permalink=comment.permalink,
+                # depth is only available when comments are fetched as part of a tree,
+                # not when fetched directly by ID
+                depth=getattr(comment, "depth", 0),
+            )
+            yield "comment", comment_data
+        except Exception as e:
+            yield "error", str(e)
+
+
+class ReplyToRedditCommentBlock(Block):
+    """Reply to a specific Reddit comment."""
+
+    class Input(BlockSchemaInput):
+        credentials: RedditCredentialsInput = RedditCredentialsField()
+        comment_id: str = SchemaField(
+            description="The ID of the comment to reply to",
+        )
+        reply_text: str = SchemaField(
+            description="The text content of the reply",
+        )
+
+    class Output(BlockSchemaOutput):
+        comment_id: str = SchemaField(description="ID of the newly created reply")
+        parent_comment_id: str = SchemaField(
+            description="The parent comment ID (pass-through for chaining)"
+        )
+        error: str = SchemaField(description="Error message if reply failed")
+
+    def __init__(self):
+        super().__init__(
+            id="7635b059-3a9f-4f7d-b499-1b56c4f76f4f",
+            description="Reply to a specific Reddit comment. Useful for threaded conversations.",
+            categories={BlockCategory.SOCIAL},
+            input_schema=ReplyToRedditCommentBlock.Input,
+            output_schema=ReplyToRedditCommentBlock.Output,
+            disabled=(
+                not settings.secrets.reddit_client_id
+                or not settings.secrets.reddit_client_secret
+            ),
+            test_credentials=TEST_CREDENTIALS,
+            test_input={
+                "credentials": TEST_CREDENTIALS_INPUT,
+                "comment_id": "parent_comment",
+                "reply_text": "This is a reply",
+            },
+            test_output=[
+                ("comment_id", "new_reply_id"),
+                ("parent_comment_id", "parent_comment"),
+            ],
+            test_mock={
+                "reply_to_comment": lambda creds, comment_id, reply_text: "new_reply_id"
+            },
+        )
+
+    @staticmethod
+    def reply_to_comment(
+        creds: RedditCredentials, comment_id: str, reply_text: str
+    ) -> str:
+        client = get_praw(creds)
+        comment_id = strip_reddit_prefix(comment_id)
+        comment = client.comment(id=comment_id)
+        reply = comment.reply(reply_text)
+        if not reply:
+            raise ValueError("Failed to post reply.")
+        return reply.id
+
+    async def run(
+        self, input_data: Input, *, credentials: RedditCredentials, **kwargs
+    ) -> BlockOutput:
+        try:
+            new_comment_id = self.reply_to_comment(
+                credentials, input_data.comment_id, input_data.reply_text
+            )
+            yield "comment_id", new_comment_id
+            yield "parent_comment_id", input_data.comment_id
+        except Exception as e:
+            yield "error", str(e)
+
+
+class RedditUserProfileSubreddit(BaseModel):
+    """Information about a user's profile subreddit."""
+
+    name: str
+    title: str
+    public_description: str
+    subscribers: int
+    over_18: bool
+
+
+class RedditUserInfo(BaseModel):
+    """Information about a Reddit user."""
+
+    username: str
+    user_id: str
+    comment_karma: int
+    link_karma: int
+    total_karma: int
+    created_utc: float
+    is_gold: bool
+    is_mod: bool
+    has_verified_email: bool
+    moderated_subreddits: list[str]
+    profile_subreddit: RedditUserProfileSubreddit | None
+
+
+class GetRedditUserInfoBlock(Block):
+    """Get information about a Reddit user."""
+
+    class Input(BlockSchemaInput):
+        credentials: RedditCredentialsInput = RedditCredentialsField()
+        username: str = SchemaField(
+            description="The Reddit username to look up (without /u/ prefix)",
+        )
+
+    class Output(BlockSchemaOutput):
+        user: RedditUserInfo = SchemaField(description="User information")
+        username: str = SchemaField(
+            description="The username (pass-through for chaining)"
+        )
+        error: str = SchemaField(description="Error message if user lookup failed")
+
+    def __init__(self):
+        super().__init__(
+            id="1b4c6bd1-4f28-4bad-9ae9-e7034a0f61ff",
+            description="Get information about a Reddit user including karma, account age, and verification status.",
+            categories={BlockCategory.SOCIAL},
+            input_schema=GetRedditUserInfoBlock.Input,
+            output_schema=GetRedditUserInfoBlock.Output,
+            disabled=(
+                not settings.secrets.reddit_client_id
+                or not settings.secrets.reddit_client_secret
+            ),
+            test_credentials=TEST_CREDENTIALS,
+            test_input={
+                "credentials": TEST_CREDENTIALS_INPUT,
+                "username": "testuser",
+            },
+            test_output=[
+                (
+                    "user",
+                    RedditUserInfo(
+                        username="testuser",
+                        user_id="abc123",
+                        comment_karma=1000,
+                        link_karma=500,
+                        total_karma=1500,
+                        created_utc=1234567890.0,
+                        is_gold=False,
+                        is_mod=True,
+                        has_verified_email=True,
+                        moderated_subreddits=["python", "learnpython"],
+                        profile_subreddit=RedditUserProfileSubreddit(
+                            name="u_testuser",
+                            title="testuser's profile",
+                            public_description="A test user",
+                            subscribers=100,
+                            over_18=False,
+                        ),
+                    ),
+                ),
+                ("username", "testuser"),
+            ],
+            test_mock={
+                "get_user_info": lambda creds, username: MockObject(
+                    name="testuser",
+                    id="abc123",
+                    comment_karma=1000,
+                    link_karma=500,
+                    total_karma=1500,
+                    created_utc=1234567890.0,
+                    is_gold=False,
+                    is_mod=True,
+                    has_verified_email=True,
+                    subreddit=MockObject(
+                        display_name="u_testuser",
+                        title="testuser's profile",
+                        public_description="A test user",
+                        subscribers=100,
+                        over18=False,
+                    ),
+                ),
+                "get_moderated_subreddits": lambda creds, username: [
+                    MockObject(display_name="python"),
+                    MockObject(display_name="learnpython"),
+                ],
+            },
+        )
+
+    @staticmethod
+    def get_user_info(creds: RedditCredentials, username: str):
+        client = get_praw(creds)
+        if username.startswith("u/"):
+            username = username[2:]
+        return client.redditor(username)
+
+    @staticmethod
+    def get_moderated_subreddits(creds: RedditCredentials, username: str) -> list:
+        client = get_praw(creds)
+        if username.startswith("u/"):
+            username = username[2:]
+        redditor = client.redditor(username)
+        return list(redditor.moderated())
+
+    async def run(
+        self, input_data: Input, *, credentials: RedditCredentials, **kwargs
+    ) -> BlockOutput:
+        try:
+            redditor = self.get_user_info(credentials, input_data.username)
+            moderated = self.get_moderated_subreddits(credentials, input_data.username)
+
+            # Extract moderated subreddit names
+            moderated_subreddits = [sub.display_name for sub in moderated]
+
+            # Get profile subreddit info if available
+            profile_subreddit = None
+            if hasattr(redditor, "subreddit") and redditor.subreddit:
+                try:
+                    profile_subreddit = RedditUserProfileSubreddit(
+                        name=redditor.subreddit.display_name,
+                        title=redditor.subreddit.title or "",
+                        public_description=redditor.subreddit.public_description or "",
+                        subscribers=redditor.subreddit.subscribers or 0,
+                        over_18=(
+                            redditor.subreddit.over18
+                            if hasattr(redditor.subreddit, "over18")
+                            else False
+                        ),
+                    )
+                except Exception:
+                    # Profile subreddit may not be accessible
+                    pass
+
+            user_info = RedditUserInfo(
+                username=redditor.name,
+                user_id=redditor.id,
+                comment_karma=redditor.comment_karma,
+                link_karma=redditor.link_karma,
+                total_karma=redditor.total_karma,
+                created_utc=redditor.created_utc,
+                is_gold=redditor.is_gold,
+                is_mod=redditor.is_mod,
+                has_verified_email=redditor.has_verified_email,
+                moderated_subreddits=moderated_subreddits,
+                profile_subreddit=profile_subreddit,
+            )
+            yield "user", user_info
+            yield "username", input_data.username
+        except Exception as e:
+            yield "error", str(e)
+
+
+class SendRedditMessageBlock(Block):
+    """Send a private message to a Reddit user."""
+
+    class Input(BlockSchemaInput):
+        credentials: RedditCredentialsInput = RedditCredentialsField()
+        username: str = SchemaField(
+            description="The Reddit username to send a message to (without /u/ prefix)",
+        )
+        subject: str = SchemaField(
+            description="The subject line of the message",
+        )
+        message: str = SchemaField(
+            description="The body content of the message",
+        )
+
+    class Output(BlockSchemaOutput):
+        success: bool = SchemaField(description="Whether the message was sent")
+        username: str = SchemaField(
+            description="The username (pass-through for chaining)"
+        )
+        error: str = SchemaField(description="Error message if sending failed")
+
+    def __init__(self):
+        super().__init__(
+            id="7921101a-0537-4259-82ea-bc186ca6b1b6",
+            description="Send a private message (DM) to a Reddit user.",
+            categories={BlockCategory.SOCIAL},
+            input_schema=SendRedditMessageBlock.Input,
+            output_schema=SendRedditMessageBlock.Output,
+            disabled=(
+                not settings.secrets.reddit_client_id
+                or not settings.secrets.reddit_client_secret
+            ),
+            test_credentials=TEST_CREDENTIALS,
+            test_input={
+                "credentials": TEST_CREDENTIALS_INPUT,
+                "username": "testuser",
+                "subject": "Hello",
+                "message": "This is a test message",
+            },
+            test_output=[
+                ("success", True),
+                ("username", "testuser"),
+            ],
+            test_mock={"send_message": lambda creds, username, subject, message: True},
+        )
+
+    @staticmethod
+    def send_message(
+        creds: RedditCredentials, username: str, subject: str, message: str
+    ) -> bool:
+        client = get_praw(creds)
+        if username.startswith("u/"):
+            username = username[2:]
+        redditor = client.redditor(username)
+        redditor.message(subject=subject, message=message)
+        return True
+
+    async def run(
+        self, input_data: Input, *, credentials: RedditCredentials, **kwargs
+    ) -> BlockOutput:
+        try:
+            success = self.send_message(
+                credentials,
+                input_data.username,
+                input_data.subject,
+                input_data.message,
+            )
+            yield "success", success
+            yield "username", input_data.username
+        except Exception as e:
+            yield "error", str(e)
+
+
+class RedditInboxItem(BaseModel):
+    """A Reddit inbox item (message, comment reply, or mention)."""
+
+    item_id: str
+    item_type: str  # "message", "comment_reply", "mention"
+    subject: str
+    body: str
+    author: str
+    created_utc: float
+    is_read: bool
+    context: str | None  # permalink for comments, None for messages
+
+
+class GetRedditInboxBlock(Block):
+    """Get messages and notifications from Reddit inbox."""
+
+    class Input(BlockSchemaInput):
+        credentials: RedditCredentialsInput = RedditCredentialsField()
+        inbox_type: InboxType = SchemaField(
+            description="Type of inbox items to fetch",
+            default="unread",
+        )
+        limit: int = SchemaField(
+            description="Maximum number of items to fetch",
+            default=25,
+        )
+        mark_read: bool = SchemaField(
+            description="Whether to mark fetched items as read",
+            default=False,
+        )
+
+    class Output(BlockSchemaOutput):
+        item: RedditInboxItem = SchemaField(description="An inbox item")
+        items: list[RedditInboxItem] = SchemaField(description="All fetched items")
+        error: str = SchemaField(description="Error message if fetch failed")
+
+    def __init__(self):
+        super().__init__(
+            id="5a91bb34-7ffe-4b9e-957b-9d4f8fe8dbc9",
+            description="Get messages, mentions, and comment replies from your Reddit inbox.",
+            categories={BlockCategory.SOCIAL},
+            input_schema=GetRedditInboxBlock.Input,
+            output_schema=GetRedditInboxBlock.Output,
+            disabled=(
+                not settings.secrets.reddit_client_id
+                or not settings.secrets.reddit_client_secret
+            ),
+            test_credentials=TEST_CREDENTIALS,
+            test_input={
+                "credentials": TEST_CREDENTIALS_INPUT,
+                "inbox_type": "unread",
+                "limit": 10,
+            },
+            test_output=[
+                (
+                    "item",
+                    RedditInboxItem(
+                        item_id="msg123",
+                        item_type="message",
+                        subject="Hello",
+                        body="Test message body",
+                        author="sender_user",
+                        created_utc=1234567890.0,
+                        is_read=False,
+                        context=None,
+                    ),
+                ),
+                (
+                    "items",
+                    [
+                        RedditInboxItem(
+                            item_id="msg123",
+                            item_type="message",
+                            subject="Hello",
+                            body="Test message body",
+                            author="sender_user",
+                            created_utc=1234567890.0,
+                            is_read=False,
+                            context=None,
+                        ),
+                    ],
+                ),
+            ],
+            test_mock={
+                "get_inbox": lambda creds, inbox_type, limit: [
+                    MockObject(
+                        id="msg123",
+                        subject="Hello",
+                        body="Test message body",
+                        author="sender_user",
+                        created_utc=1234567890.0,
+                        new=True,
+                        context=None,
+                        was_comment=False,
+                    ),
+                ]
+            },
+        )
+
+    @staticmethod
+    def get_inbox(creds: RedditCredentials, inbox_type: InboxType, limit: int) -> list:
+        client = get_praw(creds)
+        inbox = client.inbox
+
+        if inbox_type == "all":
+            items = inbox.all(limit=limit)
+        elif inbox_type == "unread":
+            items = inbox.unread(limit=limit)
+        elif inbox_type == "messages":
+            items = inbox.messages(limit=limit)
+        elif inbox_type == "mentions":
+            items = inbox.mentions(limit=limit)
+        elif inbox_type == "comment_replies":
+            items = inbox.comment_replies(limit=limit)
+        else:
+            items = inbox.unread(limit=limit)
+
+        return list(items)
+
+    async def run(
+        self, input_data: Input, *, credentials: RedditCredentials, **kwargs
+    ) -> BlockOutput:
+        try:
+            raw_items = self.get_inbox(
+                credentials, input_data.inbox_type, input_data.limit
+            )
+            all_items = []
+
+            for item in raw_items:
+                # Determine item type
+                if hasattr(item, "was_comment") and item.was_comment:
+                    if hasattr(item, "subject") and "mention" in item.subject.lower():
+                        item_type = "mention"
+                    else:
+                        item_type = "comment_reply"
+                else:
+                    item_type = "message"
+
+                inbox_item = RedditInboxItem(
+                    item_id=item.id,
+                    item_type=item_type,
+                    subject=item.subject if hasattr(item, "subject") else "",
+                    body=item.body,
+                    author=str(item.author) if item.author else "[deleted]",
+                    created_utc=item.created_utc,
+                    is_read=not item.new,
+                    context=item.context if hasattr(item, "context") else None,
+                )
+                all_items.append(inbox_item)
+                yield "item", inbox_item
+
+            # Mark as read if requested
+            if input_data.mark_read and raw_items:
+                client = get_praw(credentials)
+                client.inbox.mark_read(raw_items)
+
+            yield "items", all_items
+        except Exception as e:
+            yield "error", str(e)
+
+
+class DeleteRedditPostBlock(Block):
+    """Delete a Reddit post that you own."""
+
+    class Input(BlockSchemaInput):
+        credentials: RedditCredentialsInput = RedditCredentialsField()
+        post_id: str = SchemaField(
+            description="The ID of the post to delete (must be your own post)",
+        )
+
+    class Output(BlockSchemaOutput):
+        success: bool = SchemaField(description="Whether the deletion was successful")
+        post_id: str = SchemaField(
+            description="The post ID (pass-through for chaining)"
+        )
+        error: str = SchemaField(description="Error message if deletion failed")
+
+    def __init__(self):
+        super().__init__(
+            id="72e4730a-d66d-4785-8e54-5ab3af450c81",
+            description="Delete a Reddit post that you own.",
+            categories={BlockCategory.SOCIAL},
+            input_schema=DeleteRedditPostBlock.Input,
+            output_schema=DeleteRedditPostBlock.Output,
+            disabled=(
+                not settings.secrets.reddit_client_id
+                or not settings.secrets.reddit_client_secret
+            ),
+            test_credentials=TEST_CREDENTIALS,
+            test_input={
+                "credentials": TEST_CREDENTIALS_INPUT,
+                "post_id": "abc123",
+            },
+            test_output=[
+                ("success", True),
+                ("post_id", "abc123"),
+            ],
+            test_mock={"delete_post": lambda creds, post_id: True},
+        )
+
+    @staticmethod
+    def delete_post(creds: RedditCredentials, post_id: str) -> bool:
+        client = get_praw(creds)
+        post_id = strip_reddit_prefix(post_id)
+        submission = client.submission(id=post_id)
+        submission.delete()
+        return True
+
+    async def run(
+        self, input_data: Input, *, credentials: RedditCredentials, **kwargs
+    ) -> BlockOutput:
+        try:
+            success = self.delete_post(credentials, input_data.post_id)
+            yield "success", success
+            yield "post_id", input_data.post_id
+        except Exception as e:
+            yield "error", str(e)
+
+
+class DeleteRedditCommentBlock(Block):
+    """Delete a Reddit comment that you own."""
+
+    class Input(BlockSchemaInput):
+        credentials: RedditCredentialsInput = RedditCredentialsField()
+        comment_id: str = SchemaField(
+            description="The ID of the comment to delete (must be your own comment)",
+        )
+
+    class Output(BlockSchemaOutput):
+        success: bool = SchemaField(description="Whether the deletion was successful")
+        comment_id: str = SchemaField(
+            description="The comment ID (pass-through for chaining)"
+        )
+        error: str = SchemaField(description="Error message if deletion failed")
+
+    def __init__(self):
+        super().__init__(
+            id="2650584d-434f-46db-81ef-26c8d8d41f81",
+            description="Delete a Reddit comment that you own.",
+            categories={BlockCategory.SOCIAL},
+            input_schema=DeleteRedditCommentBlock.Input,
+            output_schema=DeleteRedditCommentBlock.Output,
+            disabled=(
+                not settings.secrets.reddit_client_id
+                or not settings.secrets.reddit_client_secret
+            ),
+            test_credentials=TEST_CREDENTIALS,
+            test_input={
+                "credentials": TEST_CREDENTIALS_INPUT,
+                "comment_id": "xyz789",
+            },
+            test_output=[
+                ("success", True),
+                ("comment_id", "xyz789"),
+            ],
+            test_mock={"delete_comment": lambda creds, comment_id: True},
+        )
+
+    @staticmethod
+    def delete_comment(creds: RedditCredentials, comment_id: str) -> bool:
+        client = get_praw(creds)
+        comment_id = strip_reddit_prefix(comment_id)
+        comment = client.comment(id=comment_id)
+        comment.delete()
+        return True
+
+    async def run(
+        self, input_data: Input, *, credentials: RedditCredentials, **kwargs
+    ) -> BlockOutput:
+        try:
+            success = self.delete_comment(credentials, input_data.comment_id)
+            yield "success", success
+            yield "comment_id", input_data.comment_id
+        except Exception as e:
+            yield "error", str(e)
+
+
+class SubredditFlair(BaseModel):
+    """A subreddit link flair template."""
+
+    flair_id: str
+    text: str
+    text_editable: bool
+    css_class: str = ""  # The CSS class for styling (from flair_css_class)
+
+
+class GetSubredditFlairsBlock(Block):
+    """Get available link flairs for a subreddit."""
+
+    class Input(BlockSchemaInput):
+        credentials: RedditCredentialsInput = RedditCredentialsField()
+        subreddit: str = SchemaField(
+            description="Subreddit name (without /r/ prefix)",
+        )
+
+    class Output(BlockSchemaOutput):
+        flair: SubredditFlair = SchemaField(description="A flair option")
+        flairs: list[SubredditFlair] = SchemaField(description="All available flairs")
+        subreddit: str = SchemaField(
+            description="The subreddit name (pass-through for chaining)"
+        )
+        error: str = SchemaField(description="Error message if fetch failed")
+
+    def __init__(self):
+        super().__init__(
+            id="ada08f34-a7a9-44aa-869f-0638fa4e0a84",
+            description="Get available link flair options for a subreddit.",
+            categories={BlockCategory.SOCIAL},
+            input_schema=GetSubredditFlairsBlock.Input,
+            output_schema=GetSubredditFlairsBlock.Output,
+            disabled=(
+                not settings.secrets.reddit_client_id
+                or not settings.secrets.reddit_client_secret
+            ),
+            test_credentials=TEST_CREDENTIALS,
+            test_input={
+                "credentials": TEST_CREDENTIALS_INPUT,
+                "subreddit": "test",
+            },
+            test_output=[
+                (
+                    "flair",
+                    SubredditFlair(
+                        flair_id="abc123",
+                        text="Discussion",
+                        text_editable=False,
+                        css_class="discussion",
+                    ),
+                ),
+                (
+                    "flairs",
+                    [
+                        SubredditFlair(
+                            flair_id="abc123",
+                            text="Discussion",
+                            text_editable=False,
+                            css_class="discussion",
+                        ),
+                    ],
+                ),
+                ("subreddit", "test"),
+            ],
+            test_mock={
+                "get_flairs": lambda creds, subreddit: [
+                    {
+                        "flair_template_id": "abc123",
+                        "flair_text": "Discussion",
+                        "flair_text_editable": False,
+                        "flair_css_class": "discussion",
+                    },
+                ]
+            },
+        )
+
+    @staticmethod
+    def get_flairs(creds: RedditCredentials, subreddit: str) -> list:
+        client = get_praw(creds)
+        # Use /r/{subreddit}/api/flairselector endpoint directly with is_newlink=True
+        # This returns link flairs available for new submissions without requiring mod access
+        # The link_templates API is moderator-only, so we use flairselector instead
+        # Path must include the subreddit prefix per Reddit API docs
+        response = client.post(
+            f"r/{subreddit}/api/flairselector",
+            data={"is_newlink": "true"},
+        )
+        # Response contains 'choices' list with available flairs
+        choices = response.get("choices", [])
+        return choices
+
+    async def run(
+        self, input_data: Input, *, credentials: RedditCredentials, **kwargs
+    ) -> BlockOutput:
+        try:
+            raw_flairs = self.get_flairs(credentials, input_data.subreddit)
+            all_flairs = []
+
+            for flair in raw_flairs:
+                # /api/flairselector returns flairs with flair_template_id, flair_text, etc.
+                flair_data = SubredditFlair(
+                    flair_id=flair.get("flair_template_id", ""),
+                    text=flair.get("flair_text", ""),
+                    text_editable=flair.get("flair_text_editable", False),
+                    css_class=flair.get("flair_css_class", ""),
+                )
+                all_flairs.append(flair_data)
+                yield "flair", flair_data
+
+            yield "flairs", all_flairs
+            yield "subreddit", input_data.subreddit
+        except Exception as e:
+            yield "error", str(e)
+
+
+class SubredditRule(BaseModel):
+    """A subreddit rule."""
+
+    short_name: str
+    description: str
+    kind: str  # "all", "link", "comment"
+    violation_reason: str
+    priority: int
+
+
+class GetSubredditRulesBlock(Block):
+    """Get the rules for a subreddit."""
+
+    class Input(BlockSchemaInput):
+        credentials: RedditCredentialsInput = RedditCredentialsField()
+        subreddit: str = SchemaField(
+            description="Subreddit name (without /r/ prefix)",
+        )
+
+    class Output(BlockSchemaOutput):
+        rule: SubredditRule = SchemaField(description="A subreddit rule")
+        rules: list[SubredditRule] = SchemaField(description="All subreddit rules")
+        subreddit: str = SchemaField(
+            description="The subreddit name (pass-through for chaining)"
+        )
+        error: str = SchemaField(description="Error message if fetch failed")
+
+    def __init__(self):
+        super().__init__(
+            id="222aa36c-fa70-4879-8e8a-37d100175f5c",
+            description="Get the rules for a subreddit to ensure compliance before posting.",
+            categories={BlockCategory.SOCIAL},
+            input_schema=GetSubredditRulesBlock.Input,
+            output_schema=GetSubredditRulesBlock.Output,
+            disabled=(
+                not settings.secrets.reddit_client_id
+                or not settings.secrets.reddit_client_secret
+            ),
+            test_credentials=TEST_CREDENTIALS,
+            test_input={
+                "credentials": TEST_CREDENTIALS_INPUT,
+                "subreddit": "test",
+            },
+            test_output=[
+                (
+                    "rule",
+                    SubredditRule(
+                        short_name="No spam",
+                        description="Do not post spam or self-promotional content.",
+                        kind="all",
+                        violation_reason="Spam",
+                        priority=0,
+                    ),
+                ),
+                (
+                    "rules",
+                    [
+                        SubredditRule(
+                            short_name="No spam",
+                            description="Do not post spam or self-promotional content.",
+                            kind="all",
+                            violation_reason="Spam",
+                            priority=0,
+                        ),
+                    ],
+                ),
+                ("subreddit", "test"),
+            ],
+            test_mock={
+                "get_rules": lambda creds, subreddit: [
+                    MockObject(
+                        short_name="No spam",
+                        description="Do not post spam or self-promotional content.",
+                        kind="all",
+                        violation_reason="Spam",
+                        priority=0,
+                    ),
+                ]
+            },
+        )
+
+    @staticmethod
+    def get_rules(creds: RedditCredentials, subreddit: str) -> list:
+        client = get_praw(creds)
+        sub = client.subreddit(subreddit)
+        return list(sub.rules)
+
+    async def run(
+        self, input_data: Input, *, credentials: RedditCredentials, **kwargs
+    ) -> BlockOutput:
+        try:
+            raw_rules = self.get_rules(credentials, input_data.subreddit)
+            all_rules = []
+
+            for idx, rule in enumerate(raw_rules):
+                rule_data = SubredditRule(
+                    short_name=rule.short_name,
+                    description=rule.description or "",
+                    kind=rule.kind,
+                    violation_reason=rule.violation_reason or rule.short_name,
+                    priority=idx,
+                )
+                all_rules.append(rule_data)
+                yield "rule", rule_data
+
+            yield "rules", all_rules
+            yield "subreddit", input_data.subreddit
+        except Exception as e:
+            yield "error", str(e)
diff --git a/autogpt_platform/backend/backend/blocks/screenshotone.py b/autogpt_platform/backend/backend/blocks/screenshotone.py
index 1f8947376b..ee998f8da2 100644
--- a/autogpt_platform/backend/backend/blocks/screenshotone.py
+++ b/autogpt_platform/backend/backend/blocks/screenshotone.py
@@ -11,6 +11,7 @@ from backend.data.block import (
     BlockSchemaInput,
     BlockSchemaOutput,
 )
+from backend.data.execution import ExecutionContext
 from backend.data.model import (
     APIKeyCredentials,
     CredentialsField,
@@ -112,8 +113,7 @@ class ScreenshotWebPageBlock(Block):
     @staticmethod
     async def take_screenshot(
         credentials: APIKeyCredentials,
-        graph_exec_id: str,
-        user_id: str,
+        execution_context: ExecutionContext,
         url: str,
         viewport_width: int,
         viewport_height: int,
@@ -155,12 +155,11 @@ class ScreenshotWebPageBlock(Block):
 
         return {
             "image": await store_media_file(
-                graph_exec_id=graph_exec_id,
                 file=MediaFileType(
                     f"data:image/{format.value};base64,{b64encode(content).decode('utf-8')}"
                 ),
-                user_id=user_id,
-                return_content=True,
+                execution_context=execution_context,
+                return_format="for_block_output",
             )
         }
 
@@ -169,15 +168,13 @@ class ScreenshotWebPageBlock(Block):
         input_data: Input,
         *,
         credentials: APIKeyCredentials,
-        graph_exec_id: str,
-        user_id: str,
+        execution_context: ExecutionContext,
         **kwargs,
     ) -> BlockOutput:
         try:
             screenshot_data = await self.take_screenshot(
                 credentials=credentials,
-                graph_exec_id=graph_exec_id,
-                user_id=user_id,
+                execution_context=execution_context,
                 url=input_data.url,
                 viewport_width=input_data.viewport_width,
                 viewport_height=input_data.viewport_height,
diff --git a/autogpt_platform/backend/backend/blocks/search.py b/autogpt_platform/backend/backend/blocks/search.py
index 2d10dffab6..09e16034a3 100644
--- a/autogpt_platform/backend/backend/blocks/search.py
+++ b/autogpt_platform/backend/backend/blocks/search.py
@@ -18,6 +18,7 @@ from backend.data.model import (
     SchemaField,
 )
 from backend.integrations.providers import ProviderName
+from backend.util.request import DEFAULT_USER_AGENT
 
 
 class GetWikipediaSummaryBlock(Block, GetRequest):
@@ -39,17 +40,27 @@ class GetWikipediaSummaryBlock(Block, GetRequest):
             output_schema=GetWikipediaSummaryBlock.Output,
             test_input={"topic": "Artificial Intelligence"},
             test_output=("summary", "summary content"),
-            test_mock={"get_request": lambda url, json: {"extract": "summary content"}},
+            test_mock={
+                "get_request": lambda url, headers, json: {"extract": "summary content"}
+            },
         )
 
     async def run(self, input_data: Input, **kwargs) -> BlockOutput:
         topic = input_data.topic
-        url = f"https://en.wikipedia.org/api/rest_v1/page/summary/{topic}"
+        # URL-encode the topic to handle spaces and special characters
+        encoded_topic = quote(topic, safe="")
+        url = f"https://en.wikipedia.org/api/rest_v1/page/summary/{encoded_topic}"
+
+        # Set headers per Wikimedia robot policy (https://w.wiki/4wJS)
+        # - User-Agent: Required, must identify the bot
+        # - Accept-Encoding: gzip recommended to reduce bandwidth
+        headers = {
+            "User-Agent": DEFAULT_USER_AGENT,
+            "Accept-Encoding": "gzip, deflate",
+        }
 
-        # Note: User-Agent is now automatically set by the request library
-        # to comply with Wikimedia's robot policy (https://w.wiki/4wJS)
         try:
-            response = await self.get_request(url, json=True)
+            response = await self.get_request(url, headers=headers, json=True)
             if "extract" not in response:
                 raise ValueError(f"Unable to parse Wikipedia response: {response}")
             yield "summary", response["extract"]
diff --git a/autogpt_platform/backend/backend/blocks/smart_decision_maker.py b/autogpt_platform/backend/backend/blocks/smart_decision_maker.py
index 751f6af37f..ff6042eaab 100644
--- a/autogpt_platform/backend/backend/blocks/smart_decision_maker.py
+++ b/autogpt_platform/backend/backend/blocks/smart_decision_maker.py
@@ -391,8 +391,12 @@ class SmartDecisionMakerBlock(Block):
         """
         block = sink_node.block
 
+        # Use custom name from node metadata if set, otherwise fall back to block.name
+        custom_name = sink_node.metadata.get("customized_name")
+        tool_name = custom_name if custom_name else block.name
+
         tool_function: dict[str, Any] = {
-            "name": SmartDecisionMakerBlock.cleanup(block.name),
+            "name": SmartDecisionMakerBlock.cleanup(tool_name),
             "description": block.description,
         }
         sink_block_input_schema = block.input_schema
@@ -489,14 +493,24 @@ class SmartDecisionMakerBlock(Block):
                 f"Sink graph metadata not found: {graph_id} {graph_version}"
             )
 
+        # Use custom name from node metadata if set, otherwise fall back to graph name
+        custom_name = sink_node.metadata.get("customized_name")
+        tool_name = custom_name if custom_name else sink_graph_meta.name
+
         tool_function: dict[str, Any] = {
-            "name": SmartDecisionMakerBlock.cleanup(sink_graph_meta.name),
+            "name": SmartDecisionMakerBlock.cleanup(tool_name),
             "description": sink_graph_meta.description,
         }
 
         properties = {}
+        field_mapping = {}
 
         for link in links:
+            field_name = link.sink_name
+
+            clean_field_name = SmartDecisionMakerBlock.cleanup(field_name)
+            field_mapping[clean_field_name] = field_name
+
             sink_block_input_schema = sink_node.input_default["input_schema"]
             sink_block_properties = sink_block_input_schema.get("properties", {}).get(
                 link.sink_name, {}
@@ -506,7 +520,7 @@ class SmartDecisionMakerBlock(Block):
                 if "description" in sink_block_properties
                 else f"The {link.sink_name} of the tool"
             )
-            properties[link.sink_name] = {
+            properties[clean_field_name] = {
                 "type": "string",
                 "description": description,
                 "default": json.dumps(sink_block_properties.get("default", None)),
@@ -519,7 +533,7 @@ class SmartDecisionMakerBlock(Block):
             "strict": True,
         }
 
-        # Store node info for later use in output processing
+        tool_function["_field_mapping"] = field_mapping
         tool_function["_sink_node_id"] = sink_node.id
 
         return {"type": "function", "function": tool_function}
@@ -975,10 +989,28 @@ class SmartDecisionMakerBlock(Block):
         graph_version: int,
         execution_context: ExecutionContext,
         execution_processor: "ExecutionProcessor",
+        nodes_to_skip: set[str] | None = None,
         **kwargs,
     ) -> BlockOutput:
 
         tool_functions = await self._create_tool_node_signatures(node_id)
+        original_tool_count = len(tool_functions)
+
+        # Filter out tools for nodes that should be skipped (e.g., missing optional credentials)
+        if nodes_to_skip:
+            tool_functions = [
+                tf
+                for tf in tool_functions
+                if tf.get("function", {}).get("_sink_node_id") not in nodes_to_skip
+            ]
+
+            # Only raise error if we had tools but they were all filtered out
+            if original_tool_count > 0 and not tool_functions:
+                raise ValueError(
+                    "No available tools to execute - all downstream nodes are unavailable "
+                    "(possibly due to missing optional credentials)"
+                )
+
         yield "tool_functions", json.dumps(tool_functions)
 
         conversation_history = input_data.conversation_history or []
@@ -1129,8 +1161,9 @@ class SmartDecisionMakerBlock(Block):
                 original_field_name = field_mapping.get(clean_arg_name, clean_arg_name)
                 arg_value = tool_args.get(clean_arg_name)
 
-                sanitized_arg_name = self.cleanup(original_field_name)
-                emit_key = f"tools_^_{sink_node_id}_~_{sanitized_arg_name}"
+                # Use original_field_name directly (not sanitized) to match link sink_name
+                # The field_mapping already translates from LLM's cleaned names to original names
+                emit_key = f"tools_^_{sink_node_id}_~_{original_field_name}"
 
                 logger.debug(
                     "[SmartDecisionMakerBlock|geid:%s|neid:%s] emit %s",
diff --git a/autogpt_platform/backend/backend/blocks/spreadsheet.py b/autogpt_platform/backend/backend/blocks/spreadsheet.py
index 211aac23f4..a13f9e2f6d 100644
--- a/autogpt_platform/backend/backend/blocks/spreadsheet.py
+++ b/autogpt_platform/backend/backend/blocks/spreadsheet.py
@@ -7,6 +7,7 @@ from backend.data.block import (
     BlockSchemaInput,
     BlockSchemaOutput,
 )
+from backend.data.execution import ExecutionContext
 from backend.data.model import ContributorDetails, SchemaField
 from backend.util.file import get_exec_file_path, store_media_file
 from backend.util.type import MediaFileType
@@ -98,7 +99,7 @@ class ReadSpreadsheetBlock(Block):
         )
 
     async def run(
-        self, input_data: Input, *, graph_exec_id: str, user_id: str, **_kwargs
+        self, input_data: Input, *, execution_context: ExecutionContext, **_kwargs
     ) -> BlockOutput:
         import csv
         from io import StringIO
@@ -106,14 +107,16 @@ class ReadSpreadsheetBlock(Block):
         # Determine data source - prefer file_input if provided, otherwise use contents
         if input_data.file_input:
             stored_file_path = await store_media_file(
-                user_id=user_id,
-                graph_exec_id=graph_exec_id,
                 file=input_data.file_input,
-                return_content=False,
+                execution_context=execution_context,
+                return_format="for_local_processing",
             )
 
             # Get full file path
-            file_path = get_exec_file_path(graph_exec_id, stored_file_path)
+            assert execution_context.graph_exec_id  # Validated by store_media_file
+            file_path = get_exec_file_path(
+                execution_context.graph_exec_id, stored_file_path
+            )
             if not Path(file_path).exists():
                 raise ValueError(f"File does not exist: {file_path}")
 
diff --git a/autogpt_platform/backend/backend/blocks/stagehand/blocks.py b/autogpt_platform/backend/backend/blocks/stagehand/blocks.py
index be1d736962..91c096ffe4 100644
--- a/autogpt_platform/backend/backend/blocks/stagehand/blocks.py
+++ b/autogpt_platform/backend/backend/blocks/stagehand/blocks.py
@@ -83,7 +83,7 @@ class StagehandRecommendedLlmModel(str, Enum):
     GPT41_MINI = "gpt-4.1-mini-2025-04-14"
 
     # Anthropic
-    CLAUDE_3_7_SONNET = "claude-3-7-sonnet-20250219"
+    CLAUDE_4_5_SONNET = "claude-sonnet-4-5-20250929"
 
     @property
     def provider_name(self) -> str:
@@ -137,7 +137,7 @@ class StagehandObserveBlock(Block):
         model: StagehandRecommendedLlmModel = SchemaField(
             title="LLM Model",
             description="LLM to use for Stagehand (provider is inferred)",
-            default=StagehandRecommendedLlmModel.CLAUDE_3_7_SONNET,
+            default=StagehandRecommendedLlmModel.CLAUDE_4_5_SONNET,
             advanced=False,
         )
         model_credentials: AICredentials = AICredentialsField()
@@ -182,10 +182,7 @@ class StagehandObserveBlock(Block):
         **kwargs,
     ) -> BlockOutput:
 
-        logger.info(f"OBSERVE: Stagehand credentials: {stagehand_credentials}")
-        logger.info(
-            f"OBSERVE: Model credentials: {model_credentials} for provider {model_credentials.provider} secret: {model_credentials.api_key.get_secret_value()}"
-        )
+        logger.debug(f"OBSERVE: Using model provider {model_credentials.provider}")
 
         with disable_signal_handling():
             stagehand = Stagehand(
@@ -230,7 +227,7 @@ class StagehandActBlock(Block):
         model: StagehandRecommendedLlmModel = SchemaField(
             title="LLM Model",
             description="LLM to use for Stagehand (provider is inferred)",
-            default=StagehandRecommendedLlmModel.CLAUDE_3_7_SONNET,
+            default=StagehandRecommendedLlmModel.CLAUDE_4_5_SONNET,
             advanced=False,
         )
         model_credentials: AICredentials = AICredentialsField()
@@ -282,10 +279,7 @@ class StagehandActBlock(Block):
         **kwargs,
     ) -> BlockOutput:
 
-        logger.info(f"ACT: Stagehand credentials: {stagehand_credentials}")
-        logger.info(
-            f"ACT: Model credentials: {model_credentials} for provider {model_credentials.provider} secret: {model_credentials.api_key.get_secret_value()}"
-        )
+        logger.debug(f"ACT: Using model provider {model_credentials.provider}")
 
         with disable_signal_handling():
             stagehand = Stagehand(
@@ -330,7 +324,7 @@ class StagehandExtractBlock(Block):
         model: StagehandRecommendedLlmModel = SchemaField(
             title="LLM Model",
             description="LLM to use for Stagehand (provider is inferred)",
-            default=StagehandRecommendedLlmModel.CLAUDE_3_7_SONNET,
+            default=StagehandRecommendedLlmModel.CLAUDE_4_5_SONNET,
             advanced=False,
         )
         model_credentials: AICredentials = AICredentialsField()
@@ -370,10 +364,7 @@ class StagehandExtractBlock(Block):
         **kwargs,
     ) -> BlockOutput:
 
-        logger.info(f"EXTRACT: Stagehand credentials: {stagehand_credentials}")
-        logger.info(
-            f"EXTRACT: Model credentials: {model_credentials} for provider {model_credentials.provider} secret: {model_credentials.api_key.get_secret_value()}"
-        )
+        logger.debug(f"EXTRACT: Using model provider {model_credentials.provider}")
 
         with disable_signal_handling():
             stagehand = Stagehand(
diff --git a/autogpt_platform/backend/backend/blocks/talking_head.py b/autogpt_platform/backend/backend/blocks/talking_head.py
index b33561d7aa..e01e3d4023 100644
--- a/autogpt_platform/backend/backend/blocks/talking_head.py
+++ b/autogpt_platform/backend/backend/blocks/talking_head.py
@@ -10,6 +10,7 @@ from backend.data.block import (
     BlockSchemaInput,
     BlockSchemaOutput,
 )
+from backend.data.execution import ExecutionContext
 from backend.data.model import (
     APIKeyCredentials,
     CredentialsField,
@@ -17,7 +18,9 @@ from backend.data.model import (
     SchemaField,
 )
 from backend.integrations.providers import ProviderName
+from backend.util.file import store_media_file
 from backend.util.request import Requests
+from backend.util.type import MediaFileType
 
 TEST_CREDENTIALS = APIKeyCredentials(
     id="01234567-89ab-cdef-0123-456789abcdef",
@@ -50,7 +53,7 @@ class CreateTalkingAvatarVideoBlock(Block):
             description="The voice provider to use", default="microsoft"
         )
         voice_id: str = SchemaField(
-            description="The voice ID to use, get list of voices [here](https://docs.agpt.co/server/d_id)",
+            description="The voice ID to use, see [available voice IDs](https://agpt.co/docs/platform/using-ai-services/d_id)",
             default="en-US-JennyNeural",
         )
         presenter_id: str = SchemaField(
@@ -102,7 +105,7 @@ class CreateTalkingAvatarVideoBlock(Block):
             test_output=[
                 (
                     "video_url",
-                    "https://d-id.com/api/clips/abcd1234-5678-efgh-ijkl-mnopqrstuvwx/video",
+                    lambda x: x.startswith(("workspace://", "data:")),
                 ),
             ],
             test_mock={
@@ -110,9 +113,10 @@ class CreateTalkingAvatarVideoBlock(Block):
                     "id": "abcd1234-5678-efgh-ijkl-mnopqrstuvwx",
                     "status": "created",
                 },
+                # Use data URI to avoid HTTP requests during tests
                 "get_clip_status": lambda *args, **kwargs: {
                     "status": "done",
-                    "result_url": "https://d-id.com/api/clips/abcd1234-5678-efgh-ijkl-mnopqrstuvwx/video",
+                    "result_url": "data:video/mp4;base64,AAAA",
                 },
             },
             test_credentials=TEST_CREDENTIALS,
@@ -138,7 +142,12 @@ class CreateTalkingAvatarVideoBlock(Block):
         return response.json()
 
     async def run(
-        self, input_data: Input, *, credentials: APIKeyCredentials, **kwargs
+        self,
+        input_data: Input,
+        *,
+        credentials: APIKeyCredentials,
+        execution_context: ExecutionContext,
+        **kwargs,
     ) -> BlockOutput:
         # Create the clip
         payload = {
@@ -165,7 +174,14 @@ class CreateTalkingAvatarVideoBlock(Block):
         for _ in range(input_data.max_polling_attempts):
             status_response = await self.get_clip_status(credentials.api_key, clip_id)
             if status_response["status"] == "done":
-                yield "video_url", status_response["result_url"]
+                # Store the generated video to the user's workspace for persistence
+                video_url = status_response["result_url"]
+                stored_url = await store_media_file(
+                    file=MediaFileType(video_url),
+                    execution_context=execution_context,
+                    return_format="for_block_output",
+                )
+                yield "video_url", stored_url
                 return
             elif status_response["status"] == "error":
                 raise RuntimeError(
diff --git a/autogpt_platform/backend/backend/blocks/test/test_blocks_dos_vulnerability.py b/autogpt_platform/backend/backend/blocks/test/test_blocks_dos_vulnerability.py
index 389bb5c636..e2e44b194c 100644
--- a/autogpt_platform/backend/backend/blocks/test/test_blocks_dos_vulnerability.py
+++ b/autogpt_platform/backend/backend/blocks/test/test_blocks_dos_vulnerability.py
@@ -12,6 +12,7 @@ from backend.blocks.iteration import StepThroughItemsBlock
 from backend.blocks.llm import AITextSummarizerBlock
 from backend.blocks.text import ExtractTextInformationBlock
 from backend.blocks.xml_parser import XMLParserBlock
+from backend.data.execution import ExecutionContext
 from backend.util.file import store_media_file
 from backend.util.type import MediaFileType
 
@@ -233,9 +234,12 @@ class TestStoreMediaFileSecurity:
 
         with pytest.raises(ValueError, match="File too large"):
             await store_media_file(
-                graph_exec_id="test",
                 file=MediaFileType(large_data_uri),
-                user_id="test_user",
+                execution_context=ExecutionContext(
+                    user_id="test_user",
+                    graph_exec_id="test",
+                ),
+                return_format="for_local_processing",
             )
 
     @patch("backend.util.file.Path")
@@ -270,9 +274,12 @@ class TestStoreMediaFileSecurity:
         # Should raise an error when directory size exceeds limit
         with pytest.raises(ValueError, match="Disk usage limit exceeded"):
             await store_media_file(
-                graph_exec_id="test",
                 file=MediaFileType(
                     "data:text/plain;base64,dGVzdA=="
                 ),  # Small test file
-                user_id="test_user",
+                execution_context=ExecutionContext(
+                    user_id="test_user",
+                    graph_exec_id="test",
+                ),
+                return_format="for_local_processing",
             )
diff --git a/autogpt_platform/backend/backend/blocks/test/test_http.py b/autogpt_platform/backend/backend/blocks/test/test_http.py
index bdc30f3ecf..e01b8e2c5b 100644
--- a/autogpt_platform/backend/backend/blocks/test/test_http.py
+++ b/autogpt_platform/backend/backend/blocks/test/test_http.py
@@ -11,10 +11,22 @@ from backend.blocks.http import (
     HttpMethod,
     SendAuthenticatedWebRequestBlock,
 )
+from backend.data.execution import ExecutionContext
 from backend.data.model import HostScopedCredentials
 from backend.util.request import Response
 
 
+def make_test_context(
+    graph_exec_id: str = "test-exec-id",
+    user_id: str = "test-user-id",
+) -> ExecutionContext:
+    """Helper to create test ExecutionContext."""
+    return ExecutionContext(
+        user_id=user_id,
+        graph_exec_id=graph_exec_id,
+    )
+
+
 class TestHttpBlockWithHostScopedCredentials:
     """Test suite for HTTP block integration with HostScopedCredentials."""
 
@@ -105,8 +117,7 @@ class TestHttpBlockWithHostScopedCredentials:
         async for output_name, output_data in http_block.run(
             input_data,
             credentials=exact_match_credentials,
-            graph_exec_id="test-exec-id",
-            user_id="test-user-id",
+            execution_context=make_test_context(),
         ):
             result.append((output_name, output_data))
 
@@ -161,8 +172,7 @@ class TestHttpBlockWithHostScopedCredentials:
         async for output_name, output_data in http_block.run(
             input_data,
             credentials=wildcard_credentials,
-            graph_exec_id="test-exec-id",
-            user_id="test-user-id",
+            execution_context=make_test_context(),
         ):
             result.append((output_name, output_data))
 
@@ -208,8 +218,7 @@ class TestHttpBlockWithHostScopedCredentials:
         async for output_name, output_data in http_block.run(
             input_data,
             credentials=non_matching_credentials,
-            graph_exec_id="test-exec-id",
-            user_id="test-user-id",
+            execution_context=make_test_context(),
         ):
             result.append((output_name, output_data))
 
@@ -258,8 +267,7 @@ class TestHttpBlockWithHostScopedCredentials:
         async for output_name, output_data in http_block.run(
             input_data,
             credentials=exact_match_credentials,
-            graph_exec_id="test-exec-id",
-            user_id="test-user-id",
+            execution_context=make_test_context(),
         ):
             result.append((output_name, output_data))
 
@@ -318,8 +326,7 @@ class TestHttpBlockWithHostScopedCredentials:
         async for output_name, output_data in http_block.run(
             input_data,
             credentials=auto_discovered_creds,  # Execution manager found these
-            graph_exec_id="test-exec-id",
-            user_id="test-user-id",
+            execution_context=make_test_context(),
         ):
             result.append((output_name, output_data))
 
@@ -382,8 +389,7 @@ class TestHttpBlockWithHostScopedCredentials:
         async for output_name, output_data in http_block.run(
             input_data,
             credentials=multi_header_creds,
-            graph_exec_id="test-exec-id",
-            user_id="test-user-id",
+            execution_context=make_test_context(),
         ):
             result.append((output_name, output_data))
 
@@ -471,8 +477,7 @@ class TestHttpBlockWithHostScopedCredentials:
             async for output_name, output_data in http_block.run(
                 input_data,
                 credentials=test_creds,
-                graph_exec_id="test-exec-id",
-                user_id="test-user-id",
+                execution_context=make_test_context(),
             ):
                 result.append((output_name, output_data))
 
diff --git a/autogpt_platform/backend/backend/blocks/test/test_smart_decision_maker.py b/autogpt_platform/backend/backend/blocks/test/test_smart_decision_maker.py
index c930fab37e..0f9da7e10b 100644
--- a/autogpt_platform/backend/backend/blocks/test/test_smart_decision_maker.py
+++ b/autogpt_platform/backend/backend/blocks/test/test_smart_decision_maker.py
@@ -242,7 +242,7 @@ async def test_smart_decision_maker_tracks_llm_stats():
         outputs = {}
         # Create execution context
 
-        mock_execution_context = ExecutionContext(safe_mode=False)
+        mock_execution_context = ExecutionContext(human_in_the_loop_safe_mode=False)
 
         # Create a mock execution processor for tests
 
@@ -343,7 +343,7 @@ async def test_smart_decision_maker_parameter_validation():
 
         # Create execution context
 
-        mock_execution_context = ExecutionContext(safe_mode=False)
+        mock_execution_context = ExecutionContext(human_in_the_loop_safe_mode=False)
 
         # Create a mock execution processor for tests
 
@@ -409,7 +409,7 @@ async def test_smart_decision_maker_parameter_validation():
 
         # Create execution context
 
-        mock_execution_context = ExecutionContext(safe_mode=False)
+        mock_execution_context = ExecutionContext(human_in_the_loop_safe_mode=False)
 
         # Create a mock execution processor for tests
 
@@ -471,7 +471,7 @@ async def test_smart_decision_maker_parameter_validation():
         outputs = {}
         # Create execution context
 
-        mock_execution_context = ExecutionContext(safe_mode=False)
+        mock_execution_context = ExecutionContext(human_in_the_loop_safe_mode=False)
 
         # Create a mock execution processor for tests
 
@@ -535,7 +535,7 @@ async def test_smart_decision_maker_parameter_validation():
         outputs = {}
         # Create execution context
 
-        mock_execution_context = ExecutionContext(safe_mode=False)
+        mock_execution_context = ExecutionContext(human_in_the_loop_safe_mode=False)
 
         # Create a mock execution processor for tests
 
@@ -658,7 +658,7 @@ async def test_smart_decision_maker_raw_response_conversion():
         outputs = {}
         # Create execution context
 
-        mock_execution_context = ExecutionContext(safe_mode=False)
+        mock_execution_context = ExecutionContext(human_in_the_loop_safe_mode=False)
 
         # Create a mock execution processor for tests
 
@@ -730,7 +730,7 @@ async def test_smart_decision_maker_raw_response_conversion():
         outputs = {}
         # Create execution context
 
-        mock_execution_context = ExecutionContext(safe_mode=False)
+        mock_execution_context = ExecutionContext(human_in_the_loop_safe_mode=False)
 
         # Create a mock execution processor for tests
 
@@ -786,7 +786,7 @@ async def test_smart_decision_maker_raw_response_conversion():
         outputs = {}
         # Create execution context
 
-        mock_execution_context = ExecutionContext(safe_mode=False)
+        mock_execution_context = ExecutionContext(human_in_the_loop_safe_mode=False)
 
         # Create a mock execution processor for tests
 
@@ -905,7 +905,7 @@ async def test_smart_decision_maker_agent_mode():
         # Create a mock execution context
 
         mock_execution_context = ExecutionContext(
-            safe_mode=False,
+            human_in_the_loop_safe_mode=False,
         )
 
         # Create a mock execution processor for agent mode tests
@@ -1027,7 +1027,7 @@ async def test_smart_decision_maker_traditional_mode_default():
 
         # Create execution context
 
-        mock_execution_context = ExecutionContext(safe_mode=False)
+        mock_execution_context = ExecutionContext(human_in_the_loop_safe_mode=False)
 
         # Create a mock execution processor for tests
 
@@ -1057,3 +1057,153 @@ async def test_smart_decision_maker_traditional_mode_default():
         )  # Should yield individual tool parameters
         assert "tools_^_test-sink-node-id_~_max_keyword_difficulty" in outputs
         assert "conversations" in outputs
+
+
+@pytest.mark.asyncio
+async def test_smart_decision_maker_uses_customized_name_for_blocks():
+    """Test that SmartDecisionMakerBlock uses customized_name from node metadata for tool names."""
+    from unittest.mock import MagicMock
+
+    from backend.blocks.basic import StoreValueBlock
+    from backend.blocks.smart_decision_maker import SmartDecisionMakerBlock
+    from backend.data.graph import Link, Node
+
+    # Create a mock node with customized_name in metadata
+    mock_node = MagicMock(spec=Node)
+    mock_node.id = "test-node-id"
+    mock_node.block_id = StoreValueBlock().id
+    mock_node.metadata = {"customized_name": "My Custom Tool Name"}
+    mock_node.block = StoreValueBlock()
+
+    # Create a mock link
+    mock_link = MagicMock(spec=Link)
+    mock_link.sink_name = "input"
+
+    # Call the function directly
+    result = await SmartDecisionMakerBlock._create_block_function_signature(
+        mock_node, [mock_link]
+    )
+
+    # Verify the tool name uses the customized name (cleaned up)
+    assert result["type"] == "function"
+    assert result["function"]["name"] == "my_custom_tool_name"  # Cleaned version
+    assert result["function"]["_sink_node_id"] == "test-node-id"
+
+
+@pytest.mark.asyncio
+async def test_smart_decision_maker_falls_back_to_block_name():
+    """Test that SmartDecisionMakerBlock falls back to block.name when no customized_name."""
+    from unittest.mock import MagicMock
+
+    from backend.blocks.basic import StoreValueBlock
+    from backend.blocks.smart_decision_maker import SmartDecisionMakerBlock
+    from backend.data.graph import Link, Node
+
+    # Create a mock node without customized_name
+    mock_node = MagicMock(spec=Node)
+    mock_node.id = "test-node-id"
+    mock_node.block_id = StoreValueBlock().id
+    mock_node.metadata = {}  # No customized_name
+    mock_node.block = StoreValueBlock()
+
+    # Create a mock link
+    mock_link = MagicMock(spec=Link)
+    mock_link.sink_name = "input"
+
+    # Call the function directly
+    result = await SmartDecisionMakerBlock._create_block_function_signature(
+        mock_node, [mock_link]
+    )
+
+    # Verify the tool name uses the block's default name
+    assert result["type"] == "function"
+    assert result["function"]["name"] == "storevalueblock"  # Default block name cleaned
+    assert result["function"]["_sink_node_id"] == "test-node-id"
+
+
+@pytest.mark.asyncio
+async def test_smart_decision_maker_uses_customized_name_for_agents():
+    """Test that SmartDecisionMakerBlock uses customized_name from metadata for agent nodes."""
+    from unittest.mock import AsyncMock, MagicMock, patch
+
+    from backend.blocks.smart_decision_maker import SmartDecisionMakerBlock
+    from backend.data.graph import Link, Node
+
+    # Create a mock node with customized_name in metadata
+    mock_node = MagicMock(spec=Node)
+    mock_node.id = "test-agent-node-id"
+    mock_node.metadata = {"customized_name": "My Custom Agent"}
+    mock_node.input_default = {
+        "graph_id": "test-graph-id",
+        "graph_version": 1,
+        "input_schema": {"properties": {"test_input": {"description": "Test input"}}},
+    }
+
+    # Create a mock link
+    mock_link = MagicMock(spec=Link)
+    mock_link.sink_name = "test_input"
+
+    # Mock the database client
+    mock_graph_meta = MagicMock()
+    mock_graph_meta.name = "Original Agent Name"
+    mock_graph_meta.description = "Agent description"
+
+    mock_db_client = AsyncMock()
+    mock_db_client.get_graph_metadata.return_value = mock_graph_meta
+
+    with patch(
+        "backend.blocks.smart_decision_maker.get_database_manager_async_client",
+        return_value=mock_db_client,
+    ):
+        result = await SmartDecisionMakerBlock._create_agent_function_signature(
+            mock_node, [mock_link]
+        )
+
+    # Verify the tool name uses the customized name (cleaned up)
+    assert result["type"] == "function"
+    assert result["function"]["name"] == "my_custom_agent"  # Cleaned version
+    assert result["function"]["_sink_node_id"] == "test-agent-node-id"
+
+
+@pytest.mark.asyncio
+async def test_smart_decision_maker_agent_falls_back_to_graph_name():
+    """Test that agent node falls back to graph name when no customized_name."""
+    from unittest.mock import AsyncMock, MagicMock, patch
+
+    from backend.blocks.smart_decision_maker import SmartDecisionMakerBlock
+    from backend.data.graph import Link, Node
+
+    # Create a mock node without customized_name
+    mock_node = MagicMock(spec=Node)
+    mock_node.id = "test-agent-node-id"
+    mock_node.metadata = {}  # No customized_name
+    mock_node.input_default = {
+        "graph_id": "test-graph-id",
+        "graph_version": 1,
+        "input_schema": {"properties": {"test_input": {"description": "Test input"}}},
+    }
+
+    # Create a mock link
+    mock_link = MagicMock(spec=Link)
+    mock_link.sink_name = "test_input"
+
+    # Mock the database client
+    mock_graph_meta = MagicMock()
+    mock_graph_meta.name = "Original Agent Name"
+    mock_graph_meta.description = "Agent description"
+
+    mock_db_client = AsyncMock()
+    mock_db_client.get_graph_metadata.return_value = mock_graph_meta
+
+    with patch(
+        "backend.blocks.smart_decision_maker.get_database_manager_async_client",
+        return_value=mock_db_client,
+    ):
+        result = await SmartDecisionMakerBlock._create_agent_function_signature(
+            mock_node, [mock_link]
+        )
+
+    # Verify the tool name uses the graph's default name
+    assert result["type"] == "function"
+    assert result["function"]["name"] == "original_agent_name"  # Graph name cleaned
+    assert result["function"]["_sink_node_id"] == "test-agent-node-id"
diff --git a/autogpt_platform/backend/backend/blocks/test/test_smart_decision_maker_dict.py b/autogpt_platform/backend/backend/blocks/test/test_smart_decision_maker_dict.py
index 839bdc5e15..2087c0b7d6 100644
--- a/autogpt_platform/backend/backend/blocks/test/test_smart_decision_maker_dict.py
+++ b/autogpt_platform/backend/backend/blocks/test/test_smart_decision_maker_dict.py
@@ -15,6 +15,7 @@ async def test_smart_decision_maker_handles_dynamic_dict_fields():
     mock_node.block = CreateDictionaryBlock()
     mock_node.block_id = CreateDictionaryBlock().id
     mock_node.input_default = {}
+    mock_node.metadata = {}
 
     # Create mock links with dynamic dictionary fields
     mock_links = [
@@ -77,6 +78,7 @@ async def test_smart_decision_maker_handles_dynamic_list_fields():
     mock_node.block = AddToListBlock()
     mock_node.block_id = AddToListBlock().id
     mock_node.input_default = {}
+    mock_node.metadata = {}
 
     # Create mock links with dynamic list fields
     mock_links = [
diff --git a/autogpt_platform/backend/backend/blocks/test/test_smart_decision_maker_dynamic_fields.py b/autogpt_platform/backend/backend/blocks/test/test_smart_decision_maker_dynamic_fields.py
index 6ed830e517..0427b13466 100644
--- a/autogpt_platform/backend/backend/blocks/test/test_smart_decision_maker_dynamic_fields.py
+++ b/autogpt_platform/backend/backend/blocks/test/test_smart_decision_maker_dynamic_fields.py
@@ -44,6 +44,7 @@ async def test_create_block_function_signature_with_dict_fields():
     mock_node.block = CreateDictionaryBlock()
     mock_node.block_id = CreateDictionaryBlock().id
     mock_node.input_default = {}
+    mock_node.metadata = {}
 
     # Create mock links with dynamic dictionary fields (source sanitized, sink original)
     mock_links = [
@@ -106,6 +107,7 @@ async def test_create_block_function_signature_with_list_fields():
     mock_node.block = AddToListBlock()
     mock_node.block_id = AddToListBlock().id
     mock_node.input_default = {}
+    mock_node.metadata = {}
 
     # Create mock links with dynamic list fields
     mock_links = [
@@ -159,6 +161,7 @@ async def test_create_block_function_signature_with_object_fields():
     mock_node.block = MatchTextPatternBlock()
     mock_node.block_id = MatchTextPatternBlock().id
     mock_node.input_default = {}
+    mock_node.metadata = {}
 
     # Create mock links with dynamic object fields
     mock_links = [
@@ -208,11 +211,13 @@ async def test_create_tool_node_signatures():
         mock_dict_node.block = CreateDictionaryBlock()
         mock_dict_node.block_id = CreateDictionaryBlock().id
         mock_dict_node.input_default = {}
+        mock_dict_node.metadata = {}
 
         mock_list_node = Mock()
         mock_list_node.block = AddToListBlock()
         mock_list_node.block_id = AddToListBlock().id
         mock_list_node.input_default = {}
+        mock_list_node.metadata = {}
 
         # Mock links with dynamic fields
         dict_link1 = Mock(
@@ -381,7 +386,7 @@ async def test_output_yielding_with_dynamic_fields():
             outputs = {}
             from backend.data.execution import ExecutionContext
 
-            mock_execution_context = ExecutionContext(safe_mode=False)
+            mock_execution_context = ExecutionContext(human_in_the_loop_safe_mode=False)
             mock_execution_processor = MagicMock()
 
             async for output_name, output_value in block.run(
@@ -423,6 +428,7 @@ async def test_mixed_regular_and_dynamic_fields():
     mock_node.block.name = "TestBlock"
     mock_node.block.description = "A test block"
     mock_node.block.input_schema = Mock()
+    mock_node.metadata = {}
 
     # Mock the get_field_schema to return a proper schema for regular fields
     def get_field_schema(field_name):
@@ -603,7 +609,9 @@ async def test_validation_errors_dont_pollute_conversation():
                 outputs = {}
                 from backend.data.execution import ExecutionContext
 
-                mock_execution_context = ExecutionContext(safe_mode=False)
+                mock_execution_context = ExecutionContext(
+                    human_in_the_loop_safe_mode=False
+                )
 
                 # Create a proper mock execution processor for agent mode
                 from collections import defaultdict
diff --git a/autogpt_platform/backend/backend/blocks/text.py b/autogpt_platform/backend/backend/blocks/text.py
index 5e58e27101..359e22a84f 100644
--- a/autogpt_platform/backend/backend/blocks/text.py
+++ b/autogpt_platform/backend/backend/blocks/text.py
@@ -11,6 +11,7 @@ from backend.data.block import (
     BlockSchemaInput,
     BlockSchemaOutput,
 )
+from backend.data.execution import ExecutionContext
 from backend.data.model import SchemaField
 from backend.util import json, text
 from backend.util.file import get_exec_file_path, store_media_file
@@ -444,18 +445,21 @@ class FileReadBlock(Block):
         )
 
     async def run(
-        self, input_data: Input, *, graph_exec_id: str, user_id: str, **_kwargs
+        self, input_data: Input, *, execution_context: ExecutionContext, **_kwargs
     ) -> BlockOutput:
         # Store the media file properly (handles URLs, data URIs, etc.)
         stored_file_path = await store_media_file(
-            user_id=user_id,
-            graph_exec_id=graph_exec_id,
             file=input_data.file_input,
-            return_content=False,
+            execution_context=execution_context,
+            return_format="for_local_processing",
         )
 
-        # Get full file path
-        file_path = get_exec_file_path(graph_exec_id, stored_file_path)
+        # Get full file path (graph_exec_id validated by store_media_file above)
+        if not execution_context.graph_exec_id:
+            raise ValueError("execution_context.graph_exec_id is required")
+        file_path = get_exec_file_path(
+            execution_context.graph_exec_id, stored_file_path
+        )
 
         if not Path(file_path).exists():
             raise ValueError(f"File does not exist: {file_path}")
diff --git a/autogpt_platform/backend/backend/blocks/wordpress/__init__.py b/autogpt_platform/backend/backend/blocks/wordpress/__init__.py
index c7b1e26eea..3eae4a1063 100644
--- a/autogpt_platform/backend/backend/blocks/wordpress/__init__.py
+++ b/autogpt_platform/backend/backend/blocks/wordpress/__init__.py
@@ -1,3 +1,3 @@
-from .blog import WordPressCreatePostBlock
+from .blog import WordPressCreatePostBlock, WordPressGetAllPostsBlock
 
-__all__ = ["WordPressCreatePostBlock"]
+__all__ = ["WordPressCreatePostBlock", "WordPressGetAllPostsBlock"]
diff --git a/autogpt_platform/backend/backend/blocks/wordpress/_api.py b/autogpt_platform/backend/backend/blocks/wordpress/_api.py
index 78f535947b..d21dc3e05d 100644
--- a/autogpt_platform/backend/backend/blocks/wordpress/_api.py
+++ b/autogpt_platform/backend/backend/blocks/wordpress/_api.py
@@ -161,7 +161,7 @@ async def oauth_exchange_code_for_tokens(
         grant_type="authorization_code",
     ).model_dump(exclude_none=True)
 
-    response = await Requests().post(
+    response = await Requests(raise_for_status=False).post(
         f"{WORDPRESS_BASE_URL}oauth2/token",
         headers=headers,
         data=data,
@@ -205,7 +205,7 @@ async def oauth_refresh_tokens(
         grant_type="refresh_token",
     ).model_dump(exclude_none=True)
 
-    response = await Requests().post(
+    response = await Requests(raise_for_status=False).post(
         f"{WORDPRESS_BASE_URL}oauth2/token",
         headers=headers,
         data=data,
@@ -252,7 +252,7 @@ async def validate_token(
         "token": token,
     }
 
-    response = await Requests().get(
+    response = await Requests(raise_for_status=False).get(
         f"{WORDPRESS_BASE_URL}oauth2/token-info",
         params=params,
     )
@@ -296,7 +296,7 @@ async def make_api_request(
 
     url = f"{WORDPRESS_BASE_URL.rstrip('/')}{endpoint}"
 
-    request_method = getattr(Requests(), method.lower())
+    request_method = getattr(Requests(raise_for_status=False), method.lower())
     response = await request_method(
         url,
         headers=headers,
@@ -476,6 +476,7 @@ async def create_post(
         data["tags"] = ",".join(str(t) for t in data["tags"])
 
     # Make the API request
+    site = normalize_site(site)
     endpoint = f"/rest/v1.1/sites/{site}/posts/new"
 
     headers = {
@@ -483,7 +484,7 @@ async def create_post(
         "Content-Type": "application/x-www-form-urlencoded",
     }
 
-    response = await Requests().post(
+    response = await Requests(raise_for_status=False).post(
         f"{WORDPRESS_BASE_URL.rstrip('/')}{endpoint}",
         headers=headers,
         data=data,
@@ -499,3 +500,132 @@ async def create_post(
     )
     error_message = error_data.get("message", response.text)
     raise ValueError(f"Failed to create post: {response.status} - {error_message}")
+
+
+class Post(BaseModel):
+    """Response model for individual posts in a posts list response.
+
+    This is a simplified version compared to PostResponse, as the list endpoint
+    returns less detailed information than the create/get single post endpoints.
+    """
+
+    ID: int
+    site_ID: int
+    author: PostAuthor
+    date: datetime
+    modified: datetime
+    title: str
+    URL: str
+    short_URL: str
+    content: str | None = None
+    excerpt: str | None = None
+    slug: str
+    guid: str
+    status: str
+    sticky: bool
+    password: str | None = ""
+    parent: Union[Dict[str, Any], bool, None] = None
+    type: str
+    discussion: Dict[str, Union[str, bool, int]] | None = None
+    likes_enabled: bool | None = None
+    sharing_enabled: bool | None = None
+    like_count: int | None = None
+    i_like: bool | None = None
+    is_reblogged: bool | None = None
+    is_following: bool | None = None
+    global_ID: str | None = None
+    featured_image: str | None = None
+    post_thumbnail: Dict[str, Any] | None = None
+    format: str | None = None
+    geo: Union[Dict[str, Any], bool, None] = None
+    menu_order: int | None = None
+    page_template: str | None = None
+    publicize_URLs: List[str] | None = None
+    terms: Dict[str, Dict[str, Any]] | None = None
+    tags: Dict[str, Dict[str, Any]] | None = None
+    categories: Dict[str, Dict[str, Any]] | None = None
+    attachments: Dict[str, Dict[str, Any]] | None = None
+    attachment_count: int | None = None
+    metadata: List[Dict[str, Any]] | None = None
+    meta: Dict[str, Any] | None = None
+    capabilities: Dict[str, bool] | None = None
+    revisions: List[int] | None = None
+    other_URLs: Dict[str, Any] | None = None
+
+
+class PostsResponse(BaseModel):
+    """Response model for WordPress posts list."""
+
+    found: int
+    posts: List[Post]
+    meta: Dict[str, Any]
+
+
+def normalize_site(site: str) -> str:
+    """
+    Normalize a site identifier by stripping protocol and trailing slashes.
+
+    Args:
+        site: Site URL, domain, or ID (e.g., "https://myblog.wordpress.com/", "myblog.wordpress.com", "123456789")
+
+    Returns:
+        Normalized site identifier (domain or ID only)
+    """
+    site = site.strip()
+    if site.startswith("https://"):
+        site = site[8:]
+    elif site.startswith("http://"):
+        site = site[7:]
+    return site.rstrip("/")
+
+
+async def get_posts(
+    credentials: Credentials,
+    site: str,
+    status: PostStatus | None = None,
+    number: int = 100,
+    offset: int = 0,
+) -> PostsResponse:
+    """
+    Get posts from a WordPress site.
+
+    Args:
+        credentials: OAuth credentials
+        site: Site ID or domain (e.g., "myblog.wordpress.com" or "123456789")
+        status: Filter by post status using PostStatus enum, or None for all
+        number: Number of posts to retrieve (max 100)
+        offset: Number of posts to skip (for pagination)
+
+    Returns:
+        PostsResponse with the list of posts
+    """
+    site = normalize_site(site)
+    endpoint = f"/rest/v1.1/sites/{site}/posts"
+
+    headers = {
+        "Authorization": credentials.auth_header(),
+    }
+
+    params: Dict[str, Any] = {
+        "number": max(1, min(number, 100)),  # 1–100 posts per request
+        "offset": offset,
+    }
+
+    if status:
+        params["status"] = status.value
+    response = await Requests(raise_for_status=False).get(
+        f"{WORDPRESS_BASE_URL.rstrip('/')}{endpoint}",
+        headers=headers,
+        params=params,
+    )
+
+    if response.ok:
+        return PostsResponse.model_validate(response.json())
+
+    error_data = (
+        response.json()
+        if response.headers.get("content-type", "").startswith("application/json")
+        else {}
+    )
+    error_message = error_data.get("message", response.text)
+    raise ValueError(f"Failed to get posts: {response.status} - {error_message}")
diff --git a/autogpt_platform/backend/backend/blocks/wordpress/blog.py b/autogpt_platform/backend/backend/blocks/wordpress/blog.py
index c0ad5eca54..22b691480b 100644
--- a/autogpt_platform/backend/backend/blocks/wordpress/blog.py
+++ b/autogpt_platform/backend/backend/blocks/wordpress/blog.py
@@ -9,7 +9,15 @@ from backend.sdk import (
     SchemaField,
 )
 
-from ._api import CreatePostRequest, PostResponse, PostStatus, create_post
+from ._api import (
+    CreatePostRequest,
+    Post,
+    PostResponse,
+    PostsResponse,
+    PostStatus,
+    create_post,
+    get_posts,
+)
 from ._config import wordpress
 
 
@@ -49,8 +57,15 @@ class WordPressCreatePostBlock(Block):
         media_urls: list[str] = SchemaField(
             description="URLs of images to sideload and attach to the post", default=[]
         )
+        publish_as_draft: bool = SchemaField(
+            description="If True, publishes the post as a draft. If False, publishes it publicly.",
+            default=False,
+        )
 
     class Output(BlockSchemaOutput):
+        site: str = SchemaField(
+            description="The site ID or domain (pass-through for chaining with other blocks)"
+        )
         post_id: int = SchemaField(description="The ID of the created post")
         post_url: str = SchemaField(description="The full URL of the created post")
         short_url: str = SchemaField(description="The shortened wp.me URL")
@@ -78,7 +93,9 @@ class WordPressCreatePostBlock(Block):
             tags=input_data.tags,
             featured_image=input_data.featured_image,
             media_urls=input_data.media_urls,
-            status=PostStatus.PUBLISH,
+            status=(
+                PostStatus.DRAFT if input_data.publish_as_draft else PostStatus.PUBLISH
+            ),
         )
 
         post_response: PostResponse = await create_post(
@@ -87,7 +104,69 @@ class WordPressCreatePostBlock(Block):
             post_data=post_request,
         )
 
+        yield "site", input_data.site
         yield "post_id", post_response.ID
         yield "post_url", post_response.URL
         yield "short_url", post_response.short_URL
         yield "post_data", post_response.model_dump()
+
+
+class WordPressGetAllPostsBlock(Block):
+    """
+    Fetches all posts from a WordPress.com site or Jetpack-enabled site.
+    Supports filtering by status and pagination.
+    """
+
+    class Input(BlockSchemaInput):
+        credentials: CredentialsMetaInput = wordpress.credentials_field()
+        site: str = SchemaField(
+            description="Site ID or domain (e.g., 'myblog.wordpress.com' or '123456789')"
+        )
+        status: PostStatus | None = SchemaField(
+            description="Filter by post status, or None for all",
+            default=None,
+        )
+        number: int = SchemaField(
+            description="Number of posts to retrieve (max 100 per request)", default=20
+        )
+        offset: int = SchemaField(
+            description="Number of posts to skip (for pagination)", default=0
+        )
+
+    class Output(BlockSchemaOutput):
+        site: str = SchemaField(
+            description="The site ID or domain (pass-through for chaining with other blocks)"
+        )
+        found: int = SchemaField(description="Total number of posts found")
+        posts: list[Post] = SchemaField(
+            description="List of post objects with their details"
+        )
+        post: Post = SchemaField(
+            description="Individual post object (yielded for each post)"
+        )
+
+    def __init__(self):
+        super().__init__(
+            id="97728fa7-7f6f-4789-ba0c-f2c114119536",
+            description="Fetch all posts from WordPress.com or Jetpack sites",
+            categories={BlockCategory.SOCIAL},
+            input_schema=self.Input,
+            output_schema=self.Output,
+        )
+
+    async def run(
+        self, input_data: Input, *, credentials: Credentials, **kwargs
+    ) -> BlockOutput:
+        posts_response: PostsResponse = await get_posts(
+            credentials=credentials,
+            site=input_data.site,
+            status=input_data.status,
+            number=input_data.number,
+            offset=input_data.offset,
+        )
+
+        yield "site", input_data.site
+        yield "found", posts_response.found
+        yield "posts", posts_response.posts
+        for post in posts_response.posts:
+            yield "post", post
diff --git a/autogpt_platform/backend/backend/conftest.py b/autogpt_platform/backend/backend/conftest.py
index b0b7f0cc67..57481e4b85 100644
--- a/autogpt_platform/backend/backend/conftest.py
+++ b/autogpt_platform/backend/backend/conftest.py
@@ -1,7 +1,7 @@
 import logging
 import os
 
-import pytest
+import pytest_asyncio
 from dotenv import load_dotenv
 
 from backend.util.logging import configure_logging
@@ -19,7 +19,7 @@ if not os.getenv("PRISMA_DEBUG"):
     prisma_logger.setLevel(logging.INFO)
 
 
-@pytest.fixture(scope="session")
+@pytest_asyncio.fixture(scope="session", loop_scope="session")
 async def server():
     from backend.util.test import SpinTestServer
 
@@ -27,7 +27,7 @@ async def server():
         yield server
 
 
-@pytest.fixture(scope="session", autouse=True)
+@pytest_asyncio.fixture(scope="session", loop_scope="session", autouse=True)
 async def graph_cleanup(server):
     created_graph_ids = []
     original_create_graph = server.agent_server.test_create_graph
diff --git a/autogpt_platform/backend/backend/data/analytics.py b/autogpt_platform/backend/backend/data/analytics.py
index 7419539026..2e148cd10f 100644
--- a/autogpt_platform/backend/backend/data/analytics.py
+++ b/autogpt_platform/backend/backend/data/analytics.py
@@ -104,7 +104,7 @@ async def get_accuracy_trends_and_alerts(
             AND e."executionStatus" IN ('COMPLETED', 'FAILED', 'TERMINATED')
             {user_filter}
         GROUP BY DATE(e."createdAt")
-        HAVING COUNT(*) >= 3  -- Need at least 3 executions per day
+        HAVING COUNT(*) >= 1  -- Include all days with at least 1 execution
     ),
     trends AS (
         SELECT 
diff --git a/autogpt_platform/backend/backend/data/block.py b/autogpt_platform/backend/backend/data/block.py
index 727688dcf0..eb9360b037 100644
--- a/autogpt_platform/backend/backend/data/block.py
+++ b/autogpt_platform/backend/backend/data/block.py
@@ -50,6 +50,8 @@ from .model import (
 logger = logging.getLogger(__name__)
 
 if TYPE_CHECKING:
+    from backend.data.execution import ExecutionContext
+
     from .graph import Link
 
 app_config = Config()
@@ -439,6 +441,7 @@ class Block(ABC, Generic[BlockSchemaInputType, BlockSchemaOutputType]):
         static_output: bool = False,
         block_type: BlockType = BlockType.STANDARD,
         webhook_config: Optional[BlockWebhookConfig | BlockManualWebhookConfig] = None,
+        is_sensitive_action: bool = False,
     ):
         """
         Initialize the block with the given schema.
@@ -471,6 +474,7 @@ class Block(ABC, Generic[BlockSchemaInputType, BlockSchemaOutputType]):
         self.static_output = static_output
         self.block_type = block_type
         self.webhook_config = webhook_config
+        self.is_sensitive_action = is_sensitive_action
         self.execution_stats: NodeExecutionStats = NodeExecutionStats()
 
         if self.webhook_config:
@@ -614,7 +618,90 @@ class Block(ABC, Generic[BlockSchemaInputType, BlockSchemaOutputType]):
                     block_id=self.id,
                 ) from ex
 
+    async def is_block_exec_need_review(
+        self,
+        input_data: BlockInput,
+        *,
+        user_id: str,
+        node_id: str,
+        node_exec_id: str,
+        graph_exec_id: str,
+        graph_id: str,
+        graph_version: int,
+        execution_context: "ExecutionContext",
+        **kwargs,
+    ) -> tuple[bool, BlockInput]:
+        """
+        Check if this block execution needs human review and handle the review process.
+
+        Returns:
+            Tuple of (should_pause, input_data_to_use)
+            - should_pause: True if execution should be paused for review
+            - input_data_to_use: The input data to use (may be modified by reviewer)
+        """
+        if not (
+            self.is_sensitive_action and execution_context.sensitive_action_safe_mode
+        ):
+            return False, input_data
+
+        from backend.blocks.helpers.review import HITLReviewHelper
+
+        # Handle the review request and get decision
+        decision = await HITLReviewHelper.handle_review_decision(
+            input_data=input_data,
+            user_id=user_id,
+            node_id=node_id,
+            node_exec_id=node_exec_id,
+            graph_exec_id=graph_exec_id,
+            graph_id=graph_id,
+            graph_version=graph_version,
+            block_name=self.name,
+            editable=True,
+        )
+
+        if decision is None:
+            # We're awaiting review - pause execution
+            return True, input_data
+
+        if not decision.should_proceed:
+            # Review was rejected, raise an error to stop execution
+            raise BlockExecutionError(
+                message=f"Block execution rejected by reviewer: {decision.message}",
+                block_name=self.name,
+                block_id=self.id,
+            )
+
+        # Review was approved - use the potentially modified data
+        # ReviewResult.data must be a dict for block inputs
+        reviewed_data = decision.review_result.data
+        if not isinstance(reviewed_data, dict):
+            raise BlockExecutionError(
+                message=f"Review data must be a dict for block input, got {type(reviewed_data).__name__}",
+                block_name=self.name,
+                block_id=self.id,
+            )
+        return False, reviewed_data
+
     async def _execute(self, input_data: BlockInput, **kwargs) -> BlockOutput:
+        # Check for review requirement only if running within a graph execution context
+        # Direct block execution (e.g., from chat) skips the review process
+        has_graph_context = all(
+            key in kwargs
+            for key in (
+                "node_exec_id",
+                "graph_exec_id",
+                "graph_id",
+                "execution_context",
+            )
+        )
+        if has_graph_context:
+            should_pause, input_data = await self.is_block_exec_need_review(
+                input_data, **kwargs
+            )
+            if should_pause:
+                return
+
+        # Validate the input data (original or reviewer-modified) once
         if error := self.input_schema.validate_data(input_data):
             raise BlockInputError(
                 message=f"Unable to execute block with invalid input data: {error}",
@@ -622,6 +709,7 @@ class Block(ABC, Generic[BlockSchemaInputType, BlockSchemaOutputType]):
                 block_id=self.id,
             )
 
+        # Use the validated input data
         async for output_name, output_data in self.run(
             self.input_schema(**{k: v for k, v in input_data.items() if v is not None}),
             **kwargs,
@@ -785,14 +873,13 @@ def is_block_auth_configured(
 
 
 async def initialize_blocks() -> None:
-    # First, sync all provider costs to blocks
-    # Imported here to avoid circular import
     from backend.sdk.cost_integration import sync_all_provider_costs
+    from backend.util.retry import func_retry
 
     sync_all_provider_costs()
 
-    for cls in get_blocks().values():
-        block = cls()
+    @func_retry
+    async def sync_block_to_db(block: Block) -> None:
         existing_block = await AgentBlock.prisma().find_first(
             where={"OR": [{"id": block.id}, {"name": block.name}]}
         )
@@ -805,7 +892,7 @@ async def initialize_blocks() -> None:
                     outputSchema=json.dumps(block.output_schema.jsonschema()),
                 )
             )
-            continue
+            return
 
         input_schema = json.dumps(block.input_schema.jsonschema())
         output_schema = json.dumps(block.output_schema.jsonschema())
@@ -825,6 +912,25 @@ async def initialize_blocks() -> None:
                 },
             )
 
+    failed_blocks: list[str] = []
+    for cls in get_blocks().values():
+        block = cls()
+        try:
+            await sync_block_to_db(block)
+        except Exception as e:
+            logger.warning(
+                f"Failed to sync block {block.name} to database: {e}. "
+                "Block is still available in memory.",
+                exc_info=True,
+            )
+            failed_blocks.append(block.name)
+
+    if failed_blocks:
+        logger.error(
+            f"Failed to sync {len(failed_blocks)} block(s) to database: "
+            f"{', '.join(failed_blocks)}. These blocks are still available in memory."
+        )
+
 
 # Note on the return type annotation: https://github.com/microsoft/pyright/issues/10281
 def get_block(block_id: str) -> AnyBlockSchema | None:
diff --git a/autogpt_platform/backend/backend/data/block_cost_config.py b/autogpt_platform/backend/backend/data/block_cost_config.py
index 7f8ee97d52..f46cc726f0 100644
--- a/autogpt_platform/backend/backend/data/block_cost_config.py
+++ b/autogpt_platform/backend/backend/data/block_cost_config.py
@@ -81,7 +81,6 @@ MODEL_COST: dict[LlmModel, int] = {
     LlmModel.CLAUDE_4_5_HAIKU: 4,
     LlmModel.CLAUDE_4_5_OPUS: 14,
     LlmModel.CLAUDE_4_5_SONNET: 9,
-    LlmModel.CLAUDE_3_7_SONNET: 5,
     LlmModel.CLAUDE_3_HAIKU: 1,
     LlmModel.AIML_API_QWEN2_5_72B: 1,
     LlmModel.AIML_API_LLAMA3_1_70B: 1,
@@ -99,10 +98,15 @@ MODEL_COST: dict[LlmModel, int] = {
     LlmModel.OPENAI_GPT_OSS_20B: 1,
     LlmModel.GEMINI_2_5_PRO: 4,
     LlmModel.GEMINI_3_PRO_PREVIEW: 5,
+    LlmModel.GEMINI_2_5_FLASH: 1,
+    LlmModel.GEMINI_2_0_FLASH: 1,
+    LlmModel.GEMINI_2_5_FLASH_LITE_PREVIEW: 1,
+    LlmModel.GEMINI_2_0_FLASH_LITE: 1,
     LlmModel.MISTRAL_NEMO: 1,
     LlmModel.COHERE_COMMAND_R_08_2024: 1,
     LlmModel.COHERE_COMMAND_R_PLUS_08_2024: 3,
     LlmModel.DEEPSEEK_CHAT: 2,
+    LlmModel.DEEPSEEK_R1_0528: 1,
     LlmModel.PERPLEXITY_SONAR: 1,
     LlmModel.PERPLEXITY_SONAR_PRO: 5,
     LlmModel.PERPLEXITY_SONAR_DEEP_RESEARCH: 10,
@@ -126,11 +130,6 @@ MODEL_COST: dict[LlmModel, int] = {
     LlmModel.KIMI_K2: 1,
     LlmModel.QWEN3_235B_A22B_THINKING: 1,
     LlmModel.QWEN3_CODER: 9,
-    LlmModel.GEMINI_2_5_FLASH: 1,
-    LlmModel.GEMINI_2_0_FLASH: 1,
-    LlmModel.GEMINI_2_5_FLASH_LITE_PREVIEW: 1,
-    LlmModel.GEMINI_2_0_FLASH_LITE: 1,
-    LlmModel.DEEPSEEK_R1_0528: 1,
     # v0 by Vercel models
     LlmModel.V0_1_5_MD: 1,
     LlmModel.V0_1_5_LG: 2,
diff --git a/autogpt_platform/backend/backend/data/db.py b/autogpt_platform/backend/backend/data/db.py
index 31a27e9163..48f420aec7 100644
--- a/autogpt_platform/backend/backend/data/db.py
+++ b/autogpt_platform/backend/backend/data/db.py
@@ -108,21 +108,105 @@ def get_database_schema() -> str:
     return query_params.get("schema", "public")
 
 
-async def query_raw_with_schema(query_template: str, *args) -> list[dict]:
-    """Execute raw SQL query with proper schema handling."""
+async def _raw_with_schema(
+    query_template: str,
+    *args,
+    execute: bool = False,
+    client: Prisma | None = None,
+) -> list[dict] | int:
+    """Internal: Execute raw SQL with proper schema handling.
+
+    Use query_raw_with_schema() or execute_raw_with_schema() instead.
+
+    Supports placeholders:
+        - {schema_prefix}: Table/type prefix (e.g., "platform".)
+        - {schema}: Raw schema name for application tables (e.g., platform)
+
+    Note on pgvector types:
+        Use unqualified ::vector and <=> operator in queries. PostgreSQL resolves
+        these via search_path, which includes the schema where pgvector is installed
+        on all environments (local, CI, dev).
+
+    Args:
+        query_template: SQL query with {schema_prefix} and/or {schema} placeholders
+        *args: Query parameters
+        execute: If False, executes SELECT query. If True, executes INSERT/UPDATE/DELETE.
+        client: Optional Prisma client for transactions (only used when execute=True).
+
+    Returns:
+        - list[dict] if execute=False (query results)
+        - int if execute=True (number of affected rows)
+
+    Example with vector type:
+        await execute_raw_with_schema(
+            'INSERT INTO {schema_prefix}"Embedding" (vec) VALUES ($1::vector)',
+            embedding_data
+        )
+    """
     schema = get_database_schema()
     schema_prefix = f'"{schema}".' if schema != "public" else ""
-    formatted_query = query_template.format(schema_prefix=schema_prefix)
+
+    formatted_query = query_template.format(
+        schema_prefix=schema_prefix,
+        schema=schema,
+    )
 
     import prisma as prisma_module
 
-    result = await prisma_module.get_client().query_raw(
-        formatted_query, *args  # type: ignore
-    )
+    db_client = client if client else prisma_module.get_client()
+
+    if execute:
+        result = await db_client.execute_raw(formatted_query, *args)  # type: ignore
+    else:
+        result = await db_client.query_raw(formatted_query, *args)  # type: ignore
 
     return result
 
 
+async def query_raw_with_schema(query_template: str, *args) -> list[dict]:
+    """Execute raw SQL SELECT query with proper schema handling.
+
+    Args:
+        query_template: SQL query with {schema_prefix} and/or {schema} placeholders
+        *args: Query parameters
+
+    Returns:
+        List of result rows as dictionaries
+
+    Example:
+        results = await query_raw_with_schema(
+            'SELECT * FROM {schema_prefix}"User" WHERE id = $1',
+            user_id
+        )
+    """
+    return await _raw_with_schema(query_template, *args, execute=False)  # type: ignore
+
+
+async def execute_raw_with_schema(
+    query_template: str,
+    *args,
+    client: Prisma | None = None,
+) -> int:
+    """Execute raw SQL command (INSERT/UPDATE/DELETE) with proper schema handling.
+
+    Args:
+        query_template: SQL query with {schema_prefix} and/or {schema} placeholders
+        *args: Query parameters
+        client: Optional Prisma client for transactions
+
+    Returns:
+        Number of affected rows
+
+    Example:
+        await execute_raw_with_schema(
+            'INSERT INTO {schema_prefix}"User" (id, name) VALUES ($1, $2)',
+            user_id, name,
+            client=tx  # Optional transaction client
+        )
+    """
+    return await _raw_with_schema(query_template, *args, execute=True, client=client)  # type: ignore
+
+
 class BaseDbModel(BaseModel):
     id: str = Field(default_factory=lambda: str(uuid4()))
 
diff --git a/autogpt_platform/backend/backend/data/event_bus.py b/autogpt_platform/backend/backend/data/event_bus.py
index 48f9df87fa..614fb158b2 100644
--- a/autogpt_platform/backend/backend/data/event_bus.py
+++ b/autogpt_platform/backend/backend/data/event_bus.py
@@ -103,8 +103,18 @@ class RedisEventBus(BaseRedisEventBus[M], ABC):
         return redis.get_redis()
 
     def publish_event(self, event: M, channel_key: str):
-        message, full_channel_name = self._serialize_message(event, channel_key)
-        self.connection.publish(full_channel_name, message)
+        """
+        Publish an event to Redis. Gracefully handles connection failures
+        by logging the error instead of raising exceptions.
+        """
+        try:
+            message, full_channel_name = self._serialize_message(event, channel_key)
+            self.connection.publish(full_channel_name, message)
+        except Exception:
+            logger.exception(
+                f"Failed to publish event to Redis channel {channel_key}. "
+                "Event bus operation will continue without Redis connectivity."
+            )
 
     def listen_events(self, channel_key: str) -> Generator[M, None, None]:
         pubsub, full_channel_name = self._get_pubsub_channel(
@@ -123,20 +133,44 @@ class RedisEventBus(BaseRedisEventBus[M], ABC):
 
 
 class AsyncRedisEventBus(BaseRedisEventBus[M], ABC):
+    def __init__(self):
+        self._pubsub: AsyncPubSub | None = None
+
     @property
     async def connection(self) -> redis.AsyncRedis:
         return await redis.get_redis_async()
 
+    async def close(self) -> None:
+        """Close the PubSub connection if it exists."""
+        if self._pubsub is not None:
+            try:
+                await self._pubsub.close()
+            except Exception:
+                logger.warning("Failed to close PubSub connection", exc_info=True)
+            finally:
+                self._pubsub = None
+
     async def publish_event(self, event: M, channel_key: str):
-        message, full_channel_name = self._serialize_message(event, channel_key)
-        connection = await self.connection
-        await connection.publish(full_channel_name, message)
+        """
+        Publish an event to Redis. Gracefully handles connection failures
+        by logging the error instead of raising exceptions.
+        """
+        try:
+            message, full_channel_name = self._serialize_message(event, channel_key)
+            connection = await self.connection
+            await connection.publish(full_channel_name, message)
+        except Exception:
+            logger.exception(
+                f"Failed to publish event to Redis channel {channel_key}. "
+                "Event bus operation will continue without Redis connectivity."
+            )
 
     async def listen_events(self, channel_key: str) -> AsyncGenerator[M, None]:
         pubsub, full_channel_name = self._get_pubsub_channel(
             await self.connection, channel_key
         )
         assert isinstance(pubsub, AsyncPubSub)
+        self._pubsub = pubsub
 
         if "*" in channel_key:
             await pubsub.psubscribe(full_channel_name)
diff --git a/autogpt_platform/backend/backend/data/event_bus_test.py b/autogpt_platform/backend/backend/data/event_bus_test.py
new file mode 100644
index 0000000000..93ecc0ba2a
--- /dev/null
+++ b/autogpt_platform/backend/backend/data/event_bus_test.py
@@ -0,0 +1,56 @@
+"""
+Tests for event_bus graceful degradation when Redis is unavailable.
+"""
+
+from unittest.mock import AsyncMock, patch
+
+import pytest
+from pydantic import BaseModel
+
+from backend.data.event_bus import AsyncRedisEventBus
+
+
+class TestEvent(BaseModel):
+    """Test event model."""
+
+    message: str
+
+
+class TestNotificationBus(AsyncRedisEventBus[TestEvent]):
+    """Test implementation of AsyncRedisEventBus."""
+
+    Model = TestEvent
+
+    @property
+    def event_bus_name(self) -> str:
+        return "test_event_bus"
+
+
+@pytest.mark.asyncio
+async def test_publish_event_handles_connection_failure_gracefully():
+    """Test that publish_event logs exception instead of raising when Redis is unavailable."""
+    bus = TestNotificationBus()
+    event = TestEvent(message="test message")
+
+    # Mock get_redis_async to raise connection error
+    with patch(
+        "backend.data.event_bus.redis.get_redis_async",
+        side_effect=ConnectionError("Authentication required."),
+    ):
+        # Should not raise exception
+        await bus.publish_event(event, "test_channel")
+
+
+@pytest.mark.asyncio
+async def test_publish_event_works_with_redis_available():
+    """Test that publish_event works normally when Redis is available."""
+    bus = TestNotificationBus()
+    event = TestEvent(message="test message")
+
+    # Mock successful Redis connection
+    mock_redis = AsyncMock()
+    mock_redis.publish = AsyncMock()
+
+    with patch("backend.data.event_bus.redis.get_redis_async", return_value=mock_redis):
+        await bus.publish_event(event, "test_channel")
+        mock_redis.publish.assert_called_once()
diff --git a/autogpt_platform/backend/backend/data/execution.py b/autogpt_platform/backend/backend/data/execution.py
index 020a5a1906..afb8c70538 100644
--- a/autogpt_platform/backend/backend/data/execution.py
+++ b/autogpt_platform/backend/backend/data/execution.py
@@ -81,11 +81,31 @@ class ExecutionContext(BaseModel):
     This includes information needed by blocks, sub-graphs, and execution management.
     """
 
-    safe_mode: bool = True
+    model_config = {"extra": "ignore"}
+
+    # Execution identity
+    user_id: Optional[str] = None
+    graph_id: Optional[str] = None
+    graph_exec_id: Optional[str] = None
+    graph_version: Optional[int] = None
+    node_id: Optional[str] = None
+    node_exec_id: Optional[str] = None
+
+    # Safety settings
+    human_in_the_loop_safe_mode: bool = True
+    sensitive_action_safe_mode: bool = False
+
+    # User settings
     user_timezone: str = "UTC"
+
+    # Execution hierarchy
     root_execution_id: Optional[str] = None
     parent_execution_id: Optional[str] = None
 
+    # Workspace
+    workspace_id: Optional[str] = None
+    session_id: Optional[str] = None
+
 
 # -------------------------- Models -------------------------- #
 
@@ -153,8 +173,14 @@ class GraphExecutionMeta(BaseDbModel):
     nodes_input_masks: Optional[dict[str, BlockInput]]
     preset_id: Optional[str]
     status: ExecutionStatus
-    started_at: datetime
-    ended_at: datetime
+    started_at: Optional[datetime] = Field(
+        None,
+        description="When execution started running. Null if not yet started (QUEUED).",
+    )
+    ended_at: Optional[datetime] = Field(
+        None,
+        description="When execution finished. Null if not yet completed (QUEUED, RUNNING, INCOMPLETE, REVIEW).",
+    )
     is_shared: bool = False
     share_token: Optional[str] = None
 
@@ -229,10 +255,8 @@ class GraphExecutionMeta(BaseDbModel):
 
     @staticmethod
     def from_db(_graph_exec: AgentGraphExecution):
-        now = datetime.now(timezone.utc)
-        # TODO: make started_at and ended_at optional
-        start_time = _graph_exec.startedAt or _graph_exec.createdAt
-        end_time = _graph_exec.updatedAt or now
+        start_time = _graph_exec.startedAt
+        end_time = _graph_exec.endedAt
 
         try:
             stats = GraphExecutionStats.model_validate(_graph_exec.stats)
@@ -383,6 +407,7 @@ class GraphExecutionWithNodes(GraphExecution):
         self,
         execution_context: ExecutionContext,
         compiled_nodes_input_masks: Optional[NodesInputMasks] = None,
+        nodes_to_skip: Optional[set[str]] = None,
     ):
         return GraphExecutionEntry(
             user_id=self.user_id,
@@ -390,6 +415,7 @@ class GraphExecutionWithNodes(GraphExecution):
             graph_version=self.graph_version or 0,
             graph_exec_id=self.id,
             nodes_input_masks=compiled_nodes_input_masks,
+            nodes_to_skip=nodes_to_skip or set(),
             execution_context=execution_context,
         )
 
@@ -900,6 +926,14 @@ async def update_graph_execution_stats(
 
     if status:
         update_data["executionStatus"] = status
+        # Set endedAt when execution reaches a terminal status
+        terminal_statuses = [
+            ExecutionStatus.COMPLETED,
+            ExecutionStatus.FAILED,
+            ExecutionStatus.TERMINATED,
+        ]
+        if status in terminal_statuses:
+            update_data["endedAt"] = datetime.now(tz=timezone.utc)
 
     where_clause: AgentGraphExecutionWhereInput = {"id": graph_exec_id}
 
@@ -1145,6 +1179,8 @@ class GraphExecutionEntry(BaseModel):
     graph_id: str
     graph_version: int
     nodes_input_masks: Optional[NodesInputMasks] = None
+    nodes_to_skip: set[str] = Field(default_factory=set)
+    """Node IDs that should be skipped due to optional credentials not being configured."""
     execution_context: ExecutionContext = Field(default_factory=ExecutionContext)
 
 
diff --git a/autogpt_platform/backend/backend/data/graph.py b/autogpt_platform/backend/backend/data/graph.py
index 0757a86f4a..ee6cd2e4b0 100644
--- a/autogpt_platform/backend/backend/data/graph.py
+++ b/autogpt_platform/backend/backend/data/graph.py
@@ -3,7 +3,7 @@ import logging
 import uuid
 from collections import defaultdict
 from datetime import datetime, timezone
-from typing import TYPE_CHECKING, Any, Literal, Optional, cast
+from typing import TYPE_CHECKING, Annotated, Any, Literal, Optional, cast
 
 from prisma.enums import SubmissionStatus
 from prisma.models import (
@@ -20,7 +20,7 @@ from prisma.types import (
     AgentNodeLinkCreateInput,
     StoreListingVersionWhereInput,
 )
-from pydantic import BaseModel, Field, create_model
+from pydantic import BaseModel, BeforeValidator, Field, create_model
 from pydantic.fields import computed_field
 
 from backend.blocks.agent import AgentExecutorBlock
@@ -62,7 +62,31 @@ logger = logging.getLogger(__name__)
 
 
 class GraphSettings(BaseModel):
-    human_in_the_loop_safe_mode: bool | None = None
+    # Use Annotated with BeforeValidator to coerce None to default values.
+    # This handles cases where the database has null values for these fields.
+    model_config = {"extra": "ignore"}
+
+    human_in_the_loop_safe_mode: Annotated[
+        bool, BeforeValidator(lambda v: v if v is not None else True)
+    ] = True
+    sensitive_action_safe_mode: Annotated[
+        bool, BeforeValidator(lambda v: v if v is not None else False)
+    ] = False
+
+    @classmethod
+    def from_graph(
+        cls,
+        graph: "GraphModel",
+        hitl_safe_mode: bool | None = None,
+        sensitive_action_safe_mode: bool = False,
+    ) -> "GraphSettings":
+        # Default to True if not explicitly set
+        if hitl_safe_mode is None:
+            hitl_safe_mode = True
+        return cls(
+            human_in_the_loop_safe_mode=hitl_safe_mode,
+            sensitive_action_safe_mode=sensitive_action_safe_mode,
+        )
 
 
 class Link(BaseDbModel):
@@ -94,6 +118,15 @@ class Node(BaseDbModel):
     input_links: list[Link] = []
     output_links: list[Link] = []
 
+    @property
+    def credentials_optional(self) -> bool:
+        """
+        Whether credentials are optional for this node.
+        When True and credentials are not configured, the node will be skipped
+        during execution rather than causing a validation error.
+        """
+        return self.metadata.get("credentials_optional", False)
+
     @property
     def block(self) -> AnyBlockSchema | "_UnknownBlockBase":
         """Get the block for this node. Returns UnknownBlock if block is deleted/missing."""
@@ -238,6 +271,13 @@ class BaseGraph(BaseDbModel):
             if node.block.block_type == BlockType.HUMAN_IN_THE_LOOP
         )
 
+    @computed_field
+    @property
+    def has_sensitive_action(self) -> bool:
+        return any(
+            node.block_id for node in self.nodes if node.block.is_sensitive_action
+        )
+
     @property
     def webhook_input_node(self) -> Node | None:
         return next(
@@ -326,7 +366,35 @@ class Graph(BaseGraph):
     @computed_field
     @property
     def credentials_input_schema(self) -> dict[str, Any]:
-        return self._credentials_input_schema.jsonschema()
+        schema = self._credentials_input_schema.jsonschema()
+
+        # Determine which credential fields are required based on credentials_optional metadata
+        graph_credentials_inputs = self.aggregate_credentials_inputs()
+        required_fields = []
+
+        # Build a map of node_id -> node for quick lookup
+        all_nodes = {node.id: node for node in self.nodes}
+        for sub_graph in self.sub_graphs:
+            for node in sub_graph.nodes:
+                all_nodes[node.id] = node
+
+        for field_key, (
+            _field_info,
+            node_field_pairs,
+        ) in graph_credentials_inputs.items():
+            # A field is required if ANY node using it has credentials_optional=False
+            is_required = False
+            for node_id, _field_name in node_field_pairs:
+                node = all_nodes.get(node_id)
+                if node and not node.credentials_optional:
+                    is_required = True
+                    break
+
+            if is_required:
+                required_fields.append(field_key)
+
+        schema["required"] = required_fields
+        return schema
 
     @property
     def _credentials_input_schema(self) -> type[BlockSchema]:
@@ -960,6 +1028,39 @@ async def get_graph(
     return GraphModel.from_db(graph, for_export)
 
 
+async def get_store_listed_graphs(*graph_ids: str) -> dict[str, GraphModel]:
+    """Batch-fetch multiple store-listed graphs by their IDs.
+
+    Only returns graphs that have approved store listings (publicly available).
+    Does not require permission checks since store-listed graphs are public.
+
+    Args:
+        *graph_ids: Variable number of graph IDs to fetch
+
+    Returns:
+        Dict mapping graph_id to GraphModel for graphs with approved store listings
+    """
+    if not graph_ids:
+        return {}
+
+    store_listings = await StoreListingVersion.prisma().find_many(
+        where={
+            "agentGraphId": {"in": list(graph_ids)},
+            "submissionStatus": SubmissionStatus.APPROVED,
+            "isDeleted": False,
+        },
+        include={"AgentGraph": {"include": AGENT_GRAPH_INCLUDE}},
+        distinct=["agentGraphId"],
+        order={"agentGraphVersion": "desc"},
+    )
+
+    return {
+        listing.agentGraphId: GraphModel.from_db(listing.AgentGraph)
+        for listing in store_listings
+        if listing.AgentGraph
+    }
+
+
 async def get_graph_as_admin(
     graph_id: str,
     version: int | None = None,
diff --git a/autogpt_platform/backend/backend/data/graph_test.py b/autogpt_platform/backend/backend/data/graph_test.py
index 044d75e0ca..8b7eadb887 100644
--- a/autogpt_platform/backend/backend/data/graph_test.py
+++ b/autogpt_platform/backend/backend/data/graph_test.py
@@ -1,5 +1,6 @@
 import json
 from typing import Any
+from unittest.mock import AsyncMock, patch
 from uuid import UUID
 
 import fastapi.exceptions
@@ -18,6 +19,17 @@ from backend.usecases.sample import create_test_user
 from backend.util.test import SpinTestServer
 
 
+@pytest.fixture(scope="session", autouse=True)
+def mock_embedding_functions():
+    """Mock embedding functions for all tests to avoid database/API dependencies."""
+    with patch(
+        "backend.api.features.store.db.ensure_embedding",
+        new_callable=AsyncMock,
+        return_value=True,
+    ):
+        yield
+
+
 @pytest.mark.asyncio(loop_scope="session")
 async def test_graph_creation(server: SpinTestServer, snapshot: Snapshot):
     """
@@ -396,3 +408,58 @@ async def test_access_store_listing_graph(server: SpinTestServer):
         created_graph.id, created_graph.version, "3e53486c-cf57-477e-ba2a-cb02dc828e1b"
     )
     assert got_graph is not None
+
+
+# ============================================================================
+# Tests for Optional Credentials Feature
+# ============================================================================
+
+
+def test_node_credentials_optional_default():
+    """Test that credentials_optional defaults to False when not set in metadata."""
+    node = Node(
+        id="test_node",
+        block_id=StoreValueBlock().id,
+        input_default={},
+        metadata={},
+    )
+    assert node.credentials_optional is False
+
+
+def test_node_credentials_optional_true():
+    """Test that credentials_optional returns True when explicitly set."""
+    node = Node(
+        id="test_node",
+        block_id=StoreValueBlock().id,
+        input_default={},
+        metadata={"credentials_optional": True},
+    )
+    assert node.credentials_optional is True
+
+
+def test_node_credentials_optional_false():
+    """Test that credentials_optional returns False when explicitly set to False."""
+    node = Node(
+        id="test_node",
+        block_id=StoreValueBlock().id,
+        input_default={},
+        metadata={"credentials_optional": False},
+    )
+    assert node.credentials_optional is False
+
+
+def test_node_credentials_optional_with_other_metadata():
+    """Test that credentials_optional works correctly with other metadata present."""
+    node = Node(
+        id="test_node",
+        block_id=StoreValueBlock().id,
+        input_default={},
+        metadata={
+            "position": {"x": 100, "y": 200},
+            "customized_name": "My Custom Node",
+            "credentials_optional": True,
+        },
+    )
+    assert node.credentials_optional is True
+    assert node.metadata["position"] == {"x": 100, "y": 200}
+    assert node.metadata["customized_name"] == "My Custom Node"
diff --git a/autogpt_platform/backend/backend/data/human_review.py b/autogpt_platform/backend/backend/data/human_review.py
index de7a30759e..f198043a38 100644
--- a/autogpt_platform/backend/backend/data/human_review.py
+++ b/autogpt_platform/backend/backend/data/human_review.py
@@ -6,10 +6,10 @@ Handles all database operations for pending human reviews.
 import asyncio
 import logging
 from datetime import datetime, timezone
-from typing import Optional
+from typing import TYPE_CHECKING, Optional
 
 from prisma.enums import ReviewStatus
-from prisma.models import PendingHumanReview
+from prisma.models import AgentNodeExecution, PendingHumanReview
 from prisma.types import PendingHumanReviewUpdateInput
 from pydantic import BaseModel
 
@@ -17,8 +17,12 @@ from backend.api.features.executions.review.model import (
     PendingHumanReviewModel,
     SafeJsonData,
 )
+from backend.data.execution import get_graph_execution_meta
 from backend.util.json import SafeJson
 
+if TYPE_CHECKING:
+    pass
+
 logger = logging.getLogger(__name__)
 
 
@@ -32,6 +36,125 @@ class ReviewResult(BaseModel):
     node_exec_id: str
 
 
+def get_auto_approve_key(graph_exec_id: str, node_id: str) -> str:
+    """Generate the special nodeExecId key for auto-approval records."""
+    return f"auto_approve_{graph_exec_id}_{node_id}"
+
+
+async def check_approval(
+    node_exec_id: str,
+    graph_exec_id: str,
+    node_id: str,
+    user_id: str,
+    input_data: SafeJsonData | None = None,
+) -> Optional[ReviewResult]:
+    """
+    Check if there's an existing approval for this node execution.
+
+    Checks both:
+    1. Normal approval by node_exec_id (previous run of the same node execution)
+    2. Auto-approval by special key pattern "auto_approve_{graph_exec_id}_{node_id}"
+
+    Args:
+        node_exec_id: ID of the node execution
+        graph_exec_id: ID of the graph execution
+        node_id: ID of the node definition (not execution)
+        user_id: ID of the user (for data isolation)
+        input_data: Current input data (used for auto-approvals to avoid stale data)
+
+    Returns:
+        ReviewResult if approval found (either normal or auto), None otherwise
+    """
+    auto_approve_key = get_auto_approve_key(graph_exec_id, node_id)
+
+    # Check for either normal approval or auto-approval in a single query
+    existing_review = await PendingHumanReview.prisma().find_first(
+        where={
+            "OR": [
+                {"nodeExecId": node_exec_id},
+                {"nodeExecId": auto_approve_key},
+            ],
+            "status": ReviewStatus.APPROVED,
+            "userId": user_id,
+        },
+    )
+
+    if existing_review:
+        is_auto_approval = existing_review.nodeExecId == auto_approve_key
+        logger.info(
+            f"Found {'auto-' if is_auto_approval else ''}approval for node {node_id} "
+            f"(exec: {node_exec_id}) in execution {graph_exec_id}"
+        )
+        # For auto-approvals, use current input_data to avoid replaying stale payload
+        # For normal approvals, use the stored payload (which may have been edited)
+        return ReviewResult(
+            data=(
+                input_data
+                if is_auto_approval and input_data is not None
+                else existing_review.payload
+            ),
+            status=ReviewStatus.APPROVED,
+            message=(
+                "Auto-approved (user approved all future actions for this node)"
+                if is_auto_approval
+                else existing_review.reviewMessage or ""
+            ),
+            processed=True,
+            node_exec_id=existing_review.nodeExecId,
+        )
+
+    return None
+
+
+async def create_auto_approval_record(
+    user_id: str,
+    graph_exec_id: str,
+    graph_id: str,
+    graph_version: int,
+    node_id: str,
+    payload: SafeJsonData,
+) -> None:
+    """
+    Create an auto-approval record for a node in this execution.
+
+    This is stored as a PendingHumanReview with a special nodeExecId pattern
+    and status=APPROVED, so future executions of the same node can skip review.
+
+    Raises:
+        ValueError: If the graph execution doesn't belong to the user
+    """
+    # Validate that the graph execution belongs to this user (defense in depth)
+    graph_exec = await get_graph_execution_meta(
+        user_id=user_id, execution_id=graph_exec_id
+    )
+    if not graph_exec:
+        raise ValueError(
+            f"Graph execution {graph_exec_id} not found or doesn't belong to user {user_id}"
+        )
+
+    auto_approve_key = get_auto_approve_key(graph_exec_id, node_id)
+
+    await PendingHumanReview.prisma().upsert(
+        where={"nodeExecId": auto_approve_key},
+        data={
+            "create": {
+                "nodeExecId": auto_approve_key,
+                "userId": user_id,
+                "graphExecId": graph_exec_id,
+                "graphId": graph_id,
+                "graphVersion": graph_version,
+                "payload": SafeJson(payload),
+                "instructions": "Auto-approval record",
+                "editable": False,
+                "status": ReviewStatus.APPROVED,
+                "processed": True,
+                "reviewedAt": datetime.now(timezone.utc),
+            },
+            "update": {},  # Already exists, no update needed
+        },
+    )
+
+
 async def get_or_create_human_review(
     user_id: str,
     node_exec_id: str,
@@ -108,6 +231,89 @@ async def get_or_create_human_review(
         )
 
 
+async def get_pending_review_by_node_exec_id(
+    node_exec_id: str, user_id: str
+) -> Optional["PendingHumanReviewModel"]:
+    """
+    Get a pending review by its node execution ID.
+
+    Args:
+        node_exec_id: The node execution ID to look up
+        user_id: User ID for authorization (only returns if review belongs to this user)
+
+    Returns:
+        The pending review if found and belongs to user, None otherwise
+    """
+    review = await PendingHumanReview.prisma().find_first(
+        where={
+            "nodeExecId": node_exec_id,
+            "userId": user_id,
+            "status": ReviewStatus.WAITING,
+        }
+    )
+
+    if not review:
+        return None
+
+    # Local import to avoid event loop conflicts in tests
+    from backend.data.execution import get_node_execution
+
+    node_exec = await get_node_execution(review.nodeExecId)
+    node_id = node_exec.node_id if node_exec else review.nodeExecId
+    return PendingHumanReviewModel.from_db(review, node_id=node_id)
+
+
+async def get_reviews_by_node_exec_ids(
+    node_exec_ids: list[str], user_id: str
+) -> dict[str, "PendingHumanReviewModel"]:
+    """
+    Get multiple reviews by their node execution IDs regardless of status.
+
+    Unlike get_pending_reviews_by_node_exec_ids, this returns reviews in any status
+    (WAITING, APPROVED, REJECTED). Used for validation in idempotent operations.
+
+    Args:
+        node_exec_ids: List of node execution IDs to look up
+        user_id: User ID for authorization (only returns reviews belonging to this user)
+
+    Returns:
+        Dictionary mapping node_exec_id -> PendingHumanReviewModel for found reviews
+    """
+    if not node_exec_ids:
+        return {}
+
+    reviews = await PendingHumanReview.prisma().find_many(
+        where={
+            "nodeExecId": {"in": node_exec_ids},
+            "userId": user_id,
+        }
+    )
+
+    if not reviews:
+        return {}
+
+    # Batch fetch all node executions to avoid N+1 queries
+    node_exec_ids_to_fetch = [review.nodeExecId for review in reviews]
+    node_execs = await AgentNodeExecution.prisma().find_many(
+        where={"id": {"in": node_exec_ids_to_fetch}},
+        include={"Node": True},
+    )
+
+    # Create mapping from node_exec_id to node_id
+    node_exec_id_to_node_id = {
+        node_exec.id: node_exec.agentNodeId for node_exec in node_execs
+    }
+
+    result = {}
+    for review in reviews:
+        node_id = node_exec_id_to_node_id.get(review.nodeExecId, review.nodeExecId)
+        result[review.nodeExecId] = PendingHumanReviewModel.from_db(
+            review, node_id=node_id
+        )
+
+    return result
+
+
 async def has_pending_reviews_for_graph_exec(graph_exec_id: str) -> bool:
     """
     Check if a graph execution has any pending reviews.
@@ -137,8 +343,11 @@ async def get_pending_reviews_for_user(
         page_size: Number of reviews per page
 
     Returns:
-        List of pending review models
+        List of pending review models with node_id included
     """
+    # Local import to avoid event loop conflicts in tests
+    from backend.data.execution import get_node_execution
+
     # Calculate offset for pagination
     offset = (page - 1) * page_size
 
@@ -149,7 +358,14 @@ async def get_pending_reviews_for_user(
         take=page_size,
     )
 
-    return [PendingHumanReviewModel.from_db(review) for review in reviews]
+    # Fetch node_id for each review from NodeExecution
+    result = []
+    for review in reviews:
+        node_exec = await get_node_execution(review.nodeExecId)
+        node_id = node_exec.node_id if node_exec else review.nodeExecId
+        result.append(PendingHumanReviewModel.from_db(review, node_id=node_id))
+
+    return result
 
 
 async def get_pending_reviews_for_execution(
@@ -163,8 +379,11 @@ async def get_pending_reviews_for_execution(
         user_id: User ID for security validation
 
     Returns:
-        List of pending review models
+        List of pending review models with node_id included
     """
+    # Local import to avoid event loop conflicts in tests
+    from backend.data.execution import get_node_execution
+
     reviews = await PendingHumanReview.prisma().find_many(
         where={
             "userId": user_id,
@@ -174,7 +393,14 @@ async def get_pending_reviews_for_execution(
         order={"createdAt": "asc"},
     )
 
-    return [PendingHumanReviewModel.from_db(review) for review in reviews]
+    # Fetch node_id for each review from NodeExecution
+    result = []
+    for review in reviews:
+        node_exec = await get_node_execution(review.nodeExecId)
+        node_id = node_exec.node_id if node_exec else review.nodeExecId
+        result.append(PendingHumanReviewModel.from_db(review, node_id=node_id))
+
+    return result
 
 
 async def process_all_reviews_for_execution(
@@ -183,38 +409,68 @@ async def process_all_reviews_for_execution(
 ) -> dict[str, PendingHumanReviewModel]:
     """Process all pending reviews for an execution with approve/reject decisions.
 
+    Handles race conditions gracefully: if a review was already processed with the
+    same decision by a concurrent request, it's treated as success rather than error.
+
     Args:
         user_id: User ID for ownership validation
         review_decisions: Map of node_exec_id -> (status, reviewed_data, message)
 
     Returns:
-        Dict of node_exec_id -> updated review model
+        Dict of node_exec_id -> updated review model (includes already-processed reviews)
     """
     if not review_decisions:
         return {}
 
     node_exec_ids = list(review_decisions.keys())
 
-    # Get all reviews for validation
-    reviews = await PendingHumanReview.prisma().find_many(
+    # Get all reviews (both WAITING and already processed) for the user
+    all_reviews = await PendingHumanReview.prisma().find_many(
         where={
             "nodeExecId": {"in": node_exec_ids},
             "userId": user_id,
-            "status": ReviewStatus.WAITING,
         },
     )
 
-    # Validate all reviews can be processed
-    if len(reviews) != len(node_exec_ids):
-        missing_ids = set(node_exec_ids) - {review.nodeExecId for review in reviews}
+    # Separate into pending and already-processed reviews
+    reviews_to_process = []
+    already_processed = []
+    for review in all_reviews:
+        if review.status == ReviewStatus.WAITING:
+            reviews_to_process.append(review)
+        else:
+            already_processed.append(review)
+
+    # Check for truly missing reviews (not found at all)
+    found_ids = {review.nodeExecId for review in all_reviews}
+    missing_ids = set(node_exec_ids) - found_ids
+    if missing_ids:
         raise ValueError(
-            f"Reviews not found, access denied, or not in WAITING status: {', '.join(missing_ids)}"
+            f"Reviews not found or access denied: {', '.join(missing_ids)}"
         )
 
-    # Create parallel update tasks
+    # Validate already-processed reviews have compatible status (same decision)
+    # This handles race conditions where another request processed the same reviews
+    for review in already_processed:
+        requested_status = review_decisions[review.nodeExecId][0]
+        if review.status != requested_status:
+            raise ValueError(
+                f"Review {review.nodeExecId} was already processed with status "
+                f"{review.status}, cannot change to {requested_status}"
+            )
+
+    # Log if we're handling a race condition (some reviews already processed)
+    if already_processed:
+        already_processed_ids = [r.nodeExecId for r in already_processed]
+        logger.info(
+            f"Race condition handled: {len(already_processed)} review(s) already "
+            f"processed by concurrent request: {already_processed_ids}"
+        )
+
+    # Create parallel update tasks for reviews that still need processing
     update_tasks = []
 
-    for review in reviews:
+    for review in reviews_to_process:
         new_status, reviewed_data, message = review_decisions[review.nodeExecId]
         has_data_changes = reviewed_data is not None and reviewed_data != review.payload
 
@@ -239,16 +495,27 @@ async def process_all_reviews_for_execution(
         update_tasks.append(task)
 
     # Execute all updates in parallel and get updated reviews
-    updated_reviews = await asyncio.gather(*update_tasks)
+    updated_reviews = await asyncio.gather(*update_tasks) if update_tasks else []
 
     # Note: Execution resumption is now handled at the API layer after ALL reviews
     # for an execution are processed (both approved and rejected)
 
-    # Return as dict for easy access
-    return {
-        review.nodeExecId: PendingHumanReviewModel.from_db(review)
-        for review in updated_reviews
-    }
+    # Fetch node_id for each review and return as dict for easy access
+    # Local import to avoid event loop conflicts in tests
+    from backend.data.execution import get_node_execution
+
+    # Combine updated reviews with already-processed ones (for idempotent response)
+    all_result_reviews = list(updated_reviews) + already_processed
+
+    result = {}
+    for review in all_result_reviews:
+        node_exec = await get_node_execution(review.nodeExecId)
+        node_id = node_exec.node_id if node_exec else review.nodeExecId
+        result[review.nodeExecId] = PendingHumanReviewModel.from_db(
+            review, node_id=node_id
+        )
+
+    return result
 
 
 async def update_review_processed_status(node_exec_id: str, processed: bool) -> None:
@@ -256,3 +523,44 @@ async def update_review_processed_status(node_exec_id: str, processed: bool) ->
     await PendingHumanReview.prisma().update(
         where={"nodeExecId": node_exec_id}, data={"processed": processed}
     )
+
+
+async def cancel_pending_reviews_for_execution(graph_exec_id: str, user_id: str) -> int:
+    """
+    Cancel all pending reviews for a graph execution (e.g., when execution is stopped).
+
+    Marks all WAITING reviews as REJECTED with a message indicating the execution was stopped.
+
+    Args:
+        graph_exec_id: The graph execution ID
+        user_id: User ID who owns the execution (for security validation)
+
+    Returns:
+        Number of reviews cancelled
+
+    Raises:
+        ValueError: If the graph execution doesn't belong to the user
+    """
+    # Validate user ownership before cancelling reviews
+    graph_exec = await get_graph_execution_meta(
+        user_id=user_id, execution_id=graph_exec_id
+    )
+    if not graph_exec:
+        raise ValueError(
+            f"Graph execution {graph_exec_id} not found or doesn't belong to user {user_id}"
+        )
+
+    result = await PendingHumanReview.prisma().update_many(
+        where={
+            "graphExecId": graph_exec_id,
+            "userId": user_id,
+            "status": ReviewStatus.WAITING,
+        },
+        data={
+            "status": ReviewStatus.REJECTED,
+            "reviewMessage": "Execution was stopped by user",
+            "processed": True,
+            "reviewedAt": datetime.now(timezone.utc),
+        },
+    )
+    return result
diff --git a/autogpt_platform/backend/backend/data/human_review_test.py b/autogpt_platform/backend/backend/data/human_review_test.py
index c349fdde46..baa5c0c0c4 100644
--- a/autogpt_platform/backend/backend/data/human_review_test.py
+++ b/autogpt_platform/backend/backend/data/human_review_test.py
@@ -36,7 +36,7 @@ def sample_db_review():
     return mock_review
 
 
-@pytest.mark.asyncio
+@pytest.mark.asyncio(loop_scope="function")
 async def test_get_or_create_human_review_new(
     mocker: pytest_mock.MockFixture,
     sample_db_review,
@@ -46,8 +46,8 @@ async def test_get_or_create_human_review_new(
     sample_db_review.status = ReviewStatus.WAITING
     sample_db_review.processed = False
 
-    mock_upsert = mocker.patch("backend.data.human_review.PendingHumanReview.prisma")
-    mock_upsert.return_value.upsert = AsyncMock(return_value=sample_db_review)
+    mock_prisma = mocker.patch("backend.data.human_review.PendingHumanReview.prisma")
+    mock_prisma.return_value.upsert = AsyncMock(return_value=sample_db_review)
 
     result = await get_or_create_human_review(
         user_id="test-user-123",
@@ -64,7 +64,7 @@ async def test_get_or_create_human_review_new(
     assert result is None
 
 
-@pytest.mark.asyncio
+@pytest.mark.asyncio(loop_scope="function")
 async def test_get_or_create_human_review_approved(
     mocker: pytest_mock.MockFixture,
     sample_db_review,
@@ -75,8 +75,8 @@ async def test_get_or_create_human_review_approved(
     sample_db_review.processed = False
     sample_db_review.reviewMessage = "Looks good"
 
-    mock_upsert = mocker.patch("backend.data.human_review.PendingHumanReview.prisma")
-    mock_upsert.return_value.upsert = AsyncMock(return_value=sample_db_review)
+    mock_prisma = mocker.patch("backend.data.human_review.PendingHumanReview.prisma")
+    mock_prisma.return_value.upsert = AsyncMock(return_value=sample_db_review)
 
     result = await get_or_create_human_review(
         user_id="test-user-123",
@@ -96,7 +96,7 @@ async def test_get_or_create_human_review_approved(
     assert result.message == "Looks good"
 
 
-@pytest.mark.asyncio
+@pytest.mark.asyncio(loop_scope="function")
 async def test_has_pending_reviews_for_graph_exec_true(
     mocker: pytest_mock.MockFixture,
 ):
@@ -109,7 +109,7 @@ async def test_has_pending_reviews_for_graph_exec_true(
     assert result is True
 
 
-@pytest.mark.asyncio
+@pytest.mark.asyncio(loop_scope="function")
 async def test_has_pending_reviews_for_graph_exec_false(
     mocker: pytest_mock.MockFixture,
 ):
@@ -122,7 +122,7 @@ async def test_has_pending_reviews_for_graph_exec_false(
     assert result is False
 
 
-@pytest.mark.asyncio
+@pytest.mark.asyncio(loop_scope="function")
 async def test_get_pending_reviews_for_user(
     mocker: pytest_mock.MockFixture,
     sample_db_review,
@@ -131,10 +131,19 @@ async def test_get_pending_reviews_for_user(
     mock_find_many = mocker.patch("backend.data.human_review.PendingHumanReview.prisma")
     mock_find_many.return_value.find_many = AsyncMock(return_value=[sample_db_review])
 
+    # Mock get_node_execution to return node with node_id (async function)
+    mock_node_exec = Mock()
+    mock_node_exec.node_id = "test_node_def_789"
+    mocker.patch(
+        "backend.data.execution.get_node_execution",
+        new=AsyncMock(return_value=mock_node_exec),
+    )
+
     result = await get_pending_reviews_for_user("test_user", page=2, page_size=10)
 
     assert len(result) == 1
     assert result[0].node_exec_id == "test_node_123"
+    assert result[0].node_id == "test_node_def_789"
 
     # Verify pagination parameters
     call_args = mock_find_many.return_value.find_many.call_args
@@ -142,7 +151,7 @@ async def test_get_pending_reviews_for_user(
     assert call_args.kwargs["take"] == 10
 
 
-@pytest.mark.asyncio
+@pytest.mark.asyncio(loop_scope="function")
 async def test_get_pending_reviews_for_execution(
     mocker: pytest_mock.MockFixture,
     sample_db_review,
@@ -151,12 +160,21 @@ async def test_get_pending_reviews_for_execution(
     mock_find_many = mocker.patch("backend.data.human_review.PendingHumanReview.prisma")
     mock_find_many.return_value.find_many = AsyncMock(return_value=[sample_db_review])
 
+    # Mock get_node_execution to return node with node_id (async function)
+    mock_node_exec = Mock()
+    mock_node_exec.node_id = "test_node_def_789"
+    mocker.patch(
+        "backend.data.execution.get_node_execution",
+        new=AsyncMock(return_value=mock_node_exec),
+    )
+
     result = await get_pending_reviews_for_execution(
         "test_graph_exec_456", "test-user-123"
     )
 
     assert len(result) == 1
     assert result[0].graph_exec_id == "test_graph_exec_456"
+    assert result[0].node_id == "test_node_def_789"
 
     # Verify it filters by execution and user
     call_args = mock_find_many.return_value.find_many.call_args
@@ -166,7 +184,7 @@ async def test_get_pending_reviews_for_execution(
     assert where_clause["status"] == ReviewStatus.WAITING
 
 
-@pytest.mark.asyncio
+@pytest.mark.asyncio(loop_scope="function")
 async def test_process_all_reviews_for_execution_success(
     mocker: pytest_mock.MockFixture,
     sample_db_review,
@@ -201,6 +219,14 @@ async def test_process_all_reviews_for_execution_success(
         new=AsyncMock(return_value=[updated_review]),
     )
 
+    # Mock get_node_execution to return node with node_id (async function)
+    mock_node_exec = Mock()
+    mock_node_exec.node_id = "test_node_def_789"
+    mocker.patch(
+        "backend.data.execution.get_node_execution",
+        new=AsyncMock(return_value=mock_node_exec),
+    )
+
     result = await process_all_reviews_for_execution(
         user_id="test-user-123",
         review_decisions={
@@ -211,9 +237,10 @@ async def test_process_all_reviews_for_execution_success(
     assert len(result) == 1
     assert "test_node_123" in result
     assert result["test_node_123"].status == ReviewStatus.APPROVED
+    assert result["test_node_123"].node_id == "test_node_def_789"
 
 
-@pytest.mark.asyncio
+@pytest.mark.asyncio(loop_scope="function")
 async def test_process_all_reviews_for_execution_validation_errors(
     mocker: pytest_mock.MockFixture,
 ):
@@ -233,7 +260,7 @@ async def test_process_all_reviews_for_execution_validation_errors(
         )
 
 
-@pytest.mark.asyncio
+@pytest.mark.asyncio(loop_scope="function")
 async def test_process_all_reviews_edit_permission_error(
     mocker: pytest_mock.MockFixture,
     sample_db_review,
@@ -259,7 +286,7 @@ async def test_process_all_reviews_edit_permission_error(
         )
 
 
-@pytest.mark.asyncio
+@pytest.mark.asyncio(loop_scope="function")
 async def test_process_all_reviews_mixed_approval_rejection(
     mocker: pytest_mock.MockFixture,
     sample_db_review,
@@ -329,6 +356,14 @@ async def test_process_all_reviews_mixed_approval_rejection(
         new=AsyncMock(return_value=[approved_review, rejected_review]),
     )
 
+    # Mock get_node_execution to return node with node_id (async function)
+    mock_node_exec = Mock()
+    mock_node_exec.node_id = "test_node_def_789"
+    mocker.patch(
+        "backend.data.execution.get_node_execution",
+        new=AsyncMock(return_value=mock_node_exec),
+    )
+
     result = await process_all_reviews_for_execution(
         user_id="test-user-123",
         review_decisions={
@@ -340,3 +375,5 @@ async def test_process_all_reviews_mixed_approval_rejection(
     assert len(result) == 2
     assert "test_node_123" in result
     assert "test_node_456" in result
+    assert result["test_node_123"].node_id == "test_node_def_789"
+    assert result["test_node_456"].node_id == "test_node_def_789"
diff --git a/autogpt_platform/backend/backend/data/model.py b/autogpt_platform/backend/backend/data/model.py
index 2cc73f6b7b..5a09c591c9 100644
--- a/autogpt_platform/backend/backend/data/model.py
+++ b/autogpt_platform/backend/backend/data/model.py
@@ -19,7 +19,6 @@ from typing import (
     cast,
     get_args,
 )
-from urllib.parse import urlparse
 from uuid import uuid4
 
 from prisma.enums import CreditTransactionType, OnboardingStep
@@ -42,6 +41,7 @@ from typing_extensions import TypedDict
 
 from backend.integrations.providers import ProviderName
 from backend.util.json import loads as json_loads
+from backend.util.request import parse_url
 from backend.util.settings import Secrets
 
 # Type alias for any provider name (including custom ones)
@@ -397,19 +397,25 @@ class HostScopedCredentials(_BaseCredentials):
     def matches_url(self, url: str) -> bool:
         """Check if this credential should be applied to the given URL."""
 
-        parsed_url = urlparse(url)
-        # Extract hostname without port
-        request_host = parsed_url.hostname
+        request_host, request_port = _extract_host_from_url(url)
+        cred_scope_host, cred_scope_port = _extract_host_from_url(self.host)
         if not request_host:
             return False
 
-        # Simple host matching - exact match or wildcard subdomain match
-        if self.host == request_host:
+        # If a port is specified in credential host, the request host port must match
+        if cred_scope_port is not None and request_port != cred_scope_port:
+            return False
+        # Non-standard ports are only allowed if explicitly specified in credential host
+        elif cred_scope_port is None and request_port not in (80, 443, None):
+            return False
+
+        # Simple host matching
+        if cred_scope_host == request_host:
             return True
 
         # Support wildcard matching (e.g., "*.example.com" matches "api.example.com")
-        if self.host.startswith("*."):
-            domain = self.host[2:]  # Remove "*."
+        if cred_scope_host.startswith("*."):
+            domain = cred_scope_host[2:]  # Remove "*."
             return request_host.endswith(f".{domain}") or request_host == domain
 
         return False
@@ -551,13 +557,13 @@ class CredentialsMetaInput(BaseModel, Generic[CP, CT]):
     )
 
 
-def _extract_host_from_url(url: str) -> str:
-    """Extract host from URL for grouping host-scoped credentials."""
+def _extract_host_from_url(url: str) -> tuple[str, int | None]:
+    """Extract host and port from URL for grouping host-scoped credentials."""
     try:
-        parsed = urlparse(url)
-        return parsed.hostname or url
+        parsed = parse_url(url)
+        return parsed.hostname or url, parsed.port
     except Exception:
-        return ""
+        return "", None
 
 
 class CredentialsFieldInfo(BaseModel, Generic[CP, CT]):
@@ -606,7 +612,7 @@ class CredentialsFieldInfo(BaseModel, Generic[CP, CT]):
                 providers = frozenset(
                     [cast(CP, "http")]
                     + [
-                        cast(CP, _extract_host_from_url(str(value)))
+                        cast(CP, parse_url(str(value)).netloc)
                         for value in field.discriminator_values
                     ]
                 )
@@ -666,10 +672,16 @@ class CredentialsFieldInfo(BaseModel, Generic[CP, CT]):
         if not (self.discriminator and self.discriminator_mapping):
             return self
 
+        try:
+            provider = self.discriminator_mapping[discriminator_value]
+        except KeyError:
+            raise ValueError(
+                f"Model '{discriminator_value}' is not supported. "
+                "It may have been deprecated. Please update your agent configuration."
+            )
+
         return CredentialsFieldInfo(
-            credentials_provider=frozenset(
-                [self.discriminator_mapping[discriminator_value]]
-            ),
+            credentials_provider=frozenset([provider]),
             credentials_types=self.supported_types,
             credentials_scopes=self.required_scopes,
             discriminator=self.discriminator,
diff --git a/autogpt_platform/backend/backend/data/model_test.py b/autogpt_platform/backend/backend/data/model_test.py
index 37ec6be82f..e8e2ddfa35 100644
--- a/autogpt_platform/backend/backend/data/model_test.py
+++ b/autogpt_platform/backend/backend/data/model_test.py
@@ -79,10 +79,23 @@ class TestHostScopedCredentials:
             headers={"Authorization": SecretStr("Bearer token")},
         )
 
-        assert creds.matches_url("http://localhost:8080/api/v1")
+        # Non-standard ports require explicit port in credential host
+        assert not creds.matches_url("http://localhost:8080/api/v1")
         assert creds.matches_url("https://localhost:443/secure/endpoint")
         assert creds.matches_url("http://localhost/simple")
 
+    def test_matches_url_with_explicit_port(self):
+        """Test URL matching with explicit port in credential host."""
+        creds = HostScopedCredentials(
+            provider="custom",
+            host="localhost:8080",
+            headers={"Authorization": SecretStr("Bearer token")},
+        )
+
+        assert creds.matches_url("http://localhost:8080/api/v1")
+        assert not creds.matches_url("http://localhost:3000/api/v1")
+        assert not creds.matches_url("http://localhost/simple")
+
     def test_empty_headers_dict(self):
         """Test HostScopedCredentials with empty headers."""
         creds = HostScopedCredentials(
@@ -128,8 +141,20 @@ class TestHostScopedCredentials:
             ("*.example.com", "https://sub.api.example.com/test", True),
             ("*.example.com", "https://example.com/test", True),
             ("*.example.com", "https://example.org/test", False),
-            ("localhost", "http://localhost:3000/test", True),
+            # Non-standard ports require explicit port in credential host
+            ("localhost", "http://localhost:3000/test", False),
+            ("localhost:3000", "http://localhost:3000/test", True),
             ("localhost", "http://127.0.0.1:3000/test", False),
+            # IPv6 addresses (frontend stores with brackets via URL.hostname)
+            ("[::1]", "http://[::1]/test", True),
+            ("[::1]", "http://[::1]:80/test", True),
+            ("[::1]", "https://[::1]:443/test", True),
+            ("[::1]", "http://[::1]:8080/test", False),  # Non-standard port
+            ("[::1]:8080", "http://[::1]:8080/test", True),
+            ("[::1]:8080", "http://[::1]:9090/test", False),
+            ("[2001:db8::1]", "http://[2001:db8::1]/path", True),
+            ("[2001:db8::1]", "https://[2001:db8::1]:443/path", True),
+            ("[2001:db8::1]", "http://[2001:db8::ff]/path", False),
         ],
     )
     def test_url_matching_parametrized(self, host: str, test_url: str, expected: bool):
diff --git a/autogpt_platform/backend/backend/data/onboarding.py b/autogpt_platform/backend/backend/data/onboarding.py
index cc63b89afd..4af8e8dffd 100644
--- a/autogpt_platform/backend/backend/data/onboarding.py
+++ b/autogpt_platform/backend/backend/data/onboarding.py
@@ -41,6 +41,7 @@ FrontendOnboardingStep = Literal[
     OnboardingStep.AGENT_NEW_RUN,
     OnboardingStep.AGENT_INPUT,
     OnboardingStep.CONGRATS,
+    OnboardingStep.VISIT_COPILOT,
     OnboardingStep.MARKETPLACE_VISIT,
     OnboardingStep.BUILDER_OPEN,
 ]
@@ -122,6 +123,9 @@ async def update_user_onboarding(user_id: str, data: UserOnboardingUpdate):
 async def _reward_user(user_id: str, onboarding: UserOnboarding, step: OnboardingStep):
     reward = 0
     match step:
+        # Welcome bonus for visiting copilot ($5 = 500 credits)
+        case OnboardingStep.VISIT_COPILOT:
+            reward = 500
         # Reward user when they clicked New Run during onboarding
         # This is because they need credits before scheduling a run (next step)
         # This is seen as a reward for the GET_RESULTS step in the wallet
@@ -334,7 +338,7 @@ async def _get_user_timezone(user_id: str) -> str:
     return get_user_timezone_or_utc(user.timezone if user else None)
 
 
-async def increment_runs(user_id: str):
+async def increment_onboarding_runs(user_id: str):
     """
     Increment a user's run counters and trigger any onboarding milestones.
     """
diff --git a/autogpt_platform/backend/backend/data/understanding.py b/autogpt_platform/backend/backend/data/understanding.py
new file mode 100644
index 0000000000..c604e046b6
--- /dev/null
+++ b/autogpt_platform/backend/backend/data/understanding.py
@@ -0,0 +1,406 @@
+"""Data models and access layer for user business understanding."""
+
+import logging
+from datetime import datetime
+from typing import Any, Optional, cast
+
+import pydantic
+from prisma.models import CoPilotUnderstanding
+
+from backend.data.redis_client import get_redis_async
+from backend.util.json import SafeJson
+
+logger = logging.getLogger(__name__)
+
+# Cache configuration
+CACHE_KEY_PREFIX = "understanding"
+CACHE_TTL_SECONDS = 48 * 60 * 60  # 48 hours
+
+
+def _cache_key(user_id: str) -> str:
+    """Generate cache key for user business understanding."""
+    return f"{CACHE_KEY_PREFIX}:{user_id}"
+
+
+def _json_to_list(value: Any) -> list[str]:
+    """Convert Json field to list[str], handling None."""
+    if value is None:
+        return []
+    if isinstance(value, list):
+        return cast(list[str], value)
+    return []
+
+
+class BusinessUnderstandingInput(pydantic.BaseModel):
+    """Input model for updating business understanding - all fields optional for incremental updates."""
+
+    # User info
+    user_name: Optional[str] = pydantic.Field(None, description="The user's name")
+    job_title: Optional[str] = pydantic.Field(None, description="The user's job title")
+
+    # Business basics
+    business_name: Optional[str] = pydantic.Field(
+        None, description="Name of the user's business"
+    )
+    industry: Optional[str] = pydantic.Field(None, description="Industry or sector")
+    business_size: Optional[str] = pydantic.Field(
+        None, description="Company size (e.g., '1-10', '11-50')"
+    )
+    user_role: Optional[str] = pydantic.Field(
+        None,
+        description="User's role in the organization (e.g., 'decision maker', 'implementer')",
+    )
+
+    # Processes & activities
+    key_workflows: Optional[list[str]] = pydantic.Field(
+        None, description="Key business workflows"
+    )
+    daily_activities: Optional[list[str]] = pydantic.Field(
+        None, description="Daily activities performed"
+    )
+
+    # Pain points & goals
+    pain_points: Optional[list[str]] = pydantic.Field(
+        None, description="Current pain points"
+    )
+    bottlenecks: Optional[list[str]] = pydantic.Field(
+        None, description="Process bottlenecks"
+    )
+    manual_tasks: Optional[list[str]] = pydantic.Field(
+        None, description="Manual/repetitive tasks"
+    )
+    automation_goals: Optional[list[str]] = pydantic.Field(
+        None, description="Desired automation goals"
+    )
+
+    # Current tools
+    current_software: Optional[list[str]] = pydantic.Field(
+        None, description="Software/tools currently used"
+    )
+    existing_automation: Optional[list[str]] = pydantic.Field(
+        None, description="Existing automations"
+    )
+
+    # Additional context
+    additional_notes: Optional[str] = pydantic.Field(
+        None, description="Any additional context"
+    )
+
+
+class BusinessUnderstanding(pydantic.BaseModel):
+    """Full business understanding model returned from database."""
+
+    id: str
+    user_id: str
+    created_at: datetime
+    updated_at: datetime
+
+    # User info
+    user_name: Optional[str] = None
+    job_title: Optional[str] = None
+
+    # Business basics
+    business_name: Optional[str] = None
+    industry: Optional[str] = None
+    business_size: Optional[str] = None
+    user_role: Optional[str] = None
+
+    # Processes & activities
+    key_workflows: list[str] = pydantic.Field(default_factory=list)
+    daily_activities: list[str] = pydantic.Field(default_factory=list)
+
+    # Pain points & goals
+    pain_points: list[str] = pydantic.Field(default_factory=list)
+    bottlenecks: list[str] = pydantic.Field(default_factory=list)
+    manual_tasks: list[str] = pydantic.Field(default_factory=list)
+    automation_goals: list[str] = pydantic.Field(default_factory=list)
+
+    # Current tools
+    current_software: list[str] = pydantic.Field(default_factory=list)
+    existing_automation: list[str] = pydantic.Field(default_factory=list)
+
+    # Additional context
+    additional_notes: Optional[str] = None
+
+    @classmethod
+    def from_db(cls, db_record: CoPilotUnderstanding) -> "BusinessUnderstanding":
+        """Convert database record to Pydantic model."""
+        data = db_record.data if isinstance(db_record.data, dict) else {}
+        business = (
+            data.get("business", {}) if isinstance(data.get("business"), dict) else {}
+        )
+        return cls(
+            id=db_record.id,
+            user_id=db_record.userId,
+            created_at=db_record.createdAt,
+            updated_at=db_record.updatedAt,
+            user_name=data.get("name"),
+            job_title=business.get("job_title"),
+            business_name=business.get("business_name"),
+            industry=business.get("industry"),
+            business_size=business.get("business_size"),
+            user_role=business.get("user_role"),
+            key_workflows=_json_to_list(business.get("key_workflows")),
+            daily_activities=_json_to_list(business.get("daily_activities")),
+            pain_points=_json_to_list(business.get("pain_points")),
+            bottlenecks=_json_to_list(business.get("bottlenecks")),
+            manual_tasks=_json_to_list(business.get("manual_tasks")),
+            automation_goals=_json_to_list(business.get("automation_goals")),
+            current_software=_json_to_list(business.get("current_software")),
+            existing_automation=_json_to_list(business.get("existing_automation")),
+            additional_notes=business.get("additional_notes"),
+        )
+
+
+def _merge_lists(existing: list | None, new: list | None) -> list | None:
+    """Merge two lists, removing duplicates while preserving order."""
+    if new is None:
+        return existing
+    if existing is None:
+        return new
+    # Preserve order, add new items that don't exist
+    merged = list(existing)
+    for item in new:
+        if item not in merged:
+            merged.append(item)
+    return merged
+
+
+async def _get_from_cache(user_id: str) -> Optional[BusinessUnderstanding]:
+    """Get business understanding from Redis cache."""
+    try:
+        redis = await get_redis_async()
+        cached_data = await redis.get(_cache_key(user_id))
+        if cached_data:
+            return BusinessUnderstanding.model_validate_json(cached_data)
+    except Exception as e:
+        logger.warning(f"Failed to get understanding from cache: {e}")
+    return None
+
+
+async def _set_cache(user_id: str, understanding: BusinessUnderstanding) -> None:
+    """Set business understanding in Redis cache with TTL."""
+    try:
+        redis = await get_redis_async()
+        await redis.setex(
+            _cache_key(user_id),
+            CACHE_TTL_SECONDS,
+            understanding.model_dump_json(),
+        )
+    except Exception as e:
+        logger.warning(f"Failed to set understanding in cache: {e}")
+
+
+async def _delete_cache(user_id: str) -> None:
+    """Delete business understanding from Redis cache."""
+    try:
+        redis = await get_redis_async()
+        await redis.delete(_cache_key(user_id))
+    except Exception as e:
+        logger.warning(f"Failed to delete understanding from cache: {e}")
+
+
+async def get_business_understanding(
+    user_id: str,
+) -> Optional[BusinessUnderstanding]:
+    """Get the business understanding for a user.
+
+    Checks cache first, falls back to database if not cached.
+    Results are cached for 48 hours.
+    """
+    # Try cache first
+    cached = await _get_from_cache(user_id)
+    if cached:
+        logger.debug(f"Business understanding cache hit for user {user_id}")
+        return cached
+
+    # Cache miss - load from database
+    logger.debug(f"Business understanding cache miss for user {user_id}")
+    record = await CoPilotUnderstanding.prisma().find_unique(where={"userId": user_id})
+    if record is None:
+        return None
+
+    understanding = BusinessUnderstanding.from_db(record)
+
+    # Store in cache for next time
+    await _set_cache(user_id, understanding)
+
+    return understanding
+
+
+async def upsert_business_understanding(
+    user_id: str,
+    input_data: BusinessUnderstandingInput,
+) -> BusinessUnderstanding:
+    """
+    Create or update business understanding with incremental merge strategy.
+
+    - String fields: new value overwrites if provided (not None)
+    - List fields: new items are appended to existing (deduplicated)
+
+    Data is stored as: {name: ..., business: {version: 1, ...}}
+    """
+    # Get existing record for merge
+    existing = await CoPilotUnderstanding.prisma().find_unique(
+        where={"userId": user_id}
+    )
+
+    # Get existing data structure or start fresh
+    existing_data: dict[str, Any] = {}
+    if existing and isinstance(existing.data, dict):
+        existing_data = dict(existing.data)
+
+    existing_business: dict[str, Any] = {}
+    if isinstance(existing_data.get("business"), dict):
+        existing_business = dict(existing_data["business"])
+
+    # Business fields (stored inside business object)
+    business_string_fields = [
+        "job_title",
+        "business_name",
+        "industry",
+        "business_size",
+        "user_role",
+        "additional_notes",
+    ]
+    business_list_fields = [
+        "key_workflows",
+        "daily_activities",
+        "pain_points",
+        "bottlenecks",
+        "manual_tasks",
+        "automation_goals",
+        "current_software",
+        "existing_automation",
+    ]
+
+    # Handle top-level name field
+    if input_data.user_name is not None:
+        existing_data["name"] = input_data.user_name
+
+    # Business string fields - overwrite if provided
+    for field in business_string_fields:
+        value = getattr(input_data, field)
+        if value is not None:
+            existing_business[field] = value
+
+    # Business list fields - merge with existing
+    for field in business_list_fields:
+        value = getattr(input_data, field)
+        if value is not None:
+            existing_list = _json_to_list(existing_business.get(field))
+            merged = _merge_lists(existing_list, value)
+            existing_business[field] = merged
+
+    # Set version and nest business data
+    existing_business["version"] = 1
+    existing_data["business"] = existing_business
+
+    # Upsert with the merged data
+    record = await CoPilotUnderstanding.prisma().upsert(
+        where={"userId": user_id},
+        data={
+            "create": {"userId": user_id, "data": SafeJson(existing_data)},
+            "update": {"data": SafeJson(existing_data)},
+        },
+    )
+
+    understanding = BusinessUnderstanding.from_db(record)
+
+    # Update cache with new understanding
+    await _set_cache(user_id, understanding)
+
+    return understanding
+
+
+async def clear_business_understanding(user_id: str) -> bool:
+    """Clear/delete business understanding for a user from both DB and cache."""
+    # Delete from cache first
+    await _delete_cache(user_id)
+
+    try:
+        await CoPilotUnderstanding.prisma().delete(where={"userId": user_id})
+        return True
+    except Exception:
+        # Record might not exist
+        return False
+
+
+def format_understanding_for_prompt(understanding: BusinessUnderstanding) -> str:
+    """Format business understanding as text for system prompt injection."""
+    if not understanding:
+        return ""
+    sections = []
+
+    # User info section
+    user_info = []
+    if understanding.user_name:
+        user_info.append(f"Name: {understanding.user_name}")
+    if understanding.job_title:
+        user_info.append(f"Job Title: {understanding.job_title}")
+    if user_info:
+        sections.append("## User\n" + "\n".join(user_info))
+
+    # Business section
+    business_info = []
+    if understanding.business_name:
+        business_info.append(f"Company: {understanding.business_name}")
+    if understanding.industry:
+        business_info.append(f"Industry: {understanding.industry}")
+    if understanding.business_size:
+        business_info.append(f"Size: {understanding.business_size}")
+    if understanding.user_role:
+        business_info.append(f"Role Context: {understanding.user_role}")
+    if business_info:
+        sections.append("## Business\n" + "\n".join(business_info))
+
+    # Processes section
+    processes = []
+    if understanding.key_workflows:
+        processes.append(f"Key Workflows: {', '.join(understanding.key_workflows)}")
+    if understanding.daily_activities:
+        processes.append(
+            f"Daily Activities: {', '.join(understanding.daily_activities)}"
+        )
+    if processes:
+        sections.append("## Processes\n" + "\n".join(processes))
+
+    # Pain points section
+    pain_points = []
+    if understanding.pain_points:
+        pain_points.append(f"Pain Points: {', '.join(understanding.pain_points)}")
+    if understanding.bottlenecks:
+        pain_points.append(f"Bottlenecks: {', '.join(understanding.bottlenecks)}")
+    if understanding.manual_tasks:
+        pain_points.append(f"Manual Tasks: {', '.join(understanding.manual_tasks)}")
+    if pain_points:
+        sections.append("## Pain Points\n" + "\n".join(pain_points))
+
+    # Goals section
+    if understanding.automation_goals:
+        sections.append(
+            "## Automation Goals\n"
+            + "\n".join(f"- {goal}" for goal in understanding.automation_goals)
+        )
+
+    # Current tools section
+    tools_info = []
+    if understanding.current_software:
+        tools_info.append(
+            f"Current Software: {', '.join(understanding.current_software)}"
+        )
+    if understanding.existing_automation:
+        tools_info.append(
+            f"Existing Automation: {', '.join(understanding.existing_automation)}"
+        )
+    if tools_info:
+        sections.append("## Current Tools\n" + "\n".join(tools_info))
+
+    # Additional notes
+    if understanding.additional_notes:
+        sections.append(f"## Additional Context\n{understanding.additional_notes}")
+
+    if not sections:
+        return ""
+
+    return "# User Business Context\n\n" + "\n\n".join(sections)
diff --git a/autogpt_platform/backend/backend/data/workspace.py b/autogpt_platform/backend/backend/data/workspace.py
new file mode 100644
index 0000000000..f3dba0a294
--- /dev/null
+++ b/autogpt_platform/backend/backend/data/workspace.py
@@ -0,0 +1,276 @@
+"""
+Database CRUD operations for User Workspace.
+
+This module provides functions for managing user workspaces and workspace files.
+"""
+
+import logging
+from datetime import datetime, timezone
+from typing import Optional
+
+from prisma.models import UserWorkspace, UserWorkspaceFile
+from prisma.types import UserWorkspaceFileWhereInput
+
+from backend.util.json import SafeJson
+
+logger = logging.getLogger(__name__)
+
+
+async def get_or_create_workspace(user_id: str) -> UserWorkspace:
+    """
+    Get user's workspace, creating one if it doesn't exist.
+
+    Uses upsert to handle race conditions when multiple concurrent requests
+    attempt to create a workspace for the same user.
+
+    Args:
+        user_id: The user's ID
+
+    Returns:
+        UserWorkspace instance
+    """
+    workspace = await UserWorkspace.prisma().upsert(
+        where={"userId": user_id},
+        data={
+            "create": {"userId": user_id},
+            "update": {},  # No updates needed if exists
+        },
+    )
+
+    return workspace
+
+
+async def get_workspace(user_id: str) -> Optional[UserWorkspace]:
+    """
+    Get user's workspace if it exists.
+
+    Args:
+        user_id: The user's ID
+
+    Returns:
+        UserWorkspace instance or None
+    """
+    return await UserWorkspace.prisma().find_unique(where={"userId": user_id})
+
+
+async def create_workspace_file(
+    workspace_id: str,
+    file_id: str,
+    name: str,
+    path: str,
+    storage_path: str,
+    mime_type: str,
+    size_bytes: int,
+    checksum: Optional[str] = None,
+    metadata: Optional[dict] = None,
+) -> UserWorkspaceFile:
+    """
+    Create a new workspace file record.
+
+    Args:
+        workspace_id: The workspace ID
+        file_id: The file ID (same as used in storage path for consistency)
+        name: User-visible filename
+        path: Virtual path (e.g., "/documents/report.pdf")
+        storage_path: Actual storage path (GCS or local)
+        mime_type: MIME type of the file
+        size_bytes: File size in bytes
+        checksum: Optional SHA256 checksum
+        metadata: Optional additional metadata
+
+    Returns:
+        Created UserWorkspaceFile instance
+    """
+    # Normalize path to start with /
+    if not path.startswith("/"):
+        path = f"/{path}"
+
+    file = await UserWorkspaceFile.prisma().create(
+        data={
+            "id": file_id,
+            "workspaceId": workspace_id,
+            "name": name,
+            "path": path,
+            "storagePath": storage_path,
+            "mimeType": mime_type,
+            "sizeBytes": size_bytes,
+            "checksum": checksum,
+            "metadata": SafeJson(metadata or {}),
+        }
+    )
+
+    logger.info(
+        f"Created workspace file {file.id} at path {path} "
+        f"in workspace {workspace_id}"
+    )
+    return file
+
+
+async def get_workspace_file(
+    file_id: str,
+    workspace_id: Optional[str] = None,
+) -> Optional[UserWorkspaceFile]:
+    """
+    Get a workspace file by ID.
+
+    Args:
+        file_id: The file ID
+        workspace_id: Optional workspace ID for validation
+
+    Returns:
+        UserWorkspaceFile instance or None
+    """
+    where_clause: dict = {"id": file_id, "isDeleted": False}
+    if workspace_id:
+        where_clause["workspaceId"] = workspace_id
+
+    return await UserWorkspaceFile.prisma().find_first(where=where_clause)
+
+
+async def get_workspace_file_by_path(
+    workspace_id: str,
+    path: str,
+) -> Optional[UserWorkspaceFile]:
+    """
+    Get a workspace file by its virtual path.
+
+    Args:
+        workspace_id: The workspace ID
+        path: Virtual path
+
+    Returns:
+        UserWorkspaceFile instance or None
+    """
+    # Normalize path
+    if not path.startswith("/"):
+        path = f"/{path}"
+
+    return await UserWorkspaceFile.prisma().find_first(
+        where={
+            "workspaceId": workspace_id,
+            "path": path,
+            "isDeleted": False,
+        }
+    )
+
+
+async def list_workspace_files(
+    workspace_id: str,
+    path_prefix: Optional[str] = None,
+    include_deleted: bool = False,
+    limit: Optional[int] = None,
+    offset: int = 0,
+) -> list[UserWorkspaceFile]:
+    """
+    List files in a workspace.
+
+    Args:
+        workspace_id: The workspace ID
+        path_prefix: Optional path prefix to filter (e.g., "/documents/")
+        include_deleted: Whether to include soft-deleted files
+        limit: Maximum number of files to return
+        offset: Number of files to skip
+
+    Returns:
+        List of UserWorkspaceFile instances
+    """
+    where_clause: UserWorkspaceFileWhereInput = {"workspaceId": workspace_id}
+
+    if not include_deleted:
+        where_clause["isDeleted"] = False
+
+    if path_prefix:
+        # Normalize prefix
+        if not path_prefix.startswith("/"):
+            path_prefix = f"/{path_prefix}"
+        where_clause["path"] = {"startswith": path_prefix}
+
+    return await UserWorkspaceFile.prisma().find_many(
+        where=where_clause,
+        order={"createdAt": "desc"},
+        take=limit,
+        skip=offset,
+    )
+
+
+async def count_workspace_files(
+    workspace_id: str,
+    path_prefix: Optional[str] = None,
+    include_deleted: bool = False,
+) -> int:
+    """
+    Count files in a workspace.
+
+    Args:
+        workspace_id: The workspace ID
+        path_prefix: Optional path prefix to filter (e.g., "/sessions/abc123/")
+        include_deleted: Whether to include soft-deleted files
+
+    Returns:
+        Number of files
+    """
+    where_clause: dict = {"workspaceId": workspace_id}
+    if not include_deleted:
+        where_clause["isDeleted"] = False
+
+    if path_prefix:
+        # Normalize prefix
+        if not path_prefix.startswith("/"):
+            path_prefix = f"/{path_prefix}"
+        where_clause["path"] = {"startswith": path_prefix}
+
+    return await UserWorkspaceFile.prisma().count(where=where_clause)
+
+
+async def soft_delete_workspace_file(
+    file_id: str,
+    workspace_id: Optional[str] = None,
+) -> Optional[UserWorkspaceFile]:
+    """
+    Soft-delete a workspace file.
+
+    The path is modified to include a deletion timestamp to free up the original
+    path for new files while preserving the record for potential recovery.
+
+    Args:
+        file_id: The file ID
+        workspace_id: Optional workspace ID for validation
+
+    Returns:
+        Updated UserWorkspaceFile instance or None if not found
+    """
+    # First verify the file exists and belongs to workspace
+    file = await get_workspace_file(file_id, workspace_id)
+    if file is None:
+        return None
+
+    deleted_at = datetime.now(timezone.utc)
+    # Modify path to free up the unique constraint for new files at original path
+    # Format: {original_path}__deleted__{timestamp}
+    deleted_path = f"{file.path}__deleted__{int(deleted_at.timestamp())}"
+
+    updated = await UserWorkspaceFile.prisma().update(
+        where={"id": file_id},
+        data={
+            "isDeleted": True,
+            "deletedAt": deleted_at,
+            "path": deleted_path,
+        },
+    )
+
+    logger.info(f"Soft-deleted workspace file {file_id}")
+    return updated
+
+
+async def get_workspace_total_size(workspace_id: str) -> int:
+    """
+    Get the total size of all files in a workspace.
+
+    Args:
+        workspace_id: The workspace ID
+
+    Returns:
+        Total size in bytes
+    """
+    files = await list_workspace_files(workspace_id)
+    return sum(file.sizeBytes for file in files)
diff --git a/autogpt_platform/backend/backend/executor/database.py b/autogpt_platform/backend/backend/executor/database.py
index af68bf526d..d44439d51c 100644
--- a/autogpt_platform/backend/backend/executor/database.py
+++ b/autogpt_platform/backend/backend/executor/database.py
@@ -7,11 +7,17 @@ from backend.api.features.library.db import (
     list_library_agents,
 )
 from backend.api.features.store.db import get_store_agent_details, get_store_agents
+from backend.api.features.store.embeddings import (
+    backfill_missing_embeddings,
+    cleanup_orphaned_embeddings,
+    get_embedding_stats,
+)
 from backend.data import db
 from backend.data.analytics import (
     get_accuracy_trends_and_alerts,
     get_marketplace_graphs_for_monitoring,
 )
+from backend.data.auth.oauth import cleanup_expired_oauth_tokens
 from backend.data.credit import UsageTransactionMetadata, get_user_credit_model
 from backend.data.execution import (
     create_graph_execution,
@@ -20,6 +26,7 @@ from backend.data.execution import (
     get_execution_kv_data,
     get_execution_outputs_by_node_exec_id,
     get_frequently_executed_graphs,
+    get_graph_execution,
     get_graph_execution_meta,
     get_graph_executions,
     get_graph_executions_count,
@@ -44,6 +51,8 @@ from backend.data.graph import (
     validate_graph_execution_permissions,
 )
 from backend.data.human_review import (
+    cancel_pending_reviews_for_execution,
+    check_approval,
     get_or_create_human_review,
     has_pending_reviews_for_graph_exec,
     update_review_processed_status,
@@ -57,6 +66,7 @@ from backend.data.notifications import (
     get_user_notification_oldest_message_in_batch,
     remove_notifications_from_batch,
 )
+from backend.data.onboarding import increment_onboarding_runs
 from backend.data.user import (
     get_active_user_ids_in_timerange,
     get_user_by_id,
@@ -140,6 +150,7 @@ class DatabaseManager(AppService):
     get_child_graph_executions = _(get_child_graph_executions)
     get_graph_executions = _(get_graph_executions)
     get_graph_executions_count = _(get_graph_executions_count)
+    get_graph_execution = _(get_graph_execution)
     get_graph_execution_meta = _(get_graph_execution_meta)
     create_graph_execution = _(create_graph_execution)
     get_node_execution = _(get_node_execution)
@@ -182,6 +193,8 @@ class DatabaseManager(AppService):
     get_user_notification_preference = _(get_user_notification_preference)
 
     # Human In The Loop
+    cancel_pending_reviews_for_execution = _(cancel_pending_reviews_for_execution)
+    check_approval = _(check_approval)
     get_or_create_human_review = _(get_or_create_human_review)
     has_pending_reviews_for_graph_exec = _(has_pending_reviews_for_graph_exec)
     update_review_processed_status = _(update_review_processed_status)
@@ -204,10 +217,21 @@ class DatabaseManager(AppService):
     add_store_agent_to_library = _(add_store_agent_to_library)
     validate_graph_execution_permissions = _(validate_graph_execution_permissions)
 
+    # Onboarding
+    increment_onboarding_runs = _(increment_onboarding_runs)
+
+    # OAuth
+    cleanup_expired_oauth_tokens = _(cleanup_expired_oauth_tokens)
+
     # Store
     get_store_agents = _(get_store_agents)
     get_store_agent_details = _(get_store_agent_details)
 
+    # Store Embeddings
+    get_embedding_stats = _(get_embedding_stats)
+    backfill_missing_embeddings = _(backfill_missing_embeddings)
+    cleanup_orphaned_embeddings = _(cleanup_orphaned_embeddings)
+
     # Summary data - async
     get_user_execution_summary_data = _(get_user_execution_summary_data)
 
@@ -259,6 +283,11 @@ class DatabaseManagerClient(AppServiceClient):
     get_store_agents = _(d.get_store_agents)
     get_store_agent_details = _(d.get_store_agent_details)
 
+    # Store Embeddings
+    get_embedding_stats = _(d.get_embedding_stats)
+    backfill_missing_embeddings = _(d.backfill_missing_embeddings)
+    cleanup_orphaned_embeddings = _(d.cleanup_orphaned_embeddings)
+
 
 class DatabaseManagerAsyncClient(AppServiceClient):
     d = DatabaseManager
@@ -274,6 +303,7 @@ class DatabaseManagerAsyncClient(AppServiceClient):
     get_graph = d.get_graph
     get_graph_metadata = d.get_graph_metadata
     get_graph_settings = d.get_graph_settings
+    get_graph_execution = d.get_graph_execution
     get_graph_execution_meta = d.get_graph_execution_meta
     get_node = d.get_node
     get_node_execution = d.get_node_execution
@@ -291,6 +321,8 @@ class DatabaseManagerAsyncClient(AppServiceClient):
     set_execution_kv_data = d.set_execution_kv_data
 
     # Human In The Loop
+    cancel_pending_reviews_for_execution = d.cancel_pending_reviews_for_execution
+    check_approval = d.check_approval
     get_or_create_human_review = d.get_or_create_human_review
     update_review_processed_status = d.update_review_processed_status
 
@@ -318,6 +350,12 @@ class DatabaseManagerAsyncClient(AppServiceClient):
     add_store_agent_to_library = d.add_store_agent_to_library
     validate_graph_execution_permissions = d.validate_graph_execution_permissions
 
+    # Onboarding
+    increment_onboarding_runs = d.increment_onboarding_runs
+
+    # OAuth
+    cleanup_expired_oauth_tokens = d.cleanup_expired_oauth_tokens
+
     # Store
     get_store_agents = d.get_store_agents
     get_store_agent_details = d.get_store_agent_details
diff --git a/autogpt_platform/backend/backend/executor/manager.py b/autogpt_platform/backend/backend/executor/manager.py
index 75459c5a2a..8362dae828 100644
--- a/autogpt_platform/backend/backend/executor/manager.py
+++ b/autogpt_platform/backend/backend/executor/manager.py
@@ -178,6 +178,7 @@ async def execute_node(
     execution_processor: "ExecutionProcessor",
     execution_stats: NodeExecutionStats | None = None,
     nodes_input_masks: Optional[NodesInputMasks] = None,
+    nodes_to_skip: Optional[set[str]] = None,
 ) -> BlockOutput:
     """
     Execute a node in the graph. This will trigger a block execution on a node,
@@ -235,7 +236,14 @@ async def execute_node(
     input_size = len(input_data_str)
     log_metadata.debug("Executed node with input", input=input_data_str)
 
+    # Create node-specific execution context to avoid race conditions
+    # (multiple nodes can execute concurrently and would otherwise mutate shared state)
+    execution_context = execution_context.model_copy(
+        update={"node_id": node_id, "node_exec_id": node_exec_id}
+    )
+
     # Inject extra execution arguments for the blocks via kwargs
+    # Keep individual kwargs for backwards compatibility with existing blocks
     extra_exec_kwargs: dict = {
         "graph_id": graph_id,
         "graph_version": graph_version,
@@ -245,6 +253,7 @@ async def execute_node(
         "user_id": user_id,
         "execution_context": execution_context,
         "execution_processor": execution_processor,
+        "nodes_to_skip": nodes_to_skip or set(),
     }
 
     # Last-minute fetch credentials + acquire a system-wide read-write lock to prevent
@@ -542,6 +551,7 @@ class ExecutionProcessor:
         node_exec_progress: NodeExecutionProgress,
         nodes_input_masks: Optional[NodesInputMasks],
         graph_stats_pair: tuple[GraphExecutionStats, threading.Lock],
+        nodes_to_skip: Optional[set[str]] = None,
     ) -> NodeExecutionStats:
         log_metadata = LogMetadata(
             logger=_logger,
@@ -564,6 +574,7 @@ class ExecutionProcessor:
             db_client=db_client,
             log_metadata=log_metadata,
             nodes_input_masks=nodes_input_masks,
+            nodes_to_skip=nodes_to_skip,
         )
         if isinstance(status, BaseException):
             raise status
@@ -609,6 +620,7 @@ class ExecutionProcessor:
         db_client: "DatabaseManagerAsyncClient",
         log_metadata: LogMetadata,
         nodes_input_masks: Optional[NodesInputMasks] = None,
+        nodes_to_skip: Optional[set[str]] = None,
     ) -> ExecutionStatus:
         status = ExecutionStatus.RUNNING
 
@@ -645,6 +657,7 @@ class ExecutionProcessor:
                 execution_processor=self,
                 execution_stats=stats,
                 nodes_input_masks=nodes_input_masks,
+                nodes_to_skip=nodes_to_skip,
             ):
                 await persist_output(output_name, output_data)
 
@@ -956,6 +969,21 @@ class ExecutionProcessor:
 
                 queued_node_exec = execution_queue.get()
 
+                # Check if this node should be skipped due to optional credentials
+                if queued_node_exec.node_id in graph_exec.nodes_to_skip:
+                    log_metadata.info(
+                        f"Skipping node execution {queued_node_exec.node_exec_id} "
+                        f"for node {queued_node_exec.node_id} - optional credentials not configured"
+                    )
+                    # Mark the node as completed without executing
+                    # No outputs will be produced, so downstream nodes won't trigger
+                    update_node_execution_status(
+                        db_client=db_client,
+                        exec_id=queued_node_exec.node_exec_id,
+                        status=ExecutionStatus.COMPLETED,
+                    )
+                    continue
+
                 log_metadata.debug(
                     f"Dispatching node execution {queued_node_exec.node_exec_id} "
                     f"for node {queued_node_exec.node_id}",
@@ -1016,6 +1044,7 @@ class ExecutionProcessor:
                             execution_stats,
                             execution_stats_lock,
                         ),
+                        nodes_to_skip=graph_exec.nodes_to_skip,
                     ),
                     self.node_execution_loop,
                 )
diff --git a/autogpt_platform/backend/backend/executor/manager_test.py b/autogpt_platform/backend/backend/executor/manager_test.py
index bdfdb5d724..69deba4b00 100644
--- a/autogpt_platform/backend/backend/executor/manager_test.py
+++ b/autogpt_platform/backend/backend/executor/manager_test.py
@@ -1,4 +1,5 @@
 import logging
+from unittest.mock import AsyncMock, patch
 
 import fastapi.responses
 import pytest
@@ -19,6 +20,17 @@ from backend.util.test import SpinTestServer, wait_execution
 logger = logging.getLogger(__name__)
 
 
+@pytest.fixture(scope="session", autouse=True)
+def mock_embedding_functions():
+    """Mock embedding functions for all tests to avoid database/API dependencies."""
+    with patch(
+        "backend.api.features.store.db.ensure_embedding",
+        new_callable=AsyncMock,
+        return_value=True,
+    ):
+        yield
+
+
 async def create_graph(s: SpinTestServer, g: graph.Graph, u: User) -> graph.Graph:
     logger.info(f"Creating graph for user {u.id}")
     return await s.agent_server.test_create_graph(CreateGraph(graph=g), u.id)
diff --git a/autogpt_platform/backend/backend/executor/scheduler.py b/autogpt_platform/backend/backend/executor/scheduler.py
index 06c50bf82e..cbdc441718 100644
--- a/autogpt_platform/backend/backend/executor/scheduler.py
+++ b/autogpt_platform/backend/backend/executor/scheduler.py
@@ -2,6 +2,7 @@ import asyncio
 import logging
 import os
 import threading
+import time
 import uuid
 from enum import Enum
 from typing import Optional
@@ -23,11 +24,9 @@ from dotenv import load_dotenv
 from pydantic import BaseModel, Field, ValidationError
 from sqlalchemy import MetaData, create_engine
 
-from backend.data.auth.oauth import cleanup_expired_oauth_tokens
 from backend.data.block import BlockInput
 from backend.data.execution import GraphExecutionWithNodes
 from backend.data.model import CredentialsMetaInput
-from backend.data.onboarding import increment_runs
 from backend.executor import utils as execution_utils
 from backend.monitoring import (
     NotificationJobArgs,
@@ -37,7 +36,11 @@ from backend.monitoring import (
     report_execution_accuracy_alerts,
     report_late_executions,
 )
-from backend.util.clients import get_scheduler_client
+from backend.util.clients import (
+    get_database_manager_async_client,
+    get_database_manager_client,
+    get_scheduler_client,
+)
 from backend.util.cloud_storage import cleanup_expired_files_async
 from backend.util.exceptions import (
     GraphNotFoundError,
@@ -147,6 +150,7 @@ def execute_graph(**kwargs):
 async def _execute_graph(**kwargs):
     args = GraphExecutionJobArgs(**kwargs)
     start_time = asyncio.get_event_loop().time()
+    db = get_database_manager_async_client()
     try:
         logger.info(f"Executing recurring job for graph #{args.graph_id}")
         graph_exec: GraphExecutionWithNodes = await execution_utils.add_graph_execution(
@@ -156,7 +160,7 @@ async def _execute_graph(**kwargs):
             inputs=args.input_data,
             graph_credentials_inputs=args.input_credentials,
         )
-        await increment_runs(args.user_id)
+        await db.increment_onboarding_runs(args.user_id)
         elapsed = asyncio.get_event_loop().time() - start_time
         logger.info(
             f"Graph execution started with ID {graph_exec.id} for graph {args.graph_id} "
@@ -245,8 +249,13 @@ def cleanup_expired_files():
 
 def cleanup_oauth_tokens():
     """Clean up expired OAuth tokens from the database."""
+
     # Wait for completion
-    run_async(cleanup_expired_oauth_tokens())
+    async def _cleanup():
+        db = get_database_manager_async_client()
+        return await db.cleanup_expired_oauth_tokens()
+
+    run_async(_cleanup())
 
 
 def execution_accuracy_alerts():
@@ -254,6 +263,114 @@ def execution_accuracy_alerts():
     return report_execution_accuracy_alerts()
 
 
+def ensure_embeddings_coverage():
+    """
+    Ensure all content types (store agents, blocks, docs) have embeddings for search.
+
+    Processes ALL missing embeddings in batches of 10 per content type until 100% coverage.
+    Missing embeddings = content invisible in hybrid search.
+
+    Schedule: Runs every 6 hours (balanced between coverage and API costs).
+    - Catches new content added between scheduled runs
+    - Batch size 10 per content type: gradual processing to avoid rate limits
+    - Manual trigger available via execute_ensure_embeddings_coverage endpoint
+    """
+    db_client = get_database_manager_client()
+    stats = db_client.get_embedding_stats()
+
+    # Check for error from get_embedding_stats() first
+    if "error" in stats:
+        logger.error(
+            f"Failed to get embedding stats: {stats['error']} - skipping backfill"
+        )
+        return {
+            "backfill": {"processed": 0, "success": 0, "failed": 0},
+            "cleanup": {"deleted": 0},
+            "error": stats["error"],
+        }
+
+    # Extract totals from new stats structure
+    totals = stats.get("totals", {})
+    without_embeddings = totals.get("without_embeddings", 0)
+    coverage_percent = totals.get("coverage_percent", 0)
+
+    total_processed = 0
+    total_success = 0
+    total_failed = 0
+
+    if without_embeddings == 0:
+        logger.info("All content has embeddings, skipping backfill")
+    else:
+        # Log per-content-type stats for visibility
+        by_type = stats.get("by_type", {})
+        for content_type, type_stats in by_type.items():
+            if type_stats.get("without_embeddings", 0) > 0:
+                logger.info(
+                    f"{content_type}: {type_stats['without_embeddings']} items without embeddings "
+                    f"({type_stats['coverage_percent']}% coverage)"
+                )
+
+        logger.info(
+            f"Total: {without_embeddings} items without embeddings "
+            f"({coverage_percent}% coverage) - processing all"
+        )
+
+        # Process in batches until no more missing embeddings
+        while True:
+            result = db_client.backfill_missing_embeddings(batch_size=100)
+
+            total_processed += result["processed"]
+            total_success += result["success"]
+            total_failed += result["failed"]
+
+            if result["processed"] == 0:
+                # No more missing embeddings
+                break
+
+            if result["success"] == 0 and result["processed"] > 0:
+                # All attempts in this batch failed - stop to avoid infinite loop
+                logger.error(
+                    f"All {result['processed']} embedding attempts failed - stopping backfill"
+                )
+                break
+
+            # Small delay between batches to avoid rate limits
+            time.sleep(1)
+
+        logger.info(
+            f"Embedding backfill completed: {total_success}/{total_processed} succeeded, "
+            f"{total_failed} failed"
+        )
+
+    # Clean up orphaned embeddings for blocks and docs
+    logger.info("Running cleanup for orphaned embeddings (blocks/docs)...")
+    cleanup_result = db_client.cleanup_orphaned_embeddings()
+    cleanup_totals = cleanup_result.get("totals", {})
+    cleanup_deleted = cleanup_totals.get("deleted", 0)
+
+    if cleanup_deleted > 0:
+        logger.info(f"Cleanup completed: deleted {cleanup_deleted} orphaned embeddings")
+        by_type = cleanup_result.get("by_type", {})
+        for content_type, type_result in by_type.items():
+            if type_result.get("deleted", 0) > 0:
+                logger.info(
+                    f"{content_type}: deleted {type_result['deleted']} orphaned embeddings"
+                )
+    else:
+        logger.info("Cleanup completed: no orphaned embeddings found")
+
+    return {
+        "backfill": {
+            "processed": total_processed,
+            "success": total_success,
+            "failed": total_failed,
+        },
+        "cleanup": {
+            "deleted": cleanup_deleted,
+        },
+    }
+
+
 # Monitoring functions are now imported from monitoring module
 
 
@@ -475,11 +592,36 @@ class Scheduler(AppService):
                 jobstore=Jobstores.EXECUTION.value,
             )
 
+            # Embedding Coverage - Every 6 hours
+            # Ensures all approved agents have embeddings for hybrid search
+            # Critical: missing embeddings = agents invisible in search
+            self.scheduler.add_job(
+                ensure_embeddings_coverage,
+                id="ensure_embeddings_coverage",
+                trigger="interval",
+                hours=6,
+                replace_existing=True,
+                max_instances=1,  # Prevent overlapping runs
+                jobstore=Jobstores.EXECUTION.value,
+            )
+
         self.scheduler.add_listener(job_listener, EVENT_JOB_EXECUTED | EVENT_JOB_ERROR)
         self.scheduler.add_listener(job_missed_listener, EVENT_JOB_MISSED)
         self.scheduler.add_listener(job_max_instances_listener, EVENT_JOB_MAX_INSTANCES)
         self.scheduler.start()
 
+        # Run embedding backfill immediately on startup
+        # This ensures blocks/docs are searchable right away, not after 6 hours
+        # Safe to run on multiple pods - uses upserts and checks for existing embeddings
+        if self.register_system_tasks:
+            logger.info("Running embedding backfill on startup...")
+            try:
+                result = ensure_embeddings_coverage()
+                logger.info(f"Startup embedding backfill complete: {result}")
+            except Exception as e:
+                logger.error(f"Startup embedding backfill failed: {e}")
+                # Don't fail startup - the scheduled job will retry later
+
         # Keep the service running since BackgroundScheduler doesn't block
         super().run_service()
 
@@ -632,6 +774,11 @@ class Scheduler(AppService):
         """Manually trigger execution accuracy alert checking."""
         return execution_accuracy_alerts()
 
+    @expose
+    def execute_ensure_embeddings_coverage(self):
+        """Manually trigger embedding backfill for approved store agents."""
+        return ensure_embeddings_coverage()
+
 
 class SchedulerClient(AppServiceClient):
     @classmethod
diff --git a/autogpt_platform/backend/backend/executor/utils.py b/autogpt_platform/backend/backend/executor/utils.py
index bcd3dcf3b6..fa264c30a7 100644
--- a/autogpt_platform/backend/backend/executor/utils.py
+++ b/autogpt_platform/backend/backend/executor/utils.py
@@ -10,6 +10,8 @@ from pydantic import BaseModel, JsonValue, ValidationError
 
 from backend.data import execution as execution_db
 from backend.data import graph as graph_db
+from backend.data import human_review as human_review_db
+from backend.data import onboarding as onboarding_db
 from backend.data import user as user_db
 from backend.data.block import (
     Block,
@@ -31,7 +33,6 @@ from backend.data.execution import (
     GraphExecutionStats,
     GraphExecutionWithNodes,
     NodesInputMasks,
-    get_graph_execution,
 )
 from backend.data.graph import GraphModel, Node
 from backend.data.model import USER_TIMEZONE_NOT_SET, CredentialsMetaInput
@@ -239,14 +240,19 @@ async def _validate_node_input_credentials(
     graph: GraphModel,
     user_id: str,
     nodes_input_masks: Optional[NodesInputMasks] = None,
-) -> dict[str, dict[str, str]]:
+) -> tuple[dict[str, dict[str, str]], set[str]]:
     """
-    Checks all credentials for all nodes of the graph and returns structured errors.
+    Checks all credentials for all nodes of the graph and returns structured errors
+    and a set of nodes that should be skipped due to optional missing credentials.
 
     Returns:
-        dict[node_id, dict[field_name, error_message]]: Credential validation errors per node
+        tuple[
+            dict[node_id, dict[field_name, error_message]]: Credential validation errors per node,
+            set[node_id]: Nodes that should be skipped (optional credentials not configured)
+        ]
     """
     credential_errors: dict[str, dict[str, str]] = defaultdict(dict)
+    nodes_to_skip: set[str] = set()
 
     for node in graph.nodes:
         block = node.block
@@ -256,27 +262,46 @@ async def _validate_node_input_credentials(
         if not credentials_fields:
             continue
 
+        # Track if any credential field is missing for this node
+        has_missing_credentials = False
+
         for field_name, credentials_meta_type in credentials_fields.items():
             try:
+                # Check nodes_input_masks first, then input_default
+                field_value = None
                 if (
                     nodes_input_masks
                     and (node_input_mask := nodes_input_masks.get(node.id))
                     and field_name in node_input_mask
                 ):
-                    credentials_meta = credentials_meta_type.model_validate(
-                        node_input_mask[field_name]
-                    )
+                    field_value = node_input_mask[field_name]
                 elif field_name in node.input_default:
-                    credentials_meta = credentials_meta_type.model_validate(
-                        node.input_default[field_name]
-                    )
-                else:
-                    # Missing credentials
-                    credential_errors[node.id][
-                        field_name
-                    ] = "These credentials are required"
-                    continue
+                    # For optional credentials, don't use input_default - treat as missing
+                    # This prevents stale credential IDs from failing validation
+                    if node.credentials_optional:
+                        field_value = None
+                    else:
+                        field_value = node.input_default[field_name]
+
+                # Check if credentials are missing (None, empty, or not present)
+                if field_value is None or (
+                    isinstance(field_value, dict) and not field_value.get("id")
+                ):
+                    has_missing_credentials = True
+                    # If node has credentials_optional flag, mark for skipping instead of error
+                    if node.credentials_optional:
+                        continue  # Don't add error, will be marked for skip after loop
+                    else:
+                        credential_errors[node.id][
+                            field_name
+                        ] = "These credentials are required"
+                        continue
+
+                credentials_meta = credentials_meta_type.model_validate(field_value)
+
             except ValidationError as e:
+                # Validation error means credentials were provided but invalid
+                # This should always be an error, even if optional
                 credential_errors[node.id][field_name] = f"Invalid credentials: {e}"
                 continue
 
@@ -287,6 +312,7 @@ async def _validate_node_input_credentials(
                 )
             except Exception as e:
                 # Handle any errors fetching credentials
+                # If credentials were explicitly configured but unavailable, it's an error
                 credential_errors[node.id][
                     field_name
                 ] = f"Credentials not available: {e}"
@@ -313,7 +339,19 @@ async def _validate_node_input_credentials(
                 ] = "Invalid credentials: type/provider mismatch"
                 continue
 
-    return credential_errors
+        # If node has optional credentials and any are missing, mark for skipping
+        # But only if there are no other errors for this node
+        if (
+            has_missing_credentials
+            and node.credentials_optional
+            and node.id not in credential_errors
+        ):
+            nodes_to_skip.add(node.id)
+            logger.info(
+                f"Node #{node.id} will be skipped: optional credentials not configured"
+            )
+
+    return credential_errors, nodes_to_skip
 
 
 def make_node_credentials_input_map(
@@ -355,21 +393,25 @@ async def validate_graph_with_credentials(
     graph: GraphModel,
     user_id: str,
     nodes_input_masks: Optional[NodesInputMasks] = None,
-) -> Mapping[str, Mapping[str, str]]:
+) -> tuple[Mapping[str, Mapping[str, str]], set[str]]:
     """
-    Validate graph including credentials and return structured errors per node.
+    Validate graph including credentials and return structured errors per node,
+    along with a set of nodes that should be skipped due to optional missing credentials.
 
     Returns:
-        dict[node_id, dict[field_name, error_message]]: Validation errors per node
+        tuple[
+            dict[node_id, dict[field_name, error_message]]: Validation errors per node,
+            set[node_id]: Nodes that should be skipped (optional credentials not configured)
+        ]
     """
     # Get input validation errors
     node_input_errors = GraphModel.validate_graph_get_errors(
         graph, for_run=True, nodes_input_masks=nodes_input_masks
     )
 
-    # Get credential input/availability/validation errors
-    node_credential_input_errors = await _validate_node_input_credentials(
-        graph, user_id, nodes_input_masks
+    # Get credential input/availability/validation errors and nodes to skip
+    node_credential_input_errors, nodes_to_skip = (
+        await _validate_node_input_credentials(graph, user_id, nodes_input_masks)
     )
 
     # Merge credential errors with structural errors
@@ -378,7 +420,7 @@ async def validate_graph_with_credentials(
             node_input_errors[node_id] = {}
         node_input_errors[node_id].update(field_errors)
 
-    return node_input_errors
+    return node_input_errors, nodes_to_skip
 
 
 async def _construct_starting_node_execution_input(
@@ -386,7 +428,7 @@ async def _construct_starting_node_execution_input(
     user_id: str,
     graph_inputs: BlockInput,
     nodes_input_masks: Optional[NodesInputMasks] = None,
-) -> list[tuple[str, BlockInput]]:
+) -> tuple[list[tuple[str, BlockInput]], set[str]]:
     """
     Validates and prepares the input data for executing a graph.
     This function checks the graph for starting nodes, validates the input data
@@ -400,11 +442,14 @@ async def _construct_starting_node_execution_input(
         node_credentials_map: `dict[node_id, dict[input_name, CredentialsMetaInput]]`
 
     Returns:
-        list[tuple[str, BlockInput]]: A list of tuples, each containing the node ID and
-            the corresponding input data for that node.
+        tuple[
+            list[tuple[str, BlockInput]]: A list of tuples, each containing the node ID
+                and the corresponding input data for that node.
+            set[str]: Node IDs that should be skipped (optional credentials not configured)
+        ]
     """
     # Use new validation function that includes credentials
-    validation_errors = await validate_graph_with_credentials(
+    validation_errors, nodes_to_skip = await validate_graph_with_credentials(
         graph, user_id, nodes_input_masks
     )
     n_error_nodes = len(validation_errors)
@@ -445,7 +490,7 @@ async def _construct_starting_node_execution_input(
             "No starting nodes found for the graph, make sure an AgentInput or blocks with no inbound links are present as starting nodes."
         )
 
-    return nodes_input
+    return nodes_input, nodes_to_skip
 
 
 async def validate_and_construct_node_execution_input(
@@ -456,7 +501,7 @@ async def validate_and_construct_node_execution_input(
     graph_credentials_inputs: Optional[Mapping[str, CredentialsMetaInput]] = None,
     nodes_input_masks: Optional[NodesInputMasks] = None,
     is_sub_graph: bool = False,
-) -> tuple[GraphModel, list[tuple[str, BlockInput]], NodesInputMasks]:
+) -> tuple[GraphModel, list[tuple[str, BlockInput]], NodesInputMasks, set[str]]:
     """
     Public wrapper that handles graph fetching, credential mapping, and validation+construction.
     This centralizes the logic used by both scheduler validation and actual execution.
@@ -473,6 +518,7 @@ async def validate_and_construct_node_execution_input(
         GraphModel: Full graph object for the given `graph_id`.
         list[tuple[node_id, BlockInput]]: Starting node IDs with corresponding inputs.
         dict[str, BlockInput]: Node input masks including all passed-in credentials.
+        set[str]: Node IDs that should be skipped (optional credentials not configured).
 
     Raises:
         NotFoundError: If the graph is not found.
@@ -514,14 +560,16 @@ async def validate_and_construct_node_execution_input(
         nodes_input_masks or {},
     )
 
-    starting_nodes_input = await _construct_starting_node_execution_input(
-        graph=graph,
-        user_id=user_id,
-        graph_inputs=graph_inputs,
-        nodes_input_masks=nodes_input_masks,
+    starting_nodes_input, nodes_to_skip = (
+        await _construct_starting_node_execution_input(
+            graph=graph,
+            user_id=user_id,
+            graph_inputs=graph_inputs,
+            nodes_input_masks=nodes_input_masks,
+        )
     )
 
-    return graph, starting_nodes_input, nodes_input_masks
+    return graph, starting_nodes_input, nodes_input_masks, nodes_to_skip
 
 
 def _merge_nodes_input_masks(
@@ -702,9 +750,27 @@ async def stop_graph_execution(
         if graph_exec.status in [
             ExecutionStatus.QUEUED,
             ExecutionStatus.INCOMPLETE,
+            ExecutionStatus.REVIEW,
         ]:
-            # If the graph is still on the queue, we can prevent them from being executed
-            # by setting the status to TERMINATED.
+            # If the graph is queued/incomplete/paused for review, terminate immediately
+            # No need to wait for executor since it's not actively running
+
+            # If graph is in REVIEW status, clean up pending reviews before terminating
+            if graph_exec.status == ExecutionStatus.REVIEW:
+                # Use human_review_db if Prisma connected, else database manager
+                review_db = (
+                    human_review_db
+                    if prisma.is_connected()
+                    else get_database_manager_async_client()
+                )
+                # Mark all pending reviews as rejected/cancelled
+                cancelled_count = await review_db.cancel_pending_reviews_for_execution(
+                    graph_exec_id, user_id
+                )
+                logger.info(
+                    f"Cancelled {cancelled_count} pending review(s) for stopped execution {graph_exec_id}"
+                )
+
             graph_exec.status = ExecutionStatus.TERMINATED
 
             await asyncio.gather(
@@ -762,13 +828,14 @@ async def add_graph_execution(
         edb = execution_db
         udb = user_db
         gdb = graph_db
+        odb = onboarding_db
     else:
-        edb = udb = gdb = get_database_manager_async_client()
+        edb = udb = gdb = odb = get_database_manager_async_client()
 
     # Get or create the graph execution
     if graph_exec_id:
         # Resume existing execution
-        graph_exec = await get_graph_execution(
+        graph_exec = await edb.get_graph_execution(
             user_id=user_id,
             execution_id=graph_exec_id,
             include_node_executions=True,
@@ -779,6 +846,9 @@ async def add_graph_execution(
 
         # Use existing execution's compiled input masks
         compiled_nodes_input_masks = graph_exec.nodes_input_masks or {}
+        # For resumed executions, nodes_to_skip was already determined at creation time
+        # TODO: Consider storing nodes_to_skip in DB if we need to preserve it across resumes
+        nodes_to_skip: set[str] = set()
 
         logger.info(f"Resuming graph execution #{graph_exec.id} for graph #{graph_id}")
     else:
@@ -787,7 +857,7 @@ async def add_graph_execution(
         )
 
         # Create new execution
-        graph, starting_nodes_input, compiled_nodes_input_masks = (
+        graph, starting_nodes_input, compiled_nodes_input_masks, nodes_to_skip = (
             await validate_and_construct_node_execution_input(
                 graph_id=graph_id,
                 user_id=user_id,
@@ -822,24 +892,50 @@ async def add_graph_execution(
         settings = await gdb.get_graph_settings(user_id=user_id, graph_id=graph_id)
 
         execution_context = ExecutionContext(
-            safe_mode=(
-                settings.human_in_the_loop_safe_mode
-                if settings.human_in_the_loop_safe_mode is not None
-                else True
-            ),
+            # Execution identity
+            user_id=user_id,
+            graph_id=graph_id,
+            graph_exec_id=graph_exec.id,
+            graph_version=graph_exec.graph_version,
+            # Safety settings
+            human_in_the_loop_safe_mode=settings.human_in_the_loop_safe_mode,
+            sensitive_action_safe_mode=settings.sensitive_action_safe_mode,
+            # User settings
             user_timezone=(
                 user.timezone if user.timezone != USER_TIMEZONE_NOT_SET else "UTC"
             ),
+            # Execution hierarchy
             root_execution_id=graph_exec.id,
         )
 
     try:
         graph_exec_entry = graph_exec.to_graph_execution_entry(
             compiled_nodes_input_masks=compiled_nodes_input_masks,
+            nodes_to_skip=nodes_to_skip,
             execution_context=execution_context,
         )
-        logger.info(f"Publishing execution {graph_exec.id} to execution queue")
+        logger.info(f"Queueing execution {graph_exec.id}")
 
+        # Update execution status to QUEUED BEFORE publishing to prevent race condition
+        # where two concurrent requests could both publish the same execution
+        updated_exec = await edb.update_graph_execution_stats(
+            graph_exec_id=graph_exec.id,
+            status=ExecutionStatus.QUEUED,
+        )
+
+        # Verify the status update succeeded (prevents duplicate queueing in race conditions)
+        # If another request already updated the status, this execution will not be QUEUED
+        if not updated_exec or updated_exec.status != ExecutionStatus.QUEUED:
+            logger.warning(
+                f"Skipping queue publish for execution {graph_exec.id} - "
+                f"status update failed or execution already queued by another request"
+            )
+            return graph_exec
+
+        graph_exec.status = ExecutionStatus.QUEUED
+
+        # Publish to execution queue for executor to pick up
+        # This happens AFTER status update to ensure only one request publishes
         exec_queue = await get_async_execution_queue()
         await exec_queue.publish_message(
             routing_key=GRAPH_EXECUTION_ROUTING_KEY,
@@ -847,15 +943,6 @@ async def add_graph_execution(
             exchange=GRAPH_EXECUTION_EXCHANGE,
         )
         logger.info(f"Published execution {graph_exec.id} to RabbitMQ queue")
-
-        graph_exec.status = ExecutionStatus.QUEUED
-        await edb.update_graph_execution_stats(
-            graph_exec_id=graph_exec.id,
-            status=graph_exec.status,
-        )
-        await get_async_execution_event_bus().publish(graph_exec)
-
-        return graph_exec
     except BaseException as e:
         err = str(e) or type(e).__name__
         if not graph_exec:
@@ -876,6 +963,24 @@ async def add_graph_execution(
         )
         raise
 
+    try:
+        await get_async_execution_event_bus().publish(graph_exec)
+        logger.info(f"Published update for execution #{graph_exec.id} to event bus")
+    except Exception as e:
+        logger.error(
+            f"Failed to publish execution event for graph exec #{graph_exec.id}: {e}"
+        )
+
+    try:
+        await odb.increment_onboarding_runs(user_id)
+        logger.info(
+            f"Incremented user #{user_id} onboarding runs for exec #{graph_exec.id}"
+        )
+    except Exception as e:
+        logger.error(f"Failed to increment onboarding runs for user #{user_id}: {e}")
+
+    return graph_exec
+
 
 # ============ Execution Output Helpers ============ #
 
diff --git a/autogpt_platform/backend/backend/executor/utils_test.py b/autogpt_platform/backend/backend/executor/utils_test.py
index 8854214e14..db33249583 100644
--- a/autogpt_platform/backend/backend/executor/utils_test.py
+++ b/autogpt_platform/backend/backend/executor/utils_test.py
@@ -4,6 +4,7 @@ import pytest
 from pytest_mock import MockerFixture
 
 from backend.data.dynamic_fields import merge_execution_input, parse_execution_output
+from backend.data.execution import ExecutionStatus
 from backend.util.mock import MockObject
 
 
@@ -346,6 +347,8 @@ async def test_add_graph_execution_is_repeatable(mocker: MockerFixture):
     mock_graph_exec = mocker.MagicMock(spec=GraphExecutionWithNodes)
     mock_graph_exec.id = "execution-id-123"
     mock_graph_exec.node_executions = []  # Add this to avoid AttributeError
+    mock_graph_exec.status = ExecutionStatus.QUEUED  # Required for race condition check
+    mock_graph_exec.graph_version = graph_version
     mock_graph_exec.to_graph_execution_entry.return_value = mocker.MagicMock()
 
     # Mock the queue and event bus
@@ -367,10 +370,13 @@ async def test_add_graph_execution_is_repeatable(mocker: MockerFixture):
     )
 
     # Setup mock returns
+    # The function returns (graph, starting_nodes_input, compiled_nodes_input_masks, nodes_to_skip)
+    nodes_to_skip: set[str] = set()
     mock_validate.return_value = (
         mock_graph,
         starting_nodes_input,
         compiled_nodes_input_masks,
+        nodes_to_skip,
     )
     mock_prisma.is_connected.return_value = True
     mock_edb.create_graph_execution = mocker.AsyncMock(return_value=mock_graph_exec)
@@ -383,6 +389,7 @@ async def test_add_graph_execution_is_repeatable(mocker: MockerFixture):
     mock_user.timezone = "UTC"
     mock_settings = mocker.MagicMock()
     mock_settings.human_in_the_loop_safe_mode = True
+    mock_settings.sensitive_action_safe_mode = False
 
     mock_udb.get_user_by_id = mocker.AsyncMock(return_value=mock_user)
     mock_gdb.get_graph_settings = mocker.AsyncMock(return_value=mock_settings)
@@ -428,6 +435,9 @@ async def test_add_graph_execution_is_repeatable(mocker: MockerFixture):
     # Create a second mock execution for the sanity check
     mock_graph_exec_2 = mocker.MagicMock(spec=GraphExecutionWithNodes)
     mock_graph_exec_2.id = "execution-id-456"
+    mock_graph_exec_2.node_executions = []
+    mock_graph_exec_2.status = ExecutionStatus.QUEUED
+    mock_graph_exec_2.graph_version = graph_version
     mock_graph_exec_2.to_graph_execution_entry.return_value = mocker.MagicMock()
 
     # Reset mocks and set up for second call
@@ -456,3 +466,444 @@ async def test_add_graph_execution_is_repeatable(mocker: MockerFixture):
     # Both executions should succeed (though they create different objects)
     assert result1 == mock_graph_exec
     assert result2 == mock_graph_exec_2
+
+
+# ============================================================================
+# Tests for Optional Credentials Feature
+# ============================================================================
+
+
+@pytest.mark.asyncio
+async def test_validate_node_input_credentials_returns_nodes_to_skip(
+    mocker: MockerFixture,
+):
+    """
+    Test that _validate_node_input_credentials returns nodes_to_skip set
+    for nodes with credentials_optional=True and missing credentials.
+    """
+    from backend.executor.utils import _validate_node_input_credentials
+
+    # Create a mock node with credentials_optional=True
+    mock_node = mocker.MagicMock()
+    mock_node.id = "node-with-optional-creds"
+    mock_node.credentials_optional = True
+    mock_node.input_default = {}  # No credentials configured
+
+    # Create a mock block with credentials field
+    mock_block = mocker.MagicMock()
+    mock_credentials_field_type = mocker.MagicMock()
+    mock_block.input_schema.get_credentials_fields.return_value = {
+        "credentials": mock_credentials_field_type
+    }
+    mock_node.block = mock_block
+
+    # Create mock graph
+    mock_graph = mocker.MagicMock()
+    mock_graph.nodes = [mock_node]
+
+    # Call the function
+    errors, nodes_to_skip = await _validate_node_input_credentials(
+        graph=mock_graph,
+        user_id="test-user-id",
+        nodes_input_masks=None,
+    )
+
+    # Node should be in nodes_to_skip, not in errors
+    assert mock_node.id in nodes_to_skip
+    assert mock_node.id not in errors
+
+
+@pytest.mark.asyncio
+async def test_validate_node_input_credentials_required_missing_creds_error(
+    mocker: MockerFixture,
+):
+    """
+    Test that _validate_node_input_credentials returns errors
+    for nodes with credentials_optional=False and missing credentials.
+    """
+    from backend.executor.utils import _validate_node_input_credentials
+
+    # Create a mock node with credentials_optional=False (required)
+    mock_node = mocker.MagicMock()
+    mock_node.id = "node-with-required-creds"
+    mock_node.credentials_optional = False
+    mock_node.input_default = {}  # No credentials configured
+
+    # Create a mock block with credentials field
+    mock_block = mocker.MagicMock()
+    mock_credentials_field_type = mocker.MagicMock()
+    mock_block.input_schema.get_credentials_fields.return_value = {
+        "credentials": mock_credentials_field_type
+    }
+    mock_node.block = mock_block
+
+    # Create mock graph
+    mock_graph = mocker.MagicMock()
+    mock_graph.nodes = [mock_node]
+
+    # Call the function
+    errors, nodes_to_skip = await _validate_node_input_credentials(
+        graph=mock_graph,
+        user_id="test-user-id",
+        nodes_input_masks=None,
+    )
+
+    # Node should be in errors, not in nodes_to_skip
+    assert mock_node.id in errors
+    assert "credentials" in errors[mock_node.id]
+    assert "required" in errors[mock_node.id]["credentials"].lower()
+    assert mock_node.id not in nodes_to_skip
+
+
+@pytest.mark.asyncio
+async def test_validate_graph_with_credentials_returns_nodes_to_skip(
+    mocker: MockerFixture,
+):
+    """
+    Test that validate_graph_with_credentials returns nodes_to_skip set
+    from _validate_node_input_credentials.
+    """
+    from backend.executor.utils import validate_graph_with_credentials
+
+    # Mock _validate_node_input_credentials to return specific values
+    mock_validate = mocker.patch(
+        "backend.executor.utils._validate_node_input_credentials"
+    )
+    expected_errors = {"node1": {"field": "error"}}
+    expected_nodes_to_skip = {"node2", "node3"}
+    mock_validate.return_value = (expected_errors, expected_nodes_to_skip)
+
+    # Mock GraphModel with validate_graph_get_errors method
+    mock_graph = mocker.MagicMock()
+    mock_graph.validate_graph_get_errors.return_value = {}
+
+    # Call the function
+    errors, nodes_to_skip = await validate_graph_with_credentials(
+        graph=mock_graph,
+        user_id="test-user-id",
+        nodes_input_masks=None,
+    )
+
+    # Verify nodes_to_skip is passed through
+    assert nodes_to_skip == expected_nodes_to_skip
+    assert "node1" in errors
+
+
+@pytest.mark.asyncio
+async def test_add_graph_execution_with_nodes_to_skip(mocker: MockerFixture):
+    """
+    Test that add_graph_execution properly passes nodes_to_skip
+    to the graph execution entry.
+    """
+    from backend.data.execution import GraphExecutionWithNodes
+    from backend.executor.utils import add_graph_execution
+
+    # Mock data
+    graph_id = "test-graph-id"
+    user_id = "test-user-id"
+    inputs = {"test_input": "test_value"}
+    graph_version = 1
+
+    # Mock the graph object
+    mock_graph = mocker.MagicMock()
+    mock_graph.version = graph_version
+
+    # Starting nodes and masks
+    starting_nodes_input = [("node1", {"input1": "value1"})]
+    compiled_nodes_input_masks = {}
+    nodes_to_skip = {"skipped-node-1", "skipped-node-2"}
+
+    # Mock the graph execution object
+    mock_graph_exec = mocker.MagicMock(spec=GraphExecutionWithNodes)
+    mock_graph_exec.id = "execution-id-123"
+    mock_graph_exec.node_executions = []
+    mock_graph_exec.status = ExecutionStatus.QUEUED  # Required for race condition check
+    mock_graph_exec.graph_version = graph_version
+
+    # Track what's passed to to_graph_execution_entry
+    captured_kwargs = {}
+
+    def capture_to_entry(**kwargs):
+        captured_kwargs.update(kwargs)
+        return mocker.MagicMock()
+
+    mock_graph_exec.to_graph_execution_entry.side_effect = capture_to_entry
+
+    # Setup mocks
+    mock_validate = mocker.patch(
+        "backend.executor.utils.validate_and_construct_node_execution_input"
+    )
+    mock_edb = mocker.patch("backend.executor.utils.execution_db")
+    mock_prisma = mocker.patch("backend.executor.utils.prisma")
+    mock_udb = mocker.patch("backend.executor.utils.user_db")
+    mock_gdb = mocker.patch("backend.executor.utils.graph_db")
+    mock_get_queue = mocker.patch("backend.executor.utils.get_async_execution_queue")
+    mock_get_event_bus = mocker.patch(
+        "backend.executor.utils.get_async_execution_event_bus"
+    )
+
+    # Setup returns - include nodes_to_skip in the tuple
+    mock_validate.return_value = (
+        mock_graph,
+        starting_nodes_input,
+        compiled_nodes_input_masks,
+        nodes_to_skip,  # This should be passed through
+    )
+    mock_prisma.is_connected.return_value = True
+    mock_edb.create_graph_execution = mocker.AsyncMock(return_value=mock_graph_exec)
+    mock_edb.update_graph_execution_stats = mocker.AsyncMock(
+        return_value=mock_graph_exec
+    )
+    mock_edb.update_node_execution_status_batch = mocker.AsyncMock()
+
+    mock_user = mocker.MagicMock()
+    mock_user.timezone = "UTC"
+    mock_settings = mocker.MagicMock()
+    mock_settings.human_in_the_loop_safe_mode = True
+    mock_settings.sensitive_action_safe_mode = False
+
+    mock_udb.get_user_by_id = mocker.AsyncMock(return_value=mock_user)
+    mock_gdb.get_graph_settings = mocker.AsyncMock(return_value=mock_settings)
+    mock_get_queue.return_value = mocker.AsyncMock()
+    mock_get_event_bus.return_value = mocker.MagicMock(publish=mocker.AsyncMock())
+
+    # Call the function
+    await add_graph_execution(
+        graph_id=graph_id,
+        user_id=user_id,
+        inputs=inputs,
+        graph_version=graph_version,
+    )
+
+    # Verify nodes_to_skip was passed to to_graph_execution_entry
+    assert "nodes_to_skip" in captured_kwargs
+    assert captured_kwargs["nodes_to_skip"] == nodes_to_skip
+
+
+@pytest.mark.asyncio
+async def test_stop_graph_execution_in_review_status_cancels_pending_reviews(
+    mocker: MockerFixture,
+):
+    """Test that stopping an execution in REVIEW status cancels pending reviews."""
+    from backend.data.execution import ExecutionStatus, GraphExecutionMeta
+    from backend.executor.utils import stop_graph_execution
+
+    user_id = "test-user"
+    graph_exec_id = "test-exec-123"
+
+    # Mock graph execution in REVIEW status
+    mock_graph_exec = mocker.MagicMock(spec=GraphExecutionMeta)
+    mock_graph_exec.id = graph_exec_id
+    mock_graph_exec.status = ExecutionStatus.REVIEW
+
+    # Mock dependencies
+    mock_get_queue = mocker.patch("backend.executor.utils.get_async_execution_queue")
+    mock_queue_client = mocker.AsyncMock()
+    mock_get_queue.return_value = mock_queue_client
+
+    mock_prisma = mocker.patch("backend.executor.utils.prisma")
+    mock_prisma.is_connected.return_value = True
+
+    mock_human_review_db = mocker.patch("backend.executor.utils.human_review_db")
+    mock_human_review_db.cancel_pending_reviews_for_execution = mocker.AsyncMock(
+        return_value=2  # 2 reviews cancelled
+    )
+
+    mock_execution_db = mocker.patch("backend.executor.utils.execution_db")
+    mock_execution_db.get_graph_execution_meta = mocker.AsyncMock(
+        return_value=mock_graph_exec
+    )
+    mock_execution_db.update_graph_execution_stats = mocker.AsyncMock()
+
+    mock_get_event_bus = mocker.patch(
+        "backend.executor.utils.get_async_execution_event_bus"
+    )
+    mock_event_bus = mocker.MagicMock()
+    mock_event_bus.publish = mocker.AsyncMock()
+    mock_get_event_bus.return_value = mock_event_bus
+
+    mock_get_child_executions = mocker.patch(
+        "backend.executor.utils._get_child_executions"
+    )
+    mock_get_child_executions.return_value = []  # No children
+
+    # Call stop_graph_execution with timeout to allow status check
+    await stop_graph_execution(
+        user_id=user_id,
+        graph_exec_id=graph_exec_id,
+        wait_timeout=1.0,  # Wait to allow status check
+        cascade=True,
+    )
+
+    # Verify pending reviews were cancelled
+    mock_human_review_db.cancel_pending_reviews_for_execution.assert_called_once_with(
+        graph_exec_id, user_id
+    )
+
+    # Verify execution status was updated to TERMINATED
+    mock_execution_db.update_graph_execution_stats.assert_called_once()
+    call_kwargs = mock_execution_db.update_graph_execution_stats.call_args[1]
+    assert call_kwargs["graph_exec_id"] == graph_exec_id
+    assert call_kwargs["status"] == ExecutionStatus.TERMINATED
+
+
+@pytest.mark.asyncio
+async def test_stop_graph_execution_with_database_manager_when_prisma_disconnected(
+    mocker: MockerFixture,
+):
+    """Test that stop uses database manager when Prisma is not connected."""
+    from backend.data.execution import ExecutionStatus, GraphExecutionMeta
+    from backend.executor.utils import stop_graph_execution
+
+    user_id = "test-user"
+    graph_exec_id = "test-exec-456"
+
+    # Mock graph execution in REVIEW status
+    mock_graph_exec = mocker.MagicMock(spec=GraphExecutionMeta)
+    mock_graph_exec.id = graph_exec_id
+    mock_graph_exec.status = ExecutionStatus.REVIEW
+
+    # Mock dependencies
+    mock_get_queue = mocker.patch("backend.executor.utils.get_async_execution_queue")
+    mock_queue_client = mocker.AsyncMock()
+    mock_get_queue.return_value = mock_queue_client
+
+    # Prisma is NOT connected
+    mock_prisma = mocker.patch("backend.executor.utils.prisma")
+    mock_prisma.is_connected.return_value = False
+
+    # Mock database manager client
+    mock_get_db_manager = mocker.patch(
+        "backend.executor.utils.get_database_manager_async_client"
+    )
+    mock_db_manager = mocker.AsyncMock()
+    mock_db_manager.get_graph_execution_meta = mocker.AsyncMock(
+        return_value=mock_graph_exec
+    )
+    mock_db_manager.cancel_pending_reviews_for_execution = mocker.AsyncMock(
+        return_value=3  # 3 reviews cancelled
+    )
+    mock_db_manager.update_graph_execution_stats = mocker.AsyncMock()
+    mock_get_db_manager.return_value = mock_db_manager
+
+    mock_get_event_bus = mocker.patch(
+        "backend.executor.utils.get_async_execution_event_bus"
+    )
+    mock_event_bus = mocker.MagicMock()
+    mock_event_bus.publish = mocker.AsyncMock()
+    mock_get_event_bus.return_value = mock_event_bus
+
+    mock_get_child_executions = mocker.patch(
+        "backend.executor.utils._get_child_executions"
+    )
+    mock_get_child_executions.return_value = []  # No children
+
+    # Call stop_graph_execution with timeout
+    await stop_graph_execution(
+        user_id=user_id,
+        graph_exec_id=graph_exec_id,
+        wait_timeout=1.0,
+        cascade=True,
+    )
+
+    # Verify database manager was used for cancel_pending_reviews
+    mock_db_manager.cancel_pending_reviews_for_execution.assert_called_once_with(
+        graph_exec_id, user_id
+    )
+
+    # Verify execution status was updated via database manager
+    mock_db_manager.update_graph_execution_stats.assert_called_once()
+
+
+@pytest.mark.asyncio
+async def test_stop_graph_execution_cascades_to_child_with_reviews(
+    mocker: MockerFixture,
+):
+    """Test that stopping parent execution cascades to children and cancels their reviews."""
+    from backend.data.execution import ExecutionStatus, GraphExecutionMeta
+    from backend.executor.utils import stop_graph_execution
+
+    user_id = "test-user"
+    parent_exec_id = "parent-exec"
+    child_exec_id = "child-exec"
+
+    # Mock parent execution in RUNNING status
+    mock_parent_exec = mocker.MagicMock(spec=GraphExecutionMeta)
+    mock_parent_exec.id = parent_exec_id
+    mock_parent_exec.status = ExecutionStatus.RUNNING
+
+    # Mock child execution in REVIEW status
+    mock_child_exec = mocker.MagicMock(spec=GraphExecutionMeta)
+    mock_child_exec.id = child_exec_id
+    mock_child_exec.status = ExecutionStatus.REVIEW
+
+    # Mock dependencies
+    mock_get_queue = mocker.patch("backend.executor.utils.get_async_execution_queue")
+    mock_queue_client = mocker.AsyncMock()
+    mock_get_queue.return_value = mock_queue_client
+
+    mock_prisma = mocker.patch("backend.executor.utils.prisma")
+    mock_prisma.is_connected.return_value = True
+
+    mock_human_review_db = mocker.patch("backend.executor.utils.human_review_db")
+    mock_human_review_db.cancel_pending_reviews_for_execution = mocker.AsyncMock(
+        return_value=1  # 1 child review cancelled
+    )
+
+    # Mock execution_db to return different status based on which execution is queried
+    mock_execution_db = mocker.patch("backend.executor.utils.execution_db")
+
+    # Track call count to simulate status transition
+    call_count = {"count": 0}
+
+    async def get_exec_meta_side_effect(execution_id, user_id):
+        call_count["count"] += 1
+        if execution_id == parent_exec_id:
+            # After a few calls (child processing happens), transition parent to TERMINATED
+            # This simulates the executor service processing the stop request
+            if call_count["count"] > 3:
+                mock_parent_exec.status = ExecutionStatus.TERMINATED
+            return mock_parent_exec
+        elif execution_id == child_exec_id:
+            return mock_child_exec
+        return None
+
+    mock_execution_db.get_graph_execution_meta = mocker.AsyncMock(
+        side_effect=get_exec_meta_side_effect
+    )
+    mock_execution_db.update_graph_execution_stats = mocker.AsyncMock()
+
+    mock_get_event_bus = mocker.patch(
+        "backend.executor.utils.get_async_execution_event_bus"
+    )
+    mock_event_bus = mocker.MagicMock()
+    mock_event_bus.publish = mocker.AsyncMock()
+    mock_get_event_bus.return_value = mock_event_bus
+
+    # Mock _get_child_executions to return the child
+    mock_get_child_executions = mocker.patch(
+        "backend.executor.utils._get_child_executions"
+    )
+
+    def get_children_side_effect(parent_id):
+        if parent_id == parent_exec_id:
+            return [mock_child_exec]
+        return []
+
+    mock_get_child_executions.side_effect = get_children_side_effect
+
+    # Call stop_graph_execution on parent with cascade=True
+    await stop_graph_execution(
+        user_id=user_id,
+        graph_exec_id=parent_exec_id,
+        wait_timeout=1.0,
+        cascade=True,
+    )
+
+    # Verify child reviews were cancelled
+    mock_human_review_db.cancel_pending_reviews_for_execution.assert_called_once_with(
+        child_exec_id, user_id
+    )
+
+    # Verify both parent and child status updates
+    assert mock_execution_db.update_graph_execution_stats.call_count >= 1
diff --git a/autogpt_platform/backend/backend/integrations/credentials_store.py b/autogpt_platform/backend/backend/integrations/credentials_store.py
index 7d805913b2..40a6f7269c 100644
--- a/autogpt_platform/backend/backend/integrations/credentials_store.py
+++ b/autogpt_platform/backend/backend/integrations/credentials_store.py
@@ -96,9 +96,9 @@ jina_credentials = APIKeyCredentials(
 )
 unreal_credentials = APIKeyCredentials(
     id="66f20754-1b81-48e4-91d0-f4f0dd82145f",
-    provider="unreal",
+    provider="unreal_speech",
     api_key=SecretStr(settings.secrets.unreal_speech_api_key),
-    title="Use Credits for Unreal",
+    title="Use Credits for Unreal Speech",
     expires_at=None,
 )
 open_router_credentials = APIKeyCredentials(
@@ -216,6 +216,14 @@ webshare_proxy_credentials = UserPasswordCredentials(
     title="Use Credits for Webshare Proxy",
 )
 
+openweathermap_credentials = APIKeyCredentials(
+    id="8b3d4e5f-6a7b-8c9d-0e1f-2a3b4c5d6e7f",
+    provider="openweathermap",
+    api_key=SecretStr(settings.secrets.openweathermap_api_key),
+    title="Use Credits for OpenWeatherMap",
+    expires_at=None,
+)
+
 DEFAULT_CREDENTIALS = [
     ollama_credentials,
     revid_credentials,
@@ -243,8 +251,24 @@ DEFAULT_CREDENTIALS = [
     llama_api_credentials,
     v0_credentials,
     webshare_proxy_credentials,
+    openweathermap_credentials,
 ]
 
+SYSTEM_CREDENTIAL_IDS = {cred.id for cred in DEFAULT_CREDENTIALS}
+
+# Set of providers that have system credentials available
+SYSTEM_PROVIDERS = {cred.provider for cred in DEFAULT_CREDENTIALS}
+
+
+def is_system_credential(credential_id: str) -> bool:
+    """Check if a credential ID belongs to a system-managed credential."""
+    return credential_id in SYSTEM_CREDENTIAL_IDS
+
+
+def is_system_provider(provider: str) -> bool:
+    """Check if a provider has system-managed credentials available."""
+    return provider in SYSTEM_PROVIDERS
+
 
 class IntegrationCredentialsStore:
     def __init__(self):
@@ -331,11 +355,17 @@ class IntegrationCredentialsStore:
             all_credentials.append(zerobounce_credentials)
         if settings.secrets.google_maps_api_key:
             all_credentials.append(google_maps_credentials)
+        if settings.secrets.llama_api_key:
+            all_credentials.append(llama_api_credentials)
+        if settings.secrets.v0_api_key:
+            all_credentials.append(v0_credentials)
         if (
             settings.secrets.webshare_proxy_username
             and settings.secrets.webshare_proxy_password
         ):
             all_credentials.append(webshare_proxy_credentials)
+        if settings.secrets.openweathermap_api_key:
+            all_credentials.append(openweathermap_credentials)
         return all_credentials
 
     async def get_creds_by_id(
diff --git a/autogpt_platform/backend/backend/integrations/oauth/__init__.py b/autogpt_platform/backend/backend/integrations/oauth/__init__.py
index 137b9eadfd..1ea7a23ee7 100644
--- a/autogpt_platform/backend/backend/integrations/oauth/__init__.py
+++ b/autogpt_platform/backend/backend/integrations/oauth/__init__.py
@@ -8,6 +8,7 @@ from .discord import DiscordOAuthHandler
 from .github import GitHubOAuthHandler
 from .google import GoogleOAuthHandler
 from .notion import NotionOAuthHandler
+from .reddit import RedditOAuthHandler
 from .twitter import TwitterOAuthHandler
 
 if TYPE_CHECKING:
@@ -20,6 +21,7 @@ _ORIGINAL_HANDLERS = [
     GitHubOAuthHandler,
     GoogleOAuthHandler,
     NotionOAuthHandler,
+    RedditOAuthHandler,
     TwitterOAuthHandler,
     TodoistOAuthHandler,
 ]
diff --git a/autogpt_platform/backend/backend/integrations/oauth/reddit.py b/autogpt_platform/backend/backend/integrations/oauth/reddit.py
new file mode 100644
index 0000000000..a69e1e62c7
--- /dev/null
+++ b/autogpt_platform/backend/backend/integrations/oauth/reddit.py
@@ -0,0 +1,208 @@
+import time
+import urllib.parse
+from typing import ClassVar, Optional
+
+from pydantic import SecretStr
+
+from backend.data.model import OAuth2Credentials
+from backend.integrations.oauth.base import BaseOAuthHandler
+from backend.integrations.providers import ProviderName
+from backend.util.request import Requests
+from backend.util.settings import Settings
+
+settings = Settings()
+
+
+class RedditOAuthHandler(BaseOAuthHandler):
+    """
+    Reddit OAuth 2.0 handler.
+
+    Based on the documentation at:
+    - https://github.com/reddit-archive/reddit/wiki/OAuth2
+
+    Notes:
+    - Reddit requires `duration=permanent` to get refresh tokens
+    - Access tokens expire after 1 hour (3600 seconds)
+    - Reddit requires HTTP Basic Auth for token requests
+    - Reddit requires a unique User-Agent header
+    """
+
+    PROVIDER_NAME = ProviderName.REDDIT
+    DEFAULT_SCOPES: ClassVar[list[str]] = [
+        "identity",  # Get username, verify auth
+        "read",  # Access posts and comments
+        "submit",  # Submit new posts and comments
+        "edit",  # Edit own posts and comments
+        "history",  # Access user's post history
+        "privatemessages",  # Access inbox and send private messages
+        "flair",  # Access and set flair on posts/subreddits
+    ]
+
+    AUTHORIZE_URL = "https://www.reddit.com/api/v1/authorize"
+    TOKEN_URL = "https://www.reddit.com/api/v1/access_token"
+    USERNAME_URL = "https://oauth.reddit.com/api/v1/me"
+    REVOKE_URL = "https://www.reddit.com/api/v1/revoke_token"
+
+    def __init__(self, client_id: str, client_secret: str, redirect_uri: str):
+        self.client_id = client_id
+        self.client_secret = client_secret
+        self.redirect_uri = redirect_uri
+
+    def get_login_url(
+        self, scopes: list[str], state: str, code_challenge: Optional[str]
+    ) -> str:
+        """Generate Reddit OAuth 2.0 authorization URL"""
+        scopes = self.handle_default_scopes(scopes)
+
+        params = {
+            "response_type": "code",
+            "client_id": self.client_id,
+            "redirect_uri": self.redirect_uri,
+            "scope": " ".join(scopes),
+            "state": state,
+            "duration": "permanent",  # Required for refresh tokens
+        }
+
+        return f"{self.AUTHORIZE_URL}?{urllib.parse.urlencode(params)}"
+
+    async def exchange_code_for_tokens(
+        self, code: str, scopes: list[str], code_verifier: Optional[str]
+    ) -> OAuth2Credentials:
+        """Exchange authorization code for access tokens"""
+        scopes = self.handle_default_scopes(scopes)
+
+        headers = {
+            "Content-Type": "application/x-www-form-urlencoded",
+            "User-Agent": settings.config.reddit_user_agent,
+        }
+
+        data = {
+            "grant_type": "authorization_code",
+            "code": code,
+            "redirect_uri": self.redirect_uri,
+        }
+
+        # Reddit requires HTTP Basic Auth for token requests
+        auth = (self.client_id, self.client_secret)
+
+        response = await Requests().post(
+            self.TOKEN_URL, headers=headers, data=data, auth=auth
+        )
+
+        if not response.ok:
+            error_text = response.text()
+            raise ValueError(
+                f"Reddit token exchange failed: {response.status} - {error_text}"
+            )
+
+        tokens = response.json()
+
+        if "error" in tokens:
+            raise ValueError(f"Reddit OAuth error: {tokens.get('error')}")
+
+        username = await self._get_username(tokens["access_token"])
+
+        return OAuth2Credentials(
+            provider=self.PROVIDER_NAME,
+            title=None,
+            username=username,
+            access_token=tokens["access_token"],
+            refresh_token=tokens.get("refresh_token"),
+            access_token_expires_at=int(time.time()) + tokens.get("expires_in", 3600),
+            refresh_token_expires_at=None,  # Reddit refresh tokens don't expire
+            scopes=scopes,
+        )
+
+    async def _get_username(self, access_token: str) -> str:
+        """Get the username from the access token"""
+        headers = {
+            "Authorization": f"Bearer {access_token}",
+            "User-Agent": settings.config.reddit_user_agent,
+        }
+
+        response = await Requests().get(self.USERNAME_URL, headers=headers)
+
+        if not response.ok:
+            raise ValueError(f"Failed to get Reddit username: {response.status}")
+
+        data = response.json()
+        return data.get("name", "unknown")
+
+    async def _refresh_tokens(
+        self, credentials: OAuth2Credentials
+    ) -> OAuth2Credentials:
+        """Refresh access tokens using refresh token"""
+        if not credentials.refresh_token:
+            raise ValueError("No refresh token available")
+
+        headers = {
+            "Content-Type": "application/x-www-form-urlencoded",
+            "User-Agent": settings.config.reddit_user_agent,
+        }
+
+        data = {
+            "grant_type": "refresh_token",
+            "refresh_token": credentials.refresh_token.get_secret_value(),
+        }
+
+        auth = (self.client_id, self.client_secret)
+
+        response = await Requests().post(
+            self.TOKEN_URL, headers=headers, data=data, auth=auth
+        )
+
+        if not response.ok:
+            error_text = response.text()
+            raise ValueError(
+                f"Reddit token refresh failed: {response.status} - {error_text}"
+            )
+
+        tokens = response.json()
+
+        if "error" in tokens:
+            raise ValueError(f"Reddit OAuth error: {tokens.get('error')}")
+
+        username = await self._get_username(tokens["access_token"])
+
+        # Reddit may or may not return a new refresh token
+        new_refresh_token = tokens.get("refresh_token")
+        if new_refresh_token:
+            refresh_token: SecretStr | None = SecretStr(new_refresh_token)
+        elif credentials.refresh_token:
+            # Keep the existing refresh token
+            refresh_token = credentials.refresh_token
+        else:
+            refresh_token = None
+
+        return OAuth2Credentials(
+            id=credentials.id,
+            provider=self.PROVIDER_NAME,
+            title=credentials.title,
+            username=username,
+            access_token=tokens["access_token"],
+            refresh_token=refresh_token,
+            access_token_expires_at=int(time.time()) + tokens.get("expires_in", 3600),
+            refresh_token_expires_at=None,
+            scopes=credentials.scopes,
+        )
+
+    async def revoke_tokens(self, credentials: OAuth2Credentials) -> bool:
+        """Revoke the access token"""
+        headers = {
+            "Content-Type": "application/x-www-form-urlencoded",
+            "User-Agent": settings.config.reddit_user_agent,
+        }
+
+        data = {
+            "token": credentials.access_token.get_secret_value(),
+            "token_type_hint": "access_token",
+        }
+
+        auth = (self.client_id, self.client_secret)
+
+        response = await Requests().post(
+            self.REVOKE_URL, headers=headers, data=data, auth=auth
+        )
+
+        # Reddit returns 204 No Content on successful revocation
+        return response.ok
diff --git a/autogpt_platform/backend/backend/integrations/webhooks/utils_test.py b/autogpt_platform/backend/backend/integrations/webhooks/utils_test.py
new file mode 100644
index 0000000000..bc502a8e44
--- /dev/null
+++ b/autogpt_platform/backend/backend/integrations/webhooks/utils_test.py
@@ -0,0 +1,39 @@
+from urllib.parse import urlparse
+
+import fastapi
+from fastapi.routing import APIRoute
+
+from backend.api.features.integrations.router import router as integrations_router
+from backend.integrations.providers import ProviderName
+from backend.integrations.webhooks import utils as webhooks_utils
+
+
+def test_webhook_ingress_url_matches_route(monkeypatch) -> None:
+    app = fastapi.FastAPI()
+    app.include_router(integrations_router, prefix="/api/integrations")
+
+    provider = ProviderName.GITHUB
+    webhook_id = "webhook_123"
+    base_url = "https://example.com"
+
+    monkeypatch.setattr(webhooks_utils.app_config, "platform_base_url", base_url)
+
+    route = next(
+        route
+        for route in integrations_router.routes
+        if isinstance(route, APIRoute)
+        and route.path == "/{provider}/webhooks/{webhook_id}/ingress"
+        and "POST" in route.methods
+    )
+    expected_path = f"/api/integrations{route.path}".format(
+        provider=provider.value,
+        webhook_id=webhook_id,
+    )
+    actual_url = urlparse(webhooks_utils.webhook_ingress_url(provider, webhook_id))
+    expected_base = urlparse(base_url)
+
+    assert (actual_url.scheme, actual_url.netloc) == (
+        expected_base.scheme,
+        expected_base.netloc,
+    )
+    assert actual_url.path == expected_path
diff --git a/autogpt_platform/backend/backend/monitoring/late_execution_monitor.py b/autogpt_platform/backend/backend/monitoring/late_execution_monitor.py
index 1e0c99cac3..fd3d31cb47 100644
--- a/autogpt_platform/backend/backend/monitoring/late_execution_monitor.py
+++ b/autogpt_platform/backend/backend/monitoring/late_execution_monitor.py
@@ -60,8 +60,10 @@ class LateExecutionMonitor:
         if not all_late_executions:
             return "No late executions detected."
 
-        # Sort by created time (oldest first)
-        all_late_executions.sort(key=lambda x: x.started_at)
+        # Sort by started time (oldest first), with None values (unstarted) first
+        all_late_executions.sort(
+            key=lambda x: x.started_at or datetime.min.replace(tzinfo=timezone.utc)
+        )
 
         num_total_late = len(all_late_executions)
         num_queued = len(queued_late_executions)
@@ -74,7 +76,7 @@ class LateExecutionMonitor:
         was_truncated = num_total_late > tuncate_size
 
         late_execution_details = [
-            f"* `Execution ID: {exec.id}, Graph ID: {exec.graph_id}v{exec.graph_version}, User ID: {exec.user_id}, Status: {exec.status}, Created At: {exec.started_at.isoformat()}`"
+            f"* `Execution ID: {exec.id}, Graph ID: {exec.graph_id}v{exec.graph_version}, User ID: {exec.user_id}, Status: {exec.status}, Started At: {exec.started_at.isoformat() if exec.started_at else 'Not started'}`"
             for exec in truncated_executions
         ]
 
diff --git a/autogpt_platform/backend/backend/util/cache.py b/autogpt_platform/backend/backend/util/cache.py
index 757ba45b42..38c3667951 100644
--- a/autogpt_platform/backend/backend/util/cache.py
+++ b/autogpt_platform/backend/backend/util/cache.py
@@ -16,7 +16,7 @@ import pickle
 import threading
 import time
 from dataclasses import dataclass
-from functools import wraps
+from functools import cache, wraps
 from typing import Any, Callable, ParamSpec, Protocol, TypeVar, cast, runtime_checkable
 
 from redis import ConnectionPool, Redis
@@ -38,29 +38,34 @@ settings = Settings()
 #   maxmemory 2gb                   # Set memory limit (adjust based on your needs)
 #   save ""                         # Disable persistence if using Redis purely for caching
 
-# Create a dedicated Redis connection pool for caching (binary mode for pickle)
-_cache_pool: ConnectionPool | None = None
 
-
-@conn_retry("Redis", "Acquiring cache connection pool")
+@cache
 def _get_cache_pool() -> ConnectionPool:
-    """Get or create a connection pool for cache operations."""
-    global _cache_pool
-    if _cache_pool is None:
-        _cache_pool = ConnectionPool(
-            host=settings.config.redis_host,
-            port=settings.config.redis_port,
-            password=settings.config.redis_password or None,
-            decode_responses=False,  # Binary mode for pickle
-            max_connections=50,
-            socket_keepalive=True,
-            socket_connect_timeout=5,
-            retry_on_timeout=True,
-        )
-    return _cache_pool
+    """Get or create a connection pool for cache operations (lazy, thread-safe)."""
+    return ConnectionPool(
+        host=settings.config.redis_host,
+        port=settings.config.redis_port,
+        password=settings.config.redis_password or None,
+        decode_responses=False,  # Binary mode for pickle
+        max_connections=50,
+        socket_keepalive=True,
+        socket_connect_timeout=5,
+        retry_on_timeout=True,
+    )
 
 
-redis = Redis(connection_pool=_get_cache_pool())
+@cache
+@conn_retry("Redis", "Acquiring cache connection")
+def _get_redis() -> Redis:
+    """
+    Get the lazily-initialized Redis client for shared cache operations.
+    Uses @cache for thread-safe singleton behavior - connection is only
+    established when first accessed, allowing services that only use
+    in-memory caching to work without Redis configuration.
+    """
+    r = Redis(connection_pool=_get_cache_pool())
+    r.ping()  # Verify connection
+    return r
 
 
 @dataclass
@@ -179,9 +184,9 @@ def cached(
             try:
                 if refresh_ttl_on_get:
                     # Use GETEX to get value and refresh expiry atomically
-                    cached_bytes = redis.getex(redis_key, ex=ttl_seconds)
+                    cached_bytes = _get_redis().getex(redis_key, ex=ttl_seconds)
                 else:
-                    cached_bytes = redis.get(redis_key)
+                    cached_bytes = _get_redis().get(redis_key)
 
                 if cached_bytes and isinstance(cached_bytes, bytes):
                     return pickle.loads(cached_bytes)
@@ -195,7 +200,7 @@ def cached(
             """Set value in Redis with TTL."""
             try:
                 pickled_value = pickle.dumps(value, protocol=pickle.HIGHEST_PROTOCOL)
-                redis.setex(redis_key, ttl_seconds, pickled_value)
+                _get_redis().setex(redis_key, ttl_seconds, pickled_value)
             except Exception as e:
                 logger.error(
                     f"Redis error storing cache for {target_func.__name__}: {e}"
@@ -333,14 +338,18 @@ def cached(
                 if pattern:
                     # Clear entries matching pattern
                     keys = list(
-                        redis.scan_iter(f"cache:{target_func.__name__}:{pattern}")
+                        _get_redis().scan_iter(
+                            f"cache:{target_func.__name__}:{pattern}"
+                        )
                     )
                 else:
                     # Clear all cache keys
-                    keys = list(redis.scan_iter(f"cache:{target_func.__name__}:*"))
+                    keys = list(
+                        _get_redis().scan_iter(f"cache:{target_func.__name__}:*")
+                    )
 
                 if keys:
-                    pipeline = redis.pipeline()
+                    pipeline = _get_redis().pipeline()
                     for key in keys:
                         pipeline.delete(key)
                     pipeline.execute()
@@ -355,7 +364,9 @@ def cached(
 
         def cache_info() -> dict[str, int | None]:
             if shared_cache:
-                cache_keys = list(redis.scan_iter(f"cache:{target_func.__name__}:*"))
+                cache_keys = list(
+                    _get_redis().scan_iter(f"cache:{target_func.__name__}:*")
+                )
                 return {
                     "size": len(cache_keys),
                     "maxsize": None,  # Redis manages its own size
@@ -373,10 +384,8 @@ def cached(
             key = _make_hashable_key(args, kwargs)
             if shared_cache:
                 redis_key = _make_redis_key(key, target_func.__name__)
-                if redis.exists(redis_key):
-                    redis.delete(redis_key)
-                    return True
-                return False
+                deleted_count = cast(int, _get_redis().delete(redis_key))
+                return deleted_count > 0
             else:
                 if key in cache_storage:
                     del cache_storage[key]
diff --git a/autogpt_platform/backend/backend/util/clients.py b/autogpt_platform/backend/backend/util/clients.py
index bea8a5e2f9..570e9fa3de 100644
--- a/autogpt_platform/backend/backend/util/clients.py
+++ b/autogpt_platform/backend/backend/util/clients.py
@@ -10,6 +10,7 @@ from backend.util.settings import Settings
 settings = Settings()
 
 if TYPE_CHECKING:
+    from openai import AsyncOpenAI
     from supabase import AClient, Client
 
     from backend.data.execution import (
@@ -139,6 +140,24 @@ async def get_async_supabase() -> "AClient":
     )
 
 
+# ============ OpenAI Client ============ #
+
+
+@cached(ttl_seconds=3600)
+def get_openai_client() -> "AsyncOpenAI | None":
+    """
+    Get a process-cached async OpenAI client for embeddings.
+
+    Returns None if API key is not configured.
+    """
+    from openai import AsyncOpenAI
+
+    api_key = settings.secrets.openai_internal_api_key
+    if not api_key:
+        return None
+    return AsyncOpenAI(api_key=api_key)
+
+
 # ============ Notification Queue Helpers ============ #
 
 
diff --git a/autogpt_platform/backend/backend/util/cloud_storage.py b/autogpt_platform/backend/backend/util/cloud_storage.py
index 93fb9039ec..28423d003d 100644
--- a/autogpt_platform/backend/backend/util/cloud_storage.py
+++ b/autogpt_platform/backend/backend/util/cloud_storage.py
@@ -13,6 +13,7 @@ import aiohttp
 from gcloud.aio import storage as async_gcs_storage
 from google.cloud import storage as gcs_storage
 
+from backend.util.gcs_utils import download_with_fresh_session, generate_signed_url
 from backend.util.settings import Config
 
 logger = logging.getLogger(__name__)
@@ -251,7 +252,7 @@ class CloudStorageHandler:
             f"in_task: {current_task is not None}"
         )
 
-        # Parse bucket and blob name from path
+        # Parse bucket and blob name from path (path already has gcs:// prefix removed)
         parts = path.split("/", 1)
         if len(parts) != 2:
             raise ValueError(f"Invalid GCS path: {path}")
@@ -261,50 +262,19 @@ class CloudStorageHandler:
         # Authorization check
         self._validate_file_access(blob_name, user_id, graph_exec_id)
 
-        # Use a fresh client for each download to avoid session issues
-        # This is less efficient but more reliable with the executor's event loop
-        logger.info("[CloudStorage] Creating fresh GCS client for download")
-
-        # Create a new session specifically for this download
-        session = aiohttp.ClientSession(
-            connector=aiohttp.TCPConnector(limit=10, force_close=True)
+        logger.info(
+            f"[CloudStorage] About to download from GCS - bucket: {bucket_name}, blob: {blob_name}"
         )
 
-        async_client = None
         try:
-            # Create a new GCS client with the fresh session
-            async_client = async_gcs_storage.Storage(session=session)
-
-            logger.info(
-                f"[CloudStorage] About to download from GCS - bucket: {bucket_name}, blob: {blob_name}"
-            )
-
-            # Download content using the fresh client
-            content = await async_client.download(bucket_name, blob_name)
+            content = await download_with_fresh_session(bucket_name, blob_name)
             logger.info(
                 f"[CloudStorage] GCS download successful - size: {len(content)} bytes"
             )
-
-            # Clean up
-            await async_client.close()
-            await session.close()
-
             return content
-
+        except FileNotFoundError:
+            raise
         except Exception as e:
-            # Always try to clean up
-            if async_client is not None:
-                try:
-                    await async_client.close()
-                except Exception as cleanup_error:
-                    logger.warning(
-                        f"[CloudStorage] Error closing GCS client: {cleanup_error}"
-                    )
-            try:
-                await session.close()
-            except Exception as cleanup_error:
-                logger.warning(f"[CloudStorage] Error closing session: {cleanup_error}")
-
             # Log the specific error for debugging
             logger.error(
                 f"[CloudStorage] GCS download failed - error: {str(e)}, "
@@ -319,10 +289,6 @@ class CloudStorageHandler:
                     f"current_task: {current_task}, "
                     f"bucket: {bucket_name}, blob: redacted for privacy"
                 )
-
-            # Convert gcloud-aio exceptions to standard ones
-            if "404" in str(e) or "Not Found" in str(e):
-                raise FileNotFoundError(f"File not found: gcs://{path}")
             raise
 
     def _validate_file_access(
@@ -445,8 +411,7 @@ class CloudStorageHandler:
         graph_exec_id: str | None = None,
     ) -> str:
         """Generate signed URL for GCS with authorization."""
-
-        # Parse bucket and blob name from path
+        # Parse bucket and blob name from path (path already has gcs:// prefix removed)
         parts = path.split("/", 1)
         if len(parts) != 2:
             raise ValueError(f"Invalid GCS path: {path}")
@@ -456,21 +421,11 @@ class CloudStorageHandler:
         # Authorization check
         self._validate_file_access(blob_name, user_id, graph_exec_id)
 
-        # Use sync client for signed URLs since gcloud-aio doesn't support them
         sync_client = self._get_sync_gcs_client()
-        bucket = sync_client.bucket(bucket_name)
-        blob = bucket.blob(blob_name)
-
-        # Generate signed URL asynchronously using sync client
-        url = await asyncio.to_thread(
-            blob.generate_signed_url,
-            version="v4",
-            expiration=datetime.now(timezone.utc) + timedelta(hours=expiration_hours),
-            method="GET",
+        return await generate_signed_url(
+            sync_client, bucket_name, blob_name, expiration_hours * 3600
         )
 
-        return url
-
     async def delete_expired_files(self, provider: str = "gcs") -> int:
         """
         Delete files that have passed their expiration time.
diff --git a/autogpt_platform/backend/backend/util/exceptions.py b/autogpt_platform/backend/backend/util/exceptions.py
index 6d0192c0e5..ffda783873 100644
--- a/autogpt_platform/backend/backend/util/exceptions.py
+++ b/autogpt_platform/backend/backend/util/exceptions.py
@@ -135,6 +135,12 @@ class GraphValidationError(ValueError):
         )
 
 
+class InvalidInputError(ValueError):
+    """Raised when user input validation fails (e.g., search term too long)"""
+
+    pass
+
+
 class DatabaseError(Exception):
     """Raised when there is an error interacting with the database"""
 
diff --git a/autogpt_platform/backend/backend/util/file.py b/autogpt_platform/backend/backend/util/file.py
index dc8f86ea41..baa9225629 100644
--- a/autogpt_platform/backend/backend/util/file.py
+++ b/autogpt_platform/backend/backend/util/file.py
@@ -5,13 +5,26 @@ import shutil
 import tempfile
 import uuid
 from pathlib import Path
+from typing import TYPE_CHECKING, Literal
 from urllib.parse import urlparse
 
 from backend.util.cloud_storage import get_cloud_storage_handler
 from backend.util.request import Requests
+from backend.util.settings import Config
 from backend.util.type import MediaFileType
 from backend.util.virus_scanner import scan_content_safe
 
+if TYPE_CHECKING:
+    from backend.data.execution import ExecutionContext
+
+# Return format options for store_media_file
+# - "for_local_processing": Returns local file path - use with ffmpeg, MoviePy, PIL, etc.
+# - "for_external_api": Returns data URI (base64) - use when sending content to external APIs
+# - "for_block_output": Returns best format for output - workspace:// in CoPilot, data URI in graphs
+MediaReturnFormat = Literal[
+    "for_local_processing", "for_external_api", "for_block_output"
+]
+
 TEMP_DIR = Path(tempfile.gettempdir()).resolve()
 
 # Maximum filename length (conservative limit for most filesystems)
@@ -67,42 +80,56 @@ def clean_exec_files(graph_exec_id: str, file: str = "") -> None:
 
 
 async def store_media_file(
-    graph_exec_id: str,
     file: MediaFileType,
-    user_id: str,
-    return_content: bool = False,
+    execution_context: "ExecutionContext",
+    *,
+    return_format: MediaReturnFormat,
 ) -> MediaFileType:
     """
-    Safely handle 'file' (a data URI, a URL, or a local path relative to {temp}/exec_file/{exec_id}),
-    placing or verifying it under:
+    Safely handle 'file' (a data URI, a URL, a workspace:// reference, or a local path
+    relative to {temp}/exec_file/{exec_id}), placing or verifying it under:
         {tempdir}/exec_file/{exec_id}/...
 
-    If 'return_content=True', return a data URI (data:<mime>;base64,<content>).
-    Otherwise, returns the file media path relative to the exec_id folder.
+    For each MediaFileType input:
+    - Data URI: decode and store locally
+    - URL: download and store locally
+    - workspace:// reference: read from workspace, store locally
+    - Local path: verify it exists in exec_file directory
 
-    For each MediaFileType type:
-    - Data URI:
-      -> decode and store in a new random file in that folder
-    - URL:
-      -> download and store in that folder
-    - Local path:
-      -> interpret as relative to that folder; verify it exists
-         (no copying, as it's presumably already there).
-         We realpath-check so no symlink or '..' can escape the folder.
+    Return format options:
+    - "for_local_processing": Returns local file path - use with ffmpeg, MoviePy, PIL, etc.
+    - "for_external_api": Returns data URI (base64) - use when sending to external APIs
+    - "for_block_output": Returns best format for output - workspace:// in CoPilot, data URI in graphs
 
-
-    :param graph_exec_id:  The unique ID of the graph execution.
-    :param file:           Data URI, URL, or local (relative) path.
-    :param return_content: If True, return a data URI of the file content.
-                           If False, return the *relative* path inside the exec_id folder.
-    :return:               The requested result: data URI or relative path of the media.
+    :param file:               Data URI, URL, workspace://, or local (relative) path.
+    :param execution_context:  ExecutionContext with user_id, graph_exec_id, workspace_id.
+    :param return_format:      What to return: "for_local_processing", "for_external_api", or "for_block_output".
+    :return:                   The requested result based on return_format.
     """
+    # Extract values from execution_context
+    graph_exec_id = execution_context.graph_exec_id
+    user_id = execution_context.user_id
+
+    if not graph_exec_id:
+        raise ValueError("execution_context.graph_exec_id is required")
+    if not user_id:
+        raise ValueError("execution_context.user_id is required")
+
+    # Create workspace_manager if we have workspace_id (with session scoping)
+    # Import here to avoid circular import (file.py → workspace.py → data → blocks → file.py)
+    from backend.util.workspace import WorkspaceManager
+
+    workspace_manager: WorkspaceManager | None = None
+    if execution_context.workspace_id:
+        workspace_manager = WorkspaceManager(
+            user_id, execution_context.workspace_id, execution_context.session_id
+        )
     # Build base path
     base_path = Path(get_exec_file_path(graph_exec_id, ""))
     base_path.mkdir(parents=True, exist_ok=True)
 
     # Security fix: Add disk space limits to prevent DoS
-    MAX_FILE_SIZE = 100 * 1024 * 1024  # 100MB per file
+    MAX_FILE_SIZE_BYTES = Config().max_file_size_mb * 1024 * 1024
     MAX_TOTAL_DISK_USAGE = 1024 * 1024 * 1024  # 1GB total per execution directory
 
     # Check total disk usage in base_path
@@ -142,9 +169,57 @@ async def store_media_file(
         """
         return str(absolute_path.relative_to(base))
 
-    # Check if this is a cloud storage path
+    # Get cloud storage handler for checking cloud paths
     cloud_storage = await get_cloud_storage_handler()
-    if cloud_storage.is_cloud_path(file):
+
+    # Track if the input came from workspace (don't re-save it)
+    is_from_workspace = file.startswith("workspace://")
+
+    # Check if this is a workspace file reference
+    if is_from_workspace:
+        if workspace_manager is None:
+            raise ValueError(
+                "Workspace file reference requires workspace context. "
+                "This file type is only available in CoPilot sessions."
+            )
+
+        # Parse workspace reference
+        # workspace://abc123 - by file ID
+        # workspace:///path/to/file.txt - by virtual path
+        file_ref = file[12:]  # Remove "workspace://"
+
+        if file_ref.startswith("/"):
+            # Path reference
+            workspace_content = await workspace_manager.read_file(file_ref)
+            file_info = await workspace_manager.get_file_info_by_path(file_ref)
+            filename = sanitize_filename(
+                file_info.name if file_info else f"{uuid.uuid4()}.bin"
+            )
+        else:
+            # ID reference
+            workspace_content = await workspace_manager.read_file_by_id(file_ref)
+            file_info = await workspace_manager.get_file_info(file_ref)
+            filename = sanitize_filename(
+                file_info.name if file_info else f"{uuid.uuid4()}.bin"
+            )
+
+        try:
+            target_path = _ensure_inside_base(base_path / filename, base_path)
+        except OSError as e:
+            raise ValueError(f"Invalid file path '{filename}': {e}") from e
+
+        # Check file size limit
+        if len(workspace_content) > MAX_FILE_SIZE_BYTES:
+            raise ValueError(
+                f"File too large: {len(workspace_content)} bytes > {MAX_FILE_SIZE_BYTES} bytes"
+            )
+
+        # Virus scan the workspace content before writing locally
+        await scan_content_safe(workspace_content, filename=filename)
+        target_path.write_bytes(workspace_content)
+
+    # Check if this is a cloud storage path
+    elif cloud_storage.is_cloud_path(file):
         # Download from cloud storage and store locally
         cloud_content = await cloud_storage.retrieve_file(
             file, user_id=user_id, graph_exec_id=graph_exec_id
@@ -159,9 +234,9 @@ async def store_media_file(
             raise ValueError(f"Invalid file path '{filename}': {e}") from e
 
         # Check file size limit
-        if len(cloud_content) > MAX_FILE_SIZE:
+        if len(cloud_content) > MAX_FILE_SIZE_BYTES:
             raise ValueError(
-                f"File too large: {len(cloud_content)} bytes > {MAX_FILE_SIZE} bytes"
+                f"File too large: {len(cloud_content)} bytes > {MAX_FILE_SIZE_BYTES} bytes"
             )
 
         # Virus scan the cloud content before writing locally
@@ -189,9 +264,9 @@ async def store_media_file(
         content = base64.b64decode(b64_content)
 
         # Check file size limit
-        if len(content) > MAX_FILE_SIZE:
+        if len(content) > MAX_FILE_SIZE_BYTES:
             raise ValueError(
-                f"File too large: {len(content)} bytes > {MAX_FILE_SIZE} bytes"
+                f"File too large: {len(content)} bytes > {MAX_FILE_SIZE_BYTES} bytes"
             )
 
         # Virus scan the base64 content before writing
@@ -199,23 +274,31 @@ async def store_media_file(
         target_path.write_bytes(content)
 
     elif file.startswith(("http://", "https://")):
-        # URL
+        # URL - download first to get Content-Type header
+        resp = await Requests().get(file)
+
+        # Check file size limit
+        if len(resp.content) > MAX_FILE_SIZE_BYTES:
+            raise ValueError(
+                f"File too large: {len(resp.content)} bytes > {MAX_FILE_SIZE_BYTES} bytes"
+            )
+
+        # Extract filename from URL path
         parsed_url = urlparse(file)
         filename = sanitize_filename(Path(parsed_url.path).name or f"{uuid.uuid4()}")
+
+        # If filename lacks extension, add one from Content-Type header
+        if "." not in filename:
+            content_type = resp.headers.get("Content-Type", "").split(";")[0].strip()
+            if content_type:
+                ext = _extension_from_mime(content_type)
+                filename = f"{filename}{ext}"
+
         try:
             target_path = _ensure_inside_base(base_path / filename, base_path)
         except OSError as e:
             raise ValueError(f"Invalid file path '{filename}': {e}") from e
 
-        # Download and save
-        resp = await Requests().get(file)
-
-        # Check file size limit
-        if len(resp.content) > MAX_FILE_SIZE:
-            raise ValueError(
-                f"File too large: {len(resp.content)} bytes > {MAX_FILE_SIZE} bytes"
-            )
-
         # Virus scan the downloaded content before writing
         await scan_content_safe(resp.content, filename=filename)
         target_path.write_bytes(resp.content)
@@ -230,12 +313,44 @@ async def store_media_file(
         if not target_path.is_file():
             raise ValueError(f"Local file does not exist: {target_path}")
 
-    # Return result
-    if return_content:
-        return MediaFileType(_file_to_data_uri(target_path))
-    else:
+    # Return based on requested format
+    if return_format == "for_local_processing":
+        # Use when processing files locally with tools like ffmpeg, MoviePy, PIL
+        # Returns: relative path in exec_file directory (e.g., "image.png")
         return MediaFileType(_strip_base_prefix(target_path, base_path))
 
+    elif return_format == "for_external_api":
+        # Use when sending content to external APIs that need base64
+        # Returns: data URI (e.g., "data:image/png;base64,iVBORw0...")
+        return MediaFileType(_file_to_data_uri(target_path))
+
+    elif return_format == "for_block_output":
+        # Use when returning output from a block to user/next block
+        # Returns: workspace:// ref (CoPilot) or data URI (graph execution)
+        if workspace_manager is None:
+            # No workspace available (graph execution without CoPilot)
+            # Fallback to data URI so the content can still be used/displayed
+            return MediaFileType(_file_to_data_uri(target_path))
+
+        # Don't re-save if input was already from workspace
+        if is_from_workspace:
+            # Return original workspace reference
+            return MediaFileType(file)
+
+        # Save new content to workspace
+        content = target_path.read_bytes()
+        filename = target_path.name
+
+        file_record = await workspace_manager.write_file(
+            content=content,
+            filename=filename,
+            overwrite=True,
+        )
+        return MediaFileType(f"workspace://{file_record.id}")
+
+    else:
+        raise ValueError(f"Invalid return_format: {return_format}")
+
 
 def get_dir_size(path: Path) -> int:
     """Get total size of directory."""
diff --git a/autogpt_platform/backend/backend/util/file_test.py b/autogpt_platform/backend/backend/util/file_test.py
index cd4fc69706..9fe672d155 100644
--- a/autogpt_platform/backend/backend/util/file_test.py
+++ b/autogpt_platform/backend/backend/util/file_test.py
@@ -7,10 +7,22 @@ from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
 
+from backend.data.execution import ExecutionContext
 from backend.util.file import store_media_file
 from backend.util.type import MediaFileType
 
 
+def make_test_context(
+    graph_exec_id: str = "test-exec-123",
+    user_id: str = "test-user-123",
+) -> ExecutionContext:
+    """Helper to create test ExecutionContext."""
+    return ExecutionContext(
+        user_id=user_id,
+        graph_exec_id=graph_exec_id,
+    )
+
+
 class TestFileCloudIntegration:
     """Test cases for cloud storage integration in file utilities."""
 
@@ -70,10 +82,9 @@ class TestFileCloudIntegration:
             mock_path_class.side_effect = path_constructor
 
             result = await store_media_file(
-                graph_exec_id,
-                MediaFileType(cloud_path),
-                "test-user-123",
-                return_content=False,
+                file=MediaFileType(cloud_path),
+                execution_context=make_test_context(graph_exec_id=graph_exec_id),
+                return_format="for_local_processing",
             )
 
             # Verify cloud storage operations
@@ -144,10 +155,9 @@ class TestFileCloudIntegration:
             mock_path_obj.name = "image.png"
             with patch("backend.util.file.Path", return_value=mock_path_obj):
                 result = await store_media_file(
-                    graph_exec_id,
-                    MediaFileType(cloud_path),
-                    "test-user-123",
-                    return_content=True,
+                    file=MediaFileType(cloud_path),
+                    execution_context=make_test_context(graph_exec_id=graph_exec_id),
+                    return_format="for_external_api",
                 )
 
             # Verify result is a data URI
@@ -198,10 +208,9 @@ class TestFileCloudIntegration:
             mock_resolved_path.relative_to.return_value = Path("test-uuid-789.txt")
 
             await store_media_file(
-                graph_exec_id,
-                MediaFileType(data_uri),
-                "test-user-123",
-                return_content=False,
+                file=MediaFileType(data_uri),
+                execution_context=make_test_context(graph_exec_id=graph_exec_id),
+                return_format="for_local_processing",
             )
 
             # Verify cloud handler was checked but not used for retrieval
@@ -234,5 +243,7 @@ class TestFileCloudIntegration:
                 FileNotFoundError, match="File not found in cloud storage"
             ):
                 await store_media_file(
-                    graph_exec_id, MediaFileType(cloud_path), "test-user-123"
+                    file=MediaFileType(cloud_path),
+                    execution_context=make_test_context(graph_exec_id=graph_exec_id),
+                    return_format="for_local_processing",
                 )
diff --git a/autogpt_platform/backend/backend/util/gcs_utils.py b/autogpt_platform/backend/backend/util/gcs_utils.py
new file mode 100644
index 0000000000..3f91f21897
--- /dev/null
+++ b/autogpt_platform/backend/backend/util/gcs_utils.py
@@ -0,0 +1,108 @@
+"""
+Shared GCS utilities for workspace and cloud storage backends.
+
+This module provides common functionality for working with Google Cloud Storage,
+including path parsing, client management, and signed URL generation.
+"""
+
+import asyncio
+import logging
+from datetime import datetime, timedelta, timezone
+
+import aiohttp
+from gcloud.aio import storage as async_gcs_storage
+from google.cloud import storage as gcs_storage
+
+logger = logging.getLogger(__name__)
+
+
+def parse_gcs_path(path: str) -> tuple[str, str]:
+    """
+    Parse a GCS path in the format 'gcs://bucket/blob' to (bucket, blob).
+
+    Args:
+        path: GCS path string (e.g., "gcs://my-bucket/path/to/file")
+
+    Returns:
+        Tuple of (bucket_name, blob_name)
+
+    Raises:
+        ValueError: If the path format is invalid
+    """
+    if not path.startswith("gcs://"):
+        raise ValueError(f"Invalid GCS path: {path}")
+
+    path_without_prefix = path[6:]  # Remove "gcs://"
+    parts = path_without_prefix.split("/", 1)
+    if len(parts) != 2:
+        raise ValueError(f"Invalid GCS path format: {path}")
+
+    return parts[0], parts[1]
+
+
+async def download_with_fresh_session(bucket: str, blob: str) -> bytes:
+    """
+    Download file content using a fresh session.
+
+    This approach avoids event loop issues that can occur when reusing
+    sessions across different async contexts (e.g., in executors).
+
+    Args:
+        bucket: GCS bucket name
+        blob: Blob path within the bucket
+
+    Returns:
+        File content as bytes
+
+    Raises:
+        FileNotFoundError: If the file doesn't exist
+    """
+    session = aiohttp.ClientSession(
+        connector=aiohttp.TCPConnector(limit=10, force_close=True)
+    )
+    client: async_gcs_storage.Storage | None = None
+    try:
+        client = async_gcs_storage.Storage(session=session)
+        content = await client.download(bucket, blob)
+        return content
+    except Exception as e:
+        if "404" in str(e) or "Not Found" in str(e):
+            raise FileNotFoundError(f"File not found: gcs://{bucket}/{blob}")
+        raise
+    finally:
+        if client:
+            try:
+                await client.close()
+            except Exception:
+                pass  # Best-effort cleanup
+        await session.close()
+
+
+async def generate_signed_url(
+    sync_client: gcs_storage.Client,
+    bucket_name: str,
+    blob_name: str,
+    expires_in: int,
+) -> str:
+    """
+    Generate a signed URL for temporary access to a GCS file.
+
+    Uses asyncio.to_thread() to run the sync operation without blocking.
+
+    Args:
+        sync_client: Sync GCS client with service account credentials
+        bucket_name: GCS bucket name
+        blob_name: Blob path within the bucket
+        expires_in: URL expiration time in seconds
+
+    Returns:
+        Signed URL string
+    """
+    bucket = sync_client.bucket(bucket_name)
+    blob = bucket.blob(blob_name)
+    return await asyncio.to_thread(
+        blob.generate_signed_url,
+        version="v4",
+        expiration=datetime.now(timezone.utc) + timedelta(seconds=expires_in),
+        method="GET",
+    )
diff --git a/autogpt_platform/backend/backend/util/prompt.py b/autogpt_platform/backend/backend/util/prompt.py
index 775d1c932b..5f904bbc8a 100644
--- a/autogpt_platform/backend/backend/util/prompt.py
+++ b/autogpt_platform/backend/backend/util/prompt.py
@@ -1,10 +1,19 @@
+from __future__ import annotations
+
+import logging
 from copy import deepcopy
-from typing import Any
+from dataclasses import dataclass
+from typing import TYPE_CHECKING, Any
 
 from tiktoken import encoding_for_model
 
 from backend.util import json
 
+if TYPE_CHECKING:
+    from openai import AsyncOpenAI
+
+logger = logging.getLogger(__name__)
+
 # ---------------------------------------------------------------------------#
 #  CONSTANTS                                                                 #
 # ---------------------------------------------------------------------------#
@@ -100,9 +109,17 @@ def _is_objective_message(msg: dict) -> bool:
 def _truncate_tool_message_content(msg: dict, enc, max_tokens: int) -> None:
     """
     Carefully truncate tool message content while preserving tool structure.
-    Only truncates tool_result content, leaves tool_use intact.
+    Handles both Anthropic-style (list content) and OpenAI-style (string content) tool messages.
     """
     content = msg.get("content")
+
+    # OpenAI-style tool message: role="tool" with string content
+    if msg.get("role") == "tool" and isinstance(content, str):
+        if _tok_len(content, enc) > max_tokens:
+            msg["content"] = _truncate_middle_tokens(content, enc, max_tokens)
+        return
+
+    # Anthropic-style: list content with tool_result items
     if not isinstance(content, list):
         return
 
@@ -140,141 +157,6 @@ def _truncate_middle_tokens(text: str, enc, max_tok: int) -> str:
 # ---------------------------------------------------------------------------#
 
 
-def compress_prompt(
-    messages: list[dict],
-    target_tokens: int,
-    *,
-    model: str = "gpt-4o",
-    reserve: int = 2_048,
-    start_cap: int = 8_192,
-    floor_cap: int = 128,
-    lossy_ok: bool = True,
-) -> list[dict]:
-    """
-    Shrink *messages* so that::
-
-        token_count(prompt) + reserve  ≤  target_tokens
-
-    Strategy
-    --------
-    1. **Token-aware truncation** – progressively halve a per-message cap
-       (`start_cap`, `start_cap/2`, … `floor_cap`) and apply it to the
-       *content* of every message except the first and last.  Tool shells
-       are included: we keep the envelope but shorten huge payloads.
-    2. **Middle-out deletion** – if still over the limit, delete whole
-       messages working outward from the centre, **skipping** any message
-       that contains ``tool_calls`` or has ``role == "tool"``.
-    3. **Last-chance trim** – if still too big, truncate the *first* and
-       *last* message bodies down to `floor_cap` tokens.
-    4. If the prompt is *still* too large:
-         • raise ``ValueError``      when ``lossy_ok == False`` (default)
-         • return the partially-trimmed prompt when ``lossy_ok == True``
-
-    Parameters
-    ----------
-    messages        Complete chat history (will be deep-copied).
-    model           Model name; passed to tiktoken to pick the right
-                    tokenizer (gpt-4o → 'o200k_base', others fallback).
-    target_tokens   Hard ceiling for prompt size **excluding** the model's
-                    forthcoming answer.
-    reserve         How many tokens you want to leave available for that
-                    answer (`max_tokens` in your subsequent completion call).
-    start_cap       Initial per-message truncation ceiling (tokens).
-    floor_cap       Lowest cap we'll accept before moving to deletions.
-    lossy_ok        If *True* return best-effort prompt instead of raising
-                    after all trim passes have been exhausted.
-
-    Returns
-    -------
-    list[dict]  – A *new* messages list that abides by the rules above.
-    """
-    enc = encoding_for_model(model)  # best-match tokenizer
-    msgs = deepcopy(messages)  # never mutate caller
-
-    def total_tokens() -> int:
-        """Current size of *msgs* in tokens."""
-        return sum(_msg_tokens(m, enc) for m in msgs)
-
-    original_token_count = total_tokens()
-
-    if original_token_count + reserve <= target_tokens:
-        return msgs
-
-    # ---- STEP 0 : normalise content --------------------------------------
-    # Convert non-string payloads to strings so token counting is coherent.
-    for i, m in enumerate(msgs):
-        if not isinstance(m.get("content"), str) and m.get("content") is not None:
-            if _is_tool_message(m):
-                continue
-
-            # Keep first and last messages intact (unless they're tool messages)
-            if i == 0 or i == len(msgs) - 1:
-                continue
-
-            # Reasonable 20k-char ceiling prevents pathological blobs
-            content_str = json.dumps(m["content"], separators=(",", ":"))
-            if len(content_str) > 20_000:
-                content_str = _truncate_middle_tokens(content_str, enc, 20_000)
-            m["content"] = content_str
-
-    # ---- STEP 1 : token-aware truncation ---------------------------------
-    cap = start_cap
-    while total_tokens() + reserve > target_tokens and cap >= floor_cap:
-        for m in msgs[1:-1]:  # keep first & last intact
-            if _is_tool_message(m):
-                # For tool messages, only truncate tool result content, preserve structure
-                _truncate_tool_message_content(m, enc, cap)
-                continue
-
-            if _is_objective_message(m):
-                # Never truncate objective messages - they contain the core task
-                continue
-
-            content = m.get("content") or ""
-            if _tok_len(content, enc) > cap:
-                m["content"] = _truncate_middle_tokens(content, enc, cap)
-        cap //= 2  # tighten the screw
-
-    # ---- STEP 2 : middle-out deletion -----------------------------------
-    while total_tokens() + reserve > target_tokens and len(msgs) > 2:
-        # Identify all deletable messages (not first/last, not tool messages, not objective messages)
-        deletable_indices = []
-        for i in range(1, len(msgs) - 1):  # Skip first and last
-            if not _is_tool_message(msgs[i]) and not _is_objective_message(msgs[i]):
-                deletable_indices.append(i)
-
-        if not deletable_indices:
-            break  # nothing more we can drop
-
-        # Delete from center outward - find the index closest to center
-        centre = len(msgs) // 2
-        to_delete = min(deletable_indices, key=lambda i: abs(i - centre))
-        del msgs[to_delete]
-
-    # ---- STEP 3 : final safety-net trim on first & last ------------------
-    cap = start_cap
-    while total_tokens() + reserve > target_tokens and cap >= floor_cap:
-        for idx in (0, -1):  # first and last
-            if _is_tool_message(msgs[idx]):
-                # For tool messages at first/last position, truncate tool result content only
-                _truncate_tool_message_content(msgs[idx], enc, cap)
-                continue
-
-            text = msgs[idx].get("content") or ""
-            if _tok_len(text, enc) > cap:
-                msgs[idx]["content"] = _truncate_middle_tokens(text, enc, cap)
-        cap //= 2  # tighten the screw
-
-    # ---- STEP 4 : success or fail-gracefully -----------------------------
-    if total_tokens() + reserve > target_tokens and not lossy_ok:
-        raise ValueError(
-            "compress_prompt: prompt still exceeds budget "
-            f"({total_tokens() + reserve} > {target_tokens})."
-        )
-
-    return msgs
-
-
 def estimate_token_count(
     messages: list[dict],
     *,
@@ -293,7 +175,8 @@ def estimate_token_count(
     -------
     int  – Token count.
     """
-    enc = encoding_for_model(model)  # best-match tokenizer
+    token_model = _normalize_model_for_tokenizer(model)
+    enc = encoding_for_model(token_model)
     return sum(_msg_tokens(m, enc) for m in messages)
 
 
@@ -315,6 +198,543 @@ def estimate_token_count_str(
     -------
     int  – Token count.
     """
-    enc = encoding_for_model(model)  # best-match tokenizer
+    token_model = _normalize_model_for_tokenizer(model)
+    enc = encoding_for_model(token_model)
     text = json.dumps(text) if not isinstance(text, str) else text
     return _tok_len(text, enc)
+
+
+# ---------------------------------------------------------------------------#
+#  UNIFIED CONTEXT COMPRESSION                                               #
+# ---------------------------------------------------------------------------#
+
+# Default thresholds
+DEFAULT_TOKEN_THRESHOLD = 120_000
+DEFAULT_KEEP_RECENT = 15
+
+
+@dataclass
+class CompressResult:
+    """Result of context compression."""
+
+    messages: list[dict]
+    token_count: int
+    was_compacted: bool
+    error: str | None = None
+    original_token_count: int = 0
+    messages_summarized: int = 0
+    messages_dropped: int = 0
+
+
+def _normalize_model_for_tokenizer(model: str) -> str:
+    """Normalize model name for tiktoken tokenizer selection."""
+    if "/" in model:
+        model = model.split("/")[-1]
+    if "claude" in model.lower() or not any(
+        known in model.lower() for known in ["gpt", "o1", "chatgpt", "text-"]
+    ):
+        return "gpt-4o"
+    return model
+
+
+def _extract_tool_call_ids_from_message(msg: dict) -> set[str]:
+    """
+    Extract tool_call IDs from an assistant message.
+
+    Supports both formats:
+    - OpenAI: {"role": "assistant", "tool_calls": [{"id": "..."}]}
+    - Anthropic: {"role": "assistant", "content": [{"type": "tool_use", "id": "..."}]}
+
+    Returns:
+        Set of tool_call IDs found in the message.
+    """
+    ids: set[str] = set()
+    if msg.get("role") != "assistant":
+        return ids
+
+    # OpenAI format: tool_calls array
+    if msg.get("tool_calls"):
+        for tc in msg["tool_calls"]:
+            tc_id = tc.get("id")
+            if tc_id:
+                ids.add(tc_id)
+
+    # Anthropic format: content list with tool_use blocks
+    content = msg.get("content")
+    if isinstance(content, list):
+        for block in content:
+            if isinstance(block, dict) and block.get("type") == "tool_use":
+                tc_id = block.get("id")
+                if tc_id:
+                    ids.add(tc_id)
+
+    return ids
+
+
+def _extract_tool_response_ids_from_message(msg: dict) -> set[str]:
+    """
+    Extract tool_call IDs that this message is responding to.
+
+    Supports both formats:
+    - OpenAI: {"role": "tool", "tool_call_id": "..."}
+    - Anthropic: {"role": "user", "content": [{"type": "tool_result", "tool_use_id": "..."}]}
+
+    Returns:
+        Set of tool_call IDs this message responds to.
+    """
+    ids: set[str] = set()
+
+    # OpenAI format: role=tool with tool_call_id
+    if msg.get("role") == "tool":
+        tc_id = msg.get("tool_call_id")
+        if tc_id:
+            ids.add(tc_id)
+
+    # Anthropic format: content list with tool_result blocks
+    content = msg.get("content")
+    if isinstance(content, list):
+        for block in content:
+            if isinstance(block, dict) and block.get("type") == "tool_result":
+                tc_id = block.get("tool_use_id")
+                if tc_id:
+                    ids.add(tc_id)
+
+    return ids
+
+
+def _is_tool_response_message(msg: dict) -> bool:
+    """Check if message is a tool response (OpenAI or Anthropic format)."""
+    # OpenAI format
+    if msg.get("role") == "tool":
+        return True
+    # Anthropic format
+    content = msg.get("content")
+    if isinstance(content, list):
+        for block in content:
+            if isinstance(block, dict) and block.get("type") == "tool_result":
+                return True
+    return False
+
+
+def _remove_orphan_tool_responses(
+    messages: list[dict], orphan_ids: set[str]
+) -> list[dict]:
+    """
+    Remove tool response messages/blocks that reference orphan tool_call IDs.
+
+    Supports both OpenAI and Anthropic formats.
+    For Anthropic messages with mixed valid/orphan tool_result blocks,
+    filters out only the orphan blocks instead of dropping the entire message.
+    """
+    result = []
+    for msg in messages:
+        # OpenAI format: role=tool - drop entire message if orphan
+        if msg.get("role") == "tool":
+            tc_id = msg.get("tool_call_id")
+            if tc_id and tc_id in orphan_ids:
+                continue
+            result.append(msg)
+            continue
+
+        # Anthropic format: content list may have mixed tool_result blocks
+        content = msg.get("content")
+        if isinstance(content, list):
+            has_tool_results = any(
+                isinstance(b, dict) and b.get("type") == "tool_result" for b in content
+            )
+            if has_tool_results:
+                # Filter out orphan tool_result blocks, keep valid ones
+                filtered_content = [
+                    block
+                    for block in content
+                    if not (
+                        isinstance(block, dict)
+                        and block.get("type") == "tool_result"
+                        and block.get("tool_use_id") in orphan_ids
+                    )
+                ]
+                # Only keep message if it has remaining content
+                if filtered_content:
+                    msg = msg.copy()
+                    msg["content"] = filtered_content
+                    result.append(msg)
+                continue
+
+        result.append(msg)
+    return result
+
+
+def _ensure_tool_pairs_intact(
+    recent_messages: list[dict],
+    all_messages: list[dict],
+    start_index: int,
+) -> list[dict]:
+    """
+    Ensure tool_call/tool_response pairs stay together after slicing.
+
+    When slicing messages for context compaction, a naive slice can separate
+    an assistant message containing tool_calls from its corresponding tool
+    response messages. This causes API validation errors (e.g., Anthropic's
+    "unexpected tool_use_id found in tool_result blocks").
+
+    This function checks for orphan tool responses in the slice and extends
+    backwards to include their corresponding assistant messages.
+
+    Supports both formats:
+    - OpenAI: tool_calls array + role="tool" responses
+    - Anthropic: tool_use blocks + tool_result blocks
+
+    Args:
+        recent_messages: The sliced messages to validate
+        all_messages: The complete message list (for looking up missing assistants)
+        start_index: The index in all_messages where recent_messages begins
+
+    Returns:
+        A potentially extended list of messages with tool pairs intact
+    """
+    if not recent_messages:
+        return recent_messages
+
+    # Collect all tool_call_ids from assistant messages in the slice
+    available_tool_call_ids: set[str] = set()
+    for msg in recent_messages:
+        available_tool_call_ids |= _extract_tool_call_ids_from_message(msg)
+
+    # Find orphan tool responses (responses whose tool_call_id is missing)
+    orphan_tool_call_ids: set[str] = set()
+    for msg in recent_messages:
+        response_ids = _extract_tool_response_ids_from_message(msg)
+        for tc_id in response_ids:
+            if tc_id not in available_tool_call_ids:
+                orphan_tool_call_ids.add(tc_id)
+
+    if not orphan_tool_call_ids:
+        # No orphans, slice is valid
+        return recent_messages
+
+    # Find the assistant messages that contain the orphan tool_call_ids
+    # Search backwards from start_index in all_messages
+    messages_to_prepend: list[dict] = []
+    for i in range(start_index - 1, -1, -1):
+        msg = all_messages[i]
+        msg_tool_ids = _extract_tool_call_ids_from_message(msg)
+        if msg_tool_ids & orphan_tool_call_ids:
+            # This assistant message has tool_calls we need
+            # Also collect its contiguous tool responses that follow it
+            assistant_and_responses: list[dict] = [msg]
+
+            # Scan forward from this assistant to collect tool responses
+            for j in range(i + 1, start_index):
+                following_msg = all_messages[j]
+                following_response_ids = _extract_tool_response_ids_from_message(
+                    following_msg
+                )
+                if following_response_ids and following_response_ids & msg_tool_ids:
+                    assistant_and_responses.append(following_msg)
+                elif not _is_tool_response_message(following_msg):
+                    # Stop at first non-tool-response message
+                    break
+
+            # Prepend the assistant and its tool responses (maintain order)
+            messages_to_prepend = assistant_and_responses + messages_to_prepend
+            # Mark these as found
+            orphan_tool_call_ids -= msg_tool_ids
+            # Also add this assistant's tool_call_ids to available set
+            available_tool_call_ids |= msg_tool_ids
+
+        if not orphan_tool_call_ids:
+            # Found all missing assistants
+            break
+
+    if orphan_tool_call_ids:
+        # Some tool_call_ids couldn't be resolved - remove those tool responses
+        # This shouldn't happen in normal operation but handles edge cases
+        logger.warning(
+            f"Could not find assistant messages for tool_call_ids: {orphan_tool_call_ids}. "
+            "Removing orphan tool responses."
+        )
+        recent_messages = _remove_orphan_tool_responses(
+            recent_messages, orphan_tool_call_ids
+        )
+
+    if messages_to_prepend:
+        logger.info(
+            f"Extended recent messages by {len(messages_to_prepend)} to preserve "
+            f"tool_call/tool_response pairs"
+        )
+        return messages_to_prepend + recent_messages
+
+    return recent_messages
+
+
+async def _summarize_messages_llm(
+    messages: list[dict],
+    client: AsyncOpenAI,
+    model: str,
+    timeout: float = 30.0,
+) -> str:
+    """Summarize messages using an LLM."""
+    conversation = []
+    for msg in messages:
+        role = msg.get("role", "")
+        content = msg.get("content", "")
+        if content and role in ("user", "assistant", "tool"):
+            conversation.append(f"{role.upper()}: {content}")
+
+    conversation_text = "\n\n".join(conversation)
+
+    if not conversation_text:
+        return "No conversation history available."
+
+    # Limit to ~100k chars for safety
+    MAX_CHARS = 100_000
+    if len(conversation_text) > MAX_CHARS:
+        conversation_text = conversation_text[:MAX_CHARS] + "\n\n[truncated]"
+
+    response = await client.with_options(timeout=timeout).chat.completions.create(
+        model=model,
+        messages=[
+            {
+                "role": "system",
+                "content": (
+                    "Create a detailed summary of the conversation so far. "
+                    "This summary will be used as context when continuing the conversation.\n\n"
+                    "Before writing the summary, analyze each message chronologically to identify:\n"
+                    "- User requests and their explicit goals\n"
+                    "- Your approach and key decisions made\n"
+                    "- Technical specifics (file names, tool outputs, function signatures)\n"
+                    "- Errors encountered and resolutions applied\n\n"
+                    "You MUST include ALL of the following sections:\n\n"
+                    "## 1. Primary Request and Intent\n"
+                    "The user's explicit goals and what they are trying to accomplish.\n\n"
+                    "## 2. Key Technical Concepts\n"
+                    "Technologies, frameworks, tools, and patterns being used or discussed.\n\n"
+                    "## 3. Files and Resources Involved\n"
+                    "Specific files examined or modified, with relevant snippets and identifiers.\n\n"
+                    "## 4. Errors and Fixes\n"
+                    "Problems encountered, error messages, and their resolutions. "
+                    "Include any user feedback on fixes.\n\n"
+                    "## 5. Problem Solving\n"
+                    "Issues that have been resolved and how they were addressed.\n\n"
+                    "## 6. All User Messages\n"
+                    "A complete list of all user inputs (excluding tool outputs) to preserve their exact requests.\n\n"
+                    "## 7. Pending Tasks\n"
+                    "Work items the user explicitly requested that have not yet been completed.\n\n"
+                    "## 8. Current Work\n"
+                    "Precise description of what was being worked on most recently, including relevant context.\n\n"
+                    "## 9. Next Steps\n"
+                    "What should happen next, aligned with the user's most recent requests. "
+                    "Include verbatim quotes of recent instructions if relevant."
+                ),
+            },
+            {"role": "user", "content": f"Summarize:\n\n{conversation_text}"},
+        ],
+        max_tokens=1500,
+        temperature=0.3,
+    )
+
+    return response.choices[0].message.content or "No summary available."
+
+
+async def compress_context(
+    messages: list[dict],
+    target_tokens: int = DEFAULT_TOKEN_THRESHOLD,
+    *,
+    model: str = "gpt-4o",
+    client: AsyncOpenAI | None = None,
+    keep_recent: int = DEFAULT_KEEP_RECENT,
+    reserve: int = 2_048,
+    start_cap: int = 8_192,
+    floor_cap: int = 128,
+) -> CompressResult:
+    """
+    Unified context compression that combines summarization and truncation strategies.
+
+    Strategy (in order):
+    1. **LLM summarization** – If client provided, summarize old messages into a
+       single context message while keeping recent messages intact. This is the
+       primary strategy for chat service.
+    2. **Content truncation** – Progressively halve a per-message cap and truncate
+       bloated message content (tool outputs, large pastes). Preserves all messages
+       but shortens their content. Primary strategy when client=None (LLM blocks).
+    3. **Middle-out deletion** – Delete whole messages one at a time from the center
+       outward, skipping tool messages and objective messages.
+    4. **First/last trim** – Truncate first and last message content as last resort.
+
+    Parameters
+    ----------
+    messages        Complete chat history (will be deep-copied).
+    target_tokens   Hard ceiling for prompt size.
+    model           Model name for tokenization and summarization.
+    client          AsyncOpenAI client. If provided, enables LLM summarization
+                    as the first strategy. If None, skips to truncation strategies.
+    keep_recent     Number of recent messages to preserve during summarization.
+    reserve         Tokens to reserve for model response.
+    start_cap       Initial per-message truncation ceiling (tokens).
+    floor_cap       Lowest cap before moving to deletions.
+
+    Returns
+    -------
+    CompressResult with compressed messages and metadata.
+    """
+    # Guard clause for empty messages
+    if not messages:
+        return CompressResult(
+            messages=[],
+            token_count=0,
+            was_compacted=False,
+            original_token_count=0,
+        )
+
+    token_model = _normalize_model_for_tokenizer(model)
+    enc = encoding_for_model(token_model)
+    msgs = deepcopy(messages)
+
+    def total_tokens() -> int:
+        return sum(_msg_tokens(m, enc) for m in msgs)
+
+    original_count = total_tokens()
+
+    # Already under limit
+    if original_count + reserve <= target_tokens:
+        return CompressResult(
+            messages=msgs,
+            token_count=original_count,
+            was_compacted=False,
+            original_token_count=original_count,
+        )
+
+    messages_summarized = 0
+    messages_dropped = 0
+
+    # ---- STEP 1: LLM summarization (if client provided) -------------------
+    # This is the primary compression strategy for chat service.
+    # Summarize old messages while keeping recent ones intact.
+    if client is not None:
+        has_system = len(msgs) > 0 and msgs[0].get("role") == "system"
+        system_msg = msgs[0] if has_system else None
+
+        # Calculate old vs recent messages
+        if has_system:
+            if len(msgs) > keep_recent + 1:
+                old_msgs = msgs[1:-keep_recent]
+                recent_msgs = msgs[-keep_recent:]
+            else:
+                old_msgs = []
+                recent_msgs = msgs[1:] if len(msgs) > 1 else []
+        else:
+            if len(msgs) > keep_recent:
+                old_msgs = msgs[:-keep_recent]
+                recent_msgs = msgs[-keep_recent:]
+            else:
+                old_msgs = []
+                recent_msgs = msgs
+
+        # Ensure tool pairs stay intact
+        slice_start = max(0, len(msgs) - keep_recent)
+        recent_msgs = _ensure_tool_pairs_intact(recent_msgs, msgs, slice_start)
+
+        if old_msgs:
+            try:
+                summary_text = await _summarize_messages_llm(old_msgs, client, model)
+                summary_msg = {
+                    "role": "assistant",
+                    "content": f"[Previous conversation summary — for context only]: {summary_text}",
+                }
+                messages_summarized = len(old_msgs)
+
+                if has_system:
+                    msgs = [system_msg, summary_msg] + recent_msgs
+                else:
+                    msgs = [summary_msg] + recent_msgs
+
+                logger.info(
+                    f"Context summarized: {original_count} -> {total_tokens()} tokens, "
+                    f"summarized {messages_summarized} messages"
+                )
+            except Exception as e:
+                logger.warning(f"Summarization failed, continuing with truncation: {e}")
+                # Fall through to content truncation
+
+    # ---- STEP 2: Normalize content ----------------------------------------
+    # Convert non-string payloads to strings so token counting is coherent.
+    # Always run this before truncation to ensure consistent token counting.
+    for i, m in enumerate(msgs):
+        if not isinstance(m.get("content"), str) and m.get("content") is not None:
+            if _is_tool_message(m):
+                continue
+            if i == 0 or i == len(msgs) - 1:
+                continue
+            content_str = json.dumps(m["content"], separators=(",", ":"))
+            if len(content_str) > 20_000:
+                content_str = _truncate_middle_tokens(content_str, enc, 20_000)
+            m["content"] = content_str
+
+    # ---- STEP 3: Token-aware content truncation ---------------------------
+    # Progressively halve per-message cap and truncate bloated content.
+    # This preserves all messages but shortens their content.
+    cap = start_cap
+    while total_tokens() + reserve > target_tokens and cap >= floor_cap:
+        for m in msgs[1:-1]:
+            if _is_tool_message(m):
+                _truncate_tool_message_content(m, enc, cap)
+                continue
+            if _is_objective_message(m):
+                continue
+            content = m.get("content") or ""
+            if _tok_len(content, enc) > cap:
+                m["content"] = _truncate_middle_tokens(content, enc, cap)
+        cap //= 2
+
+    # ---- STEP 4: Middle-out deletion --------------------------------------
+    # Delete messages one at a time from the center outward.
+    # This is more granular than dropping all old messages at once.
+    while total_tokens() + reserve > target_tokens and len(msgs) > 2:
+        deletable: list[int] = []
+        for i in range(1, len(msgs) - 1):
+            msg = msgs[i]
+            if (
+                msg is not None
+                and not _is_tool_message(msg)
+                and not _is_objective_message(msg)
+            ):
+                deletable.append(i)
+        if not deletable:
+            break
+        centre = len(msgs) // 2
+        to_delete = min(deletable, key=lambda i: abs(i - centre))
+        del msgs[to_delete]
+        messages_dropped += 1
+
+    # ---- STEP 5: Final trim on first/last ---------------------------------
+    cap = start_cap
+    while total_tokens() + reserve > target_tokens and cap >= floor_cap:
+        for idx in (0, -1):
+            msg = msgs[idx]
+            if msg is None:
+                continue
+            if _is_tool_message(msg):
+                _truncate_tool_message_content(msg, enc, cap)
+                continue
+            text = msg.get("content") or ""
+            if _tok_len(text, enc) > cap:
+                msg["content"] = _truncate_middle_tokens(text, enc, cap)
+        cap //= 2
+
+    # Filter out any None values that may have been introduced
+    final_msgs: list[dict] = [m for m in msgs if m is not None]
+    final_count = sum(_msg_tokens(m, enc) for m in final_msgs)
+    error = None
+    if final_count + reserve > target_tokens:
+        error = f"Could not compress below target ({final_count + reserve} > {target_tokens})"
+        logger.warning(error)
+
+    return CompressResult(
+        messages=final_msgs,
+        token_count=final_count,
+        was_compacted=True,
+        error=error,
+        original_token_count=original_count,
+        messages_summarized=messages_summarized,
+        messages_dropped=messages_dropped,
+    )
diff --git a/autogpt_platform/backend/backend/util/prompt_test.py b/autogpt_platform/backend/backend/util/prompt_test.py
index af6b230f8f..2d4bf090b3 100644
--- a/autogpt_platform/backend/backend/util/prompt_test.py
+++ b/autogpt_platform/backend/backend/util/prompt_test.py
@@ -1,10 +1,21 @@
 """Tests for prompt utility functions, especially tool call token counting."""
 
+from unittest.mock import AsyncMock, MagicMock
+
 import pytest
 from tiktoken import encoding_for_model
 
 from backend.util import json
-from backend.util.prompt import _msg_tokens, estimate_token_count
+from backend.util.prompt import (
+    CompressResult,
+    _ensure_tool_pairs_intact,
+    _msg_tokens,
+    _normalize_model_for_tokenizer,
+    _truncate_middle_tokens,
+    _truncate_tool_message_content,
+    compress_context,
+    estimate_token_count,
+)
 
 
 class TestMsgTokens:
@@ -276,3 +287,690 @@ class TestEstimateTokenCount:
 
         assert total_tokens == expected_total
         assert total_tokens > 20  # Should be substantial
+
+
+class TestNormalizeModelForTokenizer:
+    """Test model name normalization for tiktoken."""
+
+    def test_openai_models_unchanged(self):
+        """Test that OpenAI models are returned as-is."""
+        assert _normalize_model_for_tokenizer("gpt-4o") == "gpt-4o"
+        assert _normalize_model_for_tokenizer("gpt-4") == "gpt-4"
+        assert _normalize_model_for_tokenizer("gpt-3.5-turbo") == "gpt-3.5-turbo"
+
+    def test_claude_models_normalized(self):
+        """Test that Claude models are normalized to gpt-4o."""
+        assert _normalize_model_for_tokenizer("claude-3-opus") == "gpt-4o"
+        assert _normalize_model_for_tokenizer("claude-3-sonnet") == "gpt-4o"
+        assert _normalize_model_for_tokenizer("anthropic/claude-3-haiku") == "gpt-4o"
+
+    def test_openrouter_paths_extracted(self):
+        """Test that OpenRouter model paths are handled."""
+        assert _normalize_model_for_tokenizer("openai/gpt-4o") == "gpt-4o"
+        assert _normalize_model_for_tokenizer("anthropic/claude-3-opus") == "gpt-4o"
+
+    def test_unknown_models_default_to_gpt4o(self):
+        """Test that unknown models default to gpt-4o."""
+        assert _normalize_model_for_tokenizer("some-random-model") == "gpt-4o"
+        assert _normalize_model_for_tokenizer("llama-3-70b") == "gpt-4o"
+
+
+class TestTruncateToolMessageContent:
+    """Test tool message content truncation."""
+
+    @pytest.fixture
+    def enc(self):
+        return encoding_for_model("gpt-4o")
+
+    def test_truncate_openai_tool_message(self, enc):
+        """Test truncation of OpenAI-style tool message with string content."""
+        long_content = "x" * 10000
+        msg = {"role": "tool", "tool_call_id": "call_123", "content": long_content}
+
+        _truncate_tool_message_content(msg, enc, max_tokens=100)
+
+        # Content should be truncated
+        assert len(msg["content"]) < len(long_content)
+        assert "…" in msg["content"]  # Has ellipsis marker
+
+    def test_truncate_anthropic_tool_result(self, enc):
+        """Test truncation of Anthropic-style tool_result."""
+        long_content = "y" * 10000
+        msg = {
+            "role": "user",
+            "content": [
+                {
+                    "type": "tool_result",
+                    "tool_use_id": "toolu_123",
+                    "content": long_content,
+                }
+            ],
+        }
+
+        _truncate_tool_message_content(msg, enc, max_tokens=100)
+
+        # Content should be truncated
+        result_content = msg["content"][0]["content"]
+        assert len(result_content) < len(long_content)
+        assert "…" in result_content
+
+    def test_preserve_tool_use_blocks(self, enc):
+        """Test that tool_use blocks are not truncated."""
+        msg = {
+            "role": "assistant",
+            "content": [
+                {
+                    "type": "tool_use",
+                    "id": "toolu_123",
+                    "name": "some_function",
+                    "input": {"key": "value" * 1000},  # Large input
+                }
+            ],
+        }
+
+        original = json.dumps(msg["content"][0]["input"])
+        _truncate_tool_message_content(msg, enc, max_tokens=10)
+
+        # tool_use should be unchanged
+        assert json.dumps(msg["content"][0]["input"]) == original
+
+    def test_no_truncation_when_under_limit(self, enc):
+        """Test that short content is not modified."""
+        msg = {"role": "tool", "tool_call_id": "call_123", "content": "Short content"}
+
+        original = msg["content"]
+        _truncate_tool_message_content(msg, enc, max_tokens=1000)
+
+        assert msg["content"] == original
+
+
+class TestTruncateMiddleTokens:
+    """Test middle truncation of text."""
+
+    @pytest.fixture
+    def enc(self):
+        return encoding_for_model("gpt-4o")
+
+    def test_truncates_long_text(self, enc):
+        """Test that long text is truncated with ellipsis in middle."""
+        long_text = "word " * 1000
+        result = _truncate_middle_tokens(long_text, enc, max_tok=50)
+
+        assert len(enc.encode(result)) <= 52  # Allow some slack for ellipsis
+        assert "…" in result
+        assert result.startswith("word")  # Head preserved
+        assert result.endswith("word ")  # Tail preserved
+
+    def test_preserves_short_text(self, enc):
+        """Test that short text is not modified."""
+        short_text = "Hello world"
+        result = _truncate_middle_tokens(short_text, enc, max_tok=100)
+
+        assert result == short_text
+
+
+class TestEnsureToolPairsIntact:
+    """Test tool call/response pair preservation for both OpenAI and Anthropic formats."""
+
+    # ---- OpenAI Format Tests ----
+
+    def test_openai_adds_missing_tool_call(self):
+        """Test that orphaned OpenAI tool_response gets its tool_call prepended."""
+        all_msgs = [
+            {"role": "system", "content": "You are helpful."},
+            {
+                "role": "assistant",
+                "tool_calls": [
+                    {"id": "call_1", "type": "function", "function": {"name": "f1"}}
+                ],
+            },
+            {"role": "tool", "tool_call_id": "call_1", "content": "result"},
+            {"role": "user", "content": "Thanks!"},
+        ]
+        # Recent messages start at index 2 (the tool response)
+        recent = [all_msgs[2], all_msgs[3]]
+        start_index = 2
+
+        result = _ensure_tool_pairs_intact(recent, all_msgs, start_index)
+
+        # Should prepend the tool_call message
+        assert len(result) == 3
+        assert result[0]["role"] == "assistant"
+        assert "tool_calls" in result[0]
+
+    def test_openai_keeps_complete_pairs(self):
+        """Test that complete OpenAI pairs are unchanged."""
+        all_msgs = [
+            {"role": "system", "content": "System"},
+            {
+                "role": "assistant",
+                "tool_calls": [
+                    {"id": "call_1", "type": "function", "function": {"name": "f1"}}
+                ],
+            },
+            {"role": "tool", "tool_call_id": "call_1", "content": "result"},
+        ]
+        recent = all_msgs[1:]  # Include both tool_call and response
+        start_index = 1
+
+        result = _ensure_tool_pairs_intact(recent, all_msgs, start_index)
+
+        assert len(result) == 2  # No messages added
+
+    def test_openai_multiple_tool_calls(self):
+        """Test multiple OpenAI tool calls in one assistant message."""
+        all_msgs = [
+            {"role": "system", "content": "System"},
+            {
+                "role": "assistant",
+                "tool_calls": [
+                    {"id": "call_1", "type": "function", "function": {"name": "f1"}},
+                    {"id": "call_2", "type": "function", "function": {"name": "f2"}},
+                ],
+            },
+            {"role": "tool", "tool_call_id": "call_1", "content": "result1"},
+            {"role": "tool", "tool_call_id": "call_2", "content": "result2"},
+            {"role": "user", "content": "Thanks!"},
+        ]
+        # Recent messages start at index 2 (first tool response)
+        recent = [all_msgs[2], all_msgs[3], all_msgs[4]]
+        start_index = 2
+
+        result = _ensure_tool_pairs_intact(recent, all_msgs, start_index)
+
+        # Should prepend the assistant message with both tool_calls
+        assert len(result) == 4
+        assert result[0]["role"] == "assistant"
+        assert len(result[0]["tool_calls"]) == 2
+
+    # ---- Anthropic Format Tests ----
+
+    def test_anthropic_adds_missing_tool_use(self):
+        """Test that orphaned Anthropic tool_result gets its tool_use prepended."""
+        all_msgs = [
+            {"role": "system", "content": "You are helpful."},
+            {
+                "role": "assistant",
+                "content": [
+                    {
+                        "type": "tool_use",
+                        "id": "toolu_123",
+                        "name": "get_weather",
+                        "input": {"location": "SF"},
+                    }
+                ],
+            },
+            {
+                "role": "user",
+                "content": [
+                    {
+                        "type": "tool_result",
+                        "tool_use_id": "toolu_123",
+                        "content": "22°C and sunny",
+                    }
+                ],
+            },
+            {"role": "user", "content": "Thanks!"},
+        ]
+        # Recent messages start at index 2 (the tool_result)
+        recent = [all_msgs[2], all_msgs[3]]
+        start_index = 2
+
+        result = _ensure_tool_pairs_intact(recent, all_msgs, start_index)
+
+        # Should prepend the tool_use message
+        assert len(result) == 3
+        assert result[0]["role"] == "assistant"
+        assert result[0]["content"][0]["type"] == "tool_use"
+
+    def test_anthropic_keeps_complete_pairs(self):
+        """Test that complete Anthropic pairs are unchanged."""
+        all_msgs = [
+            {"role": "system", "content": "System"},
+            {
+                "role": "assistant",
+                "content": [
+                    {
+                        "type": "tool_use",
+                        "id": "toolu_456",
+                        "name": "calculator",
+                        "input": {"expr": "2+2"},
+                    }
+                ],
+            },
+            {
+                "role": "user",
+                "content": [
+                    {
+                        "type": "tool_result",
+                        "tool_use_id": "toolu_456",
+                        "content": "4",
+                    }
+                ],
+            },
+        ]
+        recent = all_msgs[1:]  # Include both tool_use and result
+        start_index = 1
+
+        result = _ensure_tool_pairs_intact(recent, all_msgs, start_index)
+
+        assert len(result) == 2  # No messages added
+
+    def test_anthropic_multiple_tool_uses(self):
+        """Test multiple Anthropic tool_use blocks in one message."""
+        all_msgs = [
+            {"role": "system", "content": "System"},
+            {
+                "role": "assistant",
+                "content": [
+                    {"type": "text", "text": "Let me check both..."},
+                    {
+                        "type": "tool_use",
+                        "id": "toolu_1",
+                        "name": "get_weather",
+                        "input": {"city": "NYC"},
+                    },
+                    {
+                        "type": "tool_use",
+                        "id": "toolu_2",
+                        "name": "get_weather",
+                        "input": {"city": "LA"},
+                    },
+                ],
+            },
+            {
+                "role": "user",
+                "content": [
+                    {
+                        "type": "tool_result",
+                        "tool_use_id": "toolu_1",
+                        "content": "Cold",
+                    },
+                    {
+                        "type": "tool_result",
+                        "tool_use_id": "toolu_2",
+                        "content": "Warm",
+                    },
+                ],
+            },
+            {"role": "user", "content": "Thanks!"},
+        ]
+        # Recent messages start at index 2 (tool_result)
+        recent = [all_msgs[2], all_msgs[3]]
+        start_index = 2
+
+        result = _ensure_tool_pairs_intact(recent, all_msgs, start_index)
+
+        # Should prepend the assistant message with both tool_uses
+        assert len(result) == 3
+        assert result[0]["role"] == "assistant"
+        tool_use_count = sum(
+            1 for b in result[0]["content"] if b.get("type") == "tool_use"
+        )
+        assert tool_use_count == 2
+
+    # ---- Mixed/Edge Case Tests ----
+
+    def test_anthropic_with_type_message_field(self):
+        """Test Anthropic format with 'type': 'message' field (smart_decision_maker style)."""
+        all_msgs = [
+            {"role": "system", "content": "You are helpful."},
+            {
+                "role": "assistant",
+                "content": [
+                    {
+                        "type": "tool_use",
+                        "id": "toolu_abc",
+                        "name": "search",
+                        "input": {"q": "test"},
+                    }
+                ],
+            },
+            {
+                "role": "user",
+                "type": "message",  # Extra field from smart_decision_maker
+                "content": [
+                    {
+                        "type": "tool_result",
+                        "tool_use_id": "toolu_abc",
+                        "content": "Found results",
+                    }
+                ],
+            },
+            {"role": "user", "content": "Thanks!"},
+        ]
+        # Recent messages start at index 2 (the tool_result with 'type': 'message')
+        recent = [all_msgs[2], all_msgs[3]]
+        start_index = 2
+
+        result = _ensure_tool_pairs_intact(recent, all_msgs, start_index)
+
+        # Should prepend the tool_use message
+        assert len(result) == 3
+        assert result[0]["role"] == "assistant"
+        assert result[0]["content"][0]["type"] == "tool_use"
+
+    def test_handles_no_tool_messages(self):
+        """Test messages without tool calls."""
+        all_msgs = [
+            {"role": "user", "content": "Hello"},
+            {"role": "assistant", "content": "Hi there!"},
+        ]
+        recent = all_msgs
+        start_index = 0
+
+        result = _ensure_tool_pairs_intact(recent, all_msgs, start_index)
+
+        assert result == all_msgs
+
+    def test_handles_empty_messages(self):
+        """Test empty message list."""
+        result = _ensure_tool_pairs_intact([], [], 0)
+        assert result == []
+
+    def test_mixed_text_and_tool_content(self):
+        """Test Anthropic message with mixed text and tool_use content."""
+        all_msgs = [
+            {
+                "role": "assistant",
+                "content": [
+                    {"type": "text", "text": "I'll help you with that."},
+                    {
+                        "type": "tool_use",
+                        "id": "toolu_mixed",
+                        "name": "search",
+                        "input": {"q": "test"},
+                    },
+                ],
+            },
+            {
+                "role": "user",
+                "content": [
+                    {
+                        "type": "tool_result",
+                        "tool_use_id": "toolu_mixed",
+                        "content": "Found results",
+                    }
+                ],
+            },
+            {"role": "assistant", "content": "Here are the results..."},
+        ]
+        # Start from tool_result
+        recent = [all_msgs[1], all_msgs[2]]
+        start_index = 1
+
+        result = _ensure_tool_pairs_intact(recent, all_msgs, start_index)
+
+        # Should prepend the assistant message with tool_use
+        assert len(result) == 3
+        assert result[0]["content"][0]["type"] == "text"
+        assert result[0]["content"][1]["type"] == "tool_use"
+
+
+class TestCompressContext:
+    """Test the async compress_context function."""
+
+    @pytest.mark.asyncio
+    async def test_no_compression_needed(self):
+        """Test messages under limit return without compression."""
+        messages = [
+            {"role": "system", "content": "You are helpful."},
+            {"role": "user", "content": "Hello!"},
+        ]
+
+        result = await compress_context(messages, target_tokens=100000)
+
+        assert isinstance(result, CompressResult)
+        assert result.was_compacted is False
+        assert len(result.messages) == 2
+        assert result.error is None
+
+    @pytest.mark.asyncio
+    async def test_truncation_without_client(self):
+        """Test that truncation works without LLM client."""
+        long_content = "x" * 50000
+        messages = [
+            {"role": "system", "content": "System"},
+            {"role": "user", "content": long_content},
+            {"role": "assistant", "content": "Response"},
+        ]
+
+        result = await compress_context(
+            messages, target_tokens=1000, client=None, reserve=100
+        )
+
+        assert result.was_compacted is True
+        # Should have truncated without summarization
+        assert result.messages_summarized == 0
+
+    @pytest.mark.asyncio
+    async def test_with_mocked_llm_client(self):
+        """Test summarization with mocked LLM client."""
+        # Create many messages to trigger summarization
+        messages = [{"role": "system", "content": "System prompt"}]
+        for i in range(30):
+            messages.append({"role": "user", "content": f"User message {i} " * 100})
+            messages.append(
+                {"role": "assistant", "content": f"Assistant response {i} " * 100}
+            )
+
+        # Mock the AsyncOpenAI client
+        mock_client = AsyncMock()
+        mock_response = MagicMock()
+        mock_response.choices = [MagicMock()]
+        mock_response.choices[0].message.content = "Summary of conversation"
+        mock_client.with_options.return_value.chat.completions.create = AsyncMock(
+            return_value=mock_response
+        )
+
+        result = await compress_context(
+            messages,
+            target_tokens=5000,
+            client=mock_client,
+            keep_recent=5,
+            reserve=500,
+        )
+
+        assert result.was_compacted is True
+        # Should have attempted summarization
+        assert mock_client.with_options.called or result.messages_summarized > 0
+
+    @pytest.mark.asyncio
+    async def test_preserves_tool_pairs(self):
+        """Test that tool call/response pairs stay together."""
+        messages = [
+            {"role": "system", "content": "System"},
+            {"role": "user", "content": "Do something"},
+            {
+                "role": "assistant",
+                "tool_calls": [
+                    {"id": "call_1", "type": "function", "function": {"name": "func"}}
+                ],
+            },
+            {"role": "tool", "tool_call_id": "call_1", "content": "Result " * 1000},
+            {"role": "assistant", "content": "Done!"},
+        ]
+
+        result = await compress_context(
+            messages, target_tokens=500, client=None, reserve=50
+        )
+
+        # Check that if tool response exists, its call exists too
+        tool_call_ids = set()
+        tool_response_ids = set()
+        for msg in result.messages:
+            if "tool_calls" in msg:
+                for tc in msg["tool_calls"]:
+                    tool_call_ids.add(tc["id"])
+            if msg.get("role") == "tool":
+                tool_response_ids.add(msg.get("tool_call_id"))
+
+        # All tool responses should have their calls
+        assert tool_response_ids <= tool_call_ids
+
+    @pytest.mark.asyncio
+    async def test_returns_error_when_cannot_compress(self):
+        """Test that error is returned when compression fails."""
+        # Single huge message that can't be compressed enough
+        messages = [
+            {"role": "user", "content": "x" * 100000},
+        ]
+
+        result = await compress_context(
+            messages, target_tokens=100, client=None, reserve=50
+        )
+
+        # Should have an error since we can't get below 100 tokens
+        assert result.error is not None
+        assert result.was_compacted is True
+
+    @pytest.mark.asyncio
+    async def test_empty_messages(self):
+        """Test that empty messages list returns early without error."""
+        result = await compress_context([], target_tokens=1000)
+
+        assert result.messages == []
+        assert result.token_count == 0
+        assert result.was_compacted is False
+        assert result.error is None
+
+
+class TestRemoveOrphanToolResponses:
+    """Test _remove_orphan_tool_responses helper function."""
+
+    def test_removes_openai_orphan(self):
+        """Test removal of orphan OpenAI tool response."""
+        from backend.util.prompt import _remove_orphan_tool_responses
+
+        messages = [
+            {"role": "tool", "tool_call_id": "call_orphan", "content": "result"},
+            {"role": "user", "content": "Hello"},
+        ]
+        orphan_ids = {"call_orphan"}
+
+        result = _remove_orphan_tool_responses(messages, orphan_ids)
+
+        assert len(result) == 1
+        assert result[0]["role"] == "user"
+
+    def test_keeps_valid_openai_tool(self):
+        """Test that valid OpenAI tool responses are kept."""
+        from backend.util.prompt import _remove_orphan_tool_responses
+
+        messages = [
+            {"role": "tool", "tool_call_id": "call_valid", "content": "result"},
+        ]
+        orphan_ids = {"call_other"}
+
+        result = _remove_orphan_tool_responses(messages, orphan_ids)
+
+        assert len(result) == 1
+        assert result[0]["tool_call_id"] == "call_valid"
+
+    def test_filters_anthropic_mixed_blocks(self):
+        """Test filtering individual orphan blocks from Anthropic message with mixed valid/orphan."""
+        from backend.util.prompt import _remove_orphan_tool_responses
+
+        messages = [
+            {
+                "role": "user",
+                "content": [
+                    {
+                        "type": "tool_result",
+                        "tool_use_id": "toolu_valid",
+                        "content": "valid result",
+                    },
+                    {
+                        "type": "tool_result",
+                        "tool_use_id": "toolu_orphan",
+                        "content": "orphan result",
+                    },
+                ],
+            },
+        ]
+        orphan_ids = {"toolu_orphan"}
+
+        result = _remove_orphan_tool_responses(messages, orphan_ids)
+
+        assert len(result) == 1
+        # Should only have the valid tool_result, orphan filtered out
+        assert len(result[0]["content"]) == 1
+        assert result[0]["content"][0]["tool_use_id"] == "toolu_valid"
+
+    def test_removes_anthropic_all_orphan(self):
+        """Test removal of Anthropic message when all tool_results are orphans."""
+        from backend.util.prompt import _remove_orphan_tool_responses
+
+        messages = [
+            {
+                "role": "user",
+                "content": [
+                    {
+                        "type": "tool_result",
+                        "tool_use_id": "toolu_orphan1",
+                        "content": "result1",
+                    },
+                    {
+                        "type": "tool_result",
+                        "tool_use_id": "toolu_orphan2",
+                        "content": "result2",
+                    },
+                ],
+            },
+        ]
+        orphan_ids = {"toolu_orphan1", "toolu_orphan2"}
+
+        result = _remove_orphan_tool_responses(messages, orphan_ids)
+
+        # Message should be completely removed since no content left
+        assert len(result) == 0
+
+    def test_preserves_non_tool_messages(self):
+        """Test that non-tool messages are preserved."""
+        from backend.util.prompt import _remove_orphan_tool_responses
+
+        messages = [
+            {"role": "user", "content": "Hello"},
+            {"role": "assistant", "content": "Hi there!"},
+        ]
+        orphan_ids = {"some_id"}
+
+        result = _remove_orphan_tool_responses(messages, orphan_ids)
+
+        assert result == messages
+
+
+class TestCompressResultDataclass:
+    """Test CompressResult dataclass."""
+
+    def test_default_values(self):
+        """Test default values are set correctly."""
+        result = CompressResult(
+            messages=[{"role": "user", "content": "test"}],
+            token_count=10,
+            was_compacted=False,
+        )
+
+        assert result.error is None
+        assert result.original_token_count == 0  # Defaults to 0, not None
+        assert result.messages_summarized == 0
+        assert result.messages_dropped == 0
+
+    def test_all_fields(self):
+        """Test all fields can be set."""
+        result = CompressResult(
+            messages=[{"role": "user", "content": "test"}],
+            token_count=100,
+            was_compacted=True,
+            error="Some error",
+            original_token_count=500,
+            messages_summarized=10,
+            messages_dropped=5,
+        )
+
+        assert result.token_count == 100
+        assert result.was_compacted is True
+        assert result.error == "Some error"
+        assert result.original_token_count == 500
+        assert result.messages_summarized == 10
+        assert result.messages_dropped == 5
diff --git a/autogpt_platform/backend/backend/util/request.py b/autogpt_platform/backend/backend/util/request.py
index 9744372b15..95e5ee32f7 100644
--- a/autogpt_platform/backend/backend/util/request.py
+++ b/autogpt_platform/backend/backend/util/request.py
@@ -157,12 +157,7 @@ async def validate_url(
         is_trusted: Boolean indicating if the hostname is in trusted_origins
         ip_addresses: List of IP addresses for the host; empty if the host is trusted
     """
-    # Canonicalize URL
-    url = url.strip("/ ").replace("\\", "/")
-    parsed = urlparse(url)
-    if not parsed.scheme:
-        url = f"http://{url}"
-        parsed = urlparse(url)
+    parsed = parse_url(url)
 
     # Check scheme
     if parsed.scheme not in ALLOWED_SCHEMES:
@@ -220,6 +215,17 @@ async def validate_url(
     )
 
 
+def parse_url(url: str) -> URL:
+    """Canonicalizes and parses a URL string."""
+    url = url.strip("/ ").replace("\\", "/")
+
+    # Ensure scheme is present for proper parsing
+    if not re.match(r"[a-z0-9+.\-]+://", url):
+        url = f"http://{url}"
+
+    return urlparse(url)
+
+
 def pin_url(url: URL, ip_addresses: Optional[list[str]] = None) -> URL:
     """
     Pins a URL to a specific IP address to prevent DNS rebinding attacks.
diff --git a/autogpt_platform/backend/backend/util/settings.py b/autogpt_platform/backend/backend/util/settings.py
index 0f17b1215c..aa28a4c9ac 100644
--- a/autogpt_platform/backend/backend/util/settings.py
+++ b/autogpt_platform/backend/backend/util/settings.py
@@ -263,8 +263,14 @@ class Config(UpdateTrackingModel["Config"], BaseSettings):
         description="The name of the Google Cloud Storage bucket for media files",
     )
 
+    workspace_storage_dir: str = Field(
+        default="",
+        description="Local directory for workspace file storage when GCS is not configured. "
+        "If empty, defaults to {app_data}/workspaces. Used for self-hosted deployments.",
+    )
+
     reddit_user_agent: str = Field(
-        default="AutoGPT:1.0 (by /u/autogpt)",
+        default="web:AutoGPT:v0.6.0 (by /u/autogpt)",
         description="The user agent for the Reddit API",
     )
 
@@ -350,6 +356,19 @@ class Config(UpdateTrackingModel["Config"], BaseSettings):
         description="Whether to mark failed scans as clean or not",
     )
 
+    agentgenerator_host: str = Field(
+        default="",
+        description="The host for the Agent Generator service (empty to use built-in)",
+    )
+    agentgenerator_port: int = Field(
+        default=8000,
+        description="The port for the Agent Generator service",
+    )
+    agentgenerator_timeout: int = Field(
+        default=600,
+        description="The timeout in seconds for Agent Generator service requests (includes retries for rate limits)",
+    )
+
     enable_example_blocks: bool = Field(
         default=False,
         description="Whether to enable example blocks in production",
@@ -376,6 +395,13 @@ class Config(UpdateTrackingModel["Config"], BaseSettings):
         description="Maximum file size in MB for file uploads (1-1024 MB)",
     )
 
+    max_file_size_mb: int = Field(
+        default=100,
+        ge=1,
+        le=1024,
+        description="Maximum file size in MB for workspace files (1-1024 MB)",
+    )
+
     # AutoMod configuration
     automod_enabled: bool = Field(
         default=False,
@@ -658,6 +684,20 @@ class Secrets(UpdateTrackingModel["Secrets"], BaseSettings):
 
     ayrshare_api_key: str = Field(default="", description="Ayrshare API Key")
     ayrshare_jwt_key: str = Field(default="", description="Ayrshare private Key")
+
+    # Langfuse prompt management
+    langfuse_public_key: str = Field(default="", description="Langfuse public key")
+    langfuse_secret_key: str = Field(default="", description="Langfuse secret key")
+    langfuse_host: str = Field(
+        default="https://cloud.langfuse.com", description="Langfuse host URL"
+    )
+
+    # PostHog analytics
+    posthog_api_key: str = Field(default="", description="PostHog API key")
+    posthog_host: str = Field(
+        default="https://eu.i.posthog.com", description="PostHog host URL"
+    )
+
     # Add more secret fields as needed
     model_config = SettingsConfigDict(
         env_file=".env",
diff --git a/autogpt_platform/backend/backend/util/test.py b/autogpt_platform/backend/backend/util/test.py
index 1e8244ff8e..23d7c24147 100644
--- a/autogpt_platform/backend/backend/util/test.py
+++ b/autogpt_platform/backend/backend/util/test.py
@@ -1,3 +1,4 @@
+import asyncio
 import inspect
 import logging
 import time
@@ -58,6 +59,11 @@ class SpinTestServer:
         self.db_api.__exit__(exc_type, exc_val, exc_tb)
         self.notif_manager.__exit__(exc_type, exc_val, exc_tb)
 
+        # Give services time to fully shut down
+        #  This prevents event loop issues where services haven't fully cleaned up
+        # before the next test starts
+        await asyncio.sleep(0.5)
+
     def setup_dependency_overrides(self):
         # Override get_user_id for testing
         self.agent_server.set_test_dependency_overrides(
@@ -134,14 +140,29 @@ async def execute_block_test(block: Block):
             setattr(block, mock_name, mock_obj)
 
     # Populate credentials argument(s)
+    # Generate IDs for execution context
+    graph_id = str(uuid.uuid4())
+    node_id = str(uuid.uuid4())
+    graph_exec_id = str(uuid.uuid4())
+    node_exec_id = str(uuid.uuid4())
+    user_id = str(uuid.uuid4())
+    graph_version = 1  # Default version for tests
+
     extra_exec_kwargs: dict = {
-        "graph_id": str(uuid.uuid4()),
-        "node_id": str(uuid.uuid4()),
-        "graph_exec_id": str(uuid.uuid4()),
-        "node_exec_id": str(uuid.uuid4()),
-        "user_id": str(uuid.uuid4()),
-        "graph_version": 1,  # Default version for tests
-        "execution_context": ExecutionContext(),
+        "graph_id": graph_id,
+        "node_id": node_id,
+        "graph_exec_id": graph_exec_id,
+        "node_exec_id": node_exec_id,
+        "user_id": user_id,
+        "graph_version": graph_version,
+        "execution_context": ExecutionContext(
+            user_id=user_id,
+            graph_id=graph_id,
+            graph_exec_id=graph_exec_id,
+            graph_version=graph_version,
+            node_id=node_id,
+            node_exec_id=node_exec_id,
+        ),
     }
     input_model = cast(type[BlockSchema], block.input_schema)
 
diff --git a/autogpt_platform/backend/backend/util/workspace.py b/autogpt_platform/backend/backend/util/workspace.py
new file mode 100644
index 0000000000..a2f1a61b9e
--- /dev/null
+++ b/autogpt_platform/backend/backend/util/workspace.py
@@ -0,0 +1,419 @@
+"""
+WorkspaceManager for managing user workspace file operations.
+
+This module provides a high-level interface for workspace file operations,
+combining the storage backend and database layer.
+"""
+
+import logging
+import mimetypes
+import uuid
+from typing import Optional
+
+from prisma.errors import UniqueViolationError
+from prisma.models import UserWorkspaceFile
+
+from backend.data.workspace import (
+    count_workspace_files,
+    create_workspace_file,
+    get_workspace_file,
+    get_workspace_file_by_path,
+    list_workspace_files,
+    soft_delete_workspace_file,
+)
+from backend.util.settings import Config
+from backend.util.workspace_storage import compute_file_checksum, get_workspace_storage
+
+logger = logging.getLogger(__name__)
+
+
+class WorkspaceManager:
+    """
+    Manages workspace file operations.
+
+    Combines storage backend operations with database record management.
+    Supports session-scoped file segmentation where files are stored in
+    session-specific virtual paths: /sessions/{session_id}/{filename}
+    """
+
+    def __init__(
+        self, user_id: str, workspace_id: str, session_id: Optional[str] = None
+    ):
+        """
+        Initialize WorkspaceManager.
+
+        Args:
+            user_id: The user's ID
+            workspace_id: The workspace ID
+            session_id: Optional session ID for session-scoped file access
+        """
+        self.user_id = user_id
+        self.workspace_id = workspace_id
+        self.session_id = session_id
+        # Session path prefix for file isolation
+        self.session_path = f"/sessions/{session_id}" if session_id else ""
+
+    def _resolve_path(self, path: str) -> str:
+        """
+        Resolve a path, defaulting to session folder if session_id is set.
+
+        Cross-session access is allowed by explicitly using /sessions/other-session-id/...
+
+        Args:
+            path: Virtual path (e.g., "/file.txt" or "/sessions/abc123/file.txt")
+
+        Returns:
+            Resolved path with session prefix if applicable
+        """
+        # If path explicitly references a session folder, use it as-is
+        if path.startswith("/sessions/"):
+            return path
+
+        # If we have a session context, prepend session path
+        if self.session_path:
+            # Normalize the path
+            if not path.startswith("/"):
+                path = f"/{path}"
+            return f"{self.session_path}{path}"
+
+        # No session context, use path as-is
+        return path if path.startswith("/") else f"/{path}"
+
+    def _get_effective_path(
+        self, path: Optional[str], include_all_sessions: bool
+    ) -> Optional[str]:
+        """
+        Get effective path for list/count operations based on session context.
+
+        Args:
+            path: Optional path prefix to filter
+            include_all_sessions: If True, don't apply session scoping
+
+        Returns:
+            Effective path prefix for database query
+        """
+        if include_all_sessions:
+            # Normalize path to ensure leading slash (stored paths are normalized)
+            if path is not None and not path.startswith("/"):
+                return f"/{path}"
+            return path
+        elif path is not None:
+            # Resolve the provided path with session scoping
+            return self._resolve_path(path)
+        elif self.session_path:
+            # Default to session folder with trailing slash to prevent prefix collisions
+            # e.g., "/sessions/abc" should not match "/sessions/abc123"
+            return self.session_path.rstrip("/") + "/"
+        else:
+            # No session context, use path as-is
+            return path
+
+    async def read_file(self, path: str) -> bytes:
+        """
+        Read file from workspace by virtual path.
+
+        When session_id is set, paths are resolved relative to the session folder
+        unless they explicitly reference /sessions/...
+
+        Args:
+            path: Virtual path (e.g., "/documents/report.pdf")
+
+        Returns:
+            File content as bytes
+
+        Raises:
+            FileNotFoundError: If file doesn't exist
+        """
+        resolved_path = self._resolve_path(path)
+        file = await get_workspace_file_by_path(self.workspace_id, resolved_path)
+        if file is None:
+            raise FileNotFoundError(f"File not found at path: {resolved_path}")
+
+        storage = await get_workspace_storage()
+        return await storage.retrieve(file.storagePath)
+
+    async def read_file_by_id(self, file_id: str) -> bytes:
+        """
+        Read file from workspace by file ID.
+
+        Args:
+            file_id: The file's ID
+
+        Returns:
+            File content as bytes
+
+        Raises:
+            FileNotFoundError: If file doesn't exist
+        """
+        file = await get_workspace_file(file_id, self.workspace_id)
+        if file is None:
+            raise FileNotFoundError(f"File not found: {file_id}")
+
+        storage = await get_workspace_storage()
+        return await storage.retrieve(file.storagePath)
+
+    async def write_file(
+        self,
+        content: bytes,
+        filename: str,
+        path: Optional[str] = None,
+        mime_type: Optional[str] = None,
+        overwrite: bool = False,
+    ) -> UserWorkspaceFile:
+        """
+        Write file to workspace.
+
+        When session_id is set, files are written to /sessions/{session_id}/...
+        by default. Use explicit /sessions/... paths for cross-session access.
+
+        Args:
+            content: File content as bytes
+            filename: Filename for the file
+            path: Virtual path (defaults to "/{filename}", session-scoped if session_id set)
+            mime_type: MIME type (auto-detected if not provided)
+            overwrite: Whether to overwrite existing file at path
+
+        Returns:
+            Created UserWorkspaceFile instance
+
+        Raises:
+            ValueError: If file exceeds size limit or path already exists
+        """
+        # Enforce file size limit
+        max_file_size = Config().max_file_size_mb * 1024 * 1024
+        if len(content) > max_file_size:
+            raise ValueError(
+                f"File too large: {len(content)} bytes exceeds "
+                f"{Config().max_file_size_mb}MB limit"
+            )
+
+        # Determine path with session scoping
+        if path is None:
+            path = f"/{filename}"
+        elif not path.startswith("/"):
+            path = f"/{path}"
+
+        # Resolve path with session prefix
+        path = self._resolve_path(path)
+
+        # Check if file exists at path (only error for non-overwrite case)
+        # For overwrite=True, we let the write proceed and handle via UniqueViolationError
+        # This ensures the new file is written to storage BEFORE the old one is deleted,
+        # preventing data loss if the new write fails
+        if not overwrite:
+            existing = await get_workspace_file_by_path(self.workspace_id, path)
+            if existing is not None:
+                raise ValueError(f"File already exists at path: {path}")
+
+        # Auto-detect MIME type if not provided
+        if mime_type is None:
+            mime_type, _ = mimetypes.guess_type(filename)
+            mime_type = mime_type or "application/octet-stream"
+
+        # Compute checksum
+        checksum = compute_file_checksum(content)
+
+        # Generate unique file ID for storage
+        file_id = str(uuid.uuid4())
+
+        # Store file in storage backend
+        storage = await get_workspace_storage()
+        storage_path = await storage.store(
+            workspace_id=self.workspace_id,
+            file_id=file_id,
+            filename=filename,
+            content=content,
+        )
+
+        # Create database record - handle race condition where another request
+        # created a file at the same path between our check and create
+        try:
+            file = await create_workspace_file(
+                workspace_id=self.workspace_id,
+                file_id=file_id,
+                name=filename,
+                path=path,
+                storage_path=storage_path,
+                mime_type=mime_type,
+                size_bytes=len(content),
+                checksum=checksum,
+            )
+        except UniqueViolationError:
+            # Race condition: another request created a file at this path
+            if overwrite:
+                # Re-fetch and delete the conflicting file, then retry
+                existing = await get_workspace_file_by_path(self.workspace_id, path)
+                if existing:
+                    await self.delete_file(existing.id)
+                # Retry the create - if this also fails, clean up storage file
+                try:
+                    file = await create_workspace_file(
+                        workspace_id=self.workspace_id,
+                        file_id=file_id,
+                        name=filename,
+                        path=path,
+                        storage_path=storage_path,
+                        mime_type=mime_type,
+                        size_bytes=len(content),
+                        checksum=checksum,
+                    )
+                except Exception:
+                    # Clean up orphaned storage file on retry failure
+                    try:
+                        await storage.delete(storage_path)
+                    except Exception as e:
+                        logger.warning(f"Failed to clean up orphaned storage file: {e}")
+                    raise
+            else:
+                # Clean up the orphaned storage file before raising
+                try:
+                    await storage.delete(storage_path)
+                except Exception as e:
+                    logger.warning(f"Failed to clean up orphaned storage file: {e}")
+                raise ValueError(f"File already exists at path: {path}")
+        except Exception:
+            # Any other database error (connection, validation, etc.) - clean up storage
+            try:
+                await storage.delete(storage_path)
+            except Exception as e:
+                logger.warning(f"Failed to clean up orphaned storage file: {e}")
+            raise
+
+        logger.info(
+            f"Wrote file {file.id} ({filename}) to workspace {self.workspace_id} "
+            f"at path {path}, size={len(content)} bytes"
+        )
+
+        return file
+
+    async def list_files(
+        self,
+        path: Optional[str] = None,
+        limit: Optional[int] = None,
+        offset: int = 0,
+        include_all_sessions: bool = False,
+    ) -> list[UserWorkspaceFile]:
+        """
+        List files in workspace.
+
+        When session_id is set and include_all_sessions is False (default),
+        only files in the current session's folder are listed.
+
+        Args:
+            path: Optional path prefix to filter (e.g., "/documents/")
+            limit: Maximum number of files to return
+            offset: Number of files to skip
+            include_all_sessions: If True, list files from all sessions.
+                                  If False (default), only list current session's files.
+
+        Returns:
+            List of UserWorkspaceFile instances
+        """
+        effective_path = self._get_effective_path(path, include_all_sessions)
+
+        return await list_workspace_files(
+            workspace_id=self.workspace_id,
+            path_prefix=effective_path,
+            limit=limit,
+            offset=offset,
+        )
+
+    async def delete_file(self, file_id: str) -> bool:
+        """
+        Delete a file (soft-delete).
+
+        Args:
+            file_id: The file's ID
+
+        Returns:
+            True if deleted, False if not found
+        """
+        file = await get_workspace_file(file_id, self.workspace_id)
+        if file is None:
+            return False
+
+        # Delete from storage
+        storage = await get_workspace_storage()
+        try:
+            await storage.delete(file.storagePath)
+        except Exception as e:
+            logger.warning(f"Failed to delete file from storage: {e}")
+            # Continue with database soft-delete even if storage delete fails
+
+        # Soft-delete database record
+        result = await soft_delete_workspace_file(file_id, self.workspace_id)
+        return result is not None
+
+    async def get_download_url(self, file_id: str, expires_in: int = 3600) -> str:
+        """
+        Get download URL for a file.
+
+        Args:
+            file_id: The file's ID
+            expires_in: URL expiration in seconds (default 1 hour)
+
+        Returns:
+            Download URL (signed URL for GCS, API endpoint for local)
+
+        Raises:
+            FileNotFoundError: If file doesn't exist
+        """
+        file = await get_workspace_file(file_id, self.workspace_id)
+        if file is None:
+            raise FileNotFoundError(f"File not found: {file_id}")
+
+        storage = await get_workspace_storage()
+        return await storage.get_download_url(file.storagePath, expires_in)
+
+    async def get_file_info(self, file_id: str) -> Optional[UserWorkspaceFile]:
+        """
+        Get file metadata.
+
+        Args:
+            file_id: The file's ID
+
+        Returns:
+            UserWorkspaceFile instance or None
+        """
+        return await get_workspace_file(file_id, self.workspace_id)
+
+    async def get_file_info_by_path(self, path: str) -> Optional[UserWorkspaceFile]:
+        """
+        Get file metadata by path.
+
+        When session_id is set, paths are resolved relative to the session folder
+        unless they explicitly reference /sessions/...
+
+        Args:
+            path: Virtual path
+
+        Returns:
+            UserWorkspaceFile instance or None
+        """
+        resolved_path = self._resolve_path(path)
+        return await get_workspace_file_by_path(self.workspace_id, resolved_path)
+
+    async def get_file_count(
+        self,
+        path: Optional[str] = None,
+        include_all_sessions: bool = False,
+    ) -> int:
+        """
+        Get number of files in workspace.
+
+        When session_id is set and include_all_sessions is False (default),
+        only counts files in the current session's folder.
+
+        Args:
+            path: Optional path prefix to filter (e.g., "/documents/")
+            include_all_sessions: If True, count all files in workspace.
+                                  If False (default), only count current session's files.
+
+        Returns:
+            Number of files
+        """
+        effective_path = self._get_effective_path(path, include_all_sessions)
+
+        return await count_workspace_files(
+            self.workspace_id, path_prefix=effective_path
+        )
diff --git a/autogpt_platform/backend/backend/util/workspace_storage.py b/autogpt_platform/backend/backend/util/workspace_storage.py
new file mode 100644
index 0000000000..2f4c8ae2b5
--- /dev/null
+++ b/autogpt_platform/backend/backend/util/workspace_storage.py
@@ -0,0 +1,398 @@
+"""
+Workspace storage backend abstraction for supporting both cloud and local deployments.
+
+This module provides a unified interface for storing workspace files, with implementations
+for Google Cloud Storage (cloud deployments) and local filesystem (self-hosted deployments).
+"""
+
+import asyncio
+import hashlib
+import logging
+from abc import ABC, abstractmethod
+from datetime import datetime, timezone
+from pathlib import Path
+from typing import Optional
+
+import aiofiles
+import aiohttp
+from gcloud.aio import storage as async_gcs_storage
+from google.cloud import storage as gcs_storage
+
+from backend.util.data import get_data_path
+from backend.util.gcs_utils import (
+    download_with_fresh_session,
+    generate_signed_url,
+    parse_gcs_path,
+)
+from backend.util.settings import Config
+
+logger = logging.getLogger(__name__)
+
+
+class WorkspaceStorageBackend(ABC):
+    """Abstract interface for workspace file storage."""
+
+    @abstractmethod
+    async def store(
+        self,
+        workspace_id: str,
+        file_id: str,
+        filename: str,
+        content: bytes,
+    ) -> str:
+        """
+        Store file content, return storage path.
+
+        Args:
+            workspace_id: The workspace ID
+            file_id: Unique file ID for storage
+            filename: Original filename
+            content: File content as bytes
+
+        Returns:
+            Storage path string (cloud path or local path)
+        """
+        pass
+
+    @abstractmethod
+    async def retrieve(self, storage_path: str) -> bytes:
+        """
+        Retrieve file content from storage.
+
+        Args:
+            storage_path: The storage path returned from store()
+
+        Returns:
+            File content as bytes
+        """
+        pass
+
+    @abstractmethod
+    async def delete(self, storage_path: str) -> None:
+        """
+        Delete file from storage.
+
+        Args:
+            storage_path: The storage path to delete
+        """
+        pass
+
+    @abstractmethod
+    async def get_download_url(self, storage_path: str, expires_in: int = 3600) -> str:
+        """
+        Get URL for downloading the file.
+
+        Args:
+            storage_path: The storage path
+            expires_in: URL expiration time in seconds (default 1 hour)
+
+        Returns:
+            Download URL (signed URL for GCS, direct API path for local)
+        """
+        pass
+
+
+class GCSWorkspaceStorage(WorkspaceStorageBackend):
+    """Google Cloud Storage implementation for workspace storage."""
+
+    def __init__(self, bucket_name: str):
+        self.bucket_name = bucket_name
+        self._async_client: Optional[async_gcs_storage.Storage] = None
+        self._sync_client: Optional[gcs_storage.Client] = None
+        self._session: Optional[aiohttp.ClientSession] = None
+
+    async def _get_async_client(self) -> async_gcs_storage.Storage:
+        """Get or create async GCS client."""
+        if self._async_client is None:
+            self._session = aiohttp.ClientSession(
+                connector=aiohttp.TCPConnector(limit=100, force_close=False)
+            )
+            self._async_client = async_gcs_storage.Storage(session=self._session)
+        return self._async_client
+
+    def _get_sync_client(self) -> gcs_storage.Client:
+        """Get or create sync GCS client (for signed URLs)."""
+        if self._sync_client is None:
+            self._sync_client = gcs_storage.Client()
+        return self._sync_client
+
+    async def close(self) -> None:
+        """Close all client connections."""
+        if self._async_client is not None:
+            try:
+                await self._async_client.close()
+            except Exception as e:
+                logger.warning(f"Error closing GCS client: {e}")
+            self._async_client = None
+
+        if self._session is not None:
+            try:
+                await self._session.close()
+            except Exception as e:
+                logger.warning(f"Error closing session: {e}")
+            self._session = None
+
+    def _build_blob_name(self, workspace_id: str, file_id: str, filename: str) -> str:
+        """Build the blob path for workspace files."""
+        return f"workspaces/{workspace_id}/{file_id}/{filename}"
+
+    async def store(
+        self,
+        workspace_id: str,
+        file_id: str,
+        filename: str,
+        content: bytes,
+    ) -> str:
+        """Store file in GCS."""
+        client = await self._get_async_client()
+        blob_name = self._build_blob_name(workspace_id, file_id, filename)
+
+        # Upload with metadata
+        upload_time = datetime.now(timezone.utc)
+        await client.upload(
+            self.bucket_name,
+            blob_name,
+            content,
+            metadata={
+                "uploaded_at": upload_time.isoformat(),
+                "workspace_id": workspace_id,
+                "file_id": file_id,
+            },
+        )
+
+        return f"gcs://{self.bucket_name}/{blob_name}"
+
+    async def retrieve(self, storage_path: str) -> bytes:
+        """Retrieve file from GCS."""
+        bucket_name, blob_name = parse_gcs_path(storage_path)
+        return await download_with_fresh_session(bucket_name, blob_name)
+
+    async def delete(self, storage_path: str) -> None:
+        """Delete file from GCS."""
+        bucket_name, blob_name = parse_gcs_path(storage_path)
+        client = await self._get_async_client()
+
+        try:
+            await client.delete(bucket_name, blob_name)
+        except Exception as e:
+            if "404" not in str(e) and "Not Found" not in str(e):
+                raise
+            # File already deleted, that's fine
+
+    async def get_download_url(self, storage_path: str, expires_in: int = 3600) -> str:
+        """
+        Generate download URL for GCS file.
+
+        Attempts to generate a signed URL if running with service account credentials.
+        Falls back to an API proxy endpoint if signed URL generation fails
+        (e.g., when running locally with user OAuth credentials).
+        """
+        bucket_name, blob_name = parse_gcs_path(storage_path)
+
+        # Extract file_id from blob_name for fallback: workspaces/{workspace_id}/{file_id}/{filename}
+        blob_parts = blob_name.split("/")
+        file_id = blob_parts[2] if len(blob_parts) >= 3 else None
+
+        # Try to generate signed URL (requires service account credentials)
+        try:
+            sync_client = self._get_sync_client()
+            return await generate_signed_url(
+                sync_client, bucket_name, blob_name, expires_in
+            )
+        except AttributeError as e:
+            # Signed URL generation requires service account with private key.
+            # When running with user OAuth credentials, fall back to API proxy.
+            if "private key" in str(e) and file_id:
+                logger.debug(
+                    "Cannot generate signed URL (no service account credentials), "
+                    "falling back to API proxy endpoint"
+                )
+                return f"/api/workspace/files/{file_id}/download"
+            raise
+
+
+class LocalWorkspaceStorage(WorkspaceStorageBackend):
+    """Local filesystem implementation for workspace storage (self-hosted deployments)."""
+
+    def __init__(self, base_dir: Optional[str] = None):
+        """
+        Initialize local storage backend.
+
+        Args:
+            base_dir: Base directory for workspace storage.
+                     If None, defaults to {app_data}/workspaces
+        """
+        if base_dir:
+            self.base_dir = Path(base_dir)
+        else:
+            self.base_dir = Path(get_data_path()) / "workspaces"
+
+        # Ensure base directory exists
+        self.base_dir.mkdir(parents=True, exist_ok=True)
+
+    def _build_file_path(self, workspace_id: str, file_id: str, filename: str) -> Path:
+        """Build the local file path with path traversal protection."""
+        # Import here to avoid circular import
+        # (file.py imports workspace.py which imports workspace_storage.py)
+        from backend.util.file import sanitize_filename
+
+        # Sanitize filename to prevent path traversal (removes / and \ among others)
+        safe_filename = sanitize_filename(filename)
+        file_path = (self.base_dir / workspace_id / file_id / safe_filename).resolve()
+
+        # Verify the resolved path is still under base_dir
+        if not file_path.is_relative_to(self.base_dir.resolve()):
+            raise ValueError("Invalid filename: path traversal detected")
+
+        return file_path
+
+    def _parse_storage_path(self, storage_path: str) -> Path:
+        """Parse local storage path to filesystem path."""
+        if storage_path.startswith("local://"):
+            relative_path = storage_path[8:]  # Remove "local://"
+        else:
+            relative_path = storage_path
+
+        full_path = (self.base_dir / relative_path).resolve()
+
+        # Security check: ensure path is under base_dir
+        # Use is_relative_to() for robust path containment check
+        # (handles case-insensitive filesystems and edge cases)
+        if not full_path.is_relative_to(self.base_dir.resolve()):
+            raise ValueError("Invalid storage path: path traversal detected")
+
+        return full_path
+
+    async def store(
+        self,
+        workspace_id: str,
+        file_id: str,
+        filename: str,
+        content: bytes,
+    ) -> str:
+        """Store file locally."""
+        file_path = self._build_file_path(workspace_id, file_id, filename)
+
+        # Create parent directories
+        file_path.parent.mkdir(parents=True, exist_ok=True)
+
+        # Write file asynchronously
+        async with aiofiles.open(file_path, "wb") as f:
+            await f.write(content)
+
+        # Return relative path as storage path
+        relative_path = file_path.relative_to(self.base_dir)
+        return f"local://{relative_path}"
+
+    async def retrieve(self, storage_path: str) -> bytes:
+        """Retrieve file from local storage."""
+        file_path = self._parse_storage_path(storage_path)
+
+        if not file_path.exists():
+            raise FileNotFoundError(f"File not found: {storage_path}")
+
+        async with aiofiles.open(file_path, "rb") as f:
+            return await f.read()
+
+    async def delete(self, storage_path: str) -> None:
+        """Delete file from local storage."""
+        file_path = self._parse_storage_path(storage_path)
+
+        if file_path.exists():
+            # Remove file
+            file_path.unlink()
+
+            # Clean up empty parent directories
+            parent = file_path.parent
+            while parent != self.base_dir:
+                try:
+                    if parent.exists() and not any(parent.iterdir()):
+                        parent.rmdir()
+                    else:
+                        break
+                except OSError:
+                    break
+                parent = parent.parent
+
+    async def get_download_url(self, storage_path: str, expires_in: int = 3600) -> str:
+        """
+        Get download URL for local file.
+
+        For local storage, this returns an API endpoint path.
+        The actual serving is handled by the API layer.
+        """
+        # Parse the storage path to get the components
+        if storage_path.startswith("local://"):
+            relative_path = storage_path[8:]
+        else:
+            relative_path = storage_path
+
+        # Return the API endpoint for downloading
+        # The file_id is extracted from the path: {workspace_id}/{file_id}/{filename}
+        parts = relative_path.split("/")
+        if len(parts) >= 2:
+            file_id = parts[1]  # Second component is file_id
+            return f"/api/workspace/files/{file_id}/download"
+        else:
+            raise ValueError(f"Invalid storage path format: {storage_path}")
+
+
+# Global storage backend instance
+_workspace_storage: Optional[WorkspaceStorageBackend] = None
+_storage_lock = asyncio.Lock()
+
+
+async def get_workspace_storage() -> WorkspaceStorageBackend:
+    """
+    Get the workspace storage backend instance.
+
+    Uses GCS if media_gcs_bucket_name is configured, otherwise uses local storage.
+    """
+    global _workspace_storage
+
+    if _workspace_storage is None:
+        async with _storage_lock:
+            if _workspace_storage is None:
+                config = Config()
+
+                if config.media_gcs_bucket_name:
+                    logger.info(
+                        f"Using GCS workspace storage: {config.media_gcs_bucket_name}"
+                    )
+                    _workspace_storage = GCSWorkspaceStorage(
+                        config.media_gcs_bucket_name
+                    )
+                else:
+                    storage_dir = (
+                        config.workspace_storage_dir
+                        if config.workspace_storage_dir
+                        else None
+                    )
+                    logger.info(
+                        f"Using local workspace storage: {storage_dir or 'default'}"
+                    )
+                    _workspace_storage = LocalWorkspaceStorage(storage_dir)
+
+    return _workspace_storage
+
+
+async def shutdown_workspace_storage() -> None:
+    """
+    Properly shutdown the global workspace storage backend.
+
+    Closes aiohttp sessions and other resources for GCS backend.
+    Should be called during application shutdown.
+    """
+    global _workspace_storage
+
+    if _workspace_storage is not None:
+        async with _storage_lock:
+            if _workspace_storage is not None:
+                if isinstance(_workspace_storage, GCSWorkspaceStorage):
+                    await _workspace_storage.close()
+                _workspace_storage = None
+
+
+def compute_file_checksum(content: bytes) -> str:
+    """Compute SHA256 checksum of file content."""
+    return hashlib.sha256(content).hexdigest()
diff --git a/autogpt_platform/backend/gen_prisma_types_stub.py b/autogpt_platform/backend/gen_prisma_types_stub.py
new file mode 100644
index 0000000000..3f6073b2ff
--- /dev/null
+++ b/autogpt_platform/backend/gen_prisma_types_stub.py
@@ -0,0 +1,227 @@
+#!/usr/bin/env python3
+"""
+Generate a lightweight stub for prisma/types.py that collapses all exported
+symbols to Any. This prevents Pyright from spending time/budget on Prisma's
+query DSL types while keeping runtime behavior unchanged.
+
+Usage:
+    poetry run gen-prisma-stub
+
+This script automatically finds the prisma package location and generates
+the types.pyi stub file in the same directory as types.py.
+"""
+
+from __future__ import annotations
+
+import ast
+import importlib.util
+import sys
+from pathlib import Path
+from typing import Iterable, Set
+
+
+def _iter_assigned_names(target: ast.expr) -> Iterable[str]:
+    """Extract names from assignment targets (handles tuple unpacking)."""
+    if isinstance(target, ast.Name):
+        yield target.id
+    elif isinstance(target, (ast.Tuple, ast.List)):
+        for elt in target.elts:
+            yield from _iter_assigned_names(elt)
+
+
+def _is_private(name: str) -> bool:
+    """Check if a name is private (starts with _ but not __)."""
+    return name.startswith("_") and not name.startswith("__")
+
+
+def _is_safe_type_alias(node: ast.Assign) -> bool:
+    """Check if an assignment is a safe type alias that shouldn't be stubbed.
+
+    Safe types are:
+    - Literal types (don't cause type budget issues)
+    - Simple type references (SortMode, SortOrder, etc.)
+    - TypeVar definitions
+    """
+    if not node.value:
+        return False
+
+    # Check if it's a Subscript (like Literal[...], Union[...], TypeVar[...])
+    if isinstance(node.value, ast.Subscript):
+        # Get the base type name
+        if isinstance(node.value.value, ast.Name):
+            base_name = node.value.value.id
+            # Literal types are safe
+            if base_name == "Literal":
+                return True
+            # TypeVar is safe
+            if base_name == "TypeVar":
+                return True
+        elif isinstance(node.value.value, ast.Attribute):
+            # Handle typing_extensions.Literal etc.
+            if node.value.value.attr == "Literal":
+                return True
+
+    # Check if it's a simple Name reference (like SortMode = _types.SortMode)
+    if isinstance(node.value, ast.Attribute):
+        return True
+
+    # Check if it's a Call (like TypeVar(...))
+    if isinstance(node.value, ast.Call):
+        if isinstance(node.value.func, ast.Name):
+            if node.value.func.id == "TypeVar":
+                return True
+
+    return False
+
+
+def collect_top_level_symbols(
+    tree: ast.Module, source_lines: list[str]
+) -> tuple[Set[str], Set[str], list[str], Set[str]]:
+    """Collect all top-level symbols from an AST module.
+
+    Returns:
+        Tuple of (class_names, function_names, safe_variable_sources, unsafe_variable_names)
+        safe_variable_sources contains the actual source code lines for safe variables
+    """
+    classes: Set[str] = set()
+    functions: Set[str] = set()
+    safe_variable_sources: list[str] = []
+    unsafe_variables: Set[str] = set()
+
+    for node in tree.body:
+        if isinstance(node, ast.ClassDef):
+            if not _is_private(node.name):
+                classes.add(node.name)
+        elif isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef)):
+            if not _is_private(node.name):
+                functions.add(node.name)
+        elif isinstance(node, ast.Assign):
+            is_safe = _is_safe_type_alias(node)
+            names = []
+            for t in node.targets:
+                for n in _iter_assigned_names(t):
+                    if not _is_private(n):
+                        names.append(n)
+            if names:
+                if is_safe:
+                    # Extract the source code for this assignment
+                    start_line = node.lineno - 1  # 0-indexed
+                    end_line = node.end_lineno if node.end_lineno else node.lineno
+                    source = "\n".join(source_lines[start_line:end_line])
+                    safe_variable_sources.append(source)
+                else:
+                    unsafe_variables.update(names)
+        elif isinstance(node, ast.AnnAssign) and node.target:
+            # Annotated assignments are always stubbed
+            for n in _iter_assigned_names(node.target):
+                if not _is_private(n):
+                    unsafe_variables.add(n)
+
+    return classes, functions, safe_variable_sources, unsafe_variables
+
+
+def find_prisma_types_path() -> Path:
+    """Find the prisma types.py file in the installed package."""
+    spec = importlib.util.find_spec("prisma")
+    if spec is None or spec.origin is None:
+        raise RuntimeError("Could not find prisma package. Is it installed?")
+
+    prisma_dir = Path(spec.origin).parent
+    types_path = prisma_dir / "types.py"
+
+    if not types_path.exists():
+        raise RuntimeError(f"prisma/types.py not found at {types_path}")
+
+    return types_path
+
+
+def generate_stub(src_path: Path, stub_path: Path) -> int:
+    """Generate the .pyi stub file from the source types.py."""
+    code = src_path.read_text(encoding="utf-8", errors="ignore")
+    source_lines = code.splitlines()
+    tree = ast.parse(code, filename=str(src_path))
+    classes, functions, safe_variable_sources, unsafe_variables = (
+        collect_top_level_symbols(tree, source_lines)
+    )
+
+    header = """\
+# -*- coding: utf-8 -*-
+# Auto-generated stub file - DO NOT EDIT
+# Generated by gen_prisma_types_stub.py
+#
+# This stub intentionally collapses complex Prisma query DSL types to Any.
+# Prisma's generated types can explode Pyright's type inference budgets
+# on large schemas. We collapse them to Any so the rest of the codebase
+# can remain strongly typed while keeping runtime behavior unchanged.
+#
+# Safe types (Literal, TypeVar, simple references) are preserved from the
+# original types.py to maintain proper type checking where possible.
+
+from __future__ import annotations
+from typing import Any
+from typing_extensions import Literal
+
+# Re-export commonly used typing constructs that may be imported from this module
+from typing import TYPE_CHECKING, TypeVar, Generic, Union, Optional, List, Dict
+
+# Base type alias for stubbed Prisma types - allows any dict structure
+_PrismaDict = dict[str, Any]
+
+"""
+
+    lines = [header]
+
+    # Include safe variable definitions (Literal types, TypeVars, etc.)
+    lines.append("# Safe type definitions preserved from original types.py")
+    for source in safe_variable_sources:
+        lines.append(source)
+    lines.append("")
+
+    # Stub all classes and unsafe variables uniformly as dict[str, Any] aliases
+    # This allows:
+    # 1. Use in type annotations: x: SomeType
+    # 2. Constructor calls: SomeType(...)
+    # 3. Dict literal assignments: x: SomeType = {...}
+    lines.append(
+        "# Stubbed types (collapsed to dict[str, Any] to prevent type budget exhaustion)"
+    )
+    all_stubbed = sorted(classes | unsafe_variables)
+    for name in all_stubbed:
+        lines.append(f"{name} = _PrismaDict")
+
+    lines.append("")
+
+    # Stub functions
+    for name in sorted(functions):
+        lines.append(f"def {name}(*args: Any, **kwargs: Any) -> Any: ...")
+
+    lines.append("")
+
+    stub_path.write_text("\n".join(lines), encoding="utf-8")
+    return (
+        len(classes)
+        + len(functions)
+        + len(safe_variable_sources)
+        + len(unsafe_variables)
+    )
+
+
+def main() -> None:
+    """Main entry point."""
+    try:
+        types_path = find_prisma_types_path()
+        stub_path = types_path.with_suffix(".pyi")
+
+        print(f"Found prisma types.py at: {types_path}")
+        print(f"Generating stub at: {stub_path}")
+
+        num_symbols = generate_stub(types_path, stub_path)
+        print(f"Generated {stub_path.name} with {num_symbols} Any-typed symbols")
+
+    except Exception as e:
+        print(f"Error: {e}", file=sys.stderr)
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/autogpt_platform/backend/linter.py b/autogpt_platform/backend/linter.py
index a86e6761f7..599aae4580 100644
--- a/autogpt_platform/backend/linter.py
+++ b/autogpt_platform/backend/linter.py
@@ -25,6 +25,9 @@ def run(*command: str) -> None:
 
 
 def lint():
+    # Generate Prisma types stub before running pyright to prevent type budget exhaustion
+    run("gen-prisma-stub")
+
     lint_step_args: list[list[str]] = [
         ["ruff", "check", *TARGET_DIRS, "--exit-zero"],
         ["ruff", "format", "--diff", "--check", LIBS_DIR],
@@ -49,4 +52,6 @@ def format():
     run("ruff", "format", LIBS_DIR)
     run("isort", "--profile", "black", BACKEND_DIR)
     run("black", BACKEND_DIR)
+    # Generate Prisma types stub before running pyright to prevent type budget exhaustion
+    run("gen-prisma-stub")
     run("pyright", *TARGET_DIRS)
diff --git a/autogpt_platform/backend/migrations/20260109181714_add_docs_embedding/migration.sql b/autogpt_platform/backend/migrations/20260109181714_add_docs_embedding/migration.sql
new file mode 100644
index 0000000000..a839070a28
--- /dev/null
+++ b/autogpt_platform/backend/migrations/20260109181714_add_docs_embedding/migration.sql
@@ -0,0 +1,74 @@
+-- CreateExtension
+-- Supabase: pgvector must be enabled via Dashboard → Database → Extensions first
+-- Ensures vector extension is in the current schema (from DATABASE_URL ?schema= param)
+-- If it exists in a different schema (e.g., public), we drop and recreate it in the current schema
+-- This ensures vector type is in the same schema as tables, making ::vector work without explicit qualification
+DO $$
+DECLARE
+    current_schema_name text;
+    vector_schema text;
+BEGIN
+    -- Get the current schema from search_path
+    SELECT current_schema() INTO current_schema_name;
+
+    -- Check if vector extension exists and which schema it's in
+    SELECT n.nspname INTO vector_schema
+    FROM pg_extension e
+    JOIN pg_namespace n ON e.extnamespace = n.oid
+    WHERE e.extname = 'vector';
+
+    -- Handle removal if in wrong schema
+    IF vector_schema IS NOT NULL AND vector_schema != current_schema_name THEN
+        BEGIN
+            -- Vector exists in a different schema, drop it first
+            RAISE WARNING 'pgvector found in schema "%" but need it in "%". Dropping and reinstalling...',
+                vector_schema, current_schema_name;
+            EXECUTE 'DROP EXTENSION IF EXISTS vector CASCADE';
+        EXCEPTION WHEN OTHERS THEN
+            RAISE EXCEPTION 'Failed to drop pgvector from schema "%": %. You may need to drop it manually.',
+                vector_schema, SQLERRM;
+        END;
+    END IF;
+
+    -- Create extension in current schema (let it fail naturally if not available)
+    EXECUTE format('CREATE EXTENSION IF NOT EXISTS vector SCHEMA %I', current_schema_name);
+END $$;
+
+-- CreateEnum
+CREATE TYPE "ContentType" AS ENUM ('STORE_AGENT', 'BLOCK', 'INTEGRATION', 'DOCUMENTATION', 'LIBRARY_AGENT');
+
+-- CreateTable
+CREATE TABLE "UnifiedContentEmbedding" (
+    "id" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "contentType" "ContentType" NOT NULL,
+    "contentId" TEXT NOT NULL,
+    "userId" TEXT,
+    "embedding" vector(1536) NOT NULL,
+    "searchableText" TEXT NOT NULL,
+    "metadata" JSONB NOT NULL DEFAULT '{}',
+
+    CONSTRAINT "UnifiedContentEmbedding_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "UnifiedContentEmbedding_contentType_idx" ON "UnifiedContentEmbedding"("contentType");
+
+-- CreateIndex
+CREATE INDEX "UnifiedContentEmbedding_userId_idx" ON "UnifiedContentEmbedding"("userId");
+
+-- CreateIndex
+CREATE INDEX "UnifiedContentEmbedding_contentType_userId_idx" ON "UnifiedContentEmbedding"("contentType", "userId");
+
+-- CreateIndex
+-- NULLS NOT DISTINCT ensures only one public (NULL userId) embedding per contentType+contentId
+-- Requires PostgreSQL 15+. Supabase uses PostgreSQL 15+.
+CREATE UNIQUE INDEX "UnifiedContentEmbedding_contentType_contentId_userId_key" ON "UnifiedContentEmbedding"("contentType", "contentId", "userId") NULLS NOT DISTINCT;
+
+-- CreateIndex
+-- HNSW index for fast vector similarity search on embeddings
+-- Uses cosine distance operator (<=>), which matches the query in hybrid_search.py
+-- Note: Drop first in case Prisma created a btree index (Prisma doesn't support HNSW)
+DROP INDEX IF EXISTS "UnifiedContentEmbedding_embedding_idx";
+CREATE INDEX "UnifiedContentEmbedding_embedding_idx" ON "UnifiedContentEmbedding" USING hnsw ("embedding" vector_cosine_ops);
diff --git a/autogpt_platform/backend/migrations/20260113170839_add_ended_at_to_agent_graph_execution/migration.sql b/autogpt_platform/backend/migrations/20260113170839_add_ended_at_to_agent_graph_execution/migration.sql
new file mode 100644
index 0000000000..95fa3a573a
--- /dev/null
+++ b/autogpt_platform/backend/migrations/20260113170839_add_ended_at_to_agent_graph_execution/migration.sql
@@ -0,0 +1,8 @@
+-- AlterTable
+ALTER TABLE "AgentGraphExecution" ADD COLUMN "endedAt" TIMESTAMP(3);
+
+-- Set endedAt to updatedAt for existing records with terminal status only
+UPDATE "AgentGraphExecution"
+SET "endedAt" = "updatedAt"
+WHERE "endedAt" IS NULL
+  AND "executionStatus" IN ('COMPLETED', 'FAILED', 'TERMINATED');
diff --git a/autogpt_platform/backend/migrations/20260115081736_add_chat_tables/migration.sql b/autogpt_platform/backend/migrations/20260115081736_add_chat_tables/migration.sql
new file mode 100644
index 0000000000..2c964858e6
--- /dev/null
+++ b/autogpt_platform/backend/migrations/20260115081736_add_chat_tables/migration.sql
@@ -0,0 +1,64 @@
+-- CreateTable
+CREATE TABLE "CoPilotUnderstanding" (
+    "id" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "userId" TEXT NOT NULL,
+    "data" JSONB,
+
+    CONSTRAINT "CoPilotUnderstanding_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "ChatSession" (
+    "id" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "userId" TEXT NOT NULL,
+    "title" TEXT,
+    "credentials" JSONB NOT NULL DEFAULT '{}',
+    "successfulAgentRuns" JSONB NOT NULL DEFAULT '{}',
+    "successfulAgentSchedules" JSONB NOT NULL DEFAULT '{}',
+    "totalPromptTokens" INTEGER NOT NULL DEFAULT 0,
+    "totalCompletionTokens" INTEGER NOT NULL DEFAULT 0,
+
+    CONSTRAINT "ChatSession_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "ChatMessage" (
+    "id" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "sessionId" TEXT NOT NULL,
+    "role" TEXT NOT NULL,
+    "content" TEXT,
+    "name" TEXT,
+    "toolCallId" TEXT,
+    "refusal" TEXT,
+    "toolCalls" JSONB,
+    "functionCall" JSONB,
+    "sequence" INTEGER NOT NULL,
+
+    CONSTRAINT "ChatMessage_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "CoPilotUnderstanding_userId_key" ON "CoPilotUnderstanding"("userId");
+
+-- CreateIndex
+CREATE INDEX "CoPilotUnderstanding_userId_idx" ON "CoPilotUnderstanding"("userId");
+
+-- CreateIndex
+CREATE INDEX "ChatSession_userId_updatedAt_idx" ON "ChatSession"("userId", "updatedAt");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "ChatMessage_sessionId_sequence_key" ON "ChatMessage"("sessionId", "sequence");
+
+-- AddForeignKey
+ALTER TABLE "CoPilotUnderstanding" ADD CONSTRAINT "CoPilotUnderstanding_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "ChatSession" ADD CONSTRAINT "ChatSession_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "ChatMessage" ADD CONSTRAINT "ChatMessage_sessionId_fkey" FOREIGN KEY ("sessionId") REFERENCES "ChatSession"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/autogpt_platform/backend/migrations/20260115200000_add_unified_search_tsvector/migration.sql b/autogpt_platform/backend/migrations/20260115200000_add_unified_search_tsvector/migration.sql
new file mode 100644
index 0000000000..be3062cbfb
--- /dev/null
+++ b/autogpt_platform/backend/migrations/20260115200000_add_unified_search_tsvector/migration.sql
@@ -0,0 +1,35 @@
+-- Add tsvector search column to UnifiedContentEmbedding for unified full-text search
+-- This enables hybrid search (semantic + lexical) across all content types
+
+-- Add search column (IF NOT EXISTS for idempotency)
+ALTER TABLE "UnifiedContentEmbedding" ADD COLUMN IF NOT EXISTS "search" tsvector DEFAULT ''::tsvector;
+
+-- Create GIN index for fast full-text search
+-- No @@index in schema.prisma - Prisma may generate DROP INDEX on migrate dev
+-- If that happens, just let it drop and this migration will recreate it, or manually re-run:
+--   CREATE INDEX IF NOT EXISTS "UnifiedContentEmbedding_search_idx" ON "UnifiedContentEmbedding" USING GIN ("search");
+DROP INDEX IF EXISTS "UnifiedContentEmbedding_search_idx";
+CREATE INDEX "UnifiedContentEmbedding_search_idx" ON "UnifiedContentEmbedding" USING GIN ("search");
+
+-- Drop existing trigger/function if exists
+DROP TRIGGER IF EXISTS "update_unified_tsvector" ON "UnifiedContentEmbedding";
+DROP FUNCTION IF EXISTS update_unified_tsvector_column();
+
+-- Create function to auto-update tsvector from searchableText
+CREATE OR REPLACE FUNCTION update_unified_tsvector_column() RETURNS TRIGGER AS $$
+BEGIN
+  NEW.search := to_tsvector('english', COALESCE(NEW."searchableText", ''));
+  RETURN NEW;
+END;
+$$ LANGUAGE plpgsql SECURITY DEFINER SET search_path = platform, pg_temp;
+
+-- Create trigger to auto-update search column on insert/update
+CREATE TRIGGER "update_unified_tsvector"
+BEFORE INSERT OR UPDATE ON "UnifiedContentEmbedding"
+FOR EACH ROW
+EXECUTE FUNCTION update_unified_tsvector_column();
+
+-- Backfill existing rows
+UPDATE "UnifiedContentEmbedding"
+SET search = to_tsvector('english', COALESCE("searchableText", ''))
+WHERE search IS NULL OR search = ''::tsvector;
diff --git a/autogpt_platform/backend/migrations/20260115210000_remove_storelistingversion_search/migration.sql b/autogpt_platform/backend/migrations/20260115210000_remove_storelistingversion_search/migration.sql
new file mode 100644
index 0000000000..4550340330
--- /dev/null
+++ b/autogpt_platform/backend/migrations/20260115210000_remove_storelistingversion_search/migration.sql
@@ -0,0 +1,90 @@
+-- Remove the old search column from StoreListingVersion
+-- This column has been replaced by UnifiedContentEmbedding.search
+-- which provides unified hybrid search across all content types
+
+-- First drop the dependent view
+DROP VIEW IF EXISTS "StoreAgent";
+
+-- Drop the trigger and function for old search column
+-- The original trigger was created in 20251016093049_add_full_text_search
+DROP TRIGGER IF EXISTS "update_tsvector" ON "StoreListingVersion";
+DROP FUNCTION IF EXISTS update_tsvector_column();
+
+-- Drop the index
+DROP INDEX IF EXISTS "StoreListingVersion_search_idx";
+
+-- NOTE: Keeping search column for now to allow easy revert if needed
+-- Uncomment to fully remove once migration is verified in production:
+-- ALTER TABLE "StoreListingVersion" DROP COLUMN IF EXISTS "search";
+
+-- Recreate the StoreAgent view WITHOUT the search column
+-- (Search now handled by UnifiedContentEmbedding)
+CREATE OR REPLACE VIEW "StoreAgent" AS
+WITH latest_versions AS (
+    SELECT
+        "storeListingId",
+        MAX(version) AS max_version
+    FROM "StoreListingVersion"
+    WHERE "submissionStatus" = 'APPROVED'
+    GROUP BY "storeListingId"
+),
+agent_versions AS (
+    SELECT
+        "storeListingId",
+        array_agg(DISTINCT version::text ORDER BY version::text) AS versions
+    FROM "StoreListingVersion"
+    WHERE "submissionStatus" = 'APPROVED'
+    GROUP BY "storeListingId"
+),
+agent_graph_versions AS (
+    SELECT
+        "storeListingId",
+        array_agg(DISTINCT "agentGraphVersion"::text ORDER BY "agentGraphVersion"::text) AS graph_versions
+    FROM "StoreListingVersion"
+    WHERE "submissionStatus" = 'APPROVED'
+    GROUP BY "storeListingId"
+)
+SELECT
+    sl.id AS listing_id,
+    slv.id AS "storeListingVersionId",
+    slv."createdAt" AS updated_at,
+    sl.slug,
+    COALESCE(slv.name, '') AS agent_name,
+    slv."videoUrl" AS agent_video,
+    slv."agentOutputDemoUrl" AS agent_output_demo,
+    COALESCE(slv."imageUrls", ARRAY[]::text[]) AS agent_image,
+    slv."isFeatured" AS featured,
+    p.username AS creator_username,
+    p."avatarUrl" AS creator_avatar,
+    slv."subHeading" AS sub_heading,
+    slv.description,
+    slv.categories,
+    COALESCE(ar.run_count, 0::bigint) AS runs,
+    COALESCE(rs.avg_rating, 0.0)::double precision AS rating,
+    COALESCE(av.versions, ARRAY[slv.version::text]) AS versions,
+    COALESCE(agv.graph_versions, ARRAY[slv."agentGraphVersion"::text]) AS "agentGraphVersions",
+    slv."agentGraphId",
+    slv."isAvailable" AS is_available,
+    COALESCE(sl."useForOnboarding", false) AS "useForOnboarding"
+FROM "StoreListing" sl
+JOIN latest_versions lv
+    ON sl.id = lv."storeListingId"
+JOIN "StoreListingVersion" slv
+    ON slv."storeListingId" = lv."storeListingId"
+   AND slv.version = lv.max_version
+   AND slv."submissionStatus" = 'APPROVED'
+JOIN "AgentGraph" a
+    ON slv."agentGraphId" = a.id
+    AND slv."agentGraphVersion" = a.version
+LEFT JOIN "Profile" p
+    ON sl."owningUserId" = p."userId"
+LEFT JOIN "mv_review_stats" rs
+    ON sl.id = rs."storeListingId"
+LEFT JOIN "mv_agent_run_counts" ar
+    ON a.id = ar."agentGraphId"
+LEFT JOIN agent_versions av
+    ON sl.id = av."storeListingId"
+LEFT JOIN agent_graph_versions agv
+    ON sl.id = agv."storeListingId"
+WHERE sl."isDeleted" = false
+  AND sl."hasApprovedVersion" = true;
diff --git a/autogpt_platform/backend/migrations/20260121200000_remove_node_execution_fk_from_pending_human_review/migration.sql b/autogpt_platform/backend/migrations/20260121200000_remove_node_execution_fk_from_pending_human_review/migration.sql
new file mode 100644
index 0000000000..c43cb0b1e0
--- /dev/null
+++ b/autogpt_platform/backend/migrations/20260121200000_remove_node_execution_fk_from_pending_human_review/migration.sql
@@ -0,0 +1,7 @@
+-- Remove NodeExecution foreign key from PendingHumanReview
+-- The nodeExecId column remains as the primary key, but we remove the FK constraint
+-- to AgentNodeExecution since PendingHumanReview records can persist after node
+-- execution records are deleted.
+
+-- Drop foreign key constraint that linked PendingHumanReview.nodeExecId to AgentNodeExecution.id
+ALTER TABLE "PendingHumanReview" DROP CONSTRAINT IF EXISTS "PendingHumanReview_nodeExecId_fkey";
diff --git a/autogpt_platform/backend/migrations/20260126120000_migrate_claude_3_7_to_4_5_sonnet/migration.sql b/autogpt_platform/backend/migrations/20260126120000_migrate_claude_3_7_to_4_5_sonnet/migration.sql
new file mode 100644
index 0000000000..5746c80820
--- /dev/null
+++ b/autogpt_platform/backend/migrations/20260126120000_migrate_claude_3_7_to_4_5_sonnet/migration.sql
@@ -0,0 +1,22 @@
+-- Migrate Claude 3.7 Sonnet to Claude 4.5 Sonnet
+-- This updates all AgentNode blocks that use the deprecated Claude 3.7 Sonnet model
+-- Anthropic is retiring claude-3-7-sonnet-20250219 on February 19, 2026
+
+-- Update AgentNode constant inputs
+UPDATE "AgentNode"
+SET    "constantInput" = JSONB_SET(
+         "constantInput"::jsonb,
+         '{model}',
+         '"claude-sonnet-4-5-20250929"'::jsonb
+       )
+WHERE  "constantInput"::jsonb->>'model' = 'claude-3-7-sonnet-20250219';
+
+-- Update AgentPreset input overrides (stored in AgentNodeExecutionInputOutput)
+UPDATE "AgentNodeExecutionInputOutput"
+SET    "data" = JSONB_SET(
+         "data"::jsonb,
+         '{model}',
+         '"claude-sonnet-4-5-20250929"'::jsonb
+       )
+WHERE  "agentPresetId" IS NOT NULL
+  AND  "data"::jsonb->>'model' = 'claude-3-7-sonnet-20250219';
diff --git a/autogpt_platform/backend/migrations/20260127211502_add_visit_copilot_onboarding_step/migration.sql b/autogpt_platform/backend/migrations/20260127211502_add_visit_copilot_onboarding_step/migration.sql
new file mode 100644
index 0000000000..6a08d9231b
--- /dev/null
+++ b/autogpt_platform/backend/migrations/20260127211502_add_visit_copilot_onboarding_step/migration.sql
@@ -0,0 +1,2 @@
+-- AlterEnum
+ALTER TYPE "OnboardingStep" ADD VALUE 'VISIT_COPILOT';
diff --git a/autogpt_platform/backend/migrations/20260127230419_add_user_workspace/migration.sql b/autogpt_platform/backend/migrations/20260127230419_add_user_workspace/migration.sql
new file mode 100644
index 0000000000..bb63dccb33
--- /dev/null
+++ b/autogpt_platform/backend/migrations/20260127230419_add_user_workspace/migration.sql
@@ -0,0 +1,52 @@
+-- CreateEnum
+CREATE TYPE "WorkspaceFileSource" AS ENUM ('UPLOAD', 'EXECUTION', 'COPILOT', 'IMPORT');
+
+-- CreateTable
+CREATE TABLE "UserWorkspace" (
+    "id" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "userId" TEXT NOT NULL,
+
+    CONSTRAINT "UserWorkspace_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "UserWorkspaceFile" (
+    "id" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "workspaceId" TEXT NOT NULL,
+    "name" TEXT NOT NULL,
+    "path" TEXT NOT NULL,
+    "storagePath" TEXT NOT NULL,
+    "mimeType" TEXT NOT NULL,
+    "sizeBytes" BIGINT NOT NULL,
+    "checksum" TEXT,
+    "isDeleted" BOOLEAN NOT NULL DEFAULT false,
+    "deletedAt" TIMESTAMP(3),
+    "source" "WorkspaceFileSource" NOT NULL DEFAULT 'UPLOAD',
+    "sourceExecId" TEXT,
+    "sourceSessionId" TEXT,
+    "metadata" JSONB NOT NULL DEFAULT '{}',
+
+    CONSTRAINT "UserWorkspaceFile_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "UserWorkspace_userId_key" ON "UserWorkspace"("userId");
+
+-- CreateIndex
+CREATE INDEX "UserWorkspace_userId_idx" ON "UserWorkspace"("userId");
+
+-- CreateIndex
+CREATE INDEX "UserWorkspaceFile_workspaceId_isDeleted_idx" ON "UserWorkspaceFile"("workspaceId", "isDeleted");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "UserWorkspaceFile_workspaceId_path_key" ON "UserWorkspaceFile"("workspaceId", "path");
+
+-- AddForeignKey
+ALTER TABLE "UserWorkspace" ADD CONSTRAINT "UserWorkspace_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "UserWorkspaceFile" ADD CONSTRAINT "UserWorkspaceFile_workspaceId_fkey" FOREIGN KEY ("workspaceId") REFERENCES "UserWorkspace"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/autogpt_platform/backend/migrations/20260129011611_remove_workspace_file_source/migration.sql b/autogpt_platform/backend/migrations/20260129011611_remove_workspace_file_source/migration.sql
new file mode 100644
index 0000000000..2709bc8484
--- /dev/null
+++ b/autogpt_platform/backend/migrations/20260129011611_remove_workspace_file_source/migration.sql
@@ -0,0 +1,16 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `source` on the `UserWorkspaceFile` table. All the data in the column will be lost.
+  - You are about to drop the column `sourceExecId` on the `UserWorkspaceFile` table. All the data in the column will be lost.
+  - You are about to drop the column `sourceSessionId` on the `UserWorkspaceFile` table. All the data in the column will be lost.
+
+*/
+
+-- AlterTable
+ALTER TABLE "UserWorkspaceFile" DROP COLUMN "source",
+DROP COLUMN "sourceExecId",
+DROP COLUMN "sourceSessionId";
+
+-- DropEnum
+DROP TYPE "WorkspaceFileSource";
diff --git a/autogpt_platform/backend/poetry.lock b/autogpt_platform/backend/poetry.lock
index 5e3b07a145..91ac358ade 100644
--- a/autogpt_platform/backend/poetry.lock
+++ b/autogpt_platform/backend/poetry.lock
@@ -2777,6 +2777,30 @@ enabler = ["pytest-enabler (>=2.2)"]
 test = ["pyfakefs", "pytest (>=6,!=8.1.*)"]
 type = ["pygobject-stubs", "pytest-mypy", "shtab", "types-pywin32"]
 
+[[package]]
+name = "langfuse"
+version = "3.11.2"
+description = "A client library for accessing langfuse"
+optional = false
+python-versions = "<4.0,>=3.10"
+groups = ["main"]
+files = [
+    {file = "langfuse-3.11.2-py3-none-any.whl", hash = "sha256:84faea9f909694023cc7f0eb45696be190248c8790424f22af57ca4cd7a29f2d"},
+    {file = "langfuse-3.11.2.tar.gz", hash = "sha256:ab5f296a8056815b7288c7f25bc308a5e79f82a8634467b25daffdde99276e09"},
+]
+
+[package.dependencies]
+backoff = ">=1.10.0"
+httpx = ">=0.15.4,<1.0"
+openai = ">=0.27.8"
+opentelemetry-api = ">=1.33.1,<2.0.0"
+opentelemetry-exporter-otlp-proto-http = ">=1.33.1,<2.0.0"
+opentelemetry-sdk = ">=1.33.1,<2.0.0"
+packaging = ">=23.2,<26.0"
+pydantic = ">=1.10.7,<3.0"
+requests = ">=2,<3"
+wrapt = ">=1.14,<2.0"
+
 [[package]]
 name = "launchdarkly-eventsource"
 version = "1.3.0"
@@ -3468,6 +3492,90 @@ files = [
 importlib-metadata = ">=6.0,<8.8.0"
 typing-extensions = ">=4.5.0"
 
+[[package]]
+name = "opentelemetry-exporter-otlp-proto-common"
+version = "1.35.0"
+description = "OpenTelemetry Protobuf encoding"
+optional = false
+python-versions = ">=3.9"
+groups = ["main"]
+files = [
+    {file = "opentelemetry_exporter_otlp_proto_common-1.35.0-py3-none-any.whl", hash = "sha256:863465de697ae81279ede660f3918680b4480ef5f69dcdac04f30722ed7b74cc"},
+    {file = "opentelemetry_exporter_otlp_proto_common-1.35.0.tar.gz", hash = "sha256:6f6d8c39f629b9fa5c79ce19a2829dbd93034f8ac51243cdf40ed2196f00d7eb"},
+]
+
+[package.dependencies]
+opentelemetry-proto = "1.35.0"
+
+[[package]]
+name = "opentelemetry-exporter-otlp-proto-http"
+version = "1.35.0"
+description = "OpenTelemetry Collector Protobuf over HTTP Exporter"
+optional = false
+python-versions = ">=3.9"
+groups = ["main"]
+files = [
+    {file = "opentelemetry_exporter_otlp_proto_http-1.35.0-py3-none-any.whl", hash = "sha256:9a001e3df3c7f160fb31056a28ed7faa2de7df68877ae909516102ae36a54e1d"},
+    {file = "opentelemetry_exporter_otlp_proto_http-1.35.0.tar.gz", hash = "sha256:cf940147f91b450ef5f66e9980d40eb187582eed399fa851f4a7a45bb880de79"},
+]
+
+[package.dependencies]
+googleapis-common-protos = ">=1.52,<2.0"
+opentelemetry-api = ">=1.15,<2.0"
+opentelemetry-exporter-otlp-proto-common = "1.35.0"
+opentelemetry-proto = "1.35.0"
+opentelemetry-sdk = ">=1.35.0,<1.36.0"
+requests = ">=2.7,<3.0"
+typing-extensions = ">=4.5.0"
+
+[[package]]
+name = "opentelemetry-proto"
+version = "1.35.0"
+description = "OpenTelemetry Python Proto"
+optional = false
+python-versions = ">=3.9"
+groups = ["main"]
+files = [
+    {file = "opentelemetry_proto-1.35.0-py3-none-any.whl", hash = "sha256:98fffa803164499f562718384e703be8d7dfbe680192279a0429cb150a2f8809"},
+    {file = "opentelemetry_proto-1.35.0.tar.gz", hash = "sha256:532497341bd3e1c074def7c5b00172601b28bb83b48afc41a4b779f26eb4ee05"},
+]
+
+[package.dependencies]
+protobuf = ">=5.0,<7.0"
+
+[[package]]
+name = "opentelemetry-sdk"
+version = "1.35.0"
+description = "OpenTelemetry Python SDK"
+optional = false
+python-versions = ">=3.9"
+groups = ["main"]
+files = [
+    {file = "opentelemetry_sdk-1.35.0-py3-none-any.whl", hash = "sha256:223d9e5f5678518f4842311bb73966e0b6db5d1e0b74e35074c052cd2487f800"},
+    {file = "opentelemetry_sdk-1.35.0.tar.gz", hash = "sha256:2a400b415ab68aaa6f04e8a6a9f6552908fb3090ae2ff78d6ae0c597ac581954"},
+]
+
+[package.dependencies]
+opentelemetry-api = "1.35.0"
+opentelemetry-semantic-conventions = "0.56b0"
+typing-extensions = ">=4.5.0"
+
+[[package]]
+name = "opentelemetry-semantic-conventions"
+version = "0.56b0"
+description = "OpenTelemetry Semantic Conventions"
+optional = false
+python-versions = ">=3.9"
+groups = ["main"]
+files = [
+    {file = "opentelemetry_semantic_conventions-0.56b0-py3-none-any.whl", hash = "sha256:df44492868fd6b482511cc43a942e7194be64e94945f572db24df2e279a001a2"},
+    {file = "opentelemetry_semantic_conventions-0.56b0.tar.gz", hash = "sha256:c114c2eacc8ff6d3908cb328c811eaf64e6d68623840be9224dc829c4fd6c2ea"},
+]
+
+[package.dependencies]
+opentelemetry-api = "1.35.0"
+typing-extensions = ">=4.5.0"
+
 [[package]]
 name = "orjson"
 version = "3.11.3"
@@ -4096,14 +4204,14 @@ strenum = {version = ">=0.4.9,<0.5.0", markers = "python_version < \"3.11\""}
 
 [[package]]
 name = "posthog"
-version = "6.1.1"
+version = "7.6.0"
 description = "Integrate PostHog into any python application."
 optional = false
-python-versions = ">=3.9"
+python-versions = ">=3.10"
 groups = ["main"]
 files = [
-    {file = "posthog-6.1.1-py3-none-any.whl", hash = "sha256:329fd3d06b4d54cec925f47235bd8e327c91403c2f9ec38f1deb849535934dba"},
-    {file = "posthog-6.1.1.tar.gz", hash = "sha256:b453f54c4a2589da859fd575dd3bf86fcb40580727ec399535f268b1b9f318b8"},
+    {file = "posthog-7.6.0-py3-none-any.whl", hash = "sha256:c4dd78cf77c4fecceb965f86066e5ac37886ef867d68ffe75a1db5d681d7d9ad"},
+    {file = "posthog-7.6.0.tar.gz", hash = "sha256:941dfd278ee427c9b14640f09b35b5bb52a71bdf028d7dbb7307e1838fd3002e"},
 ]
 
 [package.dependencies]
@@ -4117,7 +4225,7 @@ typing-extensions = ">=4.2.0"
 [package.extras]
 dev = ["django-stubs", "lxml", "mypy", "mypy-baseline", "packaging", "pre-commit", "pydantic", "ruff", "setuptools", "tomli", "tomli_w", "twine", "types-mock", "types-python-dateutil", "types-requests", "types-setuptools", "types-six", "wheel"]
 langchain = ["langchain (>=0.2.0)"]
-test = ["anthropic", "coverage", "django", "freezegun (==1.5.1)", "google-genai", "langchain-anthropic (>=0.3.15)", "langchain-community (>=0.3.25)", "langchain-core (>=0.3.65)", "langchain-openai (>=0.3.22)", "langgraph (>=0.4.8)", "mock (>=2.0.0)", "openai", "parameterized (>=0.8.1)", "pydantic", "pytest", "pytest-asyncio", "pytest-timeout"]
+test = ["anthropic (>=0.72)", "coverage", "django", "freezegun (==1.5.1)", "google-genai", "langchain-anthropic (>=1.0)", "langchain-community (>=0.4)", "langchain-core (>=1.0)", "langchain-openai (>=1.0)", "langgraph (>=1.0)", "mock (>=2.0.0)", "openai (>=2.0)", "parameterized (>=0.8.1)", "pydantic", "pytest", "pytest-asyncio", "pytest-timeout"]
 
 [[package]]
 name = "postmarker"
@@ -5231,6 +5339,24 @@ urllib3 = ">=1.26.14,<3"
 fastembed = ["fastembed (>=0.7,<0.8)"]
 fastembed-gpu = ["fastembed-gpu (>=0.7,<0.8)"]
 
+[[package]]
+name = "rank-bm25"
+version = "0.2.2"
+description = "Various BM25 algorithms for document ranking"
+optional = false
+python-versions = "*"
+groups = ["main"]
+files = [
+    {file = "rank_bm25-0.2.2-py3-none-any.whl", hash = "sha256:7bd4a95571adadfc271746fa146a4bcfd89c0cf731e49c3d1ad863290adbe8ae"},
+    {file = "rank_bm25-0.2.2.tar.gz", hash = "sha256:096ccef76f8188563419aaf384a02f0ea459503fdf77901378d4fd9d87e5e51d"},
+]
+
+[package.dependencies]
+numpy = "*"
+
+[package.extras]
+dev = ["pytest"]
+
 [[package]]
 name = "rapidfuzz"
 version = "3.13.0"
@@ -6922,6 +7048,97 @@ files = [
     {file = "websockets-15.0.1.tar.gz", hash = "sha256:82544de02076bafba038ce055ee6412d68da13ab47f0c60cab827346de828dee"},
 ]
 
+[[package]]
+name = "wrapt"
+version = "1.17.3"
+description = "Module for decorators, wrappers and monkey patching."
+optional = false
+python-versions = ">=3.8"
+groups = ["main"]
+files = [
+    {file = "wrapt-1.17.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:88bbae4d40d5a46142e70d58bf664a89b6b4befaea7b2ecc14e03cedb8e06c04"},
+    {file = "wrapt-1.17.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e6b13af258d6a9ad602d57d889f83b9d5543acd471eee12eb51f5b01f8eb1bc2"},
+    {file = "wrapt-1.17.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:fd341868a4b6714a5962c1af0bd44f7c404ef78720c7de4892901e540417111c"},
+    {file = "wrapt-1.17.3-cp310-cp310-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:f9b2601381be482f70e5d1051a5965c25fb3625455a2bf520b5a077b22afb775"},
+    {file = "wrapt-1.17.3-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:343e44b2a8e60e06a7e0d29c1671a0d9951f59174f3709962b5143f60a2a98bd"},
+    {file = "wrapt-1.17.3-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:33486899acd2d7d3066156b03465b949da3fd41a5da6e394ec49d271baefcf05"},
+    {file = "wrapt-1.17.3-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:e6f40a8aa5a92f150bdb3e1c44b7e98fb7113955b2e5394122fa5532fec4b418"},
+    {file = "wrapt-1.17.3-cp310-cp310-win32.whl", hash = "sha256:a36692b8491d30a8c75f1dfee65bef119d6f39ea84ee04d9f9311f83c5ad9390"},
+    {file = "wrapt-1.17.3-cp310-cp310-win_amd64.whl", hash = "sha256:afd964fd43b10c12213574db492cb8f73b2f0826c8df07a68288f8f19af2ebe6"},
+    {file = "wrapt-1.17.3-cp310-cp310-win_arm64.whl", hash = "sha256:af338aa93554be859173c39c85243970dc6a289fa907402289eeae7543e1ae18"},
+    {file = "wrapt-1.17.3-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:273a736c4645e63ac582c60a56b0acb529ef07f78e08dc6bfadf6a46b19c0da7"},
+    {file = "wrapt-1.17.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:5531d911795e3f935a9c23eb1c8c03c211661a5060aab167065896bbf62a5f85"},
+    {file = "wrapt-1.17.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:0610b46293c59a3adbae3dee552b648b984176f8562ee0dba099a56cfbe4df1f"},
+    {file = "wrapt-1.17.3-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:b32888aad8b6e68f83a8fdccbf3165f5469702a7544472bdf41f582970ed3311"},
+    {file = "wrapt-1.17.3-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8cccf4f81371f257440c88faed6b74f1053eef90807b77e31ca057b2db74edb1"},
+    {file = "wrapt-1.17.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:d8a210b158a34164de8bb68b0e7780041a903d7b00c87e906fb69928bf7890d5"},
+    {file = "wrapt-1.17.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:79573c24a46ce11aab457b472efd8d125e5a51da2d1d24387666cd85f54c05b2"},
+    {file = "wrapt-1.17.3-cp311-cp311-win32.whl", hash = "sha256:c31eebe420a9a5d2887b13000b043ff6ca27c452a9a22fa71f35f118e8d4bf89"},
+    {file = "wrapt-1.17.3-cp311-cp311-win_amd64.whl", hash = "sha256:0b1831115c97f0663cb77aa27d381237e73ad4f721391a9bfb2fe8bc25fa6e77"},
+    {file = "wrapt-1.17.3-cp311-cp311-win_arm64.whl", hash = "sha256:5a7b3c1ee8265eb4c8f1b7d29943f195c00673f5ab60c192eba2d4a7eae5f46a"},
+    {file = "wrapt-1.17.3-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:ab232e7fdb44cdfbf55fc3afa31bcdb0d8980b9b95c38b6405df2acb672af0e0"},
+    {file = "wrapt-1.17.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:9baa544e6acc91130e926e8c802a17f3b16fbea0fd441b5a60f5cf2cc5c3deba"},
+    {file = "wrapt-1.17.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:6b538e31eca1a7ea4605e44f81a48aa24c4632a277431a6ed3f328835901f4fd"},
+    {file = "wrapt-1.17.3-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:042ec3bb8f319c147b1301f2393bc19dba6e176b7da446853406d041c36c7828"},
+    {file = "wrapt-1.17.3-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3af60380ba0b7b5aeb329bc4e402acd25bd877e98b3727b0135cb5c2efdaefe9"},
+    {file = "wrapt-1.17.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:0b02e424deef65c9f7326d8c19220a2c9040c51dc165cddb732f16198c168396"},
+    {file = "wrapt-1.17.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:74afa28374a3c3a11b3b5e5fca0ae03bef8450d6aa3ab3a1e2c30e3a75d023dc"},
+    {file = "wrapt-1.17.3-cp312-cp312-win32.whl", hash = "sha256:4da9f45279fff3543c371d5ababc57a0384f70be244de7759c85a7f989cb4ebe"},
+    {file = "wrapt-1.17.3-cp312-cp312-win_amd64.whl", hash = "sha256:e71d5c6ebac14875668a1e90baf2ea0ef5b7ac7918355850c0908ae82bcb297c"},
+    {file = "wrapt-1.17.3-cp312-cp312-win_arm64.whl", hash = "sha256:604d076c55e2fdd4c1c03d06dc1a31b95130010517b5019db15365ec4a405fc6"},
+    {file = "wrapt-1.17.3-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:a47681378a0439215912ef542c45a783484d4dd82bac412b71e59cf9c0e1cea0"},
+    {file = "wrapt-1.17.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:54a30837587c6ee3cd1a4d1c2ec5d24e77984d44e2f34547e2323ddb4e22eb77"},
+    {file = "wrapt-1.17.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:16ecf15d6af39246fe33e507105d67e4b81d8f8d2c6598ff7e3ca1b8a37213f7"},
+    {file = "wrapt-1.17.3-cp313-cp313-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:6fd1ad24dc235e4ab88cda009e19bf347aabb975e44fd5c2fb22a3f6e4141277"},
+    {file = "wrapt-1.17.3-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0ed61b7c2d49cee3c027372df5809a59d60cf1b6c2f81ee980a091f3afed6a2d"},
+    {file = "wrapt-1.17.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:423ed5420ad5f5529db9ce89eac09c8a2f97da18eb1c870237e84c5a5c2d60aa"},
+    {file = "wrapt-1.17.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:e01375f275f010fcbf7f643b4279896d04e571889b8a5b3f848423d91bf07050"},
+    {file = "wrapt-1.17.3-cp313-cp313-win32.whl", hash = "sha256:53e5e39ff71b3fc484df8a522c933ea2b7cdd0d5d15ae82e5b23fde87d44cbd8"},
+    {file = "wrapt-1.17.3-cp313-cp313-win_amd64.whl", hash = "sha256:1f0b2f40cf341ee8cc1a97d51ff50dddb9fcc73241b9143ec74b30fc4f44f6cb"},
+    {file = "wrapt-1.17.3-cp313-cp313-win_arm64.whl", hash = "sha256:7425ac3c54430f5fc5e7b6f41d41e704db073309acfc09305816bc6a0b26bb16"},
+    {file = "wrapt-1.17.3-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:cf30f6e3c077c8e6a9a7809c94551203c8843e74ba0c960f4a98cd80d4665d39"},
+    {file = "wrapt-1.17.3-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:e228514a06843cae89621384cfe3a80418f3c04aadf8a3b14e46a7be704e4235"},
+    {file = "wrapt-1.17.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:5ea5eb3c0c071862997d6f3e02af1d055f381b1d25b286b9d6644b79db77657c"},
+    {file = "wrapt-1.17.3-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:281262213373b6d5e4bb4353bc36d1ba4084e6d6b5d242863721ef2bf2c2930b"},
+    {file = "wrapt-1.17.3-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:dc4a8d2b25efb6681ecacad42fca8859f88092d8732b170de6a5dddd80a1c8fa"},
+    {file = "wrapt-1.17.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:373342dd05b1d07d752cecbec0c41817231f29f3a89aa8b8843f7b95992ed0c7"},
+    {file = "wrapt-1.17.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:d40770d7c0fd5cbed9d84b2c3f2e156431a12c9a37dc6284060fb4bec0b7ffd4"},
+    {file = "wrapt-1.17.3-cp314-cp314-win32.whl", hash = "sha256:fbd3c8319de8e1dc79d346929cd71d523622da527cca14e0c1d257e31c2b8b10"},
+    {file = "wrapt-1.17.3-cp314-cp314-win_amd64.whl", hash = "sha256:e1a4120ae5705f673727d3253de3ed0e016f7cd78dc463db1b31e2463e1f3cf6"},
+    {file = "wrapt-1.17.3-cp314-cp314-win_arm64.whl", hash = "sha256:507553480670cab08a800b9463bdb881b2edeed77dc677b0a5915e6106e91a58"},
+    {file = "wrapt-1.17.3-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:ed7c635ae45cfbc1a7371f708727bf74690daedc49b4dba310590ca0bd28aa8a"},
+    {file = "wrapt-1.17.3-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:249f88ed15503f6492a71f01442abddd73856a0032ae860de6d75ca62eed8067"},
+    {file = "wrapt-1.17.3-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:5a03a38adec8066d5a37bea22f2ba6bbf39fcdefbe2d91419ab864c3fb515454"},
+    {file = "wrapt-1.17.3-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:5d4478d72eb61c36e5b446e375bbc49ed002430d17cdec3cecb36993398e1a9e"},
+    {file = "wrapt-1.17.3-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:223db574bb38637e8230eb14b185565023ab624474df94d2af18f1cdb625216f"},
+    {file = "wrapt-1.17.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:e405adefb53a435f01efa7ccdec012c016b5a1d3f35459990afc39b6be4d5056"},
+    {file = "wrapt-1.17.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:88547535b787a6c9ce4086917b6e1d291aa8ed914fdd3a838b3539dc95c12804"},
+    {file = "wrapt-1.17.3-cp314-cp314t-win32.whl", hash = "sha256:41b1d2bc74c2cac6f9074df52b2efbef2b30bdfe5f40cb78f8ca22963bc62977"},
+    {file = "wrapt-1.17.3-cp314-cp314t-win_amd64.whl", hash = "sha256:73d496de46cd2cdbdbcce4ae4bcdb4afb6a11234a1df9c085249d55166b95116"},
+    {file = "wrapt-1.17.3-cp314-cp314t-win_arm64.whl", hash = "sha256:f38e60678850c42461d4202739f9bf1e3a737c7ad283638251e79cc49effb6b6"},
+    {file = "wrapt-1.17.3-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:70d86fa5197b8947a2fa70260b48e400bf2ccacdcab97bb7de47e3d1e6312225"},
+    {file = "wrapt-1.17.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:df7d30371a2accfe4013e90445f6388c570f103d61019b6b7c57e0265250072a"},
+    {file = "wrapt-1.17.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:caea3e9c79d5f0d2c6d9ab96111601797ea5da8e6d0723f77eabb0d4068d2b2f"},
+    {file = "wrapt-1.17.3-cp38-cp38-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:758895b01d546812d1f42204bd443b8c433c44d090248bf22689df673ccafe00"},
+    {file = "wrapt-1.17.3-cp38-cp38-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:02b551d101f31694fc785e58e0720ef7d9a10c4e62c1c9358ce6f63f23e30a56"},
+    {file = "wrapt-1.17.3-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:656873859b3b50eeebe6db8b1455e99d90c26ab058db8e427046dbc35c3140a5"},
+    {file = "wrapt-1.17.3-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:a9a2203361a6e6404f80b99234fe7fb37d1fc73487b5a78dc1aa5b97201e0f22"},
+    {file = "wrapt-1.17.3-cp38-cp38-win32.whl", hash = "sha256:55cbbc356c2842f39bcc553cf695932e8b30e30e797f961860afb308e6b1bb7c"},
+    {file = "wrapt-1.17.3-cp38-cp38-win_amd64.whl", hash = "sha256:ad85e269fe54d506b240d2d7b9f5f2057c2aa9a2ea5b32c66f8902f768117ed2"},
+    {file = "wrapt-1.17.3-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:30ce38e66630599e1193798285706903110d4f057aab3168a34b7fdc85569afc"},
+    {file = "wrapt-1.17.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:65d1d00fbfb3ea5f20add88bbc0f815150dbbde3b026e6c24759466c8b5a9ef9"},
+    {file = "wrapt-1.17.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:a7c06742645f914f26c7f1fa47b8bc4c91d222f76ee20116c43d5ef0912bba2d"},
+    {file = "wrapt-1.17.3-cp39-cp39-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:7e18f01b0c3e4a07fe6dfdb00e29049ba17eadbc5e7609a2a3a4af83ab7d710a"},
+    {file = "wrapt-1.17.3-cp39-cp39-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0f5f51a6466667a5a356e6381d362d259125b57f059103dd9fdc8c0cf1d14139"},
+    {file = "wrapt-1.17.3-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:59923aa12d0157f6b82d686c3fd8e1166fa8cdfb3e17b42ce3b6147ff81528df"},
+    {file = "wrapt-1.17.3-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:46acc57b331e0b3bcb3e1ca3b421d65637915cfcd65eb783cb2f78a511193f9b"},
+    {file = "wrapt-1.17.3-cp39-cp39-win32.whl", hash = "sha256:3e62d15d3cfa26e3d0788094de7b64efa75f3a53875cdbccdf78547aed547a81"},
+    {file = "wrapt-1.17.3-cp39-cp39-win_amd64.whl", hash = "sha256:1f23fa283f51c890eda8e34e4937079114c74b4c81d2b2f1f1d94948f5cc3d7f"},
+    {file = "wrapt-1.17.3-cp39-cp39-win_arm64.whl", hash = "sha256:24c2ed34dc222ed754247a2702b1e1e89fdbaa4016f324b4b8f1a802d4ffe87f"},
+    {file = "wrapt-1.17.3-py3-none-any.whl", hash = "sha256:7171ae35d2c33d326ac19dd8facb1e82e5fd04ef8c6c0e394d7af55a55051c22"},
+    {file = "wrapt-1.17.3.tar.gz", hash = "sha256:f66eb08feaa410fe4eebd17f2a2c8e2e46d3476e9f8c783daa8e09e0faa666d0"},
+]
+
 [[package]]
 name = "xattr"
 version = "1.2.0"
@@ -7295,4 +7512,4 @@ cffi = ["cffi (>=1.11)"]
 [metadata]
 lock-version = "2.1"
 python-versions = ">=3.10,<3.14"
-content-hash = "a93ba0cea3b465cb6ec3e3f258b383b09f84ea352ccfdbfa112902cde5653fc6"
+content-hash = "ee5742dc1a9df50dfc06d4b26a1682cbb2b25cab6b79ce5625ec272f93e4f4bf"
diff --git a/autogpt_platform/backend/pyproject.toml b/autogpt_platform/backend/pyproject.toml
index e8b8fd0ba5..fe263e47c0 100644
--- a/autogpt_platform/backend/pyproject.toml
+++ b/autogpt_platform/backend/pyproject.toml
@@ -33,6 +33,7 @@ html2text = "^2024.2.26"
 jinja2 = "^3.1.6"
 jsonref = "^1.1.0"
 jsonschema = "^4.25.0"
+langfuse = "^3.11.0"
 launchdarkly-server-sdk = "^9.12.0"
 mem0ai = "^0.1.115"
 moviepy = "^2.1.2"
@@ -45,6 +46,7 @@ poetry = "2.1.1" # CHECK DEPENDABOT SUPPORT BEFORE UPGRADING
 postmarker = "^1.0"
 praw = "~7.8.1"
 prisma = "^0.15.0"
+rank-bm25 = "^0.2.2"
 prometheus-client = "^0.22.1"
 prometheus-fastapi-instrumentator = "^7.0.0"
 psutil = "^7.0.0"
@@ -83,6 +85,7 @@ exa-py = "^1.14.20"
 croniter = "^6.0.0"
 stagehand = "^0.5.1"
 gravitas-md2gdocs = "^0.1.0"
+posthog = "^7.6.0"
 
 [tool.poetry.group.dev.dependencies]
 aiohappyeyeballs = "^2.6.1"
@@ -117,6 +120,7 @@ lint = "linter:lint"
 test = "run_tests:test"
 load-store-agents = "test.load_store_agents:run"
 export-api-schema = "backend.cli.generate_openapi_json:main"
+gen-prisma-stub = "gen_prisma_types_stub:main"
 oauth-tool = "backend.cli.oauth_tool:cli"
 
 [tool.isort]
@@ -134,6 +138,9 @@ ignore_patterns = []
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
 asyncio_default_fixture_loop_scope = "session"
+# Disable syrupy plugin to avoid conflict with pytest-snapshot
+# Both provide --snapshot-update argument causing ArgumentError
+addopts = "-p no:syrupy"
 filterwarnings = [
     "ignore:'audioop' is deprecated:DeprecationWarning:discord.player",
     "ignore:invalid escape sequence:DeprecationWarning:tweepy.api",
diff --git a/autogpt_platform/backend/schema.prisma b/autogpt_platform/backend/schema.prisma
index 2f6c109c03..2da898a7ce 100644
--- a/autogpt_platform/backend/schema.prisma
+++ b/autogpt_platform/backend/schema.prisma
@@ -1,14 +1,15 @@
 datasource db {
-  provider  = "postgresql"
-  url       = env("DATABASE_URL")
-  directUrl = env("DIRECT_URL")
+  provider   = "postgresql"
+  url        = env("DATABASE_URL")
+  directUrl  = env("DIRECT_URL")
+  extensions = [pgvector(map: "vector")]
 }
 
 generator client {
   provider               = "prisma-client-py"
   recursive_type_depth   = -1
   interface              = "asyncio"
-  previewFeatures        = ["views", "fullTextSearch"]
+  previewFeatures        = ["views", "fullTextSearch", "postgresqlExtensions"]
   partial_type_generator = "backend/data/partial_types.py"
 }
 
@@ -47,12 +48,13 @@ model User {
   AnalyticsMetrics     AnalyticsMetrics[]
   CreditTransactions   CreditTransaction[]
   UserBalance          UserBalance?
-
-  AgentPresets  AgentPreset[]
-  LibraryAgents LibraryAgent[]
+  ChatSessions         ChatSession[]
+  AgentPresets         AgentPreset[]
+  LibraryAgents        LibraryAgent[]
 
   Profile               Profile[]
   UserOnboarding        UserOnboarding?
+  CoPilotUnderstanding  CoPilotUnderstanding?
   BuilderSearchHistory  BuilderSearchHistory[]
   StoreListings         StoreListing[]
   StoreListingReviews   StoreListingReview[]
@@ -61,6 +63,7 @@ model User {
   IntegrationWebhooks   IntegrationWebhook[]
   NotificationBatches   UserNotificationBatch[]
   PendingHumanReviews   PendingHumanReview[]
+  Workspace             UserWorkspace?
 
   // OAuth Provider relations
   OAuthApplications       OAuthApplication[]
@@ -79,6 +82,7 @@ enum OnboardingStep {
   AGENT_INPUT
   CONGRATS
   // First Wins
+  VISIT_COPILOT
   GET_RESULTS
   MARKETPLACE_VISIT
   MARKETPLACE_ADD_AGENT
@@ -121,19 +125,131 @@ model UserOnboarding {
   User   User   @relation(fields: [userId], references: [id], onDelete: Cascade)
 }
 
+model CoPilotUnderstanding {
+  id        String   @id @default(uuid())
+  createdAt DateTime @default(now())
+  updatedAt DateTime @default(now()) @updatedAt
+
+  userId String @unique
+  User   User   @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  data Json?
+
+  @@index([userId])
+}
+
+////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////
+////////////////   USER WORKSPACE TABLES   /////////////////
+////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////
+
+// User's persistent file storage workspace
+model UserWorkspace {
+  id        String   @id @default(uuid())
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  userId String @unique
+  User   User   @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  Files UserWorkspaceFile[]
+
+  @@index([userId])
+}
+
+// Individual files in a user's workspace
+model UserWorkspaceFile {
+  id        String   @id @default(uuid())
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  workspaceId String
+  Workspace   UserWorkspace @relation(fields: [workspaceId], references: [id], onDelete: Cascade)
+
+  // File metadata
+  name        String // User-visible filename
+  path        String // Virtual path (e.g., "/documents/report.pdf")
+  storagePath String // Actual GCS or local storage path
+  mimeType    String
+  sizeBytes   BigInt
+  checksum    String? // SHA256 for integrity
+
+  // File state
+  isDeleted Boolean   @default(false)
+  deletedAt DateTime?
+
+  metadata Json @default("{}")
+
+  @@unique([workspaceId, path])
+  @@index([workspaceId, isDeleted])
+}
+
 model BuilderSearchHistory {
   id        String   @id @default(uuid())
   createdAt DateTime @default(now())
   updatedAt DateTime @default(now()) @updatedAt
 
   searchQuery String
-  filter      String[]  @default([])
-  byCreator   String[]  @default([])
+  filter      String[] @default([])
+  byCreator   String[] @default([])
 
   userId String
   User   User   @relation(fields: [userId], references: [id], onDelete: Cascade)
 }
 
+////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////
+////////////////   CHAT SESSION TABLES   ///////////////////
+////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////
+
+model ChatSession {
+  id        String   @id @default(uuid())
+  createdAt DateTime @default(now())
+  updatedAt DateTime @default(now()) @updatedAt
+
+  userId      String
+  User        User    @relation(fields: [userId], references: [id], onDelete: Cascade)
+  // Session metadata
+  title       String?
+  credentials Json    @default("{}") // Map of provider -> credential metadata
+
+  // Rate limiting counters (stored as JSON maps)
+  successfulAgentRuns      Json @default("{}") // Map of graph_id -> count
+  successfulAgentSchedules Json @default("{}") // Map of graph_id -> count
+
+  // Usage tracking
+  totalPromptTokens     Int @default(0)
+  totalCompletionTokens Int @default(0)
+
+  Messages ChatMessage[]
+
+  @@index([userId, updatedAt])
+}
+
+model ChatMessage {
+  id        String   @id @default(uuid())
+  createdAt DateTime @default(now())
+
+  sessionId String
+  Session   ChatSession @relation(fields: [sessionId], references: [id], onDelete: Cascade)
+
+  // Message content
+  role         String // "user", "assistant", "system", "tool", "function"
+  content      String?
+  name         String?
+  toolCallId   String?
+  refusal      String?
+  toolCalls    Json? // List of tool calls for assistant messages
+  functionCall Json? // Deprecated but kept for compatibility
+
+  // Ordering within session
+  sequence Int
+
+  @@unique([sessionId, sequence])
+}
+
 // This model describes the Agent Graph/Flow (Multi Agent System).
 model AgentGraph {
   id        String    @default(uuid())
@@ -383,6 +499,7 @@ model AgentGraphExecution {
   createdAt DateTime  @default(now())
   updatedAt DateTime? @updatedAt
   startedAt DateTime?
+  endedAt   DateTime?
 
   isDeleted Boolean @default(false)
 
@@ -449,8 +566,6 @@ model AgentNodeExecution {
 
   stats Json?
 
-  PendingHumanReview PendingHumanReview?
-
   @@index([agentGraphExecutionId, agentNodeId, executionStatus])
   @@index([agentNodeId, executionStatus])
   @@index([addedTime, queuedTime])
@@ -499,6 +614,7 @@ enum ReviewStatus {
 }
 
 // Pending human reviews for Human-in-the-loop blocks
+// Also stores auto-approval records with special nodeExecId patterns (e.g., "auto_approve_{graph_exec_id}_{node_id}")
 model PendingHumanReview {
   nodeExecId    String       @id
   userId        String
@@ -517,7 +633,6 @@ model PendingHumanReview {
   reviewedAt    DateTime?
 
   User           User                @relation(fields: [userId], references: [id], onDelete: Cascade)
-  NodeExecution  AgentNodeExecution  @relation(fields: [nodeExecId], references: [id], onDelete: Cascade)
   GraphExecution AgentGraphExecution @relation(fields: [graphExecId], references: [id], onDelete: Cascade)
 
   @@unique([nodeExecId]) // One pending review per node execution
@@ -721,26 +836,25 @@ view StoreAgent {
   storeListingVersionId String
   updated_at            DateTime
 
-  slug                String
-  agent_name          String
-  agent_video         String?
-  agent_output_demo   String?
-  agent_image         String[]
+  slug              String
+  agent_name        String
+  agent_video       String?
+  agent_output_demo String?
+  agent_image       String[]
 
-  featured         Boolean                  @default(false)
-  creator_username String?
-  creator_avatar   String?
-  sub_heading      String
-  description      String
-  categories       String[]
-  search           Unsupported("tsvector")? @default(dbgenerated("''::tsvector"))
-  runs                Int
-  rating              Float
-  versions            String[]
-  agentGraphVersions  String[]
-  agentGraphId        String
-  is_available        Boolean                  @default(true)
-  useForOnboarding    Boolean                  @default(false)
+  featured           Boolean  @default(false)
+  creator_username   String?
+  creator_avatar     String?
+  sub_heading        String
+  description        String
+  categories         String[]
+  runs               Int
+  rating             Float
+  versions           String[]
+  agentGraphVersions String[]
+  agentGraphId       String
+  is_available       Boolean  @default(true)
+  useForOnboarding   Boolean  @default(false)
 
   // Materialized views used (refreshed every 15 minutes via pg_cron):
   // - mv_agent_run_counts - Pre-aggregated agent execution counts by agentGraphId
@@ -856,14 +970,14 @@ model StoreListingVersion {
   AgentGraph        AgentGraph @relation(fields: [agentGraphId, agentGraphVersion], references: [id, version])
 
   // Content fields
-  name                String
-  subHeading          String
-  videoUrl            String?
-  agentOutputDemoUrl  String?
-  imageUrls           String[]
-  description         String
-  instructions        String?
-  categories          String[]
+  name               String
+  subHeading         String
+  videoUrl           String?
+  agentOutputDemoUrl String?
+  imageUrls          String[]
+  description        String
+  instructions       String?
+  categories         String[]
 
   isFeatured Boolean @default(false)
 
@@ -871,7 +985,7 @@ model StoreListingVersion {
   // Old versions can be made unavailable by the author if desired
   isAvailable Boolean @default(true)
 
-  search Unsupported("tsvector")? @default(dbgenerated("''::tsvector"))
+  // Note: search column removed - now using UnifiedContentEmbedding.search
 
   // Version workflow state
   submissionStatus SubmissionStatus @default(DRAFT)
@@ -899,6 +1013,9 @@ model StoreListingVersion {
   // Reviews for this specific version
   Reviews StoreListingReview[]
 
+  // Note: Embeddings now stored in UnifiedContentEmbedding table
+  // Use contentType=STORE_AGENT and contentId=storeListingVersionId
+
   @@unique([storeListingId, version])
   @@index([storeListingId, submissionStatus, isAvailable])
   @@index([submissionStatus])
@@ -906,6 +1023,45 @@ model StoreListingVersion {
   @@index([agentGraphId, agentGraphVersion]) // Non-unique index for efficient lookups
 }
 
+// Content type enum for unified search across store agents, blocks, docs
+// Note: BLOCK/INTEGRATION are file-based (Python classes), not DB records
+// DOCUMENTATION are file-based (.md files), not DB records  
+// Only STORE_AGENT and LIBRARY_AGENT are stored in database
+enum ContentType {
+  STORE_AGENT // Database: StoreListingVersion
+  BLOCK // File-based: Python classes in /backend/blocks/
+  INTEGRATION // File-based: Python classes (blocks with credentials)
+  DOCUMENTATION // File-based: .md/.mdx files
+  LIBRARY_AGENT // Database: User's personal agents
+}
+
+// Unified embeddings table for all searchable content types
+// Supports both public content (userId=null) and user-specific content (userId=userID)
+model UnifiedContentEmbedding {
+  id        String   @id @default(uuid())
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  // Content identification
+  contentType ContentType
+  contentId   String // DB ID (storeListingVersionId) or file identifier (block.id, file_path)
+  userId      String? // NULL for public content (store, blocks, docs), userId for private content (library agents)
+
+  // Search data
+  embedding      Unsupported("vector(1536)") // pgvector embedding (extension in platform schema)
+  searchableText String // Combined text for search and fallback
+  search         Unsupported("tsvector")? @default(dbgenerated("''::tsvector")) // Full-text search (auto-populated by trigger)
+  metadata       Json                        @default("{}") // Content-specific metadata
+
+  @@unique([contentType, contentId, userId], map: "UnifiedContentEmbedding_contentType_contentId_userId_key")
+  @@index([contentType])
+  @@index([userId])
+  @@index([contentType, userId])
+  @@index([embedding], map: "UnifiedContentEmbedding_embedding_idx")
+  // NO @@index for search - GIN index "UnifiedContentEmbedding_search_idx" created via SQL migration
+  // Prisma may generate DROP INDEX on migrate dev - that's okay, migration recreates it
+}
+
 model StoreListingReview {
   id        String   @id @default(uuid())
   createdAt DateTime @default(now())
@@ -998,16 +1154,16 @@ model OAuthApplication {
   updatedAt DateTime @updatedAt
 
   // Application metadata
-  name               String
-  description        String?
-  logoUrl            String? // URL to app logo stored in GCS
-  clientId           String @unique
-  clientSecret       String // Hashed with Scrypt (same as API keys)
-  clientSecretSalt   String // Salt for Scrypt hashing
+  name             String
+  description      String?
+  logoUrl          String? // URL to app logo stored in GCS
+  clientId         String  @unique
+  clientSecret     String // Hashed with Scrypt (same as API keys)
+  clientSecretSalt String // Salt for Scrypt hashing
 
   // OAuth configuration
   redirectUris String[] // Allowed callback URLs
-  grantTypes   String[] @default(["authorization_code", "refresh_token"])
+  grantTypes   String[]           @default(["authorization_code", "refresh_token"])
   scopes       APIKeyPermission[] // Which permissions the app can request
 
   // Application management
diff --git a/autogpt_platform/backend/scripts/generate_block_docs.py b/autogpt_platform/backend/scripts/generate_block_docs.py
new file mode 100644
index 0000000000..bb60eddb5d
--- /dev/null
+++ b/autogpt_platform/backend/scripts/generate_block_docs.py
@@ -0,0 +1,998 @@
+#!/usr/bin/env python3
+"""
+Block Documentation Generator
+
+Generates markdown documentation for all blocks from code introspection.
+Preserves manually-written content between marker comments.
+
+Usage:
+    # Generate all docs
+    poetry run python scripts/generate_block_docs.py
+
+    # Check mode for CI (exits 1 if stale)
+    poetry run python scripts/generate_block_docs.py --check
+
+    # Verbose output
+    poetry run python scripts/generate_block_docs.py -v
+"""
+
+import argparse
+import inspect
+import logging
+import re
+import sys
+from collections import defaultdict
+from dataclasses import dataclass, field
+from pathlib import Path
+from typing import Any
+
+# Add backend to path for imports
+backend_dir = Path(__file__).parent.parent
+sys.path.insert(0, str(backend_dir))
+
+logger = logging.getLogger(__name__)
+
+# Default output directory relative to repo root
+DEFAULT_OUTPUT_DIR = (
+    Path(__file__).parent.parent.parent.parent
+    / "docs"
+    / "integrations"
+    / "block-integrations"
+)
+
+
+@dataclass
+class FieldDoc:
+    """Documentation for a single input/output field."""
+
+    name: str
+    description: str
+    type_str: str
+    required: bool
+    default: Any = None
+    advanced: bool = False
+    hidden: bool = False
+    placeholder: str | None = None
+
+
+@dataclass
+class BlockDoc:
+    """Documentation data extracted from a block."""
+
+    id: str
+    name: str
+    class_name: str
+    description: str
+    categories: list[str]
+    category_descriptions: dict[str, str]
+    inputs: list[FieldDoc]
+    outputs: list[FieldDoc]
+    block_type: str
+    source_file: str
+    contributors: list[str] = field(default_factory=list)
+
+
+# Category to human-readable name mapping
+CATEGORY_DISPLAY_NAMES = {
+    "AI": "AI and Language Models",
+    "BASIC": "Basic Operations",
+    "TEXT": "Text Processing",
+    "SEARCH": "Search and Information Retrieval",
+    "SOCIAL": "Social Media and Content",
+    "DEVELOPER_TOOLS": "Developer Tools",
+    "DATA": "Data Processing",
+    "LOGIC": "Logic and Control Flow",
+    "COMMUNICATION": "Communication",
+    "INPUT": "Input/Output",
+    "OUTPUT": "Input/Output",
+    "MULTIMEDIA": "Media Generation",
+    "PRODUCTIVITY": "Productivity",
+    "HARDWARE": "Hardware",
+    "AGENT": "Agent Integration",
+    "CRM": "CRM Services",
+    "SAFETY": "AI Safety",
+    "ISSUE_TRACKING": "Issue Tracking",
+    "MARKETING": "Marketing",
+}
+
+# Category to doc file mapping (for grouping related blocks)
+CATEGORY_FILE_MAP = {
+    "BASIC": "basic",
+    "TEXT": "text",
+    "AI": "llm",
+    "SEARCH": "search",
+    "DATA": "data",
+    "LOGIC": "logic",
+    "COMMUNICATION": "communication",
+    "MULTIMEDIA": "multimedia",
+    "PRODUCTIVITY": "productivity",
+}
+
+
+def class_name_to_display_name(class_name: str) -> str:
+    """Convert BlockClassName to 'Block Class Name'."""
+    # Remove 'Block' suffix (only at the end, not all occurrences)
+    name = class_name.removesuffix("Block")
+    # Insert space before capitals
+    name = re.sub(r"([a-z])([A-Z])", r"\1 \2", name)
+    # Handle consecutive capitals (e.g., 'HTTPRequest' -> 'HTTP Request')
+    name = re.sub(r"([A-Z]+)([A-Z][a-z])", r"\1 \2", name)
+    return name.strip()
+
+
+def type_to_readable(type_schema: dict[str, Any] | Any) -> str:
+    """Convert JSON schema type to human-readable string."""
+    if not isinstance(type_schema, dict):
+        return str(type_schema) if type_schema else "Any"
+
+    if "anyOf" in type_schema:
+        # Union type - show options
+        any_of = type_schema["anyOf"]
+        if not isinstance(any_of, list):
+            return "Any"
+        options = []
+        for opt in any_of:
+            if isinstance(opt, dict) and opt.get("type") == "null":
+                continue
+            options.append(type_to_readable(opt))
+        if not options:
+            return "None"
+        if len(options) == 1:
+            return options[0]
+        return " | ".join(options)
+
+    if "allOf" in type_schema:
+        all_of = type_schema["allOf"]
+        if not isinstance(all_of, list) or not all_of:
+            return "Any"
+        return type_to_readable(all_of[0])
+
+    schema_type = type_schema.get("type")
+
+    if schema_type == "array":
+        items = type_schema.get("items", {})
+        item_type = type_to_readable(items)
+        return f"List[{item_type}]"
+
+    if schema_type == "object":
+        if "additionalProperties" in type_schema:
+            additional_props = type_schema["additionalProperties"]
+            # additionalProperties: true means any value type is allowed
+            if additional_props is True:
+                return "Dict[str, Any]"
+            value_type = type_to_readable(additional_props)
+            return f"Dict[str, {value_type}]"
+        # Check if it's a specific model
+        title = type_schema.get("title", "Object")
+        return title
+
+    if schema_type == "string":
+        if "enum" in type_schema:
+            return " | ".join(f'"{v}"' for v in type_schema["enum"])
+        if "format" in type_schema:
+            return f"str ({type_schema['format']})"
+        return "str"
+
+    if schema_type == "integer":
+        return "int"
+
+    if schema_type == "number":
+        return "float"
+
+    if schema_type == "boolean":
+        return "bool"
+
+    if schema_type == "null":
+        return "None"
+
+    # Fallback
+    return type_schema.get("title", schema_type or "Any")
+
+
+def safe_get(d: Any, key: str, default: Any = None) -> Any:
+    """Safely get a value from a dict-like object."""
+    if isinstance(d, dict):
+        return d.get(key, default)
+    return default
+
+
+def file_path_to_title(file_path: str) -> str:
+    """Convert file path to a readable title.
+
+    Examples:
+        "github/issues.md" -> "GitHub Issues"
+        "basic.md" -> "Basic"
+        "llm.md" -> "LLM"
+        "google/sheets.md" -> "Google Sheets"
+    """
+    # Special case replacements (applied after title casing)
+    TITLE_FIXES = {
+        "Llm": "LLM",
+        "Github": "GitHub",
+        "Api": "API",
+        "Ai": "AI",
+        "Oauth": "OAuth",
+        "Url": "URL",
+        "Ci": "CI",
+        "Pr": "PR",
+        "Gmb": "GMB",  # Google My Business
+        "Hubspot": "HubSpot",
+        "Linkedin": "LinkedIn",
+        "Tiktok": "TikTok",
+        "Youtube": "YouTube",
+    }
+
+    def apply_fixes(text: str) -> str:
+        # Split into words, fix each word, rejoin
+        words = text.split()
+        fixed_words = [TITLE_FIXES.get(word, word) for word in words]
+        return " ".join(fixed_words)
+
+    path = Path(file_path)
+    name = path.stem  # e.g., "issues" or "sheets"
+
+    # Get parent dir if exists
+    parent = path.parent.name if path.parent.name != "." else None
+
+    # Title case and apply fixes
+    if parent:
+        parent_title = apply_fixes(parent.replace("_", " ").title())
+        name_title = apply_fixes(name.replace("_", " ").title())
+        return f"{parent_title} {name_title}"
+    return apply_fixes(name.replace("_", " ").title())
+
+
+def extract_block_doc(block_cls: type) -> BlockDoc:
+    """Extract documentation data from a block class."""
+    block = block_cls.create()
+
+    # Get source file
+    try:
+        source_file = inspect.getfile(block_cls)
+        # Make relative to blocks directory
+        blocks_dir = Path(source_file).parent
+        while blocks_dir.name != "blocks" and blocks_dir.parent != blocks_dir:
+            blocks_dir = blocks_dir.parent
+        source_file = str(Path(source_file).relative_to(blocks_dir.parent))
+    except (TypeError, ValueError):
+        source_file = "unknown"
+
+    # Extract input fields
+    input_schema = block.input_schema.jsonschema()
+    input_properties = safe_get(input_schema, "properties", {})
+    if not isinstance(input_properties, dict):
+        input_properties = {}
+    required_raw = safe_get(input_schema, "required", [])
+    # Handle edge cases where required might not be a list
+    if isinstance(required_raw, (list, set, tuple)):
+        required_inputs = set(required_raw)
+    else:
+        required_inputs = set()
+
+    inputs = []
+    for field_name, field_schema in input_properties.items():
+        if not isinstance(field_schema, dict):
+            continue
+        # Skip credentials fields in docs (they're auto-handled)
+        if "credentials" in field_name.lower():
+            continue
+
+        inputs.append(
+            FieldDoc(
+                name=field_name,
+                description=safe_get(field_schema, "description", ""),
+                type_str=type_to_readable(field_schema),
+                required=field_name in required_inputs,
+                default=safe_get(field_schema, "default"),
+                advanced=safe_get(field_schema, "advanced", False) or False,
+                hidden=safe_get(field_schema, "hidden", False) or False,
+                placeholder=safe_get(field_schema, "placeholder"),
+            )
+        )
+
+    # Extract output fields
+    output_schema = block.output_schema.jsonschema()
+    output_properties = safe_get(output_schema, "properties", {})
+    if not isinstance(output_properties, dict):
+        output_properties = {}
+
+    outputs = []
+    for field_name, field_schema in output_properties.items():
+        if not isinstance(field_schema, dict):
+            continue
+        outputs.append(
+            FieldDoc(
+                name=field_name,
+                description=safe_get(field_schema, "description", ""),
+                type_str=type_to_readable(field_schema),
+                required=True,  # Outputs are always produced
+                hidden=safe_get(field_schema, "hidden", False) or False,
+            )
+        )
+
+    # Get category info (sort for deterministic ordering since it's a set)
+    categories = []
+    category_descriptions = {}
+    for cat in sorted(block.categories, key=lambda c: c.name):
+        categories.append(cat.name)
+        category_descriptions[cat.name] = cat.value
+
+    # Get contributors
+    contributors = []
+    for contrib in block.contributors:
+        contributors.append(contrib.name if hasattr(contrib, "name") else str(contrib))
+
+    return BlockDoc(
+        id=block.id,
+        name=class_name_to_display_name(block.name),
+        class_name=block.name,
+        description=block.description,
+        categories=categories,
+        category_descriptions=category_descriptions,
+        inputs=inputs,
+        outputs=outputs,
+        block_type=block.block_type.value,
+        source_file=source_file,
+        contributors=contributors,
+    )
+
+
+def generate_anchor(name: str) -> str:
+    """Generate markdown anchor from block name."""
+    return name.lower().replace(" ", "-").replace("(", "").replace(")", "")
+
+
+def extract_manual_content(existing_content: str) -> dict[str, str]:
+    """Extract content between MANUAL markers from existing file."""
+    manual_sections = {}
+
+    # Pattern: <!-- MANUAL: section_name -->content<!-- END MANUAL -->
+    pattern = r"<!-- MANUAL: (\w+) -->\s*(.*?)\s*<!-- END MANUAL -->"
+    matches = re.findall(pattern, existing_content, re.DOTALL)
+
+    for section_name, content in matches:
+        manual_sections[section_name] = content.strip()
+
+    return manual_sections
+
+
+def generate_block_markdown(
+    block: BlockDoc,
+    manual_content: dict[str, str] | None = None,
+) -> str:
+    """Generate markdown documentation for a single block."""
+    manual_content = manual_content or {}
+    lines = []
+
+    # All blocks use ## heading, sections use ### (consistent siblings)
+    lines.append(f"## {block.name}")
+    lines.append("")
+
+    # What it is (full description)
+    lines.append("### What it is")
+    lines.append(block.description or "No description available.")
+    lines.append("")
+
+    # How it works (manual section)
+    lines.append("### How it works")
+    how_it_works = manual_content.get(
+        "how_it_works", "_Add technical explanation here._"
+    )
+    lines.append("<!-- MANUAL: how_it_works -->")
+    lines.append(how_it_works)
+    lines.append("<!-- END MANUAL -->")
+    lines.append("")
+
+    # Inputs table (auto-generated)
+    visible_inputs = [f for f in block.inputs if not f.hidden]
+    if visible_inputs:
+        lines.append("### Inputs")
+        lines.append("")
+        lines.append("| Input | Description | Type | Required |")
+        lines.append("|-------|-------------|------|----------|")
+        for inp in visible_inputs:
+            required = "Yes" if inp.required else "No"
+            desc = inp.description or "-"
+            type_str = inp.type_str or "-"
+            # Normalize newlines and escape pipes for valid table syntax
+            desc = desc.replace("\n", " ").replace("|", "\\|")
+            type_str = type_str.replace("|", "\\|")
+            lines.append(f"| {inp.name} | {desc} | {type_str} | {required} |")
+        lines.append("")
+
+    # Outputs table (auto-generated)
+    visible_outputs = [f for f in block.outputs if not f.hidden]
+    if visible_outputs:
+        lines.append("### Outputs")
+        lines.append("")
+        lines.append("| Output | Description | Type |")
+        lines.append("|--------|-------------|------|")
+        for out in visible_outputs:
+            desc = out.description or "-"
+            type_str = out.type_str or "-"
+            # Normalize newlines and escape pipes for valid table syntax
+            desc = desc.replace("\n", " ").replace("|", "\\|")
+            type_str = type_str.replace("|", "\\|")
+            lines.append(f"| {out.name} | {desc} | {type_str} |")
+        lines.append("")
+
+    # Possible use case (manual section)
+    lines.append("### Possible use case")
+    use_case = manual_content.get("use_case", "_Add practical use case examples here._")
+    lines.append("<!-- MANUAL: use_case -->")
+    lines.append(use_case)
+    lines.append("<!-- END MANUAL -->")
+    lines.append("")
+
+    # Optional per-block extras (only include if has content)
+    extras = manual_content.get("extras", "")
+    if extras:
+        lines.append("<!-- MANUAL: extras -->")
+        lines.append(extras)
+        lines.append("<!-- END MANUAL -->")
+        lines.append("")
+
+    lines.append("---")
+    lines.append("")
+
+    return "\n".join(lines)
+
+
+def get_block_file_mapping(blocks: list[BlockDoc]) -> dict[str, list[BlockDoc]]:
+    """
+    Map blocks to their documentation files.
+
+    Returns dict of {relative_file_path: [blocks]}
+    """
+    file_mapping = defaultdict(list)
+
+    for block in blocks:
+        # Determine file path based on source file or category
+        source_path = Path(block.source_file)
+
+        # If source is in a subdirectory (e.g., google/gmail.py), use that structure
+        if len(source_path.parts) > 2:  # blocks/subdir/file.py
+            subdir = source_path.parts[1]  # e.g., "google"
+            # Use the Python filename as the md filename
+            md_file = source_path.stem + ".md"  # e.g., "gmail.md"
+            file_path = f"{subdir}/{md_file}"
+        else:
+            # Use category-based grouping for top-level blocks
+            primary_category = block.categories[0] if block.categories else "BASIC"
+            file_name = CATEGORY_FILE_MAP.get(primary_category, "misc")
+            file_path = f"{file_name}.md"
+
+        file_mapping[file_path].append(block)
+
+    return dict(file_mapping)
+
+
+def generate_overview_table(blocks: list[BlockDoc], block_dir_prefix: str = "") -> str:
+    """Generate the overview table markdown (blocks.md).
+
+    Args:
+        blocks: List of block documentation objects
+        block_dir_prefix: Prefix for block file links (e.g., "block-integrations/")
+    """
+    lines = []
+
+    # GitBook YAML frontmatter
+    lines.append("---")
+    lines.append("layout:")
+    lines.append("  width: default")
+    lines.append("  title:")
+    lines.append("    visible: true")
+    lines.append("  description:")
+    lines.append("    visible: true")
+    lines.append("  tableOfContents:")
+    lines.append("    visible: false")
+    lines.append("  outline:")
+    lines.append("    visible: true")
+    lines.append("  pagination:")
+    lines.append("    visible: true")
+    lines.append("  metadata:")
+    lines.append("    visible: true")
+    lines.append("---")
+    lines.append("")
+
+    lines.append("# AutoGPT Blocks Overview")
+    lines.append("")
+    lines.append(
+        'AutoGPT uses a modular approach with various "blocks" to handle different tasks. These blocks are the building blocks of AutoGPT workflows, allowing users to create complex automations by combining simple, specialized components.'
+    )
+    lines.append("")
+    lines.append('{% hint style="info" %}')
+    lines.append("**Creating Your Own Blocks**")
+    lines.append("")
+    lines.append("Want to create your own custom blocks? Check out our guides:")
+    lines.append("")
+    lines.append(
+        "* [Build your own Blocks](https://docs.agpt.co/platform/new_blocks/) - Step-by-step tutorial with examples"
+    )
+    lines.append(
+        "* [Block SDK Guide](https://docs.agpt.co/platform/block-sdk-guide/) - Advanced SDK patterns with OAuth, webhooks, and provider configuration"
+    )
+    lines.append("{% endhint %}")
+    lines.append("")
+    lines.append(
+        "Below is a comprehensive list of all available blocks, categorized by their primary function. Click on any block name to view its detailed documentation."
+    )
+    lines.append("")
+
+    # Group blocks by category
+    by_category = defaultdict(list)
+    for block in blocks:
+        primary_cat = block.categories[0] if block.categories else "BASIC"
+        by_category[primary_cat].append(block)
+
+    # Sort categories
+    category_order = [
+        "BASIC",
+        "DATA",
+        "TEXT",
+        "AI",
+        "SEARCH",
+        "SOCIAL",
+        "COMMUNICATION",
+        "DEVELOPER_TOOLS",
+        "MULTIMEDIA",
+        "PRODUCTIVITY",
+        "LOGIC",
+        "INPUT",
+        "OUTPUT",
+        "AGENT",
+        "CRM",
+        "SAFETY",
+        "ISSUE_TRACKING",
+        "HARDWARE",
+        "MARKETING",
+    ]
+
+    # Track emitted display names to avoid duplicate headers
+    # (e.g., INPUT and OUTPUT both map to "Input/Output")
+    emitted_display_names: set[str] = set()
+
+    for category in category_order:
+        if category not in by_category:
+            continue
+
+        display_name = CATEGORY_DISPLAY_NAMES.get(category, category)
+
+        # Collect all blocks for this display name (may span multiple categories)
+        if display_name in emitted_display_names:
+            # Already emitted header, just add rows to existing table
+            # Find the position before the last empty line and insert rows
+            cat_blocks = sorted(by_category[category], key=lambda b: b.name)
+            # Remove the trailing empty line, add rows, then re-add empty line
+            lines.pop()
+            for block in cat_blocks:
+                file_mapping = get_block_file_mapping([block])
+                file_path = list(file_mapping.keys())[0]
+                anchor = generate_anchor(block.name)
+                short_desc = (
+                    block.description.split(".")[0]
+                    if block.description
+                    else "No description"
+                )
+                short_desc = short_desc.replace("\n", " ").replace("|", "\\|")
+                link_path = f"{block_dir_prefix}{file_path}"
+                lines.append(f"| [{block.name}]({link_path}#{anchor}) | {short_desc} |")
+            lines.append("")
+            continue
+
+        emitted_display_names.add(display_name)
+        cat_blocks = sorted(by_category[category], key=lambda b: b.name)
+
+        lines.append(f"## {display_name}")
+        lines.append("")
+        lines.append("| Block Name | Description |")
+        lines.append("|------------|-------------|")
+
+        for block in cat_blocks:
+            # Determine link path
+            file_mapping = get_block_file_mapping([block])
+            file_path = list(file_mapping.keys())[0]
+            anchor = generate_anchor(block.name)
+
+            # Short description (first sentence)
+            short_desc = (
+                block.description.split(".")[0]
+                if block.description
+                else "No description"
+            )
+            short_desc = short_desc.replace("\n", " ").replace("|", "\\|")
+
+            link_path = f"{block_dir_prefix}{file_path}"
+            lines.append(f"| [{block.name}]({link_path}#{anchor}) | {short_desc} |")
+
+        lines.append("")
+
+    return "\n".join(lines)
+
+
+def generate_summary_md(
+    blocks: list[BlockDoc], root_dir: Path, block_dir_prefix: str = ""
+) -> str:
+    """Generate SUMMARY.md for GitBook navigation.
+
+    Args:
+        blocks: List of block documentation objects
+        root_dir: The root docs directory (e.g., docs/integrations/)
+        block_dir_prefix: Prefix for block file links (e.g., "block-integrations/")
+    """
+    lines = []
+    lines.append("# Table of contents")
+    lines.append("")
+    lines.append("* [AutoGPT Blocks Overview](README.md)")
+    lines.append("")
+
+    # Check for guides/ directory at the root level (docs/integrations/guides/)
+    guides_dir = root_dir / "guides"
+    if guides_dir.exists():
+        lines.append("## Guides")
+        lines.append("")
+        for guide_file in sorted(guides_dir.glob("*.md")):
+            # Use just the file name for title (replace hyphens/underscores with spaces)
+            title = file_path_to_title(guide_file.stem.replace("-", "_") + ".md")
+            lines.append(f"* [{title}](guides/{guide_file.name})")
+        lines.append("")
+
+    lines.append("## Block Integrations")
+    lines.append("")
+
+    file_mapping = get_block_file_mapping(blocks)
+    for file_path in sorted(file_mapping.keys()):
+        title = file_path_to_title(file_path)
+        link_path = f"{block_dir_prefix}{file_path}"
+        lines.append(f"* [{title}]({link_path})")
+
+    lines.append("")
+
+    return "\n".join(lines)
+
+
+def load_all_blocks_for_docs() -> list[BlockDoc]:
+    """Load all blocks and extract documentation."""
+    from backend.blocks import load_all_blocks
+
+    block_classes = load_all_blocks()
+    blocks = []
+
+    for _block_id, block_cls in block_classes.items():
+        try:
+            block_doc = extract_block_doc(block_cls)
+            blocks.append(block_doc)
+        except Exception as e:
+            logger.warning(f"Failed to extract docs for {block_cls.__name__}: {e}")
+
+    return blocks
+
+
+def write_block_docs(
+    output_dir: Path,
+    blocks: list[BlockDoc],
+    verbose: bool = False,
+) -> dict[str, str]:
+    """
+    Write block documentation files.
+
+    Returns dict of {file_path: content} for all generated files.
+    """
+    output_dir = Path(output_dir)
+    output_dir.mkdir(parents=True, exist_ok=True)
+
+    file_mapping = get_block_file_mapping(blocks)
+    generated_files = {}
+
+    for file_path, file_blocks in file_mapping.items():
+        full_path = output_dir / file_path
+
+        # Create subdirectories if needed
+        full_path.parent.mkdir(parents=True, exist_ok=True)
+
+        # Load existing content for manual section preservation
+        existing_content = ""
+        if full_path.exists():
+            existing_content = full_path.read_text()
+
+        # Always generate title from file path (with fixes applied)
+        file_title = file_path_to_title(file_path)
+
+        # Extract existing file description if present (preserve manual content)
+        file_header_pattern = (
+            r"^# .+?\n<!-- MANUAL: file_description -->\n(.*?)\n<!-- END MANUAL -->"
+        )
+        file_header_match = re.search(file_header_pattern, existing_content, re.DOTALL)
+
+        if file_header_match:
+            file_description = file_header_match.group(1)
+        else:
+            file_description = "_Add a description of this category of blocks._"
+
+        # Generate file header
+        file_header = f"# {file_title}\n"
+        file_header += "<!-- MANUAL: file_description -->\n"
+        file_header += f"{file_description}\n"
+        file_header += "<!-- END MANUAL -->\n"
+
+        # Generate content for each block
+        content_parts = []
+        for block in sorted(file_blocks, key=lambda b: b.name):
+            # Extract manual content specific to this block
+            # Match block heading (h2) and capture until --- separator
+            block_pattern = rf"(?:^|\n)## {re.escape(block.name)}\s*\n(.*?)(?=\n---|\Z)"
+            block_match = re.search(block_pattern, existing_content, re.DOTALL)
+            if block_match:
+                manual_content = extract_manual_content(block_match.group(1))
+            else:
+                manual_content = {}
+
+            content_parts.append(
+                generate_block_markdown(
+                    block,
+                    manual_content,
+                )
+            )
+
+        # Add file-level additional_content section if present
+        file_additional = extract_manual_content(existing_content).get(
+            "additional_content", ""
+        )
+        if file_additional:
+            content_parts.append("<!-- MANUAL: additional_content -->")
+            content_parts.append(file_additional)
+            content_parts.append("<!-- END MANUAL -->")
+            content_parts.append("")
+
+        full_content = file_header + "\n" + "\n".join(content_parts)
+        generated_files[str(file_path)] = full_content
+
+        if verbose:
+            print(f"  Writing {file_path} ({len(file_blocks)} blocks)")
+
+        full_path.write_text(full_content)
+
+    # Generate overview file at the parent directory (docs/integrations/)
+    # with links prefixed to point into block-integrations/
+    root_dir = output_dir.parent
+    block_dir_name = output_dir.name  # "block-integrations"
+    block_dir_prefix = f"{block_dir_name}/"
+
+    overview_content = generate_overview_table(blocks, block_dir_prefix)
+    overview_path = root_dir / "README.md"
+    generated_files["README.md"] = overview_content
+    overview_path.write_text(overview_content)
+
+    if verbose:
+        print("  Writing README.md (overview) to parent directory")
+
+    # Generate SUMMARY.md for GitBook navigation at the parent directory
+    summary_content = generate_summary_md(blocks, root_dir, block_dir_prefix)
+    summary_path = root_dir / "SUMMARY.md"
+    generated_files["SUMMARY.md"] = summary_content
+    summary_path.write_text(summary_content)
+
+    if verbose:
+        print("  Writing SUMMARY.md (navigation) to parent directory")
+
+    return generated_files
+
+
+def check_docs_in_sync(output_dir: Path, blocks: list[BlockDoc]) -> bool:
+    """
+    Check if generated docs match existing docs.
+
+    Returns True if in sync, False otherwise.
+    """
+    output_dir = Path(output_dir)
+    file_mapping = get_block_file_mapping(blocks)
+
+    all_match = True
+    out_of_sync_details: list[tuple[str, list[str]]] = []
+
+    for file_path, file_blocks in file_mapping.items():
+        full_path = output_dir / file_path
+
+        if not full_path.exists():
+            block_names = [b.name for b in sorted(file_blocks, key=lambda b: b.name)]
+            print(f"MISSING: {file_path}")
+            print(f"  Blocks: {', '.join(block_names)}")
+            out_of_sync_details.append((file_path, block_names))
+            all_match = False
+            continue
+
+        existing_content = full_path.read_text()
+
+        # Always generate title from file path (with fixes applied)
+        file_title = file_path_to_title(file_path)
+
+        # Extract existing file description if present (preserve manual content)
+        file_header_pattern = (
+            r"^# .+?\n<!-- MANUAL: file_description -->\n(.*?)\n<!-- END MANUAL -->"
+        )
+        file_header_match = re.search(file_header_pattern, existing_content, re.DOTALL)
+
+        if file_header_match:
+            file_description = file_header_match.group(1)
+        else:
+            file_description = "_Add a description of this category of blocks._"
+
+        # Generate expected file header
+        file_header = f"# {file_title}\n"
+        file_header += "<!-- MANUAL: file_description -->\n"
+        file_header += f"{file_description}\n"
+        file_header += "<!-- END MANUAL -->\n"
+
+        # Extract manual content from existing file
+        manual_sections_by_block = {}
+        for block in file_blocks:
+            block_pattern = rf"(?:^|\n)## {re.escape(block.name)}\s*\n(.*?)(?=\n---|\Z)"
+            block_match = re.search(block_pattern, existing_content, re.DOTALL)
+            if block_match:
+                manual_sections_by_block[block.name] = extract_manual_content(
+                    block_match.group(1)
+                )
+
+        # Generate expected content and check each block individually
+        content_parts = []
+        mismatched_blocks = []
+        for block in sorted(file_blocks, key=lambda b: b.name):
+            manual_content = manual_sections_by_block.get(block.name, {})
+            expected_block_content = generate_block_markdown(
+                block,
+                manual_content,
+            )
+            content_parts.append(expected_block_content)
+
+            # Check if this specific block's section exists and matches
+            # Include the --- separator to match generate_block_markdown output
+            block_pattern = rf"(?:^|\n)(## {re.escape(block.name)}\s*\n.*?\n---\n)"
+            block_match = re.search(block_pattern, existing_content, re.DOTALL)
+            if not block_match:
+                mismatched_blocks.append(f"{block.name} (missing)")
+            elif block_match.group(1).strip() != expected_block_content.strip():
+                mismatched_blocks.append(block.name)
+
+        # Add file-level additional_content to expected content (matches write_block_docs)
+        file_additional = extract_manual_content(existing_content).get(
+            "additional_content", ""
+        )
+        if file_additional:
+            content_parts.append("<!-- MANUAL: additional_content -->")
+            content_parts.append(file_additional)
+            content_parts.append("<!-- END MANUAL -->")
+            content_parts.append("")
+
+        expected_content = file_header + "\n" + "\n".join(content_parts)
+
+        if existing_content.strip() != expected_content.strip():
+            print(f"OUT OF SYNC: {file_path}")
+            if mismatched_blocks:
+                print(f"  Affected blocks: {', '.join(mismatched_blocks)}")
+            out_of_sync_details.append((file_path, mismatched_blocks))
+            all_match = False
+
+    # Check overview at the parent directory (docs/integrations/)
+    root_dir = output_dir.parent
+    block_dir_name = output_dir.name  # "block-integrations"
+    block_dir_prefix = f"{block_dir_name}/"
+
+    overview_path = root_dir / "README.md"
+    if overview_path.exists():
+        existing_overview = overview_path.read_text()
+        expected_overview = generate_overview_table(blocks, block_dir_prefix)
+        if existing_overview.strip() != expected_overview.strip():
+            print("OUT OF SYNC: README.md (overview)")
+            print("  The blocks overview table needs regeneration")
+            out_of_sync_details.append(("README.md", ["overview table"]))
+            all_match = False
+    else:
+        print("MISSING: README.md (overview)")
+        out_of_sync_details.append(("README.md", ["overview table"]))
+        all_match = False
+
+    # Check SUMMARY.md at the parent directory
+    summary_path = root_dir / "SUMMARY.md"
+    if summary_path.exists():
+        existing_summary = summary_path.read_text()
+        expected_summary = generate_summary_md(blocks, root_dir, block_dir_prefix)
+        if existing_summary.strip() != expected_summary.strip():
+            print("OUT OF SYNC: SUMMARY.md (navigation)")
+            print("  The GitBook navigation needs regeneration")
+            out_of_sync_details.append(("SUMMARY.md", ["navigation"]))
+            all_match = False
+    else:
+        print("MISSING: SUMMARY.md (navigation)")
+        out_of_sync_details.append(("SUMMARY.md", ["navigation"]))
+        all_match = False
+
+    # Check for unfilled manual sections
+    unfilled_patterns = [
+        "_Add a description of this category of blocks._",
+        "_Add technical explanation here._",
+        "_Add practical use case examples here._",
+    ]
+    files_with_unfilled = []
+    for file_path in file_mapping.keys():
+        full_path = output_dir / file_path
+        if full_path.exists():
+            content = full_path.read_text()
+            unfilled_count = sum(1 for p in unfilled_patterns if p in content)
+            if unfilled_count > 0:
+                files_with_unfilled.append((file_path, unfilled_count))
+
+    if files_with_unfilled:
+        print("\nWARNING: Files with unfilled manual sections:")
+        for file_path, count in sorted(files_with_unfilled):
+            print(f"  {file_path}: {count} unfilled section(s)")
+        print(
+            f"\nTotal: {len(files_with_unfilled)} files with unfilled manual sections"
+        )
+
+    return all_match
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description="Generate block documentation from code introspection"
+    )
+    parser.add_argument(
+        "--output-dir",
+        type=Path,
+        default=DEFAULT_OUTPUT_DIR,
+        help="Output directory for generated docs",
+    )
+    parser.add_argument(
+        "--check",
+        action="store_true",
+        help="Check if docs are in sync (for CI), exit 1 if not",
+    )
+    parser.add_argument(
+        "-v",
+        "--verbose",
+        action="store_true",
+        help="Verbose output",
+    )
+
+    args = parser.parse_args()
+
+    logging.basicConfig(
+        level=logging.DEBUG if args.verbose else logging.INFO,
+        format="%(levelname)s: %(message)s",
+    )
+
+    print("Loading blocks...")
+    blocks = load_all_blocks_for_docs()
+    print(f"Found {len(blocks)} blocks")
+
+    if args.check:
+        print(f"Checking docs in {args.output_dir}...")
+        in_sync = check_docs_in_sync(args.output_dir, blocks)
+        if in_sync:
+            print("All documentation is in sync!")
+            sys.exit(0)
+        else:
+            print("\n" + "=" * 60)
+            print("Documentation is out of sync!")
+            print("=" * 60)
+            print("\nTo fix this, run one of the following:")
+            print("\n  Option 1 - Run locally:")
+            print(
+                "    cd autogpt_platform/backend && poetry run python scripts/generate_block_docs.py"
+            )
+            print("\n  Option 2 - Ask Claude Code to run it:")
+            print('    "Run the block docs generator script to sync documentation"')
+            print("\n" + "=" * 60)
+            sys.exit(1)
+    else:
+        print(f"Generating docs to {args.output_dir}...")
+        write_block_docs(
+            args.output_dir,
+            blocks,
+            verbose=args.verbose,
+        )
+        print("Done!")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/autogpt_platform/backend/scripts/test_generate_block_docs.py b/autogpt_platform/backend/scripts/test_generate_block_docs.py
new file mode 100644
index 0000000000..a6d6d34992
--- /dev/null
+++ b/autogpt_platform/backend/scripts/test_generate_block_docs.py
@@ -0,0 +1,208 @@
+#!/usr/bin/env python3
+"""Tests for the block documentation generator."""
+import pytest
+
+from scripts.generate_block_docs import (
+    class_name_to_display_name,
+    extract_manual_content,
+    generate_anchor,
+    type_to_readable,
+)
+
+
+class TestClassNameToDisplayName:
+    """Tests for class_name_to_display_name function."""
+
+    def test_simple_block_name(self):
+        assert class_name_to_display_name("PrintBlock") == "Print"
+
+    def test_multi_word_block_name(self):
+        assert class_name_to_display_name("GetWeatherBlock") == "Get Weather"
+
+    def test_consecutive_capitals(self):
+        assert class_name_to_display_name("HTTPRequestBlock") == "HTTP Request"
+
+    def test_ai_prefix(self):
+        assert class_name_to_display_name("AIConditionBlock") == "AI Condition"
+
+    def test_no_block_suffix(self):
+        assert class_name_to_display_name("SomeClass") == "Some Class"
+
+
+class TestTypeToReadable:
+    """Tests for type_to_readable function."""
+
+    def test_string_type(self):
+        assert type_to_readable({"type": "string"}) == "str"
+
+    def test_integer_type(self):
+        assert type_to_readable({"type": "integer"}) == "int"
+
+    def test_number_type(self):
+        assert type_to_readable({"type": "number"}) == "float"
+
+    def test_boolean_type(self):
+        assert type_to_readable({"type": "boolean"}) == "bool"
+
+    def test_array_type(self):
+        result = type_to_readable({"type": "array", "items": {"type": "string"}})
+        assert result == "List[str]"
+
+    def test_object_type(self):
+        result = type_to_readable({"type": "object", "title": "MyModel"})
+        assert result == "MyModel"
+
+    def test_anyof_with_null(self):
+        result = type_to_readable({"anyOf": [{"type": "string"}, {"type": "null"}]})
+        assert result == "str"
+
+    def test_anyof_multiple_types(self):
+        result = type_to_readable({"anyOf": [{"type": "string"}, {"type": "integer"}]})
+        assert result == "str | int"
+
+    def test_enum_type(self):
+        result = type_to_readable(
+            {"type": "string", "enum": ["option1", "option2", "option3"]}
+        )
+        assert result == '"option1" | "option2" | "option3"'
+
+    def test_none_input(self):
+        assert type_to_readable(None) == "Any"
+
+    def test_non_dict_input(self):
+        assert type_to_readable("string") == "string"
+
+
+class TestExtractManualContent:
+    """Tests for extract_manual_content function."""
+
+    def test_extract_how_it_works(self):
+        content = """
+### How it works
+<!-- MANUAL: how_it_works -->
+This is how it works.
+<!-- END MANUAL -->
+"""
+        result = extract_manual_content(content)
+        assert result == {"how_it_works": "This is how it works."}
+
+    def test_extract_use_case(self):
+        content = """
+### Possible use case
+<!-- MANUAL: use_case -->
+Example use case here.
+<!-- END MANUAL -->
+"""
+        result = extract_manual_content(content)
+        assert result == {"use_case": "Example use case here."}
+
+    def test_extract_multiple_sections(self):
+        content = """
+<!-- MANUAL: how_it_works -->
+How it works content.
+<!-- END MANUAL -->
+
+<!-- MANUAL: use_case -->
+Use case content.
+<!-- END MANUAL -->
+"""
+        result = extract_manual_content(content)
+        assert result == {
+            "how_it_works": "How it works content.",
+            "use_case": "Use case content.",
+        }
+
+    def test_empty_content(self):
+        result = extract_manual_content("")
+        assert result == {}
+
+    def test_no_markers(self):
+        result = extract_manual_content("Some content without markers")
+        assert result == {}
+
+
+class TestGenerateAnchor:
+    """Tests for generate_anchor function."""
+
+    def test_simple_name(self):
+        assert generate_anchor("Print") == "print"
+
+    def test_multi_word_name(self):
+        assert generate_anchor("Get Weather") == "get-weather"
+
+    def test_name_with_parentheses(self):
+        assert generate_anchor("Something (Optional)") == "something-optional"
+
+    def test_already_lowercase(self):
+        assert generate_anchor("already lowercase") == "already-lowercase"
+
+
+class TestIntegration:
+    """Integration tests that require block loading."""
+
+    def test_load_blocks(self):
+        """Test that blocks can be loaded successfully."""
+        import logging
+        import sys
+        from pathlib import Path
+
+        logging.disable(logging.CRITICAL)
+        sys.path.insert(0, str(Path(__file__).parent.parent))
+
+        from scripts.generate_block_docs import load_all_blocks_for_docs
+
+        blocks = load_all_blocks_for_docs()
+        assert len(blocks) > 0, "Should load at least one block"
+
+    def test_block_doc_has_required_fields(self):
+        """Test that extracted block docs have required fields."""
+        import logging
+        import sys
+        from pathlib import Path
+
+        logging.disable(logging.CRITICAL)
+        sys.path.insert(0, str(Path(__file__).parent.parent))
+
+        from scripts.generate_block_docs import load_all_blocks_for_docs
+
+        blocks = load_all_blocks_for_docs()
+        block = blocks[0]
+
+        assert hasattr(block, "id")
+        assert hasattr(block, "name")
+        assert hasattr(block, "description")
+        assert hasattr(block, "categories")
+        assert hasattr(block, "inputs")
+        assert hasattr(block, "outputs")
+
+    def test_file_mapping_is_deterministic(self):
+        """Test that file mapping produces consistent results."""
+        import logging
+        import sys
+        from pathlib import Path
+
+        logging.disable(logging.CRITICAL)
+        sys.path.insert(0, str(Path(__file__).parent.parent))
+
+        from scripts.generate_block_docs import (
+            get_block_file_mapping,
+            load_all_blocks_for_docs,
+        )
+
+        # Load blocks twice and compare mappings
+        blocks1 = load_all_blocks_for_docs()
+        blocks2 = load_all_blocks_for_docs()
+
+        mapping1 = get_block_file_mapping(blocks1)
+        mapping2 = get_block_file_mapping(blocks2)
+
+        # Check same files are generated
+        assert set(mapping1.keys()) == set(mapping2.keys())
+
+        # Check same block counts per file
+        for file_path in mapping1:
+            assert len(mapping1[file_path]) == len(mapping2[file_path])
+
+
+if __name__ == "__main__":
+    pytest.main([__file__, "-v"])
diff --git a/autogpt_platform/backend/snapshots/agts_by_creator b/autogpt_platform/backend/snapshots/agts_by_creator
index 4d6dd12920..3f2e128a0d 100644
--- a/autogpt_platform/backend/snapshots/agts_by_creator
+++ b/autogpt_platform/backend/snapshots/agts_by_creator
@@ -9,7 +9,8 @@
       "sub_heading": "Creator agent subheading",
       "description": "Creator agent description",
       "runs": 50,
-      "rating": 4.0
+      "rating": 4.0,
+      "agent_graph_id": "test-graph-2"
     }
   ],
   "pagination": {
diff --git a/autogpt_platform/backend/snapshots/agts_category b/autogpt_platform/backend/snapshots/agts_category
index f65925ead3..4d0531763c 100644
--- a/autogpt_platform/backend/snapshots/agts_category
+++ b/autogpt_platform/backend/snapshots/agts_category
@@ -9,7 +9,8 @@
       "sub_heading": "Category agent subheading",
       "description": "Category agent description",
       "runs": 60,
-      "rating": 4.1
+      "rating": 4.1,
+      "agent_graph_id": "test-graph-category"
     }
   ],
   "pagination": {
diff --git a/autogpt_platform/backend/snapshots/agts_pagination b/autogpt_platform/backend/snapshots/agts_pagination
index 82e7f5f9bf..7b946157fb 100644
--- a/autogpt_platform/backend/snapshots/agts_pagination
+++ b/autogpt_platform/backend/snapshots/agts_pagination
@@ -9,7 +9,8 @@
       "sub_heading": "Agent 0 subheading",
       "description": "Agent 0 description",
       "runs": 0,
-      "rating": 4.0
+      "rating": 4.0,
+      "agent_graph_id": "test-graph-2"
     },
     {
       "slug": "agent-1",
@@ -20,7 +21,8 @@
       "sub_heading": "Agent 1 subheading",
       "description": "Agent 1 description",
       "runs": 10,
-      "rating": 4.0
+      "rating": 4.0,
+      "agent_graph_id": "test-graph-2"
     },
     {
       "slug": "agent-2",
@@ -31,7 +33,8 @@
       "sub_heading": "Agent 2 subheading",
       "description": "Agent 2 description",
       "runs": 20,
-      "rating": 4.0
+      "rating": 4.0,
+      "agent_graph_id": "test-graph-2"
     },
     {
       "slug": "agent-3",
@@ -42,7 +45,8 @@
       "sub_heading": "Agent 3 subheading",
       "description": "Agent 3 description",
       "runs": 30,
-      "rating": 4.0
+      "rating": 4.0,
+      "agent_graph_id": "test-graph-2"
     },
     {
       "slug": "agent-4",
@@ -53,7 +57,8 @@
       "sub_heading": "Agent 4 subheading",
       "description": "Agent 4 description",
       "runs": 40,
-      "rating": 4.0
+      "rating": 4.0,
+      "agent_graph_id": "test-graph-2"
     }
   ],
   "pagination": {
diff --git a/autogpt_platform/backend/snapshots/agts_search b/autogpt_platform/backend/snapshots/agts_search
index ca3f504584..ae9cc116bc 100644
--- a/autogpt_platform/backend/snapshots/agts_search
+++ b/autogpt_platform/backend/snapshots/agts_search
@@ -9,7 +9,8 @@
       "sub_heading": "Search agent subheading",
       "description": "Specific search term description",
       "runs": 75,
-      "rating": 4.2
+      "rating": 4.2,
+      "agent_graph_id": "test-graph-search"
     }
   ],
   "pagination": {
diff --git a/autogpt_platform/backend/snapshots/agts_sorted b/autogpt_platform/backend/snapshots/agts_sorted
index cddead76a5..b182256b2c 100644
--- a/autogpt_platform/backend/snapshots/agts_sorted
+++ b/autogpt_platform/backend/snapshots/agts_sorted
@@ -9,7 +9,8 @@
       "sub_heading": "Top agent subheading",
       "description": "Top agent description",
       "runs": 1000,
-      "rating": 5.0
+      "rating": 5.0,
+      "agent_graph_id": "test-graph-3"
     }
   ],
   "pagination": {
diff --git a/autogpt_platform/backend/snapshots/feat_agts b/autogpt_platform/backend/snapshots/feat_agts
index d57996a768..4f85786434 100644
--- a/autogpt_platform/backend/snapshots/feat_agts
+++ b/autogpt_platform/backend/snapshots/feat_agts
@@ -9,7 +9,8 @@
       "sub_heading": "Featured agent subheading",
       "description": "Featured agent description",
       "runs": 100,
-      "rating": 4.5
+      "rating": 4.5,
+      "agent_graph_id": "test-graph-1"
     }
   ],
   "pagination": {
diff --git a/autogpt_platform/backend/snapshots/grph_single b/autogpt_platform/backend/snapshots/grph_single
index 7ba26f6171..1811a57ec8 100644
--- a/autogpt_platform/backend/snapshots/grph_single
+++ b/autogpt_platform/backend/snapshots/grph_single
@@ -2,6 +2,7 @@
   "created_at": "2025-09-04T13:37:00",
   "credentials_input_schema": {
     "properties": {},
+    "required": [],
     "title": "TestGraphCredentialsInputSchema",
     "type": "object"
   },
@@ -10,6 +11,7 @@
   "forked_from_version": null,
   "has_external_trigger": false,
   "has_human_in_the_loop": false,
+  "has_sensitive_action": false,
   "id": "graph-123",
   "input_schema": {
     "properties": {},
diff --git a/autogpt_platform/backend/snapshots/grphs_all b/autogpt_platform/backend/snapshots/grphs_all
index d54df2bc18..0b314d96f9 100644
--- a/autogpt_platform/backend/snapshots/grphs_all
+++ b/autogpt_platform/backend/snapshots/grphs_all
@@ -2,6 +2,7 @@
   {
     "credentials_input_schema": {
       "properties": {},
+      "required": [],
       "title": "TestGraphCredentialsInputSchema",
       "type": "object"
     },
@@ -10,6 +11,7 @@
     "forked_from_version": null,
     "has_external_trigger": false,
     "has_human_in_the_loop": false,
+    "has_sensitive_action": false,
     "id": "graph-123",
     "input_schema": {
       "properties": {},
diff --git a/autogpt_platform/backend/snapshots/lib_agts_search b/autogpt_platform/backend/snapshots/lib_agts_search
index d1feb7d16d..3ce8402b63 100644
--- a/autogpt_platform/backend/snapshots/lib_agts_search
+++ b/autogpt_platform/backend/snapshots/lib_agts_search
@@ -4,6 +4,7 @@
       "id": "test-agent-1",
       "graph_id": "test-agent-1",
       "graph_version": 1,
+      "owner_user_id": "3e53486c-cf57-477e-ba2a-cb02dc828e1a",
       "image_url": null,
       "creator_name": "Test Creator",
       "creator_image_url": "",
@@ -26,14 +27,21 @@
         "properties": {}
       },
       "has_external_trigger": false,
+      "has_human_in_the_loop": false,
+      "has_sensitive_action": false,
       "trigger_setup_info": null,
       "new_output": false,
+      "execution_count": 0,
+      "success_rate": null,
+      "avg_correctness_score": null,
+      "recent_executions": [],
       "can_access_graph": true,
       "is_latest_version": true,
       "is_favorite": false,
       "recommended_schedule_cron": null,
       "settings": {
-        "human_in_the_loop_safe_mode": null
+        "human_in_the_loop_safe_mode": true,
+        "sensitive_action_safe_mode": false
       },
       "marketplace_listing": null
     },
@@ -41,6 +49,7 @@
       "id": "test-agent-2",
       "graph_id": "test-agent-2",
       "graph_version": 1,
+      "owner_user_id": "3e53486c-cf57-477e-ba2a-cb02dc828e1a",
       "image_url": null,
       "creator_name": "Test Creator",
       "creator_image_url": "",
@@ -63,14 +72,21 @@
         "properties": {}
       },
       "has_external_trigger": false,
+      "has_human_in_the_loop": false,
+      "has_sensitive_action": false,
       "trigger_setup_info": null,
       "new_output": false,
+      "execution_count": 0,
+      "success_rate": null,
+      "avg_correctness_score": null,
+      "recent_executions": [],
       "can_access_graph": false,
       "is_latest_version": true,
       "is_favorite": false,
       "recommended_schedule_cron": null,
       "settings": {
-        "human_in_the_loop_safe_mode": null
+        "human_in_the_loop_safe_mode": true,
+        "sensitive_action_safe_mode": false
       },
       "marketplace_listing": null
     }
diff --git a/autogpt_platform/backend/snapshots/sub_success b/autogpt_platform/backend/snapshots/sub_success
index 13e2ec570d..268d577745 100644
--- a/autogpt_platform/backend/snapshots/sub_success
+++ b/autogpt_platform/backend/snapshots/sub_success
@@ -1,6 +1,7 @@
 {
   "submissions": [
     {
+      "listing_id": "test-listing-id",
       "agent_id": "test-agent-id",
       "agent_version": 1,
       "name": "Test Agent",
diff --git a/autogpt_platform/backend/test/agent_generator/__init__.py b/autogpt_platform/backend/test/agent_generator/__init__.py
new file mode 100644
index 0000000000..8fcde1fa0f
--- /dev/null
+++ b/autogpt_platform/backend/test/agent_generator/__init__.py
@@ -0,0 +1 @@
+"""Tests for agent generator module."""
diff --git a/autogpt_platform/backend/test/agent_generator/test_core_integration.py b/autogpt_platform/backend/test/agent_generator/test_core_integration.py
new file mode 100644
index 0000000000..528763e751
--- /dev/null
+++ b/autogpt_platform/backend/test/agent_generator/test_core_integration.py
@@ -0,0 +1,276 @@
+"""
+Tests for the Agent Generator core module.
+
+This test suite verifies that the core functions correctly delegate to
+the external Agent Generator service.
+"""
+
+from unittest.mock import AsyncMock, patch
+
+import pytest
+
+from backend.api.features.chat.tools.agent_generator import core
+from backend.api.features.chat.tools.agent_generator.core import (
+    AgentGeneratorNotConfiguredError,
+)
+
+
+class TestServiceNotConfigured:
+    """Test that functions raise AgentGeneratorNotConfiguredError when service is not configured."""
+
+    @pytest.mark.asyncio
+    async def test_decompose_goal_raises_when_not_configured(self):
+        """Test that decompose_goal raises error when service not configured."""
+        with patch.object(core, "is_external_service_configured", return_value=False):
+            with pytest.raises(AgentGeneratorNotConfiguredError):
+                await core.decompose_goal("Build a chatbot")
+
+    @pytest.mark.asyncio
+    async def test_generate_agent_raises_when_not_configured(self):
+        """Test that generate_agent raises error when service not configured."""
+        with patch.object(core, "is_external_service_configured", return_value=False):
+            with pytest.raises(AgentGeneratorNotConfiguredError):
+                await core.generate_agent({"steps": []})
+
+    @pytest.mark.asyncio
+    async def test_generate_agent_patch_raises_when_not_configured(self):
+        """Test that generate_agent_patch raises error when service not configured."""
+        with patch.object(core, "is_external_service_configured", return_value=False):
+            with pytest.raises(AgentGeneratorNotConfiguredError):
+                await core.generate_agent_patch("Add a node", {"nodes": []})
+
+
+class TestDecomposeGoal:
+    """Test decompose_goal function service delegation."""
+
+    @pytest.mark.asyncio
+    async def test_calls_external_service(self):
+        """Test that decompose_goal calls the external service."""
+        expected_result = {"type": "instructions", "steps": ["Step 1"]}
+
+        with patch.object(
+            core, "is_external_service_configured", return_value=True
+        ), patch.object(
+            core, "decompose_goal_external", new_callable=AsyncMock
+        ) as mock_external:
+            mock_external.return_value = expected_result
+
+            result = await core.decompose_goal("Build a chatbot")
+
+            # library_agents defaults to None
+            mock_external.assert_called_once_with("Build a chatbot", "", None)
+            assert result == expected_result
+
+    @pytest.mark.asyncio
+    async def test_passes_context_to_external_service(self):
+        """Test that decompose_goal passes context to external service."""
+        expected_result = {"type": "instructions", "steps": ["Step 1"]}
+
+        with patch.object(
+            core, "is_external_service_configured", return_value=True
+        ), patch.object(
+            core, "decompose_goal_external", new_callable=AsyncMock
+        ) as mock_external:
+            mock_external.return_value = expected_result
+
+            await core.decompose_goal("Build a chatbot", "Use Python")
+
+            # library_agents defaults to None
+            mock_external.assert_called_once_with("Build a chatbot", "Use Python", None)
+
+    @pytest.mark.asyncio
+    async def test_returns_none_on_service_failure(self):
+        """Test that decompose_goal returns None when external service fails."""
+        with patch.object(
+            core, "is_external_service_configured", return_value=True
+        ), patch.object(
+            core, "decompose_goal_external", new_callable=AsyncMock
+        ) as mock_external:
+            mock_external.return_value = None
+
+            result = await core.decompose_goal("Build a chatbot")
+
+            assert result is None
+
+
+class TestGenerateAgent:
+    """Test generate_agent function service delegation."""
+
+    @pytest.mark.asyncio
+    async def test_calls_external_service(self):
+        """Test that generate_agent calls the external service."""
+        expected_result = {"name": "Test Agent", "nodes": [], "links": []}
+
+        with patch.object(
+            core, "is_external_service_configured", return_value=True
+        ), patch.object(
+            core, "generate_agent_external", new_callable=AsyncMock
+        ) as mock_external:
+            mock_external.return_value = expected_result
+
+            instructions = {"type": "instructions", "steps": ["Step 1"]}
+            result = await core.generate_agent(instructions)
+
+            mock_external.assert_called_once_with(instructions, None, None, None)
+            assert result is not None
+            assert result["name"] == "Test Agent"
+            assert "id" in result
+            assert result["version"] == 1
+            assert result["is_active"] is True
+
+    @pytest.mark.asyncio
+    async def test_preserves_existing_id_and_version(self):
+        """Test that external service result preserves existing id and version."""
+        expected_result = {
+            "id": "existing-id",
+            "version": 3,
+            "is_active": False,
+            "name": "Test Agent",
+        }
+
+        with patch.object(
+            core, "is_external_service_configured", return_value=True
+        ), patch.object(
+            core, "generate_agent_external", new_callable=AsyncMock
+        ) as mock_external:
+            mock_external.return_value = expected_result.copy()
+
+            result = await core.generate_agent({"steps": []})
+
+            assert result is not None
+            assert result["id"] == "existing-id"
+            assert result["version"] == 3
+            assert result["is_active"] is False
+
+    @pytest.mark.asyncio
+    async def test_returns_none_when_external_service_fails(self):
+        """Test that generate_agent returns None when external service fails."""
+        with patch.object(
+            core, "is_external_service_configured", return_value=True
+        ), patch.object(
+            core, "generate_agent_external", new_callable=AsyncMock
+        ) as mock_external:
+            mock_external.return_value = None
+
+            result = await core.generate_agent({"steps": []})
+
+            assert result is None
+
+
+class TestGenerateAgentPatch:
+    """Test generate_agent_patch function service delegation."""
+
+    @pytest.mark.asyncio
+    async def test_calls_external_service(self):
+        """Test that generate_agent_patch calls the external service."""
+        expected_result = {"name": "Updated Agent", "nodes": [], "links": []}
+
+        with patch.object(
+            core, "is_external_service_configured", return_value=True
+        ), patch.object(
+            core, "generate_agent_patch_external", new_callable=AsyncMock
+        ) as mock_external:
+            mock_external.return_value = expected_result
+
+            current_agent = {"nodes": [], "links": []}
+            result = await core.generate_agent_patch("Add a node", current_agent)
+
+            mock_external.assert_called_once_with(
+                "Add a node", current_agent, None, None, None
+            )
+            assert result == expected_result
+
+    @pytest.mark.asyncio
+    async def test_returns_clarifying_questions(self):
+        """Test that generate_agent_patch returns clarifying questions."""
+        expected_result = {
+            "type": "clarifying_questions",
+            "questions": [{"question": "What type of node?"}],
+        }
+
+        with patch.object(
+            core, "is_external_service_configured", return_value=True
+        ), patch.object(
+            core, "generate_agent_patch_external", new_callable=AsyncMock
+        ) as mock_external:
+            mock_external.return_value = expected_result
+
+            result = await core.generate_agent_patch("Add a node", {"nodes": []})
+
+            assert result == expected_result
+
+    @pytest.mark.asyncio
+    async def test_returns_none_when_external_service_fails(self):
+        """Test that generate_agent_patch returns None when service fails."""
+        with patch.object(
+            core, "is_external_service_configured", return_value=True
+        ), patch.object(
+            core, "generate_agent_patch_external", new_callable=AsyncMock
+        ) as mock_external:
+            mock_external.return_value = None
+
+            result = await core.generate_agent_patch("Add a node", {"nodes": []})
+
+            assert result is None
+
+
+class TestJsonToGraph:
+    """Test json_to_graph function."""
+
+    def test_converts_agent_json_to_graph(self):
+        """Test conversion of agent JSON to Graph model."""
+        agent_json = {
+            "id": "test-id",
+            "version": 2,
+            "is_active": True,
+            "name": "Test Agent",
+            "description": "A test agent",
+            "nodes": [
+                {
+                    "id": "node1",
+                    "block_id": "block1",
+                    "input_default": {"key": "value"},
+                    "metadata": {"x": 100},
+                }
+            ],
+            "links": [
+                {
+                    "id": "link1",
+                    "source_id": "node1",
+                    "sink_id": "output",
+                    "source_name": "result",
+                    "sink_name": "input",
+                    "is_static": False,
+                }
+            ],
+        }
+
+        graph = core.json_to_graph(agent_json)
+
+        assert graph.id == "test-id"
+        assert graph.version == 2
+        assert graph.is_active is True
+        assert graph.name == "Test Agent"
+        assert graph.description == "A test agent"
+        assert len(graph.nodes) == 1
+        assert graph.nodes[0].id == "node1"
+        assert graph.nodes[0].block_id == "block1"
+        assert len(graph.links) == 1
+        assert graph.links[0].source_id == "node1"
+
+    def test_generates_ids_if_missing(self):
+        """Test that missing IDs are generated."""
+        agent_json = {
+            "name": "Test Agent",
+            "nodes": [{"block_id": "block1"}],
+            "links": [],
+        }
+
+        graph = core.json_to_graph(agent_json)
+
+        assert graph.id is not None
+        assert graph.nodes[0].id is not None
+
+
+if __name__ == "__main__":
+    pytest.main([__file__, "-v"])
diff --git a/autogpt_platform/backend/test/agent_generator/test_library_agents.py b/autogpt_platform/backend/test/agent_generator/test_library_agents.py
new file mode 100644
index 0000000000..8387339582
--- /dev/null
+++ b/autogpt_platform/backend/test/agent_generator/test_library_agents.py
@@ -0,0 +1,857 @@
+"""
+Tests for library agent fetching functionality in agent generator.
+
+This test suite verifies the search-based library agent fetching,
+including the combination of library and marketplace agents.
+"""
+
+from unittest.mock import AsyncMock, MagicMock, patch
+
+import pytest
+
+from backend.api.features.chat.tools.agent_generator import core
+
+
+class TestGetLibraryAgentsForGeneration:
+    """Test get_library_agents_for_generation function."""
+
+    @pytest.mark.asyncio
+    async def test_fetches_agents_with_search_term(self):
+        """Test that search_term is passed to the library db."""
+        # Create a mock agent with proper attribute values
+        mock_agent = MagicMock()
+        mock_agent.graph_id = "agent-123"
+        mock_agent.graph_version = 1
+        mock_agent.name = "Email Agent"
+        mock_agent.description = "Sends emails"
+        mock_agent.input_schema = {"properties": {}}
+        mock_agent.output_schema = {"properties": {}}
+        mock_agent.recent_executions = []
+
+        mock_response = MagicMock()
+        mock_response.agents = [mock_agent]
+
+        with patch.object(
+            core.library_db,
+            "list_library_agents",
+            new_callable=AsyncMock,
+            return_value=mock_response,
+        ) as mock_list:
+            result = await core.get_library_agents_for_generation(
+                user_id="user-123",
+                search_query="send email",
+            )
+
+            mock_list.assert_called_once_with(
+                user_id="user-123",
+                search_term="send email",
+                page=1,
+                page_size=15,
+                include_executions=True,
+            )
+
+        # Verify result format
+        assert len(result) == 1
+        assert result[0]["graph_id"] == "agent-123"
+        assert result[0]["name"] == "Email Agent"
+
+    @pytest.mark.asyncio
+    async def test_excludes_specified_graph_id(self):
+        """Test that agents with excluded graph_id are filtered out."""
+        mock_response = MagicMock()
+        mock_response.agents = [
+            MagicMock(
+                graph_id="agent-123",
+                graph_version=1,
+                name="Agent 1",
+                description="First agent",
+                input_schema={},
+                output_schema={},
+                recent_executions=[],
+            ),
+            MagicMock(
+                graph_id="agent-456",
+                graph_version=1,
+                name="Agent 2",
+                description="Second agent",
+                input_schema={},
+                output_schema={},
+                recent_executions=[],
+            ),
+        ]
+
+        with patch.object(
+            core.library_db,
+            "list_library_agents",
+            new_callable=AsyncMock,
+            return_value=mock_response,
+        ):
+            result = await core.get_library_agents_for_generation(
+                user_id="user-123",
+                exclude_graph_id="agent-123",
+            )
+
+        # Verify the excluded agent is not in results
+        assert len(result) == 1
+        assert result[0]["graph_id"] == "agent-456"
+
+    @pytest.mark.asyncio
+    async def test_respects_max_results(self):
+        """Test that max_results parameter limits the page_size."""
+        mock_response = MagicMock()
+        mock_response.agents = []
+
+        with patch.object(
+            core.library_db,
+            "list_library_agents",
+            new_callable=AsyncMock,
+            return_value=mock_response,
+        ) as mock_list:
+            await core.get_library_agents_for_generation(
+                user_id="user-123",
+                max_results=5,
+            )
+
+            mock_list.assert_called_once_with(
+                user_id="user-123",
+                search_term=None,
+                page=1,
+                page_size=5,
+                include_executions=True,
+            )
+
+
+class TestSearchMarketplaceAgentsForGeneration:
+    """Test search_marketplace_agents_for_generation function."""
+
+    @pytest.mark.asyncio
+    async def test_searches_marketplace_with_query(self):
+        """Test that marketplace is searched with the query."""
+        mock_response = MagicMock()
+        mock_response.agents = [
+            MagicMock(
+                agent_name="Public Agent",
+                description="A public agent",
+                sub_heading="Does something useful",
+                creator="creator-1",
+                agent_graph_id="graph-123",
+            )
+        ]
+
+        mock_graph = MagicMock()
+        mock_graph.id = "graph-123"
+        mock_graph.version = 1
+        mock_graph.input_schema = {"type": "object"}
+        mock_graph.output_schema = {"type": "object"}
+
+        with (
+            patch(
+                "backend.api.features.store.db.get_store_agents",
+                new_callable=AsyncMock,
+                return_value=mock_response,
+            ) as mock_search,
+            patch(
+                "backend.api.features.chat.tools.agent_generator.core.get_store_listed_graphs",
+                new_callable=AsyncMock,
+                return_value={"graph-123": mock_graph},
+            ),
+        ):
+            result = await core.search_marketplace_agents_for_generation(
+                search_query="automation",
+                max_results=10,
+            )
+
+            mock_search.assert_called_once_with(
+                search_query="automation",
+                page=1,
+                page_size=10,
+            )
+
+        assert len(result) == 1
+        assert result[0]["name"] == "Public Agent"
+        assert result[0]["graph_id"] == "graph-123"
+
+    @pytest.mark.asyncio
+    async def test_handles_marketplace_error_gracefully(self):
+        """Test that marketplace errors don't crash the function."""
+        with patch(
+            "backend.api.features.store.db.get_store_agents",
+            new_callable=AsyncMock,
+            side_effect=Exception("Marketplace unavailable"),
+        ):
+            result = await core.search_marketplace_agents_for_generation(
+                search_query="test"
+            )
+
+        # Should return empty list, not raise exception
+        assert result == []
+
+
+class TestGetAllRelevantAgentsForGeneration:
+    """Test get_all_relevant_agents_for_generation function."""
+
+    @pytest.mark.asyncio
+    async def test_combines_library_and_marketplace_agents(self):
+        """Test that agents from both sources are combined."""
+        library_agents = [
+            {
+                "graph_id": "lib-123",
+                "graph_version": 1,
+                "name": "Library Agent",
+                "description": "From library",
+                "input_schema": {},
+                "output_schema": {},
+            }
+        ]
+
+        marketplace_agents = [
+            {
+                "graph_id": "market-456",
+                "graph_version": 1,
+                "name": "Market Agent",
+                "description": "From marketplace",
+                "input_schema": {},
+                "output_schema": {},
+            }
+        ]
+
+        with patch.object(
+            core,
+            "get_library_agents_for_generation",
+            new_callable=AsyncMock,
+            return_value=library_agents,
+        ):
+            with patch.object(
+                core,
+                "search_marketplace_agents_for_generation",
+                new_callable=AsyncMock,
+                return_value=marketplace_agents,
+            ):
+                result = await core.get_all_relevant_agents_for_generation(
+                    user_id="user-123",
+                    search_query="test query",
+                    include_marketplace=True,
+                )
+
+        # Library agents should come first
+        assert len(result) == 2
+        assert result[0]["name"] == "Library Agent"
+        assert result[1]["name"] == "Market Agent"
+
+    @pytest.mark.asyncio
+    async def test_deduplicates_by_graph_id(self):
+        """Test that marketplace agents with same graph_id as library are excluded."""
+        library_agents = [
+            {
+                "graph_id": "shared-123",
+                "graph_version": 1,
+                "name": "Shared Agent",
+                "description": "From library",
+                "input_schema": {},
+                "output_schema": {},
+            }
+        ]
+
+        marketplace_agents = [
+            {
+                "graph_id": "shared-123",  # Same graph_id, should be deduplicated
+                "graph_version": 1,
+                "name": "Shared Agent",
+                "description": "From marketplace",
+                "input_schema": {},
+                "output_schema": {},
+            },
+            {
+                "graph_id": "unique-456",
+                "graph_version": 1,
+                "name": "Unique Agent",
+                "description": "Only in marketplace",
+                "input_schema": {},
+                "output_schema": {},
+            },
+        ]
+
+        with patch.object(
+            core,
+            "get_library_agents_for_generation",
+            new_callable=AsyncMock,
+            return_value=library_agents,
+        ):
+            with patch.object(
+                core,
+                "search_marketplace_agents_for_generation",
+                new_callable=AsyncMock,
+                return_value=marketplace_agents,
+            ):
+                result = await core.get_all_relevant_agents_for_generation(
+                    user_id="user-123",
+                    search_query="test",
+                    include_marketplace=True,
+                )
+
+        # Shared Agent from marketplace should be excluded by graph_id
+        assert len(result) == 2
+        names = [a["name"] for a in result]
+        assert "Shared Agent" in names
+        assert "Unique Agent" in names
+
+    @pytest.mark.asyncio
+    async def test_skips_marketplace_when_disabled(self):
+        """Test that marketplace is not searched when include_marketplace=False."""
+        library_agents = [
+            {
+                "graph_id": "lib-123",
+                "graph_version": 1,
+                "name": "Library Agent",
+                "description": "From library",
+                "input_schema": {},
+                "output_schema": {},
+            }
+        ]
+
+        with patch.object(
+            core,
+            "get_library_agents_for_generation",
+            new_callable=AsyncMock,
+            return_value=library_agents,
+        ):
+            with patch.object(
+                core,
+                "search_marketplace_agents_for_generation",
+                new_callable=AsyncMock,
+            ) as mock_marketplace:
+                result = await core.get_all_relevant_agents_for_generation(
+                    user_id="user-123",
+                    search_query="test",
+                    include_marketplace=False,
+                )
+
+        # Marketplace should not be called
+        mock_marketplace.assert_not_called()
+        assert len(result) == 1
+
+    @pytest.mark.asyncio
+    async def test_skips_marketplace_when_no_search_query(self):
+        """Test that marketplace is not searched without a search query."""
+        library_agents = [
+            {
+                "graph_id": "lib-123",
+                "graph_version": 1,
+                "name": "Library Agent",
+                "description": "From library",
+                "input_schema": {},
+                "output_schema": {},
+            }
+        ]
+
+        with patch.object(
+            core,
+            "get_library_agents_for_generation",
+            new_callable=AsyncMock,
+            return_value=library_agents,
+        ):
+            with patch.object(
+                core,
+                "search_marketplace_agents_for_generation",
+                new_callable=AsyncMock,
+            ) as mock_marketplace:
+                result = await core.get_all_relevant_agents_for_generation(
+                    user_id="user-123",
+                    search_query=None,  # No search query
+                    include_marketplace=True,
+                )
+
+        # Marketplace should not be called without search query
+        mock_marketplace.assert_not_called()
+        assert len(result) == 1
+
+
+class TestExtractSearchTermsFromSteps:
+    """Test extract_search_terms_from_steps function."""
+
+    def test_extracts_terms_from_instructions_type(self):
+        """Test extraction from valid instructions decomposition result."""
+        decomposition_result = {
+            "type": "instructions",
+            "steps": [
+                {
+                    "description": "Send an email notification",
+                    "block_name": "GmailSendBlock",
+                },
+                {"description": "Fetch weather data", "action": "Get weather API"},
+            ],
+        }
+
+        result = core.extract_search_terms_from_steps(decomposition_result)
+
+        assert "Send an email notification" in result
+        assert "GmailSendBlock" in result
+        assert "Fetch weather data" in result
+        assert "Get weather API" in result
+
+    def test_returns_empty_for_non_instructions_type(self):
+        """Test that non-instructions types return empty list."""
+        decomposition_result = {
+            "type": "clarifying_questions",
+            "questions": [{"question": "What email?"}],
+        }
+
+        result = core.extract_search_terms_from_steps(decomposition_result)
+
+        assert result == []
+
+    def test_deduplicates_terms_case_insensitively(self):
+        """Test that duplicate terms are removed (case-insensitive)."""
+        decomposition_result = {
+            "type": "instructions",
+            "steps": [
+                {"description": "Send Email", "name": "send email"},
+                {"description": "Other task"},
+            ],
+        }
+
+        result = core.extract_search_terms_from_steps(decomposition_result)
+
+        # Should only have one "send email" variant
+        email_terms = [t for t in result if "email" in t.lower()]
+        assert len(email_terms) == 1
+
+    def test_filters_short_terms(self):
+        """Test that terms with 3 or fewer characters are filtered out."""
+        decomposition_result = {
+            "type": "instructions",
+            "steps": [
+                {"description": "ab", "action": "xyz"},  # Both too short
+                {"description": "Valid term here"},
+            ],
+        }
+
+        result = core.extract_search_terms_from_steps(decomposition_result)
+
+        assert "ab" not in result
+        assert "xyz" not in result
+        assert "Valid term here" in result
+
+    def test_handles_empty_steps(self):
+        """Test handling of empty steps list."""
+        decomposition_result = {
+            "type": "instructions",
+            "steps": [],
+        }
+
+        result = core.extract_search_terms_from_steps(decomposition_result)
+
+        assert result == []
+
+
+class TestEnrichLibraryAgentsFromSteps:
+    """Test enrich_library_agents_from_steps function."""
+
+    @pytest.mark.asyncio
+    async def test_enriches_with_additional_agents(self):
+        """Test that additional agents are found based on steps."""
+        existing_agents = [
+            {
+                "graph_id": "existing-123",
+                "graph_version": 1,
+                "name": "Existing Agent",
+                "description": "Already fetched",
+                "input_schema": {},
+                "output_schema": {},
+            }
+        ]
+
+        additional_agents = [
+            {
+                "graph_id": "new-456",
+                "graph_version": 1,
+                "name": "Email Agent",
+                "description": "For sending emails",
+                "input_schema": {},
+                "output_schema": {},
+            }
+        ]
+
+        decomposition_result = {
+            "type": "instructions",
+            "steps": [
+                {"description": "Send email notification"},
+            ],
+        }
+
+        with patch.object(
+            core,
+            "get_all_relevant_agents_for_generation",
+            new_callable=AsyncMock,
+            return_value=additional_agents,
+        ):
+            result = await core.enrich_library_agents_from_steps(
+                user_id="user-123",
+                decomposition_result=decomposition_result,
+                existing_agents=existing_agents,
+            )
+
+        # Should have both existing and new agents
+        assert len(result) == 2
+        names = [a["name"] for a in result]
+        assert "Existing Agent" in names
+        assert "Email Agent" in names
+
+    @pytest.mark.asyncio
+    async def test_deduplicates_by_graph_id(self):
+        """Test that agents with same graph_id are not duplicated."""
+        existing_agents = [
+            {
+                "graph_id": "agent-123",
+                "graph_version": 1,
+                "name": "Existing Agent",
+                "description": "Already fetched",
+                "input_schema": {},
+                "output_schema": {},
+            }
+        ]
+
+        # Additional search returns same agent
+        additional_agents = [
+            {
+                "graph_id": "agent-123",  # Same ID
+                "graph_version": 1,
+                "name": "Existing Agent Copy",
+                "description": "Same agent different name",
+                "input_schema": {},
+                "output_schema": {},
+            }
+        ]
+
+        decomposition_result = {
+            "type": "instructions",
+            "steps": [{"description": "Some action"}],
+        }
+
+        with patch.object(
+            core,
+            "get_all_relevant_agents_for_generation",
+            new_callable=AsyncMock,
+            return_value=additional_agents,
+        ):
+            result = await core.enrich_library_agents_from_steps(
+                user_id="user-123",
+                decomposition_result=decomposition_result,
+                existing_agents=existing_agents,
+            )
+
+        # Should not duplicate
+        assert len(result) == 1
+
+    @pytest.mark.asyncio
+    async def test_deduplicates_by_name(self):
+        """Test that agents with same name are not duplicated."""
+        existing_agents = [
+            {
+                "graph_id": "agent-123",
+                "graph_version": 1,
+                "name": "Email Agent",
+                "description": "Already fetched",
+                "input_schema": {},
+                "output_schema": {},
+            }
+        ]
+
+        # Additional search returns agent with same name but different ID
+        additional_agents = [
+            {
+                "graph_id": "agent-456",  # Different ID
+                "graph_version": 1,
+                "name": "Email Agent",  # Same name
+                "description": "Different agent same name",
+                "input_schema": {},
+                "output_schema": {},
+            }
+        ]
+
+        decomposition_result = {
+            "type": "instructions",
+            "steps": [{"description": "Send email"}],
+        }
+
+        with patch.object(
+            core,
+            "get_all_relevant_agents_for_generation",
+            new_callable=AsyncMock,
+            return_value=additional_agents,
+        ):
+            result = await core.enrich_library_agents_from_steps(
+                user_id="user-123",
+                decomposition_result=decomposition_result,
+                existing_agents=existing_agents,
+            )
+
+        # Should not duplicate by name
+        assert len(result) == 1
+        assert result[0].get("graph_id") == "agent-123"  # Original kept
+
+    @pytest.mark.asyncio
+    async def test_returns_existing_when_no_steps(self):
+        """Test that existing agents are returned when no search terms extracted."""
+        existing_agents = [
+            {
+                "graph_id": "existing-123",
+                "graph_version": 1,
+                "name": "Existing Agent",
+                "description": "Already fetched",
+                "input_schema": {},
+                "output_schema": {},
+            }
+        ]
+
+        decomposition_result = {
+            "type": "clarifying_questions",  # Not instructions type
+            "questions": [],
+        }
+
+        result = await core.enrich_library_agents_from_steps(
+            user_id="user-123",
+            decomposition_result=decomposition_result,
+            existing_agents=existing_agents,
+        )
+
+        # Should return existing unchanged
+        assert result == existing_agents
+
+    @pytest.mark.asyncio
+    async def test_limits_search_terms_to_three(self):
+        """Test that only first 3 search terms are used."""
+        existing_agents = []
+
+        decomposition_result = {
+            "type": "instructions",
+            "steps": [
+                {"description": "First action"},
+                {"description": "Second action"},
+                {"description": "Third action"},
+                {"description": "Fourth action"},
+                {"description": "Fifth action"},
+            ],
+        }
+
+        call_count = 0
+
+        async def mock_get_agents(*args, **kwargs):
+            nonlocal call_count
+            call_count += 1
+            return []
+
+        with patch.object(
+            core,
+            "get_all_relevant_agents_for_generation",
+            side_effect=mock_get_agents,
+        ):
+            await core.enrich_library_agents_from_steps(
+                user_id="user-123",
+                decomposition_result=decomposition_result,
+                existing_agents=existing_agents,
+            )
+
+        # Should only make 3 calls (limited to first 3 terms)
+        assert call_count == 3
+
+
+class TestExtractUuidsFromText:
+    """Test extract_uuids_from_text function."""
+
+    def test_extracts_single_uuid(self):
+        """Test extraction of a single UUID from text."""
+        text = "Use my agent 46631191-e8a8-486f-ad90-84f89738321d for this task"
+        result = core.extract_uuids_from_text(text)
+        assert len(result) == 1
+        assert "46631191-e8a8-486f-ad90-84f89738321d" in result
+
+    def test_extracts_multiple_uuids(self):
+        """Test extraction of multiple UUIDs from text."""
+        text = (
+            "Combine agents 11111111-1111-4111-8111-111111111111 "
+            "and 22222222-2222-4222-9222-222222222222"
+        )
+        result = core.extract_uuids_from_text(text)
+        assert len(result) == 2
+        assert "11111111-1111-4111-8111-111111111111" in result
+        assert "22222222-2222-4222-9222-222222222222" in result
+
+    def test_deduplicates_uuids(self):
+        """Test that duplicate UUIDs are deduplicated."""
+        text = (
+            "Use 46631191-e8a8-486f-ad90-84f89738321d twice: "
+            "46631191-e8a8-486f-ad90-84f89738321d"
+        )
+        result = core.extract_uuids_from_text(text)
+        assert len(result) == 1
+
+    def test_normalizes_to_lowercase(self):
+        """Test that UUIDs are normalized to lowercase."""
+        text = "Use 46631191-E8A8-486F-AD90-84F89738321D"
+        result = core.extract_uuids_from_text(text)
+        assert result[0] == "46631191-e8a8-486f-ad90-84f89738321d"
+
+    def test_returns_empty_for_no_uuids(self):
+        """Test that empty list is returned when no UUIDs found."""
+        text = "Create an email agent that sends notifications"
+        result = core.extract_uuids_from_text(text)
+        assert result == []
+
+    def test_ignores_invalid_uuids(self):
+        """Test that invalid UUID-like strings are ignored."""
+        text = "Not a valid UUID: 12345678-1234-1234-1234-123456789abc"
+        result = core.extract_uuids_from_text(text)
+        # UUID v4 requires specific patterns (4 in third group, 8/9/a/b in fourth)
+        assert len(result) == 0
+
+
+class TestGetLibraryAgentById:
+    """Test get_library_agent_by_id function (and its alias get_library_agent_by_graph_id)."""
+
+    @pytest.mark.asyncio
+    async def test_returns_agent_when_found_by_graph_id(self):
+        """Test that agent is returned when found by graph_id."""
+        mock_agent = MagicMock()
+        mock_agent.graph_id = "agent-123"
+        mock_agent.graph_version = 1
+        mock_agent.name = "Test Agent"
+        mock_agent.description = "Test description"
+        mock_agent.input_schema = {"properties": {}}
+        mock_agent.output_schema = {"properties": {}}
+
+        with patch.object(
+            core.library_db,
+            "get_library_agent_by_graph_id",
+            new_callable=AsyncMock,
+            return_value=mock_agent,
+        ):
+            result = await core.get_library_agent_by_id("user-123", "agent-123")
+
+        assert result is not None
+        assert result["graph_id"] == "agent-123"
+        assert result["name"] == "Test Agent"
+
+    @pytest.mark.asyncio
+    async def test_falls_back_to_library_agent_id(self):
+        """Test that lookup falls back to library agent ID when graph_id not found."""
+        mock_agent = MagicMock()
+        mock_agent.graph_id = "graph-456"  # Different from the lookup ID
+        mock_agent.graph_version = 1
+        mock_agent.name = "Library Agent"
+        mock_agent.description = "Found by library ID"
+        mock_agent.input_schema = {"properties": {}}
+        mock_agent.output_schema = {"properties": {}}
+
+        with (
+            patch.object(
+                core.library_db,
+                "get_library_agent_by_graph_id",
+                new_callable=AsyncMock,
+                return_value=None,  # Not found by graph_id
+            ),
+            patch.object(
+                core.library_db,
+                "get_library_agent",
+                new_callable=AsyncMock,
+                return_value=mock_agent,  # Found by library ID
+            ),
+        ):
+            result = await core.get_library_agent_by_id("user-123", "library-id-123")
+
+        assert result is not None
+        assert result["graph_id"] == "graph-456"
+        assert result["name"] == "Library Agent"
+
+    @pytest.mark.asyncio
+    async def test_returns_none_when_not_found_by_either_method(self):
+        """Test that None is returned when agent not found by either method."""
+        with (
+            patch.object(
+                core.library_db,
+                "get_library_agent_by_graph_id",
+                new_callable=AsyncMock,
+                return_value=None,
+            ),
+            patch.object(
+                core.library_db,
+                "get_library_agent",
+                new_callable=AsyncMock,
+                side_effect=core.NotFoundError("Not found"),
+            ),
+        ):
+            result = await core.get_library_agent_by_id("user-123", "nonexistent")
+
+        assert result is None
+
+    @pytest.mark.asyncio
+    async def test_returns_none_on_exception(self):
+        """Test that None is returned when exception occurs in both lookups."""
+        with (
+            patch.object(
+                core.library_db,
+                "get_library_agent_by_graph_id",
+                new_callable=AsyncMock,
+                side_effect=Exception("Database error"),
+            ),
+            patch.object(
+                core.library_db,
+                "get_library_agent",
+                new_callable=AsyncMock,
+                side_effect=Exception("Database error"),
+            ),
+        ):
+            result = await core.get_library_agent_by_id("user-123", "agent-123")
+
+        assert result is None
+
+    @pytest.mark.asyncio
+    async def test_alias_works(self):
+        """Test that get_library_agent_by_graph_id is an alias for get_library_agent_by_id."""
+        assert core.get_library_agent_by_graph_id is core.get_library_agent_by_id
+
+
+class TestGetAllRelevantAgentsWithUuids:
+    """Test UUID extraction in get_all_relevant_agents_for_generation."""
+
+    @pytest.mark.asyncio
+    async def test_fetches_explicitly_mentioned_agents(self):
+        """Test that agents mentioned by UUID are fetched directly."""
+        mock_agent = MagicMock()
+        mock_agent.graph_id = "46631191-e8a8-486f-ad90-84f89738321d"
+        mock_agent.graph_version = 1
+        mock_agent.name = "Mentioned Agent"
+        mock_agent.description = "Explicitly mentioned"
+        mock_agent.input_schema = {}
+        mock_agent.output_schema = {}
+
+        mock_response = MagicMock()
+        mock_response.agents = []
+
+        with (
+            patch.object(
+                core.library_db,
+                "get_library_agent_by_graph_id",
+                new_callable=AsyncMock,
+                return_value=mock_agent,
+            ),
+            patch.object(
+                core.library_db,
+                "list_library_agents",
+                new_callable=AsyncMock,
+                return_value=mock_response,
+            ),
+        ):
+            result = await core.get_all_relevant_agents_for_generation(
+                user_id="user-123",
+                search_query="Use agent 46631191-e8a8-486f-ad90-84f89738321d",
+                include_marketplace=False,
+            )
+
+        assert len(result) == 1
+        assert result[0].get("graph_id") == "46631191-e8a8-486f-ad90-84f89738321d"
+        assert result[0].get("name") == "Mentioned Agent"
+
+
+if __name__ == "__main__":
+    pytest.main([__file__, "-v"])
diff --git a/autogpt_platform/backend/test/agent_generator/test_service.py b/autogpt_platform/backend/test/agent_generator/test_service.py
new file mode 100644
index 0000000000..cc37c428c0
--- /dev/null
+++ b/autogpt_platform/backend/test/agent_generator/test_service.py
@@ -0,0 +1,574 @@
+"""
+Tests for the Agent Generator external service client.
+
+This test suite verifies the external Agent Generator service integration,
+including service detection, API calls, and error handling.
+"""
+
+from unittest.mock import AsyncMock, MagicMock, patch
+
+import httpx
+import pytest
+
+from backend.api.features.chat.tools.agent_generator import service
+
+
+class TestServiceConfiguration:
+    """Test service configuration detection."""
+
+    def setup_method(self):
+        """Reset settings singleton before each test."""
+        service._settings = None
+        service._client = None
+
+    def test_external_service_not_configured_when_host_empty(self):
+        """Test that external service is not configured when host is empty."""
+        mock_settings = MagicMock()
+        mock_settings.config.agentgenerator_host = ""
+
+        with patch.object(service, "_get_settings", return_value=mock_settings):
+            assert service.is_external_service_configured() is False
+
+    def test_external_service_configured_when_host_set(self):
+        """Test that external service is configured when host is set."""
+        mock_settings = MagicMock()
+        mock_settings.config.agentgenerator_host = "agent-generator.local"
+
+        with patch.object(service, "_get_settings", return_value=mock_settings):
+            assert service.is_external_service_configured() is True
+
+    def test_get_base_url(self):
+        """Test base URL construction."""
+        mock_settings = MagicMock()
+        mock_settings.config.agentgenerator_host = "agent-generator.local"
+        mock_settings.config.agentgenerator_port = 8000
+
+        with patch.object(service, "_get_settings", return_value=mock_settings):
+            url = service._get_base_url()
+            assert url == "http://agent-generator.local:8000"
+
+
+class TestDecomposeGoalExternal:
+    """Test decompose_goal_external function."""
+
+    def setup_method(self):
+        """Reset client singleton before each test."""
+        service._settings = None
+        service._client = None
+
+    @pytest.mark.asyncio
+    async def test_decompose_goal_returns_instructions(self):
+        """Test successful decomposition returning instructions."""
+        mock_response = MagicMock()
+        mock_response.json.return_value = {
+            "success": True,
+            "type": "instructions",
+            "steps": ["Step 1", "Step 2"],
+        }
+        mock_response.raise_for_status = MagicMock()
+
+        mock_client = AsyncMock()
+        mock_client.post.return_value = mock_response
+
+        with patch.object(service, "_get_client", return_value=mock_client):
+            result = await service.decompose_goal_external("Build a chatbot")
+
+        assert result == {"type": "instructions", "steps": ["Step 1", "Step 2"]}
+        mock_client.post.assert_called_once_with(
+            "/api/decompose-description", json={"description": "Build a chatbot"}
+        )
+
+    @pytest.mark.asyncio
+    async def test_decompose_goal_returns_clarifying_questions(self):
+        """Test decomposition returning clarifying questions."""
+        mock_response = MagicMock()
+        mock_response.json.return_value = {
+            "success": True,
+            "type": "clarifying_questions",
+            "questions": ["What platform?", "What language?"],
+        }
+        mock_response.raise_for_status = MagicMock()
+
+        mock_client = AsyncMock()
+        mock_client.post.return_value = mock_response
+
+        with patch.object(service, "_get_client", return_value=mock_client):
+            result = await service.decompose_goal_external("Build something")
+
+        assert result == {
+            "type": "clarifying_questions",
+            "questions": ["What platform?", "What language?"],
+        }
+
+    @pytest.mark.asyncio
+    async def test_decompose_goal_with_context(self):
+        """Test decomposition with additional context enriched into description."""
+        mock_response = MagicMock()
+        mock_response.json.return_value = {
+            "success": True,
+            "type": "instructions",
+            "steps": ["Step 1"],
+        }
+        mock_response.raise_for_status = MagicMock()
+
+        mock_client = AsyncMock()
+        mock_client.post.return_value = mock_response
+
+        with patch.object(service, "_get_client", return_value=mock_client):
+            await service.decompose_goal_external(
+                "Build a chatbot", context="Use Python"
+            )
+
+        expected_description = (
+            "Build a chatbot\n\nAdditional context from user:\nUse Python"
+        )
+        mock_client.post.assert_called_once_with(
+            "/api/decompose-description",
+            json={"description": expected_description},
+        )
+
+    @pytest.mark.asyncio
+    async def test_decompose_goal_returns_unachievable_goal(self):
+        """Test decomposition returning unachievable goal response."""
+        mock_response = MagicMock()
+        mock_response.json.return_value = {
+            "success": True,
+            "type": "unachievable_goal",
+            "reason": "Cannot do X",
+            "suggested_goal": "Try Y instead",
+        }
+        mock_response.raise_for_status = MagicMock()
+
+        mock_client = AsyncMock()
+        mock_client.post.return_value = mock_response
+
+        with patch.object(service, "_get_client", return_value=mock_client):
+            result = await service.decompose_goal_external("Do something impossible")
+
+        assert result == {
+            "type": "unachievable_goal",
+            "reason": "Cannot do X",
+            "suggested_goal": "Try Y instead",
+        }
+
+    @pytest.mark.asyncio
+    async def test_decompose_goal_handles_http_error(self):
+        """Test decomposition handles HTTP errors gracefully."""
+        mock_response = MagicMock()
+        mock_response.status_code = 500
+        mock_client = AsyncMock()
+        mock_client.post.side_effect = httpx.HTTPStatusError(
+            "Server error", request=MagicMock(), response=mock_response
+        )
+
+        with patch.object(service, "_get_client", return_value=mock_client):
+            result = await service.decompose_goal_external("Build a chatbot")
+
+        assert result is not None
+        assert result.get("type") == "error"
+        assert result.get("error_type") == "http_error"
+        assert "Server error" in result.get("error", "")
+
+    @pytest.mark.asyncio
+    async def test_decompose_goal_handles_request_error(self):
+        """Test decomposition handles request errors gracefully."""
+        mock_client = AsyncMock()
+        mock_client.post.side_effect = httpx.RequestError("Connection failed")
+
+        with patch.object(service, "_get_client", return_value=mock_client):
+            result = await service.decompose_goal_external("Build a chatbot")
+
+        assert result is not None
+        assert result.get("type") == "error"
+        assert result.get("error_type") == "connection_error"
+        assert "Connection failed" in result.get("error", "")
+
+    @pytest.mark.asyncio
+    async def test_decompose_goal_handles_service_error(self):
+        """Test decomposition handles service returning error."""
+        mock_response = MagicMock()
+        mock_response.json.return_value = {
+            "success": False,
+            "error": "Internal error",
+            "error_type": "internal_error",
+        }
+        mock_response.raise_for_status = MagicMock()
+
+        mock_client = AsyncMock()
+        mock_client.post.return_value = mock_response
+
+        with patch.object(service, "_get_client", return_value=mock_client):
+            result = await service.decompose_goal_external("Build a chatbot")
+
+        assert result is not None
+        assert result.get("type") == "error"
+        assert result.get("error") == "Internal error"
+        assert result.get("error_type") == "internal_error"
+
+
+class TestGenerateAgentExternal:
+    """Test generate_agent_external function."""
+
+    def setup_method(self):
+        """Reset client singleton before each test."""
+        service._settings = None
+        service._client = None
+
+    @pytest.mark.asyncio
+    async def test_generate_agent_success(self):
+        """Test successful agent generation."""
+        agent_json = {
+            "name": "Test Agent",
+            "nodes": [],
+            "links": [],
+        }
+        mock_response = MagicMock()
+        mock_response.json.return_value = {
+            "success": True,
+            "agent_json": agent_json,
+        }
+        mock_response.raise_for_status = MagicMock()
+
+        mock_client = AsyncMock()
+        mock_client.post.return_value = mock_response
+
+        instructions = {"type": "instructions", "steps": ["Step 1"]}
+
+        with patch.object(service, "_get_client", return_value=mock_client):
+            result = await service.generate_agent_external(instructions)
+
+        assert result == agent_json
+        mock_client.post.assert_called_once_with(
+            "/api/generate-agent", json={"instructions": instructions}
+        )
+
+    @pytest.mark.asyncio
+    async def test_generate_agent_handles_error(self):
+        """Test agent generation handles errors gracefully."""
+        mock_client = AsyncMock()
+        mock_client.post.side_effect = httpx.RequestError("Connection failed")
+
+        with patch.object(service, "_get_client", return_value=mock_client):
+            result = await service.generate_agent_external({"steps": []})
+
+        assert result is not None
+        assert result.get("type") == "error"
+        assert result.get("error_type") == "connection_error"
+        assert "Connection failed" in result.get("error", "")
+
+
+class TestGenerateAgentPatchExternal:
+    """Test generate_agent_patch_external function."""
+
+    def setup_method(self):
+        """Reset client singleton before each test."""
+        service._settings = None
+        service._client = None
+
+    @pytest.mark.asyncio
+    async def test_generate_patch_returns_updated_agent(self):
+        """Test successful patch generation returning updated agent."""
+        updated_agent = {
+            "name": "Updated Agent",
+            "nodes": [{"id": "1", "block_id": "test"}],
+            "links": [],
+        }
+        mock_response = MagicMock()
+        mock_response.json.return_value = {
+            "success": True,
+            "agent_json": updated_agent,
+        }
+        mock_response.raise_for_status = MagicMock()
+
+        mock_client = AsyncMock()
+        mock_client.post.return_value = mock_response
+
+        current_agent = {"name": "Old Agent", "nodes": [], "links": []}
+
+        with patch.object(service, "_get_client", return_value=mock_client):
+            result = await service.generate_agent_patch_external(
+                "Add a new node", current_agent
+            )
+
+        assert result == updated_agent
+        mock_client.post.assert_called_once_with(
+            "/api/update-agent",
+            json={
+                "update_request": "Add a new node",
+                "current_agent_json": current_agent,
+            },
+        )
+
+    @pytest.mark.asyncio
+    async def test_generate_patch_returns_clarifying_questions(self):
+        """Test patch generation returning clarifying questions."""
+        mock_response = MagicMock()
+        mock_response.json.return_value = {
+            "success": True,
+            "type": "clarifying_questions",
+            "questions": ["What type of node?"],
+        }
+        mock_response.raise_for_status = MagicMock()
+
+        mock_client = AsyncMock()
+        mock_client.post.return_value = mock_response
+
+        with patch.object(service, "_get_client", return_value=mock_client):
+            result = await service.generate_agent_patch_external(
+                "Add something", {"nodes": []}
+            )
+
+        assert result == {
+            "type": "clarifying_questions",
+            "questions": ["What type of node?"],
+        }
+
+
+class TestHealthCheck:
+    """Test health_check function."""
+
+    def setup_method(self):
+        """Reset singletons before each test."""
+        service._settings = None
+        service._client = None
+
+    @pytest.mark.asyncio
+    async def test_health_check_returns_false_when_not_configured(self):
+        """Test health check returns False when service not configured."""
+        with patch.object(
+            service, "is_external_service_configured", return_value=False
+        ):
+            result = await service.health_check()
+            assert result is False
+
+    @pytest.mark.asyncio
+    async def test_health_check_returns_true_when_healthy(self):
+        """Test health check returns True when service is healthy."""
+        mock_response = MagicMock()
+        mock_response.json.return_value = {
+            "status": "healthy",
+            "blocks_loaded": True,
+        }
+        mock_response.raise_for_status = MagicMock()
+
+        mock_client = AsyncMock()
+        mock_client.get.return_value = mock_response
+
+        with patch.object(service, "is_external_service_configured", return_value=True):
+            with patch.object(service, "_get_client", return_value=mock_client):
+                result = await service.health_check()
+
+        assert result is True
+        mock_client.get.assert_called_once_with("/health")
+
+    @pytest.mark.asyncio
+    async def test_health_check_returns_false_when_not_healthy(self):
+        """Test health check returns False when service is not healthy."""
+        mock_response = MagicMock()
+        mock_response.json.return_value = {
+            "status": "unhealthy",
+            "blocks_loaded": False,
+        }
+        mock_response.raise_for_status = MagicMock()
+
+        mock_client = AsyncMock()
+        mock_client.get.return_value = mock_response
+
+        with patch.object(service, "is_external_service_configured", return_value=True):
+            with patch.object(service, "_get_client", return_value=mock_client):
+                result = await service.health_check()
+
+        assert result is False
+
+    @pytest.mark.asyncio
+    async def test_health_check_returns_false_on_error(self):
+        """Test health check returns False on connection error."""
+        mock_client = AsyncMock()
+        mock_client.get.side_effect = httpx.RequestError("Connection failed")
+
+        with patch.object(service, "is_external_service_configured", return_value=True):
+            with patch.object(service, "_get_client", return_value=mock_client):
+                result = await service.health_check()
+
+        assert result is False
+
+
+class TestGetBlocksExternal:
+    """Test get_blocks_external function."""
+
+    def setup_method(self):
+        """Reset client singleton before each test."""
+        service._settings = None
+        service._client = None
+
+    @pytest.mark.asyncio
+    async def test_get_blocks_success(self):
+        """Test successful blocks retrieval."""
+        blocks = [
+            {"id": "block1", "name": "Block 1"},
+            {"id": "block2", "name": "Block 2"},
+        ]
+        mock_response = MagicMock()
+        mock_response.json.return_value = {
+            "success": True,
+            "blocks": blocks,
+        }
+        mock_response.raise_for_status = MagicMock()
+
+        mock_client = AsyncMock()
+        mock_client.get.return_value = mock_response
+
+        with patch.object(service, "_get_client", return_value=mock_client):
+            result = await service.get_blocks_external()
+
+        assert result == blocks
+        mock_client.get.assert_called_once_with("/api/blocks")
+
+    @pytest.mark.asyncio
+    async def test_get_blocks_handles_error(self):
+        """Test blocks retrieval handles errors gracefully."""
+        mock_client = AsyncMock()
+        mock_client.get.side_effect = httpx.RequestError("Connection failed")
+
+        with patch.object(service, "_get_client", return_value=mock_client):
+            result = await service.get_blocks_external()
+
+        assert result is None
+
+
+class TestLibraryAgentsPassthrough:
+    """Test that library_agents are passed correctly in all requests."""
+
+    def setup_method(self):
+        """Reset client singleton before each test."""
+        service._settings = None
+        service._client = None
+
+    @pytest.mark.asyncio
+    async def test_decompose_goal_passes_library_agents(self):
+        """Test that library_agents are included in decompose goal payload."""
+        library_agents = [
+            {
+                "graph_id": "agent-123",
+                "graph_version": 1,
+                "name": "Email Sender",
+                "description": "Sends emails",
+                "input_schema": {"properties": {"to": {"type": "string"}}},
+                "output_schema": {"properties": {"sent": {"type": "boolean"}}},
+            },
+        ]
+
+        mock_response = MagicMock()
+        mock_response.json.return_value = {
+            "success": True,
+            "type": "instructions",
+            "steps": ["Step 1"],
+        }
+        mock_response.raise_for_status = MagicMock()
+
+        mock_client = AsyncMock()
+        mock_client.post.return_value = mock_response
+
+        with patch.object(service, "_get_client", return_value=mock_client):
+            await service.decompose_goal_external(
+                "Send an email",
+                library_agents=library_agents,
+            )
+
+        # Verify library_agents was passed in the payload
+        call_args = mock_client.post.call_args
+        assert call_args[1]["json"]["library_agents"] == library_agents
+
+    @pytest.mark.asyncio
+    async def test_generate_agent_passes_library_agents(self):
+        """Test that library_agents are included in generate agent payload."""
+        library_agents = [
+            {
+                "graph_id": "agent-456",
+                "graph_version": 2,
+                "name": "Data Fetcher",
+                "description": "Fetches data from API",
+                "input_schema": {"properties": {"url": {"type": "string"}}},
+                "output_schema": {"properties": {"data": {"type": "object"}}},
+            },
+        ]
+
+        mock_response = MagicMock()
+        mock_response.json.return_value = {
+            "success": True,
+            "agent_json": {"name": "Test Agent", "nodes": []},
+        }
+        mock_response.raise_for_status = MagicMock()
+
+        mock_client = AsyncMock()
+        mock_client.post.return_value = mock_response
+
+        with patch.object(service, "_get_client", return_value=mock_client):
+            await service.generate_agent_external(
+                {"steps": ["Step 1"]},
+                library_agents=library_agents,
+            )
+
+        # Verify library_agents was passed in the payload
+        call_args = mock_client.post.call_args
+        assert call_args[1]["json"]["library_agents"] == library_agents
+
+    @pytest.mark.asyncio
+    async def test_generate_agent_patch_passes_library_agents(self):
+        """Test that library_agents are included in patch generation payload."""
+        library_agents = [
+            {
+                "graph_id": "agent-789",
+                "graph_version": 1,
+                "name": "Slack Notifier",
+                "description": "Sends Slack messages",
+                "input_schema": {"properties": {"message": {"type": "string"}}},
+                "output_schema": {"properties": {"success": {"type": "boolean"}}},
+            },
+        ]
+
+        mock_response = MagicMock()
+        mock_response.json.return_value = {
+            "success": True,
+            "agent_json": {"name": "Updated Agent", "nodes": []},
+        }
+        mock_response.raise_for_status = MagicMock()
+
+        mock_client = AsyncMock()
+        mock_client.post.return_value = mock_response
+
+        with patch.object(service, "_get_client", return_value=mock_client):
+            await service.generate_agent_patch_external(
+                "Add error handling",
+                {"name": "Original Agent", "nodes": []},
+                library_agents=library_agents,
+            )
+
+        # Verify library_agents was passed in the payload
+        call_args = mock_client.post.call_args
+        assert call_args[1]["json"]["library_agents"] == library_agents
+
+    @pytest.mark.asyncio
+    async def test_decompose_goal_without_library_agents(self):
+        """Test that decompose goal works without library_agents."""
+        mock_response = MagicMock()
+        mock_response.json.return_value = {
+            "success": True,
+            "type": "instructions",
+            "steps": ["Step 1"],
+        }
+        mock_response.raise_for_status = MagicMock()
+
+        mock_client = AsyncMock()
+        mock_client.post.return_value = mock_response
+
+        with patch.object(service, "_get_client", return_value=mock_client):
+            await service.decompose_goal_external("Build a workflow")
+
+        # Verify library_agents was NOT passed when not provided
+        call_args = mock_client.post.call_args
+        assert "library_agents" not in call_args[1]["json"]
+
+
+if __name__ == "__main__":
+    pytest.main([__file__, "-v"])
diff --git a/autogpt_platform/backend/test/e2e_test_data.py b/autogpt_platform/backend/test/e2e_test_data.py
index d7576cdad3..7288197a90 100644
--- a/autogpt_platform/backend/test/e2e_test_data.py
+++ b/autogpt_platform/backend/test/e2e_test_data.py
@@ -43,19 +43,24 @@ faker = Faker()
 # Constants for data generation limits (reduced for E2E tests)
 NUM_USERS = 15
 NUM_AGENT_BLOCKS = 30
-MIN_GRAPHS_PER_USER = 15
-MAX_GRAPHS_PER_USER = 15
+MIN_GRAPHS_PER_USER = 25
+MAX_GRAPHS_PER_USER = 25
 MIN_NODES_PER_GRAPH = 3
 MAX_NODES_PER_GRAPH = 6
 MIN_PRESETS_PER_USER = 2
 MAX_PRESETS_PER_USER = 3
-MIN_AGENTS_PER_USER = 15
-MAX_AGENTS_PER_USER = 15
+MIN_AGENTS_PER_USER = 25
+MAX_AGENTS_PER_USER = 25
 MIN_EXECUTIONS_PER_GRAPH = 2
 MAX_EXECUTIONS_PER_GRAPH = 8
 MIN_REVIEWS_PER_VERSION = 2
 MAX_REVIEWS_PER_VERSION = 5
 
+# Guaranteed minimums for marketplace tests (deterministic)
+GUARANTEED_FEATURED_AGENTS = 8
+GUARANTEED_FEATURED_CREATORS = 5
+GUARANTEED_TOP_AGENTS = 10
+
 
 def get_image():
     """Generate a consistent image URL using picsum.photos service."""
@@ -385,7 +390,7 @@ class TestDataCreator:
 
         library_agents = []
         for user in self.users:
-            num_agents = 10  # Create exactly 10 agents per user
+            num_agents = random.randint(MIN_AGENTS_PER_USER, MAX_AGENTS_PER_USER)
 
             # Get available graphs for this user
             user_graphs = [
@@ -507,14 +512,17 @@ class TestDataCreator:
             existing_profiles, min(num_creators, len(existing_profiles))
         )
 
-        # Mark about 50% of creators as featured (more for testing)
-        num_featured = max(2, int(num_creators * 0.5))
+        # Guarantee at least GUARANTEED_FEATURED_CREATORS featured creators
+        num_featured = max(GUARANTEED_FEATURED_CREATORS, int(num_creators * 0.5))
         num_featured = min(
             num_featured, len(selected_profiles)
         )  # Don't exceed available profiles
         featured_profile_ids = set(
             random.sample([p.id for p in selected_profiles], num_featured)
         )
+        print(
+            f"🎯 Creating {num_featured} featured creators (min: {GUARANTEED_FEATURED_CREATORS})"
+        )
 
         for profile in selected_profiles:
             try:
@@ -545,21 +553,25 @@ class TestDataCreator:
         return profiles
 
     async def create_test_store_submissions(self) -> List[Dict[str, Any]]:
-        """Create test store submissions using the API function."""
+        """Create test store submissions using the API function.
+
+        DETERMINISTIC: Guarantees minimum featured agents for E2E tests.
+        """
         print("Creating test store submissions...")
 
         submissions = []
         approved_submissions = []
+        featured_count = 0
+        submission_counter = 0
 
-        # Create a special test submission for test123@gmail.com
+        # Create a special test submission for test123@gmail.com (ALWAYS approved + featured)
         test_user = next(
             (user for user in self.users if user["email"] == "test123@gmail.com"), None
         )
-        if test_user:
-            # Special test data for consistent testing
+        if test_user and self.agent_graphs:
             test_submission_data = {
                 "user_id": test_user["id"],
-                "agent_id": self.agent_graphs[0]["id"],  # Use first available graph
+                "agent_id": self.agent_graphs[0]["id"],
                 "agent_version": 1,
                 "slug": "test-agent-submission",
                 "name": "Test Agent Submission",
@@ -580,37 +592,24 @@ class TestDataCreator:
                 submissions.append(test_submission.model_dump())
                 print("✅ Created special test store submission for test123@gmail.com")
 
-                # Randomly approve, reject, or leave pending the test submission
+                # ALWAYS approve and feature the test submission
                 if test_submission.store_listing_version_id:
-                    random_value = random.random()
-                    if random_value < 0.4:  # 40% chance to approve
-                        approved_submission = await review_store_submission(
-                            store_listing_version_id=test_submission.store_listing_version_id,
-                            is_approved=True,
-                            external_comments="Test submission approved",
-                            internal_comments="Auto-approved test submission",
-                            reviewer_id=test_user["id"],
-                        )
-                        approved_submissions.append(approved_submission.model_dump())
-                        print("✅ Approved test store submission")
+                    approved_submission = await review_store_submission(
+                        store_listing_version_id=test_submission.store_listing_version_id,
+                        is_approved=True,
+                        external_comments="Test submission approved",
+                        internal_comments="Auto-approved test submission",
+                        reviewer_id=test_user["id"],
+                    )
+                    approved_submissions.append(approved_submission.model_dump())
+                    print("✅ Approved test store submission")
 
-                        # Mark approved submission as featured
-                        await prisma.storelistingversion.update(
-                            where={"id": test_submission.store_listing_version_id},
-                            data={"isFeatured": True},
-                        )
-                        print("🌟 Marked test agent as FEATURED")
-                    elif random_value < 0.7:  # 30% chance to reject (40% to 70%)
-                        await review_store_submission(
-                            store_listing_version_id=test_submission.store_listing_version_id,
-                            is_approved=False,
-                            external_comments="Test submission rejected - needs improvements",
-                            internal_comments="Auto-rejected test submission for E2E testing",
-                            reviewer_id=test_user["id"],
-                        )
-                        print("❌ Rejected test store submission")
-                    else:  # 30% chance to leave pending (70% to 100%)
-                        print("⏳ Left test submission pending for review")
+                    await prisma.storelistingversion.update(
+                        where={"id": test_submission.store_listing_version_id},
+                        data={"isFeatured": True},
+                    )
+                    featured_count += 1
+                    print("🌟 Marked test agent as FEATURED")
 
             except Exception as e:
                 print(f"Error creating test store submission: {e}")
@@ -620,7 +619,6 @@ class TestDataCreator:
 
         # Create regular submissions for all users
         for user in self.users:
-            # Get available graphs for this specific user
             user_graphs = [
                 g for g in self.agent_graphs if g.get("userId") == user["id"]
             ]
@@ -631,18 +629,17 @@ class TestDataCreator:
                 )
                 continue
 
-            # Create exactly 4 store submissions per user
             for submission_index in range(4):
                 graph = random.choice(user_graphs)
+                submission_counter += 1
 
                 try:
                     print(
-                        f"Creating store submission for user {user['id']} with graph {graph['id']} (owner: {graph.get('userId')})"
+                        f"Creating store submission for user {user['id']} with graph {graph['id']}"
                     )
 
-                    # Use the API function to create store submission with correct parameters
                     submission = await create_store_submission(
-                        user_id=user["id"],  # Must match graph's userId
+                        user_id=user["id"],
                         agent_id=graph["id"],
                         agent_version=graph.get("version", 1),
                         slug=faker.slug(),
@@ -651,22 +648,24 @@ class TestDataCreator:
                         video_url=get_video_url() if random.random() < 0.3 else None,
                         image_urls=[get_image() for _ in range(3)],
                         description=faker.text(),
-                        categories=[
-                            get_category()
-                        ],  # Single category from predefined list
+                        categories=[get_category()],
                         changes_summary="Initial E2E test submission",
                     )
                     submissions.append(submission.model_dump())
                     print(f"✅ Created store submission: {submission.name}")
 
-                    # Randomly approve, reject, or leave pending the submission
                     if submission.store_listing_version_id:
-                        random_value = random.random()
-                        if random_value < 0.4:  # 40% chance to approve
-                            try:
-                                # Pick a random user as the reviewer (admin)
-                                reviewer_id = random.choice(self.users)["id"]
+                        # DETERMINISTIC: First N submissions are always approved
+                        # First GUARANTEED_FEATURED_AGENTS of those are always featured
+                        should_approve = (
+                            submission_counter <= GUARANTEED_TOP_AGENTS
+                            or random.random() < 0.4
+                        )
+                        should_feature = featured_count < GUARANTEED_FEATURED_AGENTS
 
+                        if should_approve:
+                            try:
+                                reviewer_id = random.choice(self.users)["id"]
                                 approved_submission = await review_store_submission(
                                     store_listing_version_id=submission.store_listing_version_id,
                                     is_approved=True,
@@ -681,16 +680,7 @@ class TestDataCreator:
                                     f"✅ Approved store submission: {submission.name}"
                                 )
 
-                                # Mark some agents as featured during creation (30% chance)
-                                # More likely for creators and first submissions
-                                is_creator = user["id"] in [
-                                    p.get("userId") for p in self.profiles
-                                ]
-                                feature_chance = (
-                                    0.5 if is_creator else 0.2
-                                )  # 50% for creators, 20% for others
-
-                                if random.random() < feature_chance:
+                                if should_feature:
                                     try:
                                         await prisma.storelistingversion.update(
                                             where={
@@ -698,8 +688,25 @@ class TestDataCreator:
                                             },
                                             data={"isFeatured": True},
                                         )
+                                        featured_count += 1
                                         print(
-                                            f"🌟 Marked agent as FEATURED: {submission.name}"
+                                            f"🌟 Marked agent as FEATURED ({featured_count}/{GUARANTEED_FEATURED_AGENTS}): {submission.name}"
+                                        )
+                                    except Exception as e:
+                                        print(
+                                            f"Warning: Could not mark submission as featured: {e}"
+                                        )
+                                elif random.random() < 0.2:
+                                    try:
+                                        await prisma.storelistingversion.update(
+                                            where={
+                                                "id": submission.store_listing_version_id
+                                            },
+                                            data={"isFeatured": True},
+                                        )
+                                        featured_count += 1
+                                        print(
+                                            f"🌟 Marked agent as FEATURED (bonus): {submission.name}"
                                         )
                                     except Exception as e:
                                         print(
@@ -710,11 +717,9 @@ class TestDataCreator:
                                 print(
                                     f"Warning: Could not approve submission {submission.name}: {e}"
                                 )
-                        elif random_value < 0.7:  # 30% chance to reject (40% to 70%)
+                        elif random.random() < 0.5:
                             try:
-                                # Pick a random user as the reviewer (admin)
                                 reviewer_id = random.choice(self.users)["id"]
-
                                 await review_store_submission(
                                     store_listing_version_id=submission.store_listing_version_id,
                                     is_approved=False,
@@ -729,7 +734,7 @@ class TestDataCreator:
                                 print(
                                     f"Warning: Could not reject submission {submission.name}: {e}"
                                 )
-                        else:  # 30% chance to leave pending (70% to 100%)
+                        else:
                             print(
                                 f"⏳ Left submission pending for review: {submission.name}"
                             )
@@ -743,9 +748,13 @@ class TestDataCreator:
                     traceback.print_exc()
                     continue
 
+        print("\n📊 Store Submissions Summary:")
+        print(f"   Created: {len(submissions)}")
+        print(f"   Approved: {len(approved_submissions)}")
         print(
-            f"Created {len(submissions)} store submissions, approved {len(approved_submissions)}"
+            f"   Featured: {featured_count} (guaranteed min: {GUARANTEED_FEATURED_AGENTS})"
         )
+
         self.store_submissions = submissions
         return submissions
 
@@ -825,12 +834,15 @@ class TestDataCreator:
         print(f"✅ Agent blocks available: {len(self.agent_blocks)}")
         print(f"✅ Agent graphs created: {len(self.agent_graphs)}")
         print(f"✅ Library agents created: {len(self.library_agents)}")
-        print(f"✅ Creator profiles updated: {len(self.profiles)} (some featured)")
-        print(
-            f"✅ Store submissions created: {len(self.store_submissions)} (some marked as featured during creation)"
-        )
+        print(f"✅ Creator profiles updated: {len(self.profiles)}")
+        print(f"✅ Store submissions created: {len(self.store_submissions)}")
         print(f"✅ API keys created: {len(self.api_keys)}")
         print(f"✅ Presets created: {len(self.presets)}")
+        print("\n🎯 Deterministic Guarantees:")
+        print(f"   • Featured agents: >= {GUARANTEED_FEATURED_AGENTS}")
+        print(f"   • Featured creators: >= {GUARANTEED_FEATURED_CREATORS}")
+        print(f"   • Top agents (approved): >= {GUARANTEED_TOP_AGENTS}")
+        print(f"   • Library agents per user: >= {MIN_AGENTS_PER_USER}")
         print("\n🚀 Your E2E test database is ready to use!")
 
 
diff --git a/autogpt_platform/docker-compose.platform.yml b/autogpt_platform/docker-compose.platform.yml
index b2df626029..de6ecfd612 100644
--- a/autogpt_platform/docker-compose.platform.yml
+++ b/autogpt_platform/docker-compose.platform.yml
@@ -37,7 +37,7 @@ services:
       context: ../
       dockerfile: autogpt_platform/backend/Dockerfile
       target: migrate
-    command: ["sh", "-c", "poetry run prisma generate && poetry run prisma migrate deploy"]
+    command: ["sh", "-c", "poetry run prisma generate && poetry run gen-prisma-stub && poetry run prisma migrate deploy"]
     develop:
       watch:
         - path: ./
diff --git a/autogpt_platform/frontend/.env.default b/autogpt_platform/frontend/.env.default
index dc3f67efab..7a9d81e39e 100644
--- a/autogpt_platform/frontend/.env.default
+++ b/autogpt_platform/frontend/.env.default
@@ -29,4 +29,11 @@ NEXT_PUBLIC_CLOUDFLARE_TURNSTILE_SITE_KEY=
 NEXT_PUBLIC_TURNSTILE=disabled
 
 # PR previews
-NEXT_PUBLIC_PREVIEW_STEALING_DEV=
\ No newline at end of file
+NEXT_PUBLIC_PREVIEW_STEALING_DEV=
+
+# PostHog Analytics
+NEXT_PUBLIC_POSTHOG_KEY=
+NEXT_PUBLIC_POSTHOG_HOST=https://eu.i.posthog.com
+
+# OpenAI (for voice transcription)
+OPENAI_API_KEY=
diff --git a/autogpt_platform/frontend/CLAUDE.md b/autogpt_platform/frontend/CLAUDE.md
new file mode 100644
index 0000000000..b58f1ad6aa
--- /dev/null
+++ b/autogpt_platform/frontend/CLAUDE.md
@@ -0,0 +1,76 @@
+# CLAUDE.md - Frontend
+
+This file provides guidance to Claude Code when working with the frontend.
+
+## Essential Commands
+
+```bash
+# Install dependencies
+pnpm i
+
+# Generate API client from OpenAPI spec
+pnpm generate:api
+
+# Start development server
+pnpm dev
+
+# Run E2E tests
+pnpm test
+
+# Run Storybook for component development
+pnpm storybook
+
+# Build production
+pnpm build
+
+# Format and lint
+pnpm format
+
+# Type checking
+pnpm types
+```
+
+### Code Style
+
+- Fully capitalize acronyms in symbols, e.g. `graphID`, `useBackendAPI`
+- Use function declarations (not arrow functions) for components/handlers
+
+## Architecture
+
+- **Framework**: Next.js 15 App Router (client-first approach)
+- **Data Fetching**: Type-safe generated API hooks via Orval + React Query
+- **State Management**: React Query for server state, co-located UI state in components/hooks
+- **Component Structure**: Separate render logic (`.tsx`) from business logic (`use*.ts` hooks)
+- **Workflow Builder**: Visual graph editor using @xyflow/react
+- **UI Components**: shadcn/ui (Radix UI primitives) with Tailwind CSS styling
+- **Icons**: Phosphor Icons only
+- **Feature Flags**: LaunchDarkly integration
+- **Error Handling**: ErrorCard for render errors, toast for mutations, Sentry for exceptions
+- **Testing**: Playwright for E2E, Storybook for component development
+
+## Environment Configuration
+
+`.env.default` (defaults) → `.env` (user overrides)
+
+## Feature Development
+
+See @CONTRIBUTING.md for complete patterns. Quick reference:
+
+1. **Pages**: Create in `src/app/(platform)/feature-name/page.tsx`
+   - Extract component logic into custom hooks grouped by concern, not by component. Each hook should represent a cohesive domain of functionality (e.g., useSearch, useFilters, usePagination) rather than bundling all state into one useComponentState hook.
+     - Put each hook in its own `.ts` file
+   - Put sub-components in local `components/` folder
+   - Component props should be `type Props = { ... }` (not exported) unless it needs to be used outside the component
+2. **Components**: Structure as `ComponentName/ComponentName.tsx` + `useComponentName.ts` + `helpers.ts`
+   - Use design system components from `src/components/` (atoms, molecules, organisms)
+   - Never use `src/components/__legacy__/*`
+3. **Data fetching**: Use generated API hooks from `@/app/api/__generated__/endpoints/`
+   - Regenerate with `pnpm generate:api`
+   - Pattern: `use{Method}{Version}{OperationName}`
+4. **Styling**: Tailwind CSS only, use design tokens, Phosphor Icons only
+5. **Testing**: Add Storybook stories for new components, Playwright for E2E
+6. **Code conventions**:
+   - Use function declarations (not arrow functions) for components/handlers
+   - Do not use `useCallback` or `useMemo` unless asked to optimise a given function
+   - Do not type hook returns, let Typescript infer as much as possible
+   - Never type with `any` unless a variable/attribute can ACTUALLY be of any type
diff --git a/autogpt_platform/frontend/CONTRIBUTING.md b/autogpt_platform/frontend/CONTRIBUTING.md
index 048c088350..649bb1ca92 100644
--- a/autogpt_platform/frontend/CONTRIBUTING.md
+++ b/autogpt_platform/frontend/CONTRIBUTING.md
@@ -175,6 +175,8 @@ While server components and actions are cool and cutting-edge, they introduce a
 
 - Prefer [React Query](https://tanstack.com/query/latest/docs/framework/react/overview) for server state, colocated near consumers (see [state colocation](https://kentcdodds.com/blog/state-colocation-will-make-your-react-app-faster))
 - Co-locate UI state inside components/hooks; keep global state minimal
+- Avoid `useMemo` and `useCallback` unless you have a measured performance issue
+- Do not abuse `useEffect`; prefer state colocation and derive values directly when possible
 
 ### Styling and components
 
@@ -549,9 +551,48 @@ Files:
 Types:
 
 - Prefer `interface` for object shapes
-- Component props should be `interface Props { ... }`
+- Component props should be `interface Props { ... }` (not exported)
+- Only use specific exported names (e.g., `export interface MyComponentProps`) when the interface needs to be used outside the component
+- Keep type definitions inline with the component - do not create separate `types.ts` files unless types are shared across multiple files
 - Use precise types; avoid `any` and unsafe casts
 
+**Props naming examples:**
+
+```tsx
+// ✅ Good - internal props, not exported
+interface Props {
+  title: string;
+  onClose: () => void;
+}
+
+export function Modal({ title, onClose }: Props) {
+  // ...
+}
+
+// ✅ Good - exported when needed externally
+export interface ModalProps {
+  title: string;
+  onClose: () => void;
+}
+
+export function Modal({ title, onClose }: ModalProps) {
+  // ...
+}
+
+// ❌ Bad - unnecessarily specific name for internal use
+interface ModalComponentProps {
+  title: string;
+  onClose: () => void;
+}
+
+// ❌ Bad - separate types.ts file for single component
+// types.ts
+export interface ModalProps { ... }
+
+// Modal.tsx
+import type { ModalProps } from './types';
+```
+
 Parameters:
 
 - If more than one parameter is needed, pass a single `Args` object for clarity
@@ -708,10 +749,7 @@ export function CreateButton() {
 
 ## 🧪 Testing & Storybook
 
-- End-to-end: [Playwright](https://playwright.dev/docs/intro) (`pnpm test`, `pnpm test-ui`)
-- [Storybook](https://storybook.js.org/docs) for isolated UI development (`pnpm storybook` / `pnpm build-storybook`)
-- For Storybook tests in CI, see [`@storybook/test-runner`](https://storybook.js.org/docs/writing-tests/test-runner) (`test-storybook:ci`)
-- When changing components in `src/components`, update or add stories and visually verify in Storybook/Chromatic
+- See `TESTING.md` for Playwright setup, E2E data seeding, and Storybook usage.
 
 ---
 
diff --git a/autogpt_platform/frontend/README.md b/autogpt_platform/frontend/README.md
index f4541cdd33..abea810fd2 100644
--- a/autogpt_platform/frontend/README.md
+++ b/autogpt_platform/frontend/README.md
@@ -5,6 +5,7 @@ This is the frontend for AutoGPT's next generation
 This project uses [**pnpm**](https://pnpm.io/) as the package manager via **corepack**. [Corepack](https://github.com/nodejs/corepack) is a Node.js tool that automatically manages package managers without requiring global installations.
 
 For architecture, conventions, data fetching, feature flags, design system usage, state management, and PR process, see [CONTRIBUTING.md](./CONTRIBUTING.md).
+For Playwright and Storybook testing setup, see [TESTING.md](./TESTING.md).
 
 ### Prerequisites
 
diff --git a/autogpt_platform/frontend/TESTING.md b/autogpt_platform/frontend/TESTING.md
new file mode 100644
index 0000000000..2995295c96
--- /dev/null
+++ b/autogpt_platform/frontend/TESTING.md
@@ -0,0 +1,57 @@
+# Frontend Testing 🧪
+
+## Quick Start (local) 🚀
+
+1. Start the backend + Supabase stack:
+   - From `autogpt_platform`: `docker compose --profile local up deps_backend -d`
+   - Or run the full stack: `docker compose up -d`
+2. Seed rich E2E data (creates `test123@gmail.com` with library agents):
+   - From `autogpt_platform/backend`: `poetry run python test/e2e_test_data.py`
+3. Run Playwright:
+   - From `autogpt_platform/frontend`: `pnpm test` or `pnpm test-ui`
+
+## How Playwright setup works 🎭
+
+- Playwright runs from `frontend/playwright.config.ts` with a global setup step.
+- The global setup creates a user pool via the real signup UI and stores it in `frontend/.auth/user-pool.json`.
+- Most tests call `getTestUser()` (from `src/tests/utils/auth.ts`) which pulls a random user from that pool.
+  - these users do not contain library agents, it's user that just "signed up" on the platform, hence some tests to make use of users created via script (see below) with more data
+
+## Test users 👤
+
+- **User pool (basic users)**  
+  Created automatically by the Playwright global setup through `/signup`.  
+  Used by `getTestUser()` in `src/tests/utils/auth.ts`.
+
+- **Rich user with library agents**  
+  Created by `backend/test/e2e_test_data.py`.  
+  Accessed via `getTestUserWithLibraryAgents()` in `src/tests/credentials/index.ts`.
+
+Use the rich user when a test needs existing library agents (e.g. `library.spec.ts`).
+
+## Resetting or wiping the DB 🔁
+
+If you reset the Docker DB and logins start failing:
+
+1. Delete `frontend/.auth/user-pool.json` so the pool is regenerated.
+2. Re-run the E2E data script to recreate the rich user + library agents:
+   - `poetry run python test/e2e_test_data.py`
+
+## Storybook 📚
+
+## Flow diagram 🗺️
+
+```mermaid
+flowchart TD
+  A[Start Docker stack] --> B[Run e2e_test_data.py]
+  B --> C[Run Playwright tests]
+  C --> D[Global setup creates user pool]
+  D --> E{Test needs rich data?}
+  E -->|No| F[getTestUser from user pool]
+  E -->|Yes| G[getTestUserWithLibraryAgents]
+```
+
+- `pnpm storybook` – Run Storybook locally
+- `pnpm build-storybook` – Build a static Storybook
+- CI runner: `pnpm test-storybook`
+- When changing components in `src/components`, update or add stories and verify in Storybook/Chromatic.
diff --git a/autogpt_platform/frontend/next.config.mjs b/autogpt_platform/frontend/next.config.mjs
index e4e4cdf544..bb4410039d 100644
--- a/autogpt_platform/frontend/next.config.mjs
+++ b/autogpt_platform/frontend/next.config.mjs
@@ -3,6 +3,13 @@ import { withSentryConfig } from "@sentry/nextjs";
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   productionBrowserSourceMaps: true,
+  // Externalize OpenTelemetry packages to fix Turbopack HMR issues
+  serverExternalPackages: [
+    "@opentelemetry/instrumentation",
+    "@opentelemetry/sdk-node",
+    "import-in-the-middle",
+    "require-in-the-middle",
+  ],
   experimental: {
     serverActions: {
       bodySizeLimit: "256mb",
diff --git a/autogpt_platform/frontend/orval.config.ts b/autogpt_platform/frontend/orval.config.ts
index dff857e1b6..9e09467518 100644
--- a/autogpt_platform/frontend/orval.config.ts
+++ b/autogpt_platform/frontend/orval.config.ts
@@ -16,6 +16,12 @@ export default defineConfig({
       client: "react-query",
       httpClient: "fetch",
       indexFiles: false,
+      mock: {
+        type: "msw",
+        baseUrl: "http://localhost:3000/api/proxy",
+        generateEachHttpStatus: true,
+        delay: 0,
+      },
       override: {
         mutator: {
           path: "./mutators/custom-mutator.ts",
diff --git a/autogpt_platform/frontend/package.json b/autogpt_platform/frontend/package.json
index 854a6b9ab4..8c4875489d 100644
--- a/autogpt_platform/frontend/package.json
+++ b/autogpt_platform/frontend/package.json
@@ -15,6 +15,8 @@
     "types": "tsc --noEmit",
     "test": "NEXT_PUBLIC_PW_TEST=true next build --turbo && playwright test",
     "test-ui": "NEXT_PUBLIC_PW_TEST=true next build --turbo && playwright test --ui",
+    "test:unit": "vitest run",
+    "test:unit:watch": "vitest",
     "test:no-build": "playwright test",
     "gentests": "playwright codegen http://localhost:3000",
     "storybook": "storybook dev -p 6006",
@@ -32,6 +34,8 @@
     "@hookform/resolvers": "5.2.2",
     "@next/third-parties": "15.4.6",
     "@phosphor-icons/react": "2.1.10",
+    "@posthog/react": "1.7.0",
+    "@radix-ui/react-accordion": "1.2.12",
     "@radix-ui/react-alert-dialog": "1.1.15",
     "@radix-ui/react-avatar": "1.1.10",
     "@radix-ui/react-checkbox": "1.3.3",
@@ -89,11 +93,11 @@
     "next-themes": "0.4.6",
     "nuqs": "2.7.2",
     "party-js": "2.2.0",
+    "posthog-js": "1.334.1",
     "react": "18.3.1",
     "react-currency-input-field": "4.0.3",
     "react-day-picker": "9.11.1",
     "react-dom": "18.3.1",
-    "react-drag-drop-files": "2.4.0",
     "react-hook-form": "7.66.0",
     "react-icons": "5.5.0",
     "react-markdown": "9.0.3",
@@ -119,6 +123,7 @@
   },
   "devDependencies": {
     "@chromatic-com/storybook": "4.1.2",
+    "@opentelemetry/instrumentation": "0.209.0",
     "@playwright/test": "1.56.1",
     "@storybook/addon-a11y": "9.1.5",
     "@storybook/addon-docs": "9.1.5",
@@ -127,6 +132,8 @@
     "@storybook/nextjs": "9.1.5",
     "@tanstack/eslint-plugin-query": "5.91.2",
     "@tanstack/react-query-devtools": "5.90.2",
+    "@testing-library/dom": "10.4.1",
+    "@testing-library/react": "16.3.2",
     "@types/canvas-confetti": "1.9.0",
     "@types/lodash": "4.17.20",
     "@types/negotiator": "0.6.4",
@@ -135,6 +142,7 @@
     "@types/react-dom": "18.3.5",
     "@types/react-modal": "3.16.3",
     "@types/react-window": "1.8.8",
+    "@vitejs/plugin-react": "5.1.2",
     "axe-playwright": "2.2.2",
     "chromatic": "13.3.3",
     "concurrently": "9.2.1",
@@ -142,6 +150,8 @@
     "eslint": "8.57.1",
     "eslint-config-next": "15.5.7",
     "eslint-plugin-storybook": "9.1.5",
+    "happy-dom": "20.3.4",
+    "import-in-the-middle": "2.0.2",
     "msw": "2.11.6",
     "msw-storybook-addon": "2.0.6",
     "orval": "7.13.0",
@@ -149,15 +159,22 @@
     "postcss": "8.5.6",
     "prettier": "3.6.2",
     "prettier-plugin-tailwindcss": "0.7.1",
-    "require-in-the-middle": "7.5.2",
+    "require-in-the-middle": "8.0.1",
     "storybook": "9.1.5",
     "tailwindcss": "3.4.17",
-    "typescript": "5.9.3"
+    "typescript": "5.9.3",
+    "vite-tsconfig-paths": "6.0.4",
+    "vitest": "4.0.17"
   },
   "msw": {
     "workerDirectory": [
       "public"
     ]
   },
+  "pnpm": {
+    "overrides": {
+      "@opentelemetry/instrumentation": "0.209.0"
+    }
+  },
   "packageManager": "pnpm@10.20.0+sha512.cf9998222162dd85864d0a8102e7892e7ba4ceadebbf5a31f9c2fce48dfce317a9c53b9f6464d1ef9042cba2e02ae02a9f7c143a2b438cd93c91840f0192b9dd"
 }
diff --git a/autogpt_platform/frontend/pnpm-lock.yaml b/autogpt_platform/frontend/pnpm-lock.yaml
index 5cffbd07fd..dff390c856 100644
--- a/autogpt_platform/frontend/pnpm-lock.yaml
+++ b/autogpt_platform/frontend/pnpm-lock.yaml
@@ -4,6 +4,9 @@ settings:
   autoInstallPeers: true
   excludeLinksFromLockfile: false
 
+overrides:
+  '@opentelemetry/instrumentation': 0.209.0
+
 importers:
 
   .:
@@ -20,6 +23,12 @@ importers:
       '@phosphor-icons/react':
         specifier: 2.1.10
         version: 2.1.10(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@posthog/react':
+        specifier: 1.7.0
+        version: 1.7.0(@types/react@18.3.17)(posthog-js@1.334.1)(react@18.3.1)
+      '@radix-ui/react-accordion':
+        specifier: 1.2.12
+        version: 1.2.12(@types/react-dom@18.3.5(@types/react@18.3.17))(@types/react@18.3.17)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-alert-dialog':
         specifier: 1.1.15
         version: 1.1.15(@types/react-dom@18.3.5(@types/react@18.3.17))(@types/react@18.3.17)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -191,6 +200,9 @@ importers:
       party-js:
         specifier: 2.2.0
         version: 2.2.0
+      posthog-js:
+        specifier: 1.334.1
+        version: 1.334.1
       react:
         specifier: 18.3.1
         version: 18.3.1
@@ -203,9 +215,6 @@ importers:
       react-dom:
         specifier: 18.3.1
         version: 18.3.1(react@18.3.1)
-      react-drag-drop-files:
-        specifier: 2.4.0
-        version: 2.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       react-hook-form:
         specifier: 7.66.0
         version: 7.66.0(react@18.3.1)
@@ -275,31 +284,40 @@ importers:
     devDependencies:
       '@chromatic-com/storybook':
         specifier: 4.1.2
-        version: 4.1.2(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))
+        version: 4.1.2(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))
+      '@opentelemetry/instrumentation':
+        specifier: 0.209.0
+        version: 0.209.0(@opentelemetry/api@1.9.0)
       '@playwright/test':
         specifier: 1.56.1
         version: 1.56.1
       '@storybook/addon-a11y':
         specifier: 9.1.5
-        version: 9.1.5(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))
+        version: 9.1.5(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))
       '@storybook/addon-docs':
         specifier: 9.1.5
-        version: 9.1.5(@types/react@18.3.17)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))
+        version: 9.1.5(@types/react@18.3.17)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))
       '@storybook/addon-links':
         specifier: 9.1.5
-        version: 9.1.5(react@18.3.1)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))
+        version: 9.1.5(react@18.3.1)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))
       '@storybook/addon-onboarding':
         specifier: 9.1.5
-        version: 9.1.5(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))
+        version: 9.1.5(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))
       '@storybook/nextjs':
         specifier: 9.1.5
-        version: 9.1.5(esbuild@0.25.12)(next@15.4.10(@babel/core@7.28.5)(@opentelemetry/api@1.9.0)(@playwright/test@1.56.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))(type-fest@4.41.0)(typescript@5.9.3)(webpack-hot-middleware@2.26.1)(webpack@5.104.1(esbuild@0.25.12))
+        version: 9.1.5(esbuild@0.25.12)(next@15.4.10(@babel/core@7.28.5)(@opentelemetry/api@1.9.0)(@playwright/test@1.56.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))(type-fest@4.41.0)(typescript@5.9.3)(webpack-hot-middleware@2.26.1)(webpack@5.104.1(esbuild@0.25.12))
       '@tanstack/eslint-plugin-query':
         specifier: 5.91.2
         version: 5.91.2(eslint@8.57.1)(typescript@5.9.3)
       '@tanstack/react-query-devtools':
         specifier: 5.90.2
         version: 5.90.2(@tanstack/react-query@5.90.6(react@18.3.1))(react@18.3.1)
+      '@testing-library/dom':
+        specifier: 10.4.1
+        version: 10.4.1
+      '@testing-library/react':
+        specifier: 16.3.2
+        version: 16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@18.3.5(@types/react@18.3.17))(@types/react@18.3.17)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@types/canvas-confetti':
         specifier: 1.9.0
         version: 1.9.0
@@ -324,6 +342,9 @@ importers:
       '@types/react-window':
         specifier: 1.8.8
         version: 1.8.8
+      '@vitejs/plugin-react':
+        specifier: 5.1.2
+        version: 5.1.2(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2))
       axe-playwright:
         specifier: 2.2.2
         version: 2.2.2(playwright@1.56.1)
@@ -344,7 +365,13 @@ importers:
         version: 15.5.7(eslint@8.57.1)(typescript@5.9.3)
       eslint-plugin-storybook:
         specifier: 9.1.5
-        version: 9.1.5(eslint@8.57.1)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))(typescript@5.9.3)
+        version: 9.1.5(eslint@8.57.1)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))(typescript@5.9.3)
+      happy-dom:
+        specifier: 20.3.4
+        version: 20.3.4
+      import-in-the-middle:
+        specifier: 2.0.2
+        version: 2.0.2
       msw:
         specifier: 2.11.6
         version: 2.11.6(@types/node@24.10.0)(typescript@5.9.3)
@@ -367,20 +394,29 @@ importers:
         specifier: 0.7.1
         version: 0.7.1(prettier@3.6.2)
       require-in-the-middle:
-        specifier: 7.5.2
-        version: 7.5.2
+        specifier: 8.0.1
+        version: 8.0.1
       storybook:
         specifier: 9.1.5
-        version: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)
+        version: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2))
       tailwindcss:
         specifier: 3.4.17
         version: 3.4.17
       typescript:
         specifier: 5.9.3
         version: 5.9.3
+      vite-tsconfig-paths:
+        specifier: 6.0.4
+        version: 6.0.4(typescript@5.9.3)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2))
+      vitest:
+        specifier: 4.0.17
+        version: 4.0.17(@opentelemetry/api@1.9.0)(@types/node@24.10.0)(happy-dom@20.3.4)(jiti@2.6.1)(jsdom@27.4.0)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(terser@5.44.1)(yaml@2.8.2)
 
 packages:
 
+  '@acemir/cssom@0.9.31':
+    resolution: {integrity: sha512-ZnR3GSaH+/vJ0YlHau21FjfLYjMpYVIzTD8M8vIEQvIGxeOXyXdzCI140rrCY862p/C/BbzWsjc1dgnM9mkoTA==}
+
   '@adobe/css-tools@4.4.4':
     resolution: {integrity: sha512-Elp+iwUx5rN5+Y8xLt5/GRoG20WGoDCQ/1Fb+1LiGtvwbDavuSk0jhD/eZdckHAuzcDzccnkv+rEjyWfRx18gg==}
 
@@ -410,6 +446,15 @@ packages:
   '@apm-js-collab/tracing-hooks@0.3.1':
     resolution: {integrity: sha512-Vu1CbmPURlN5fTboVuKMoJjbO5qcq9fA5YXpskx3dXe/zTBvjODFoerw+69rVBlRLrJpwPqSDqEuJDEKIrTldw==}
 
+  '@asamuzakjp/css-color@4.1.1':
+    resolution: {integrity: sha512-B0Hv6G3gWGMn0xKJ0txEi/jM5iFpT3MfDxmhZFb4W047GvytCf1DHQ1D69W3zHI4yWe2aTZAA0JnbMZ7Xc8DuQ==}
+
+  '@asamuzakjp/dom-selector@6.7.6':
+    resolution: {integrity: sha512-hBaJER6A9MpdG3WgdlOolHmbOYvSk46y7IQN/1+iqiCuUu6iWdQrs9DGKF8ocqsEqWujWf/V7b7vaDgiUmIvUg==}
+
+  '@asamuzakjp/nwsapi@2.3.9':
+    resolution: {integrity: sha512-n8GuYSrI9bF7FFZ/SjhwevlHc8xaVlb/7HmHelnc/PZXBD2ZR49NnN9sMMuDdEGPeeRQ5d0hqlSlEpgCX3Wl0Q==}
+
   '@asyncapi/specs@6.10.0':
     resolution: {integrity: sha512-vB5oKLsdrLUORIZ5BXortZTlVyGWWMC1Nud/0LtgxQ3Yn2738HigAD6EVqScvpPsDUI/bcLVsYEXN4dtXQHVng==}
 
@@ -843,6 +888,18 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
+  '@babel/plugin-transform-react-jsx-self@7.27.1':
+    resolution: {integrity: sha512-6UzkCs+ejGdZ5mFFC/OCUrv028ab2fp1znZmCZjAOBKiBK2jXD1O+BPSfX8X2qjJ75fZBMSnQn3Rq2mrBJK2mw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-react-jsx-source@7.27.1':
+    resolution: {integrity: sha512-zbwoTsBruTeKB9hSq73ha66iFeJHuaFkUbwvqElnygoNbj/jHRsSeokowZFN3CZ64IvEqcmmkVe89OPXc7ldAw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
   '@babel/plugin-transform-react-jsx@7.27.1':
     resolution: {integrity: sha512-2KH4LWGSrJIkVf5tSiBFYuXDAoWRq2MMwgivCf+93dd0GQi8RXLjKA/0EvRnVV5G0hrHczsquXuD01L8s6dmBw==}
     engines: {node: '>=6.9.0'}
@@ -989,6 +1046,38 @@ packages:
     peerDependencies:
       commander: ~14.0.0
 
+  '@csstools/color-helpers@5.1.0':
+    resolution: {integrity: sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==}
+    engines: {node: '>=18'}
+
+  '@csstools/css-calc@2.1.4':
+    resolution: {integrity: sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@csstools/css-parser-algorithms': ^3.0.5
+      '@csstools/css-tokenizer': ^3.0.4
+
+  '@csstools/css-color-parser@3.1.0':
+    resolution: {integrity: sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@csstools/css-parser-algorithms': ^3.0.5
+      '@csstools/css-tokenizer': ^3.0.4
+
+  '@csstools/css-parser-algorithms@3.0.5':
+    resolution: {integrity: sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@csstools/css-tokenizer': ^3.0.4
+
+  '@csstools/css-syntax-patches-for-csstree@1.0.25':
+    resolution: {integrity: sha512-g0Kw9W3vjx5BEBAF8c5Fm2NcB/Fs8jJXh85aXqwEXiL+tqtOut07TWgyaGzAAfTM+gKckrrncyeGEZPcaRgm2Q==}
+    engines: {node: '>=18'}
+
+  '@csstools/css-tokenizer@3.0.4':
+    resolution: {integrity: sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==}
+    engines: {node: '>=18'}
+
   '@date-fns/tz@1.4.1':
     resolution: {integrity: sha512-P5LUNhtbj6YfI3iJjw5EL9eUAG6OitD0W3fWQcpQjDRc/QIsL0tRNuO1PcDvPccWL1fSTXXdE1ds+l95DV/OFA==}
 
@@ -1007,9 +1096,6 @@ packages:
   '@emotion/memoize@0.8.1':
     resolution: {integrity: sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==}
 
-  '@emotion/unitless@0.8.1':
-    resolution: {integrity: sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==}
-
   '@epic-web/invariant@1.0.0':
     resolution: {integrity: sha512-lrTPqgvfFQtR/eY/qkIzp98OGdNJu0m5ji3q/nJI8v3SXkRKEnWiOxMmbvcSoAIzv/cGiuvRy57k4suKQSAdwA==}
 
@@ -1019,156 +1105,312 @@ packages:
     cpu: [ppc64]
     os: [aix]
 
+  '@esbuild/aix-ppc64@0.27.2':
+    resolution: {integrity: sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [aix]
+
   '@esbuild/android-arm64@0.25.12':
     resolution: {integrity: sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [android]
 
+  '@esbuild/android-arm64@0.27.2':
+    resolution: {integrity: sha512-pvz8ZZ7ot/RBphf8fv60ljmaoydPU12VuXHImtAs0XhLLw+EXBi2BLe3OYSBslR4rryHvweW5gmkKFwTiFy6KA==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [android]
+
   '@esbuild/android-arm@0.25.12':
     resolution: {integrity: sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==}
     engines: {node: '>=18'}
     cpu: [arm]
     os: [android]
 
+  '@esbuild/android-arm@0.27.2':
+    resolution: {integrity: sha512-DVNI8jlPa7Ujbr1yjU2PfUSRtAUZPG9I1RwW4F4xFB1Imiu2on0ADiI/c3td+KmDtVKNbi+nffGDQMfcIMkwIA==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [android]
+
   '@esbuild/android-x64@0.25.12':
     resolution: {integrity: sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [android]
 
+  '@esbuild/android-x64@0.27.2':
+    resolution: {integrity: sha512-z8Ank4Byh4TJJOh4wpz8g2vDy75zFL0TlZlkUkEwYXuPSgX8yzep596n6mT7905kA9uHZsf/o2OJZubl2l3M7A==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [android]
+
   '@esbuild/darwin-arm64@0.25.12':
     resolution: {integrity: sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [darwin]
 
+  '@esbuild/darwin-arm64@0.27.2':
+    resolution: {integrity: sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [darwin]
+
   '@esbuild/darwin-x64@0.25.12':
     resolution: {integrity: sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [darwin]
 
+  '@esbuild/darwin-x64@0.27.2':
+    resolution: {integrity: sha512-ZxtijOmlQCBWGwbVmwOF/UCzuGIbUkqB1faQRf5akQmxRJ1ujusWsb3CVfk/9iZKr2L5SMU5wPBi1UWbvL+VQA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [darwin]
+
   '@esbuild/freebsd-arm64@0.25.12':
     resolution: {integrity: sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [freebsd]
 
+  '@esbuild/freebsd-arm64@0.27.2':
+    resolution: {integrity: sha512-lS/9CN+rgqQ9czogxlMcBMGd+l8Q3Nj1MFQwBZJyoEKI50XGxwuzznYdwcav6lpOGv5BqaZXqvBSiB/kJ5op+g==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [freebsd]
+
   '@esbuild/freebsd-x64@0.25.12':
     resolution: {integrity: sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [freebsd]
 
+  '@esbuild/freebsd-x64@0.27.2':
+    resolution: {integrity: sha512-tAfqtNYb4YgPnJlEFu4c212HYjQWSO/w/h/lQaBK7RbwGIkBOuNKQI9tqWzx7Wtp7bTPaGC6MJvWI608P3wXYA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [freebsd]
+
   '@esbuild/linux-arm64@0.25.12':
     resolution: {integrity: sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [linux]
 
+  '@esbuild/linux-arm64@0.27.2':
+    resolution: {integrity: sha512-hYxN8pr66NsCCiRFkHUAsxylNOcAQaxSSkHMMjcpx0si13t1LHFphxJZUiGwojB1a/Hd5OiPIqDdXONia6bhTw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [linux]
+
   '@esbuild/linux-arm@0.25.12':
     resolution: {integrity: sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==}
     engines: {node: '>=18'}
     cpu: [arm]
     os: [linux]
 
+  '@esbuild/linux-arm@0.27.2':
+    resolution: {integrity: sha512-vWfq4GaIMP9AIe4yj1ZUW18RDhx6EPQKjwe7n8BbIecFtCQG4CfHGaHuh7fdfq+y3LIA2vGS/o9ZBGVxIDi9hw==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [linux]
+
   '@esbuild/linux-ia32@0.25.12':
     resolution: {integrity: sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [linux]
 
+  '@esbuild/linux-ia32@0.27.2':
+    resolution: {integrity: sha512-MJt5BRRSScPDwG2hLelYhAAKh9imjHK5+NE/tvnRLbIqUWa+0E9N4WNMjmp/kXXPHZGqPLxggwVhz7QP8CTR8w==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [linux]
+
   '@esbuild/linux-loong64@0.25.12':
     resolution: {integrity: sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==}
     engines: {node: '>=18'}
     cpu: [loong64]
     os: [linux]
 
+  '@esbuild/linux-loong64@0.27.2':
+    resolution: {integrity: sha512-lugyF1atnAT463aO6KPshVCJK5NgRnU4yb3FUumyVz+cGvZbontBgzeGFO1nF+dPueHD367a2ZXe1NtUkAjOtg==}
+    engines: {node: '>=18'}
+    cpu: [loong64]
+    os: [linux]
+
   '@esbuild/linux-mips64el@0.25.12':
     resolution: {integrity: sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==}
     engines: {node: '>=18'}
     cpu: [mips64el]
     os: [linux]
 
+  '@esbuild/linux-mips64el@0.27.2':
+    resolution: {integrity: sha512-nlP2I6ArEBewvJ2gjrrkESEZkB5mIoaTswuqNFRv/WYd+ATtUpe9Y09RnJvgvdag7he0OWgEZWhviS1OTOKixw==}
+    engines: {node: '>=18'}
+    cpu: [mips64el]
+    os: [linux]
+
   '@esbuild/linux-ppc64@0.25.12':
     resolution: {integrity: sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==}
     engines: {node: '>=18'}
     cpu: [ppc64]
     os: [linux]
 
+  '@esbuild/linux-ppc64@0.27.2':
+    resolution: {integrity: sha512-C92gnpey7tUQONqg1n6dKVbx3vphKtTHJaNG2Ok9lGwbZil6DrfyecMsp9CrmXGQJmZ7iiVXvvZH6Ml5hL6XdQ==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [linux]
+
   '@esbuild/linux-riscv64@0.25.12':
     resolution: {integrity: sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==}
     engines: {node: '>=18'}
     cpu: [riscv64]
     os: [linux]
 
+  '@esbuild/linux-riscv64@0.27.2':
+    resolution: {integrity: sha512-B5BOmojNtUyN8AXlK0QJyvjEZkWwy/FKvakkTDCziX95AowLZKR6aCDhG7LeF7uMCXEJqwa8Bejz5LTPYm8AvA==}
+    engines: {node: '>=18'}
+    cpu: [riscv64]
+    os: [linux]
+
   '@esbuild/linux-s390x@0.25.12':
     resolution: {integrity: sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==}
     engines: {node: '>=18'}
     cpu: [s390x]
     os: [linux]
 
+  '@esbuild/linux-s390x@0.27.2':
+    resolution: {integrity: sha512-p4bm9+wsPwup5Z8f4EpfN63qNagQ47Ua2znaqGH6bqLlmJ4bx97Y9JdqxgGZ6Y8xVTixUnEkoKSHcpRlDnNr5w==}
+    engines: {node: '>=18'}
+    cpu: [s390x]
+    os: [linux]
+
   '@esbuild/linux-x64@0.25.12':
     resolution: {integrity: sha512-uqZMTLr/zR/ed4jIGnwSLkaHmPjOjJvnm6TVVitAa08SLS9Z0VM8wIRx7gWbJB5/J54YuIMInDquWyYvQLZkgw==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [linux]
 
+  '@esbuild/linux-x64@0.27.2':
+    resolution: {integrity: sha512-uwp2Tip5aPmH+NRUwTcfLb+W32WXjpFejTIOWZFw/v7/KnpCDKG66u4DLcurQpiYTiYwQ9B7KOeMJvLCu/OvbA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [linux]
+
   '@esbuild/netbsd-arm64@0.25.12':
     resolution: {integrity: sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [netbsd]
 
+  '@esbuild/netbsd-arm64@0.27.2':
+    resolution: {integrity: sha512-Kj6DiBlwXrPsCRDeRvGAUb/LNrBASrfqAIok+xB0LxK8CHqxZ037viF13ugfsIpePH93mX7xfJp97cyDuTZ3cw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [netbsd]
+
   '@esbuild/netbsd-x64@0.25.12':
     resolution: {integrity: sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [netbsd]
 
+  '@esbuild/netbsd-x64@0.27.2':
+    resolution: {integrity: sha512-HwGDZ0VLVBY3Y+Nw0JexZy9o/nUAWq9MlV7cahpaXKW6TOzfVno3y3/M8Ga8u8Yr7GldLOov27xiCnqRZf0tCA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [netbsd]
+
   '@esbuild/openbsd-arm64@0.25.12':
     resolution: {integrity: sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openbsd]
 
+  '@esbuild/openbsd-arm64@0.27.2':
+    resolution: {integrity: sha512-DNIHH2BPQ5551A7oSHD0CKbwIA/Ox7+78/AWkbS5QoRzaqlev2uFayfSxq68EkonB+IKjiuxBFoV8ESJy8bOHA==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openbsd]
+
   '@esbuild/openbsd-x64@0.25.12':
     resolution: {integrity: sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [openbsd]
 
+  '@esbuild/openbsd-x64@0.27.2':
+    resolution: {integrity: sha512-/it7w9Nb7+0KFIzjalNJVR5bOzA9Vay+yIPLVHfIQYG/j+j9VTH84aNB8ExGKPU4AzfaEvN9/V4HV+F+vo8OEg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [openbsd]
+
   '@esbuild/openharmony-arm64@0.25.12':
     resolution: {integrity: sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openharmony]
 
+  '@esbuild/openharmony-arm64@0.27.2':
+    resolution: {integrity: sha512-LRBbCmiU51IXfeXk59csuX/aSaToeG7w48nMwA6049Y4J4+VbWALAuXcs+qcD04rHDuSCSRKdmY63sruDS5qag==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openharmony]
+
   '@esbuild/sunos-x64@0.25.12':
     resolution: {integrity: sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [sunos]
 
+  '@esbuild/sunos-x64@0.27.2':
+    resolution: {integrity: sha512-kMtx1yqJHTmqaqHPAzKCAkDaKsffmXkPHThSfRwZGyuqyIeBvf08KSsYXl+abf5HDAPMJIPnbBfXvP2ZC2TfHg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [sunos]
+
   '@esbuild/win32-arm64@0.25.12':
     resolution: {integrity: sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [win32]
 
+  '@esbuild/win32-arm64@0.27.2':
+    resolution: {integrity: sha512-Yaf78O/B3Kkh+nKABUF++bvJv5Ijoy9AN1ww904rOXZFLWVc5OLOfL56W+C8F9xn5JQZa3UX6m+IktJnIb1Jjg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [win32]
+
   '@esbuild/win32-ia32@0.25.12':
     resolution: {integrity: sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [win32]
 
+  '@esbuild/win32-ia32@0.27.2':
+    resolution: {integrity: sha512-Iuws0kxo4yusk7sw70Xa2E2imZU5HoixzxfGCdxwBdhiDgt9vX9VUCBhqcwY7/uh//78A1hMkkROMJq9l27oLQ==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [win32]
+
   '@esbuild/win32-x64@0.25.12':
     resolution: {integrity: sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [win32]
 
+  '@esbuild/win32-x64@0.27.2':
+    resolution: {integrity: sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [win32]
+
   '@eslint-community/eslint-utils@4.9.1':
     resolution: {integrity: sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -1187,6 +1429,15 @@ packages:
     resolution: {integrity: sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
+  '@exodus/bytes@1.9.0':
+    resolution: {integrity: sha512-lagqsvnk09NKogQaN/XrtlWeUF8SRhT12odMvbTIIaVObqzwAogL6jhR4DAp0gPuKoM1AOVrKUshJpRdpMFrww==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+    peerDependencies:
+      '@noble/hashes': ^1.8.0 || ^2.0.0
+    peerDependenciesMeta:
+      '@noble/hashes':
+        optional: true
+
   '@exodus/schemasafe@1.3.0':
     resolution: {integrity: sha512-5Aap/GaRupgNx/feGBwLLTVv8OQFfv3pq2lPRzPg9R+IOBnDgghTGW7l7EuVXOvg5cc/xSAlRW8rBrjIC3Nvqw==}
 
@@ -1556,6 +1807,10 @@ packages:
     resolution: {integrity: sha512-CjruKY9V6NMssL/T1kAFgzosF1v9o6oeN+aX5JB/C/xPNtmgIJqcXHG7fA82Ou1zCpWGl4lROQUKwUNE1pMCyg==}
     engines: {node: '>=8.0.0'}
 
+  '@opentelemetry/api-logs@0.209.0':
+    resolution: {integrity: sha512-xomnUNi7TiAGtOgs0tb54LyrjRZLu9shJGGwkcN7NgtiPYOpNnKLkRJtzZvTjD/w6knSZH9sFZcUSUovYOPg6A==}
+    engines: {node: '>=8.0.0'}
+
   '@opentelemetry/api@1.9.0':
     resolution: {integrity: sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==}
     engines: {node: '>=8.0.0'}
@@ -1572,6 +1827,12 @@ packages:
     peerDependencies:
       '@opentelemetry/api': '>=1.0.0 <1.10.0'
 
+  '@opentelemetry/exporter-logs-otlp-http@0.208.0':
+    resolution: {integrity: sha512-jOv40Bs9jy9bZVLo/i8FwUiuCvbjWDI+ZW13wimJm4LjnlwJxGgB+N/VWOZUTpM+ah/awXeQqKdNlpLf2EjvYg==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
   '@opentelemetry/instrumentation-amqplib@0.55.0':
     resolution: {integrity: sha512-5ULoU8p+tWcQw5PDYZn8rySptGSLZHNX/7srqo2TioPnAAcvTy6sQFQXsNPrAnyRRtYGMetXVyZUy5OaX1+IfA==}
     engines: {node: ^18.19.0 || >=20.6.0}
@@ -1704,8 +1965,20 @@ packages:
     peerDependencies:
       '@opentelemetry/api': ^1.7.0
 
-  '@opentelemetry/instrumentation@0.208.0':
-    resolution: {integrity: sha512-Eju0L4qWcQS+oXxi6pgh7zvE2byogAkcsVv0OjHF/97iOz1N/aKE6etSGowYkie+YA1uo6DNwdSxaaNnLvcRlA==}
+  '@opentelemetry/instrumentation@0.209.0':
+    resolution: {integrity: sha512-Cwe863ojTCnFlxVuuhG7s6ODkAOzKsAEthKAcI4MDRYz1OmGWYnmSl4X2pbyS+hBxVTdvfZePfoEA01IjqcEyw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/otlp-exporter-base@0.208.0':
+    resolution: {integrity: sha512-gMd39gIfVb2OgxldxUtOwGJYSH8P1kVFFlJLuut32L6KgUC4gl1dMhn+YC2mGn0bDOiQYSk/uHOdSjuKp58vvA==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/otlp-transformer@0.208.0':
+    resolution: {integrity: sha512-DCFPY8C6lAQHUNkzcNT9R+qYExvsk6C5Bto2pbNxgicpcSWbe2WHShLxkOxIdNcBiYPdVHv/e7vH7K6TI+C+fQ==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
@@ -1720,6 +1993,18 @@ packages:
     peerDependencies:
       '@opentelemetry/api': '>=1.3.0 <1.10.0'
 
+  '@opentelemetry/sdk-logs@0.208.0':
+    resolution: {integrity: sha512-QlAyL1jRpOeaqx7/leG1vJMp84g0xKP6gJmfELBpnI4O/9xPX+Hu5m1POk9Kl+veNkyth5t19hRlN6tNY1sjbA==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.4.0 <1.10.0'
+
+  '@opentelemetry/sdk-metrics@2.2.0':
+    resolution: {integrity: sha512-G5KYP6+VJMZzpGipQw7Giif48h6SGQ2PFKEYCybeXJsOCB4fp8azqMAAzE5lnnHK3ZVwYQrgmFbsUJO/zOnwGw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.9.0 <1.10.0'
+
   '@opentelemetry/sdk-trace-base@2.2.0':
     resolution: {integrity: sha512-xWQgL0Bmctsalg6PaXExmzdedSp3gyKV8mQBwK/j9VGdCDu2fmXIb2gAehBKbkXCpJ4HPkgv3QfoJWRT4dHWbw==}
     engines: {node: ^18.19.0 || >=20.6.0}
@@ -1808,17 +2093,76 @@ packages:
       webpack-plugin-serve:
         optional: true
 
+  '@posthog/core@1.13.0':
+    resolution: {integrity: sha512-knjncrk7qRmssFRbGzBl1Tunt21GRpe0Wv+uVelyL0Rh7PdQUsgguulzXFTps8hA6wPwTU4kq85qnbAJ3eH6Wg==}
+
+  '@posthog/react@1.7.0':
+    resolution: {integrity: sha512-pM7GL7z/rKjiIwosbRiQA3buhLI6vUo+wg+T/ZrVZC7O5bVU07TfgNZTcuOj8E9dx7vDbfNrc1kjDN7PKMM8ug==}
+    peerDependencies:
+      '@types/react': '>=16.8.0'
+      posthog-js: '>=1.257.2'
+      react: '>=16.8.0'
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@posthog/types@1.334.1':
+    resolution: {integrity: sha512-ypFnwTO7qbV7icylLbujbamPdQXbJq0a61GUUBnJAeTbBw/qYPIss5IRYICcbCj0uunQrwD7/CGxVb5TOYKWgA==}
+
   '@prisma/instrumentation@6.19.0':
     resolution: {integrity: sha512-QcuYy25pkXM8BJ37wVFBO7Zh34nyRV1GOb2n3lPkkbRYfl4hWl3PTcImP41P0KrzVXfa/45p6eVCos27x3exIg==}
     peerDependencies:
       '@opentelemetry/api': ^1.8
 
+  '@protobufjs/aspromise@1.1.2':
+    resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==}
+
+  '@protobufjs/base64@1.1.2':
+    resolution: {integrity: sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==}
+
+  '@protobufjs/codegen@2.0.4':
+    resolution: {integrity: sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==}
+
+  '@protobufjs/eventemitter@1.1.0':
+    resolution: {integrity: sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==}
+
+  '@protobufjs/fetch@1.1.0':
+    resolution: {integrity: sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==}
+
+  '@protobufjs/float@1.0.2':
+    resolution: {integrity: sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==}
+
+  '@protobufjs/inquire@1.1.0':
+    resolution: {integrity: sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==}
+
+  '@protobufjs/path@1.1.2':
+    resolution: {integrity: sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==}
+
+  '@protobufjs/pool@1.1.0':
+    resolution: {integrity: sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==}
+
+  '@protobufjs/utf8@1.1.0':
+    resolution: {integrity: sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==}
+
   '@radix-ui/number@1.1.1':
     resolution: {integrity: sha512-MkKCwxlXTgz6CFoJx3pCwn07GKp36+aZyu/u2Ln2VrA5DcdyCZkASEDBTd8x5whTQQL5CiYf4prXKLcgQdv29g==}
 
   '@radix-ui/primitive@1.1.3':
     resolution: {integrity: sha512-JTF99U/6XIjCBo0wqkU5sK10glYe27MRRsfwoiq5zzOEZLHU3A3KCMa5X/azekYRCJ0HlwI0crAXS/5dEHTzDg==}
 
+  '@radix-ui/react-accordion@1.2.12':
+    resolution: {integrity: sha512-T4nygeh9YE9dLRPhAHSeOZi7HBXo+0kYIPJXayZfvWOWA0+n3dESrZbjfDPUABkUNym6Hd+f2IR113To8D2GPA==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
   '@radix-ui/react-alert-dialog@1.1.15':
     resolution: {integrity: sha512-oTVLkEw5GpdRe29BqJ0LSDFWI3qu0vR1M0mUkOQWDIUnY/QIkLpgDMWuKxP94c2NAC2LGcgVhG1ImF3jkZ5wXw==}
     peerDependencies:
@@ -2391,6 +2735,9 @@ packages:
     peerDependencies:
       '@rjsf/utils': ^6.x
 
+  '@rolldown/pluginutils@1.0.0-beta.53':
+    resolution: {integrity: sha512-vENRlFU4YbrwVqNDZ7fLvy+JR1CRkyr01jhSiDpE1u6py3OMzQfztQU2jxykW3ALNxO4kSlqIDeYyD0Y9RcQeQ==}
+
   '@rollup/plugin-commonjs@28.0.1':
     resolution: {integrity: sha512-+tNWdlWKbpB3WgBN7ijjYkq9X5uhjmcvyjEght4NmH5fAU++zfQzAJ6wumLS+dNcvwEZhKx2Z+skY8m7v0wGSA==}
     engines: {node: '>=16.0.0 || 14 >= 14.17'}
@@ -2640,7 +2987,7 @@ packages:
       '@opentelemetry/api': ^1.9.0
       '@opentelemetry/context-async-hooks': ^1.30.1 || ^2.1.0 || ^2.2.0
       '@opentelemetry/core': ^1.30.1 || ^2.1.0 || ^2.2.0
-      '@opentelemetry/instrumentation': '>=0.57.1 <1'
+      '@opentelemetry/instrumentation': 0.209.0
       '@opentelemetry/resources': ^1.30.1 || ^2.1.0 || ^2.2.0
       '@opentelemetry/sdk-trace-base': ^1.30.1 || ^2.1.0 || ^2.2.0
       '@opentelemetry/semantic-conventions': ^1.37.0
@@ -2949,6 +3296,21 @@ packages:
     resolution: {integrity: sha512-zIcONa+hVtVSSep9UT3jZ5rizo2BsxgyDYU7WFD5eICBE7no3881HGeb/QkGfsJs6JTkY1aQhT7rIPC7e+0nnA==}
     engines: {node: '>=14', npm: '>=6', yarn: '>=1'}
 
+  '@testing-library/react@16.3.2':
+    resolution: {integrity: sha512-XU5/SytQM+ykqMnAnvB2umaJNIOsLF3PVv//1Ew4CTcpz0/BRyy/af40qqrt7SjKpDdT1saBMc42CUok5gaw+g==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@testing-library/dom': ^10.0.0
+      '@types/react': ^18.0.0 || ^19.0.0
+      '@types/react-dom': ^18.0.0 || ^19.0.0
+      react: ^18.0.0 || ^19.0.0
+      react-dom: ^18.0.0 || ^19.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
   '@testing-library/user-event@14.6.1':
     resolution: {integrity: sha512-vq7fv0rnt+QTXgPxr5Hjc210p6YKq2kmdziLgnsZGgLJ9e6VAShx1pACLuRjd/AS/sr7phAR58OIIpf0LlmQNw==}
     engines: {node: '>=12', npm: '>=6'}
@@ -3125,12 +3487,12 @@ packages:
   '@types/statuses@2.0.6':
     resolution: {integrity: sha512-xMAgYwceFhRA2zY+XbEA7mxYbA093wdiW8Vu6gZPGWy9cmOyU9XesH1tNcEWsKFd5Vzrqx5T3D38PWx1FIIXkA==}
 
-  '@types/stylis@4.2.7':
-    resolution: {integrity: sha512-VgDNokpBoKF+wrdvhAAfS55OMQpL6QRglwTwNC3kIgBrzZxA4WsFj+2eLfEA/uMUDzBcEhYmjSbwQakn/i3ajA==}
-
   '@types/tedious@4.0.14':
     resolution: {integrity: sha512-KHPsfX/FoVbUGbyYvk1q9MMQHLPeRZhRJZdO45Q4YjvFkv4hMNghCWTvy7rdKessBsmtz4euWCWAB6/tVpI1Iw==}
 
+  '@types/trusted-types@2.0.7':
+    resolution: {integrity: sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==}
+
   '@types/unist@2.0.11':
     resolution: {integrity: sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==}
 
@@ -3143,6 +3505,9 @@ packages:
   '@types/use-sync-external-store@0.0.6':
     resolution: {integrity: sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg==}
 
+  '@types/whatwg-mimetype@3.0.2':
+    resolution: {integrity: sha512-c2AKvDT8ToxLIOUlN51gTiHXflsfIFisS4pO7pDPoKouJCESkhZnEy623gwP9laCy5lnLDAw1vAzu2vM2YLOrA==}
+
   '@types/ws@8.18.1':
     resolution: {integrity: sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==}
 
@@ -3352,9 +3717,18 @@ packages:
       vue-router:
         optional: true
 
+  '@vitejs/plugin-react@5.1.2':
+    resolution: {integrity: sha512-EcA07pHJouywpzsoTUqNh5NwGayl2PPVEJKUSinGGSxFGYn+shYbqMGBg6FXDqgXum9Ou/ecb+411ssw8HImJQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    peerDependencies:
+      vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
+
   '@vitest/expect@3.2.4':
     resolution: {integrity: sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==}
 
+  '@vitest/expect@4.0.17':
+    resolution: {integrity: sha512-mEoqP3RqhKlbmUmntNDDCJeTDavDR+fVYkSOw8qRwJFaW/0/5zA9zFeTrHqNtcmwh6j26yMmwx2PqUDPzt5ZAQ==}
+
   '@vitest/mocker@3.2.4':
     resolution: {integrity: sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==}
     peerDependencies:
@@ -3366,15 +3740,41 @@ packages:
       vite:
         optional: true
 
+  '@vitest/mocker@4.0.17':
+    resolution: {integrity: sha512-+ZtQhLA3lDh1tI2wxe3yMsGzbp7uuJSWBM1iTIKCbppWTSBN09PUC+L+fyNlQApQoR+Ps8twt2pbSSXg2fQVEQ==}
+    peerDependencies:
+      msw: ^2.4.9
+      vite: ^6.0.0 || ^7.0.0-0
+    peerDependenciesMeta:
+      msw:
+        optional: true
+      vite:
+        optional: true
+
   '@vitest/pretty-format@3.2.4':
     resolution: {integrity: sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==}
 
+  '@vitest/pretty-format@4.0.17':
+    resolution: {integrity: sha512-Ah3VAYmjcEdHg6+MwFE17qyLqBHZ+ni2ScKCiW2XrlSBV4H3Z7vYfPfz7CWQ33gyu76oc0Ai36+kgLU3rfF4nw==}
+
+  '@vitest/runner@4.0.17':
+    resolution: {integrity: sha512-JmuQyf8aMWoo/LmNFppdpkfRVHJcsgzkbCA+/Bk7VfNH7RE6Ut2qxegeyx2j3ojtJtKIbIGy3h+KxGfYfk28YQ==}
+
+  '@vitest/snapshot@4.0.17':
+    resolution: {integrity: sha512-npPelD7oyL+YQM2gbIYvlavlMVWUfNNGZPcu0aEUQXt7FXTuqhmgiYupPnAanhKvyP6Srs2pIbWo30K0RbDtRQ==}
+
   '@vitest/spy@3.2.4':
     resolution: {integrity: sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==}
 
+  '@vitest/spy@4.0.17':
+    resolution: {integrity: sha512-I1bQo8QaP6tZlTomQNWKJE6ym4SHf3oLS7ceNjozxxgzavRAgZDc06T7kD8gb9bXKEgcLNt00Z+kZO6KaJ62Ew==}
+
   '@vitest/utils@3.2.4':
     resolution: {integrity: sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==}
 
+  '@vitest/utils@4.0.17':
+    resolution: {integrity: sha512-RG6iy+IzQpa9SB8HAFHJ9Y+pTzI+h8553MrciN9eC6TFBErqrQaTas4vG+MVj8S4uKk8uTT2p0vgZPnTdxd96w==}
+
   '@webassemblyjs/ast@1.14.1':
     resolution: {integrity: sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==}
 
@@ -3471,6 +3871,10 @@ packages:
     resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
     engines: {node: '>= 6.0.0'}
 
+  agent-base@7.1.4:
+    resolution: {integrity: sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==}
+    engines: {node: '>= 14'}
+
   ajv-draft-04@1.0.0:
     resolution: {integrity: sha512-mv00Te6nmYbRp5DCwclxtt7yV/joXJPGS7nM+97GdxvuttCOfgI3K4U25zboyeX0O+myI8ERluxQe5wljMmVIw==}
     peerDependencies:
@@ -3689,6 +4093,9 @@ packages:
     resolution: {integrity: sha512-aVNobHnJqLiUelTaHat9DZ1qM2w0C0Eym4LPI/3JxOnSokGVdsl1T1kN7TFvsEAD8G47A6VKQ0TVHqbBnYMJlQ==}
     engines: {node: '>=12.0.0'}
 
+  bidi-js@1.0.3:
+    resolution: {integrity: sha512-RKshQI1R3YQ+n9YJz2QQ147P66ELpa1FQEg20Dk8oW9t2KgLbpDLLp9aGZ7y8WHSshDknG0bknqGw5/tyCs5tw==}
+
   big.js@5.2.2:
     resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==}
 
@@ -3784,9 +4191,6 @@ packages:
     resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==}
     engines: {node: '>= 6'}
 
-  camelize@1.0.1:
-    resolution: {integrity: sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==}
-
   caniuse-lite@1.0.30001762:
     resolution: {integrity: sha512-PxZwGNvH7Ak8WX5iXzoK1KPZttBXNPuaOvI2ZYU7NrlM+d9Ov+TUvlLOBNGzVXAntMSMMlJPd+jY6ovrVjSmUw==}
 
@@ -3801,6 +4205,10 @@ packages:
     resolution: {integrity: sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw==}
     engines: {node: '>=18'}
 
+  chai@6.2.2:
+    resolution: {integrity: sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==}
+    engines: {node: '>=18'}
+
   chalk@4.1.2:
     resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
     engines: {node: '>=10'}
@@ -3962,6 +4370,9 @@ packages:
   core-js-pure@3.47.0:
     resolution: {integrity: sha512-BcxeDbzUrRnXGYIVAGFtcGQVNpFcUhVjr6W7F8XktvQW2iJP9e66GP6xdKotCRFlrxBvNIBrhwKteRXqMV86Nw==}
 
+  core-js@3.48.0:
+    resolution: {integrity: sha512-zpEHTy1fjTMZCKLHUZoVeylt9XrzaIN2rbPXEt0k+q7JE5CkCZdo6bNq55bn24a69CH7ErAVLKijxJja4fw+UQ==}
+
   core-util-is@1.0.3:
     resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
 
@@ -4000,10 +4411,6 @@ packages:
     resolution: {integrity: sha512-r4ESw/IlusD17lgQi1O20Fa3qNnsckR126TdUuBgAu7GBYSIPvdNyONd3Zrxh0xCwA4+6w/TDArBPsMvhur+KQ==}
     engines: {node: '>= 0.10'}
 
-  css-color-keywords@1.0.0:
-    resolution: {integrity: sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==}
-    engines: {node: '>=4'}
-
   css-loader@6.11.0:
     resolution: {integrity: sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g==}
     engines: {node: '>= 12.13.0'}
@@ -4019,8 +4426,9 @@ packages:
   css-select@4.3.0:
     resolution: {integrity: sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==}
 
-  css-to-react-native@3.2.0:
-    resolution: {integrity: sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==}
+  css-tree@3.1.0:
+    resolution: {integrity: sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==}
+    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
 
   css-what@6.2.2:
     resolution: {integrity: sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==}
@@ -4034,6 +4442,10 @@ packages:
     engines: {node: '>=4'}
     hasBin: true
 
+  cssstyle@5.3.7:
+    resolution: {integrity: sha512-7D2EPVltRrsTkhpQmksIu+LxeWAIEk6wRDMJ1qljlv+CKHJM+cJLlfhWIzNA44eAsHXSNe3+vO6DW1yCYx8SuQ==}
+    engines: {node: '>=20'}
+
   csstype@3.2.3:
     resolution: {integrity: sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==}
 
@@ -4106,6 +4518,10 @@ packages:
   damerau-levenshtein@1.0.8:
     resolution: {integrity: sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==}
 
+  data-urls@6.0.1:
+    resolution: {integrity: sha512-euIQENZg6x8mj3fO6o9+fOW8MimUI4PpD/fZBhJfeioZVy9TUpM4UY7KjQNVZFlqwJ0UdzRDzkycB997HEq1BQ==}
+    engines: {node: '>=20'}
+
   data-view-buffer@1.0.2:
     resolution: {integrity: sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==}
     engines: {node: '>= 0.4'}
@@ -4144,6 +4560,9 @@ packages:
   decimal.js-light@2.5.1:
     resolution: {integrity: sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==}
 
+  decimal.js@10.6.0:
+    resolution: {integrity: sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==}
+
   decode-named-character-reference@1.2.0:
     resolution: {integrity: sha512-c6fcElNV6ShtZXmsgNgFFV5tVX2PaV4g+MOAkb8eXHvn6sryJBrZa9r0zV6+dtTyoCKxtDy5tyQ5ZwQuidtd+Q==}
 
@@ -4245,6 +4664,9 @@ packages:
     resolution: {integrity: sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==}
     engines: {node: '>= 4'}
 
+  dompurify@3.3.1:
+    resolution: {integrity: sha512-qkdCKzLNtrgPFP1Vo+98FRzJnBRGe4ffyCea9IwHB1fyxPOeNTHpLKYGd4Uk9xvNoH0ZoOjwZxNptyMwqrId1Q==}
+
   domutils@2.8.0:
     resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==}
 
@@ -4385,6 +4807,11 @@ packages:
     engines: {node: '>=18'}
     hasBin: true
 
+  esbuild@0.27.2:
+    resolution: {integrity: sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==}
+    engines: {node: '>=18'}
+    hasBin: true
+
   escalade@3.2.0:
     resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
     engines: {node: '>=6'}
@@ -4559,6 +4986,10 @@ packages:
   exenv@1.2.2:
     resolution: {integrity: sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw==}
 
+  expect-type@1.3.0:
+    resolution: {integrity: sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==}
+    engines: {node: '>=12.0.0'}
+
   extend@3.0.2:
     resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==}
 
@@ -4606,6 +5037,9 @@ packages:
       picomatch:
         optional: true
 
+  fflate@0.4.8:
+    resolution: {integrity: sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA==}
+
   file-entry-cache@6.0.1:
     resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
     engines: {node: ^10.12.0 || >=12.0.0}
@@ -4799,6 +5233,9 @@ packages:
     resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
     engines: {node: '>=10'}
 
+  globrex@0.1.2:
+    resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==}
+
   gopd@1.2.0:
     resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==}
     engines: {node: '>= 0.4'}
@@ -4813,6 +5250,10 @@ packages:
     resolution: {integrity: sha512-DKKrynuQRne0PNpEbzuEdHlYOMksHSUI8Zc9Unei5gTsMNA2/vMpoMz/yKba50pejK56qj98qM0SjYxAKi13gQ==}
     engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0}
 
+  happy-dom@20.3.4:
+    resolution: {integrity: sha512-rfbiwB6OKxZFIFQ7SRnCPB2WL9WhyXsFoTfecYgeCeFSOBxvkWLaXsdv5ehzJrfqwXQmDephAKWLRQoFoJwrew==}
+    engines: {node: '>=20.0.0'}
+
   has-bigints@1.1.0:
     resolution: {integrity: sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==}
     engines: {node: '>= 0.4'}
@@ -4904,6 +5345,10 @@ packages:
   hoist-non-react-statics@3.3.2:
     resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==}
 
+  html-encoding-sniffer@6.0.0:
+    resolution: {integrity: sha512-CV9TW3Y3f8/wT0BRFc1/KAVQ3TUHiXmaAb6VW9vtiMFf7SLoMd1PdAc4W3KFOFETBJUb90KatHqlsZMWV+R9Gg==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+
   html-entities@2.6.0:
     resolution: {integrity: sha512-kig+rMn/QOVRvr7c86gQ8lWXq+Hkv6CbAH1hLu+RG338StTpE8Z0b44SDVaqVu7HGKf27frdmUYEs9hTUX/cLQ==}
 
@@ -4930,6 +5375,10 @@ packages:
   htmlparser2@6.1.0:
     resolution: {integrity: sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==}
 
+  http-proxy-agent@7.0.2:
+    resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==}
+    engines: {node: '>= 14'}
+
   http2-client@1.3.5:
     resolution: {integrity: sha512-EC2utToWl4RKfs5zd36Mxq7nzHHBuomZboI0yYL6Y0RmBgT7Sgkq4rQ0ezFTYoIsSs7Tm9SJe+o2FcAg6GBhGA==}
 
@@ -4940,6 +5389,10 @@ packages:
     resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
     engines: {node: '>= 6'}
 
+  https-proxy-agent@7.0.6:
+    resolution: {integrity: sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==}
+    engines: {node: '>= 14'}
+
   human-signals@2.1.0:
     resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
     engines: {node: '>=10.17.0'}
@@ -4982,8 +5435,8 @@ packages:
     resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==}
     engines: {node: '>=6'}
 
-  import-in-the-middle@2.0.1:
-    resolution: {integrity: sha512-bruMpJ7xz+9jwGzrwEhWgvRrlKRYCRDBrfU+ur3FcasYXLJDxTruJ//8g2Noj+QFyRBeqbpj8Bhn4Fbw6HjvhA==}
+  import-in-the-middle@2.0.2:
+    resolution: {integrity: sha512-qet/hkGt3EbNGVtbDfPu0BM+tCqBS8wT1SYrstPaDKoWtshsC6licOemz7DVtpBEyvDNzo8UTBf9/GwWuSDZ9w==}
 
   imurmurhash@0.1.4:
     resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
@@ -5128,6 +5581,9 @@ packages:
     resolution: {integrity: sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==}
     engines: {node: '>=12'}
 
+  is-potential-custom-element-name@1.0.1:
+    resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==}
+
   is-reference@1.2.1:
     resolution: {integrity: sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==}
 
@@ -5217,6 +5673,15 @@ packages:
     resolution: {integrity: sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==}
     hasBin: true
 
+  jsdom@27.4.0:
+    resolution: {integrity: sha512-mjzqwWRD9Y1J1KUi7W97Gja1bwOOM5Ug0EZ6UDK3xS7j7mndrkwozHtSblfomlzyB4NepioNt+B2sOSzczVgtQ==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+    peerDependencies:
+      canvas: ^3.0.0
+    peerDependenciesMeta:
+      canvas:
+        optional: true
+
   jsep@1.4.0:
     resolution: {integrity: sha512-B7qPcEVE3NVkmSJbaYxvv4cHkVW7DQsZz13pUMrfS8z8Q/BuShN+gcTXrUlPiGqM2/t/EEaI030bpxMqY8gMlw==}
     engines: {node: '>= 10.16.0'}
@@ -5390,6 +5855,9 @@ packages:
     resolution: {integrity: sha512-HgMmCqIJSAKqo68l0rS2AanEWfkxaZ5wNiEFb5ggm08lDs9Xl2KxBlX3PTcaD2chBM1gXAYf491/M2Rv8Jwayg==}
     engines: {node: '>= 0.6.0'}
 
+  long@5.3.2:
+    resolution: {integrity: sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA==}
+
   longest-streak@3.1.0:
     resolution: {integrity: sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==}
 
@@ -5409,6 +5877,10 @@ packages:
   lru-cache@10.4.3:
     resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
 
+  lru-cache@11.2.4:
+    resolution: {integrity: sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==}
+    engines: {node: 20 || >=22}
+
   lru-cache@5.1.1:
     resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
 
@@ -5506,6 +5978,9 @@ packages:
   mdast-util-to-string@4.0.0:
     resolution: {integrity: sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg==}
 
+  mdn-data@2.12.2:
+    resolution: {integrity: sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==}
+
   mdurl@2.0.0:
     resolution: {integrity: sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==}
 
@@ -5868,6 +6343,9 @@ packages:
   objectorarray@1.0.5:
     resolution: {integrity: sha512-eJJDYkhJFFbBBAxeh8xW+weHlkI28n2ZdQV/J/DNfWfSKlGEf2xcfAbZTv3riEXHAhL9SVOTs2pRmXiSTf78xg==}
 
+  obug@2.1.1:
+    resolution: {integrity: sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ==}
+
   once@1.4.0:
     resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
 
@@ -5958,6 +6436,9 @@ packages:
   parse5@7.3.0:
     resolution: {integrity: sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==}
 
+  parse5@8.0.0:
+    resolution: {integrity: sha512-9m4m5GSgXjL4AjumKzq1Fgfp3Z8rsvjRNbnkVwfu2ImRqE5D0LnY2QfDen18FSY9C573YU5XxSapdHZTZ2WolA==}
+
   party-js@2.2.0:
     resolution: {integrity: sha512-50hGuALCpvDTrQLPQ1fgUgxKIWAH28ShVkmeK/3zhO0YJyCqkhrZhQEkWPxDYLvbFJ7YAXyROmFEu35gKpZLtQ==}
 
@@ -5997,6 +6478,9 @@ packages:
     resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
     engines: {node: '>=8'}
 
+  pathe@2.0.3:
+    resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==}
+
   pathval@2.0.1:
     resolution: {integrity: sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==}
     engines: {node: '>= 14.16'}
@@ -6143,10 +6627,6 @@ packages:
     resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==}
     engines: {node: ^10 || ^12 || >=14}
 
-  postcss@8.4.49:
-    resolution: {integrity: sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==}
-    engines: {node: ^10 || ^12 || >=14}
-
   postcss@8.5.6:
     resolution: {integrity: sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==}
     engines: {node: ^10 || ^12 || >=14}
@@ -6167,6 +6647,12 @@ packages:
     resolution: {integrity: sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==}
     engines: {node: '>=0.10.0'}
 
+  posthog-js@1.334.1:
+    resolution: {integrity: sha512-5cDzLICr2afnwX/cR9fwoLC0vN0Nb5gP5HiCigzHkgHdO+E3WsYefla3EFMQz7U4r01CBPZ+nZ9/srkzeACxtQ==}
+
+  preact@10.28.2:
+    resolution: {integrity: sha512-lbteaWGzGHdlIuiJ0l2Jq454m6kcpI1zNje6d8MlGAFlYvP2GO4ibnat7P74Esfz4sPTdM6UxtTwh/d3pwM9JA==}
+
   prelude-ls@1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
@@ -6255,6 +6741,10 @@ packages:
   property-information@7.1.0:
     resolution: {integrity: sha512-TwEZ+X+yCJmYfL7TPUOcvBZ4QfoT5YenQiJuX//0th53DE6w0xxLEtfK3iyryQFddXuvkIk51EEgrJQ0WJkOmQ==}
 
+  protobufjs@7.5.4:
+    resolution: {integrity: sha512-CvexbZtbov6jW2eXAvLukXjXUW1TzFaivC46BpWc/3BpcCysb5Vffu+B3XHMm8lVEuy2Mm4XGex8hBSg1yapPg==}
+    engines: {node: '>=12.0.0'}
+
   proxy-from-env@1.1.0:
     resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
 
@@ -6276,6 +6766,9 @@ packages:
     resolution: {integrity: sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==}
     engines: {node: '>=0.6'}
 
+  query-selector-shadow-dom@1.0.1:
+    resolution: {integrity: sha512-lT5yCqEBgfoMYpf3F2xQRK7zEr1rhIIZuceDK6+xRkJQ4NMbHTwXqk4NkwDwQMNqXgG9r9fyHnzwNVs6zV5KRw==}
+
   querystring-es3@0.2.1:
     resolution: {integrity: sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==}
     engines: {node: '>=0.4.x'}
@@ -6318,12 +6811,6 @@ packages:
     peerDependencies:
       react: ^18.3.1
 
-  react-drag-drop-files@2.4.0:
-    resolution: {integrity: sha512-MGPV3HVVnwXEXq3gQfLtSU3jz5j5jrabvGedokpiSEMoONrDHgYl/NpIOlfsqGQ4zBv1bzzv7qbKURZNOX32PA==}
-    peerDependencies:
-      react: ^18.0.0
-      react-dom: ^18.0.0
-
   react-hook-form@7.66.0:
     resolution: {integrity: sha512-xXBqsWGKrY46ZqaHDo+ZUYiMUgi8suYu5kdrS20EG8KiL7VRQitEbNjm+UcrDYrNi1YLyfpmAeGjCZYXLT9YBw==}
     engines: {node: '>=18.0.0'}
@@ -6375,6 +6862,10 @@ packages:
     resolution: {integrity: sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==}
     engines: {node: '>=0.10.0'}
 
+  react-refresh@0.18.0:
+    resolution: {integrity: sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw==}
+    engines: {node: '>=0.10.0'}
+
   react-remove-scroll-bar@2.3.8:
     resolution: {integrity: sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q==}
     engines: {node: '>=10'}
@@ -6543,10 +7034,6 @@ packages:
     resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
     engines: {node: '>=0.10.0'}
 
-  require-in-the-middle@7.5.2:
-    resolution: {integrity: sha512-gAZ+kLqBdHarXB64XpAe2VCjB7rIRv+mU8tfRWziHRJ5umKsIHN2tLLv6EtMw7WCdP19S0ERVMldNvxYCHnhSQ==}
-    engines: {node: '>=8.6.0'}
-
   require-in-the-middle@8.0.1:
     resolution: {integrity: sha512-QT7FVMXfWOYFbeRBF6nu+I6tr2Tf3u0q8RIEjNob/heKY/nh7drD/k7eeMFmSQgnTtCzLDcCu/XEnpW2wk4xCQ==}
     engines: {node: '>=9.3.0 || >=8.10.0 <9.0.0'}
@@ -6647,6 +7134,10 @@ packages:
       webpack:
         optional: true
 
+  saxes@6.0.0:
+    resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==}
+    engines: {node: '>=v12.22.7'}
+
   scheduler@0.23.2:
     resolution: {integrity: sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==}
 
@@ -6690,9 +7181,6 @@ packages:
     engines: {node: '>= 0.10'}
     hasBin: true
 
-  shallowequal@1.1.0:
-    resolution: {integrity: sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==}
-
   sharp@0.34.5:
     resolution: {integrity: sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -6747,6 +7235,9 @@ packages:
     resolution: {integrity: sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==}
     engines: {node: '>= 0.4'}
 
+  siginfo@2.0.0:
+    resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==}
+
   signal-exit@3.0.7:
     resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
 
@@ -6789,6 +7280,9 @@ packages:
   stable-hash@0.0.5:
     resolution: {integrity: sha512-+L3ccpzibovGXFK+Ap/f8LOS0ahMrHTf3xu7mMLSpEGU0EO9ucaysSylKo9eRDFNhWve/y275iPmIZ4z39a9iA==}
 
+  stackback@0.0.2:
+    resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==}
+
   stackframe@1.3.4:
     resolution: {integrity: sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==}
 
@@ -6800,6 +7294,9 @@ packages:
     resolution: {integrity: sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==}
     engines: {node: '>= 0.8'}
 
+  std-env@3.10.0:
+    resolution: {integrity: sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg==}
+
   stop-iteration-iterator@1.1.0:
     resolution: {integrity: sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==}
     engines: {node: '>= 0.4'}
@@ -6906,13 +7403,6 @@ packages:
   style-to-object@1.0.14:
     resolution: {integrity: sha512-LIN7rULI0jBscWQYaSswptyderlarFkjQ+t79nzty8tcIAceVomEVlLzH5VP4Cmsv6MtKhs7qaAiwlcp+Mgaxw==}
 
-  styled-components@6.2.0:
-    resolution: {integrity: sha512-ryFCkETE++8jlrBmC+BoGPUN96ld1/Yp0s7t5bcXDobrs4XoXroY1tN+JbFi09hV6a5h3MzbcVi8/BGDP0eCgQ==}
-    engines: {node: '>= 16'}
-    peerDependencies:
-      react: '>= 16.8.0'
-      react-dom: '>= 16.8.0'
-
   styled-jsx@5.1.6:
     resolution: {integrity: sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==}
     engines: {node: '>= 12.0.0'}
@@ -6939,9 +7429,6 @@ packages:
       babel-plugin-macros:
         optional: true
 
-  stylis@4.3.6:
-    resolution: {integrity: sha512-yQ3rwFWRfwNUY7H5vpU0wfdkNSnvnJinhF9830Swlaxl03zsOjCfmX0ugac+3LtK0lYSgwL/KXc8oYL3mG4YFQ==}
-
   sucrase@3.35.1:
     resolution: {integrity: sha512-DhuTmvZWux4H1UOnWMB3sk0sbaCVOoQZjv8u1rDoTV0HTdGem9hkAZtl4JZy8P2z4Bg0nT+YMeOFyVr4zcG5Tw==}
     engines: {node: '>=16 || 14 >=14.17'}
@@ -6963,6 +7450,9 @@ packages:
     resolution: {integrity: sha512-upi/0ZGkYgEcLeGieoz8gT74oWHA0E7JivX7aN9mAf+Tc7BQoRBvnIGHoPDw+f9TXTW4s6kGYCZJtauP6OYp7g==}
     hasBin: true
 
+  symbol-tree@3.2.4:
+    resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
+
   tailwind-merge@2.6.0:
     resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==}
 
@@ -7027,6 +7517,13 @@ packages:
   tiny-invariant@1.3.3:
     resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==}
 
+  tinybench@2.9.0:
+    resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==}
+
+  tinyexec@1.0.2:
+    resolution: {integrity: sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg==}
+    engines: {node: '>=18'}
+
   tinyglobby@0.2.15:
     resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==}
     engines: {node: '>=12.0.0'}
@@ -7035,6 +7532,10 @@ packages:
     resolution: {integrity: sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==}
     engines: {node: '>=14.0.0'}
 
+  tinyrainbow@3.0.3:
+    resolution: {integrity: sha512-PSkbLUoxOFRzJYjjxHJt9xro7D+iilgMX/C9lawzVuYiIdcihh9DXmVibBe8lmcFrRi/VzlPjBxbN7rH24q8/Q==}
+    engines: {node: '>=14.0.0'}
+
   tinyspy@4.0.4:
     resolution: {integrity: sha512-azl+t0z7pw/z958Gy9svOTuzqIk6xq+NSheJzn5MMWtWTFywIacg2wUlzKFGtt3cthx0r2SxMK0yzJOR0IES7Q==}
     engines: {node: '>=14.0.0'}
@@ -7061,6 +7562,10 @@ packages:
   tr46@0.0.3:
     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
 
+  tr46@6.0.0:
+    resolution: {integrity: sha512-bLVMLPtstlZ4iMQHpFHTR7GAGj2jxi8Dg0s2h2MafAE4uSWF98FC/3MomU51iQAMf8/qDUbKWf5GxuvvVcXEhw==}
+    engines: {node: '>=20'}
+
   tree-kill@1.2.2:
     resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==}
     hasBin: true
@@ -7094,6 +7599,16 @@ packages:
       typescript:
         optional: true
 
+  tsconfck@3.1.6:
+    resolution: {integrity: sha512-ks6Vjr/jEw0P1gmOVwutM3B7fWxoWBL2KRDb1JfqGVawBmO5UsvmWOQFGHBPl5yxYz4eERr19E6L7NMv+Fej4w==}
+    engines: {node: ^18 || >=20}
+    hasBin: true
+    peerDependencies:
+      typescript: ^5.0.0
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
   tsconfig-paths-webpack-plugin@4.2.0:
     resolution: {integrity: sha512-zbem3rfRS8BgeNK50Zz5SIQgXzLafiHjOwUAvk/38/o1jHn/V5QAgVUcz884or7WYcPaH3N2CIfUc2u0ul7UcA==}
     engines: {node: '>=10.13.0'}
@@ -7108,9 +7623,6 @@ packages:
   tslib@1.14.1:
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
 
-  tslib@2.6.2:
-    resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==}
-
   tslib@2.8.1:
     resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
 
@@ -7336,9 +7848,95 @@ packages:
   victory-vendor@37.3.6:
     resolution: {integrity: sha512-SbPDPdDBYp+5MJHhBCAyI7wKM3d5ivekigc2Dk2s7pgbZ9wIgIBYGVw4zGHBml/qTFbexrofXW6Gu4noGxrOwQ==}
 
+  vite-tsconfig-paths@6.0.4:
+    resolution: {integrity: sha512-iIsEJ+ek5KqRTK17pmxtgIxXtqr3qDdE6OxrP9mVeGhVDNXRJTKN/l9oMbujTQNzMLe6XZ8qmpztfbkPu2TiFQ==}
+    peerDependencies:
+      vite: '*'
+    peerDependenciesMeta:
+      vite:
+        optional: true
+
+  vite@7.3.1:
+    resolution: {integrity: sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    hasBin: true
+    peerDependencies:
+      '@types/node': ^20.19.0 || >=22.12.0
+      jiti: '>=1.21.0'
+      less: ^4.0.0
+      lightningcss: ^1.21.0
+      sass: ^1.70.0
+      sass-embedded: ^1.70.0
+      stylus: '>=0.54.8'
+      sugarss: ^5.0.0
+      terser: ^5.16.0
+      tsx: ^4.8.1
+      yaml: ^2.4.2
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      jiti:
+        optional: true
+      less:
+        optional: true
+      lightningcss:
+        optional: true
+      sass:
+        optional: true
+      sass-embedded:
+        optional: true
+      stylus:
+        optional: true
+      sugarss:
+        optional: true
+      terser:
+        optional: true
+      tsx:
+        optional: true
+      yaml:
+        optional: true
+
+  vitest@4.0.17:
+    resolution: {integrity: sha512-FQMeF0DJdWY0iOnbv466n/0BudNdKj1l5jYgl5JVTwjSsZSlqyXFt/9+1sEyhR6CLowbZpV7O1sCHrzBhucKKg==}
+    engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0}
+    hasBin: true
+    peerDependencies:
+      '@edge-runtime/vm': '*'
+      '@opentelemetry/api': ^1.9.0
+      '@types/node': ^20.0.0 || ^22.0.0 || >=24.0.0
+      '@vitest/browser-playwright': 4.0.17
+      '@vitest/browser-preview': 4.0.17
+      '@vitest/browser-webdriverio': 4.0.17
+      '@vitest/ui': 4.0.17
+      happy-dom: '*'
+      jsdom: '*'
+    peerDependenciesMeta:
+      '@edge-runtime/vm':
+        optional: true
+      '@opentelemetry/api':
+        optional: true
+      '@types/node':
+        optional: true
+      '@vitest/browser-playwright':
+        optional: true
+      '@vitest/browser-preview':
+        optional: true
+      '@vitest/browser-webdriverio':
+        optional: true
+      '@vitest/ui':
+        optional: true
+      happy-dom:
+        optional: true
+      jsdom:
+        optional: true
+
   vm-browserify@1.1.2:
     resolution: {integrity: sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==}
 
+  w3c-xmlserializer@5.0.0:
+    resolution: {integrity: sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==}
+    engines: {node: '>=18'}
+
   warning@4.0.3:
     resolution: {integrity: sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==}
 
@@ -7349,9 +7947,16 @@ packages:
   web-namespaces@2.0.1:
     resolution: {integrity: sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==}
 
+  web-vitals@5.1.0:
+    resolution: {integrity: sha512-ArI3kx5jI0atlTtmV0fWU3fjpLmq/nD3Zr1iFFlJLaqa5wLBkUSzINwBPySCX/8jRyjlmy1Volw1kz1g9XE4Jg==}
+
   webidl-conversions@3.0.1:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
 
+  webidl-conversions@8.0.1:
+    resolution: {integrity: sha512-BMhLD/Sw+GbJC21C/UgyaZX41nPt8bUTg+jWyDeg7e7YN4xOM05YPSIXceACnXVtqyEw/LMClUQMtMZ+PGGpqQ==}
+    engines: {node: '>=20'}
+
   webpack-dev-middleware@6.1.3:
     resolution: {integrity: sha512-A4ChP0Qj8oGociTs6UdlRUGANIGrCDL3y+pmQMc+dSsraXHCatFpmMey4mYELA+juqwUqwQsUgJJISXl1KWmiw==}
     engines: {node: '>= 14.15.0'}
@@ -7384,6 +7989,22 @@ packages:
       webpack-cli:
         optional: true
 
+  whatwg-mimetype@3.0.0:
+    resolution: {integrity: sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==}
+    engines: {node: '>=12'}
+
+  whatwg-mimetype@4.0.0:
+    resolution: {integrity: sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==}
+    engines: {node: '>=18'}
+
+  whatwg-mimetype@5.0.0:
+    resolution: {integrity: sha512-sXcNcHOC51uPGF0P/D4NVtrkjSU2fNsm9iog4ZvZJsL3rjoDAzXZhkm2MWt1y+PUdggKAYVoMAIYcs78wJ51Cw==}
+    engines: {node: '>=20'}
+
+  whatwg-url@15.1.0:
+    resolution: {integrity: sha512-2ytDk0kiEj/yu90JOAp44PVPUkO9+jVhyf+SybKlRHSDlvOOZhdPIrr7xTH64l4WixO2cP+wQIcgujkGBPPz6g==}
+    engines: {node: '>=20'}
+
   whatwg-url@5.0.0:
     resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
 
@@ -7408,6 +8029,11 @@ packages:
     engines: {node: '>= 8'}
     hasBin: true
 
+  why-is-node-running@2.3.0:
+    resolution: {integrity: sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==}
+    engines: {node: '>=8'}
+    hasBin: true
+
   word-wrap@1.2.5:
     resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
     engines: {node: '>=0.10.0'}
@@ -7439,10 +8065,17 @@ packages:
       utf-8-validate:
         optional: true
 
+  xml-name-validator@5.0.0:
+    resolution: {integrity: sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==}
+    engines: {node: '>=18'}
+
   xmlbuilder@15.1.1:
     resolution: {integrity: sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==}
     engines: {node: '>=8.0'}
 
+  xmlchars@2.2.0:
+    resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
+
   xtend@4.0.2:
     resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
     engines: {node: '>=0.4'}
@@ -7524,6 +8157,9 @@ packages:
 
 snapshots:
 
+  '@acemir/cssom@0.9.31':
+    optional: true
+
   '@adobe/css-tools@4.4.4': {}
 
   '@alloc/quick-lru@5.2.0': {}
@@ -7557,6 +8193,27 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@asamuzakjp/css-color@4.1.1':
+    dependencies:
+      '@csstools/css-calc': 2.1.4(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-color-parser': 3.1.0(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-tokenizer': 3.0.4
+      lru-cache: 11.2.4
+    optional: true
+
+  '@asamuzakjp/dom-selector@6.7.6':
+    dependencies:
+      '@asamuzakjp/nwsapi': 2.3.9
+      bidi-js: 1.0.3
+      css-tree: 3.1.0
+      is-potential-custom-element-name: 1.0.1
+      lru-cache: 11.2.4
+    optional: true
+
+  '@asamuzakjp/nwsapi@2.3.9':
+    optional: true
+
   '@asyncapi/specs@6.10.0':
     dependencies:
       '@types/json-schema': 7.0.15
@@ -8072,6 +8729,16 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@babel/plugin-transform-react-jsx-self@7.27.1(@babel/core@7.28.5)':
+    dependencies:
+      '@babel/core': 7.28.5
+      '@babel/helper-plugin-utils': 7.27.1
+
+  '@babel/plugin-transform-react-jsx-source@7.27.1(@babel/core@7.28.5)':
+    dependencies:
+      '@babel/core': 7.28.5
+      '@babel/helper-plugin-utils': 7.27.1
+
   '@babel/plugin-transform-react-jsx@7.27.1(@babel/core@7.28.5)':
     dependencies:
       '@babel/core': 7.28.5
@@ -8310,13 +8977,13 @@ snapshots:
       '@babel/helper-string-parser': 7.27.1
       '@babel/helper-validator-identifier': 7.28.5
 
-  '@chromatic-com/storybook@4.1.2(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))':
+  '@chromatic-com/storybook@4.1.2(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))':
     dependencies:
       '@neoconfetti/react': 1.0.0
       chromatic: 12.2.0
       filesize: 10.1.6
       jsonfile: 6.2.0
-      storybook: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)
+      storybook: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2))
       strip-ansi: 7.1.2
     transitivePeerDependencies:
       - '@chromatic-com/cypress'
@@ -8326,6 +8993,34 @@ snapshots:
     dependencies:
       commander: 14.0.2
 
+  '@csstools/color-helpers@5.1.0':
+    optional: true
+
+  '@csstools/css-calc@2.1.4(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)':
+    dependencies:
+      '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-tokenizer': 3.0.4
+    optional: true
+
+  '@csstools/css-color-parser@3.1.0(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)':
+    dependencies:
+      '@csstools/color-helpers': 5.1.0
+      '@csstools/css-calc': 2.1.4(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-tokenizer': 3.0.4
+    optional: true
+
+  '@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4)':
+    dependencies:
+      '@csstools/css-tokenizer': 3.0.4
+    optional: true
+
+  '@csstools/css-syntax-patches-for-csstree@1.0.25':
+    optional: true
+
+  '@csstools/css-tokenizer@3.0.4':
+    optional: true
+
   '@date-fns/tz@1.4.1': {}
 
   '@emnapi/core@1.8.1':
@@ -8347,91 +9042,169 @@ snapshots:
   '@emotion/is-prop-valid@1.2.2':
     dependencies:
       '@emotion/memoize': 0.8.1
+    optional: true
 
-  '@emotion/memoize@0.8.1': {}
-
-  '@emotion/unitless@0.8.1': {}
+  '@emotion/memoize@0.8.1':
+    optional: true
 
   '@epic-web/invariant@1.0.0': {}
 
   '@esbuild/aix-ppc64@0.25.12':
     optional: true
 
+  '@esbuild/aix-ppc64@0.27.2':
+    optional: true
+
   '@esbuild/android-arm64@0.25.12':
     optional: true
 
+  '@esbuild/android-arm64@0.27.2':
+    optional: true
+
   '@esbuild/android-arm@0.25.12':
     optional: true
 
+  '@esbuild/android-arm@0.27.2':
+    optional: true
+
   '@esbuild/android-x64@0.25.12':
     optional: true
 
+  '@esbuild/android-x64@0.27.2':
+    optional: true
+
   '@esbuild/darwin-arm64@0.25.12':
     optional: true
 
+  '@esbuild/darwin-arm64@0.27.2':
+    optional: true
+
   '@esbuild/darwin-x64@0.25.12':
     optional: true
 
+  '@esbuild/darwin-x64@0.27.2':
+    optional: true
+
   '@esbuild/freebsd-arm64@0.25.12':
     optional: true
 
+  '@esbuild/freebsd-arm64@0.27.2':
+    optional: true
+
   '@esbuild/freebsd-x64@0.25.12':
     optional: true
 
+  '@esbuild/freebsd-x64@0.27.2':
+    optional: true
+
   '@esbuild/linux-arm64@0.25.12':
     optional: true
 
+  '@esbuild/linux-arm64@0.27.2':
+    optional: true
+
   '@esbuild/linux-arm@0.25.12':
     optional: true
 
+  '@esbuild/linux-arm@0.27.2':
+    optional: true
+
   '@esbuild/linux-ia32@0.25.12':
     optional: true
 
+  '@esbuild/linux-ia32@0.27.2':
+    optional: true
+
   '@esbuild/linux-loong64@0.25.12':
     optional: true
 
+  '@esbuild/linux-loong64@0.27.2':
+    optional: true
+
   '@esbuild/linux-mips64el@0.25.12':
     optional: true
 
+  '@esbuild/linux-mips64el@0.27.2':
+    optional: true
+
   '@esbuild/linux-ppc64@0.25.12':
     optional: true
 
+  '@esbuild/linux-ppc64@0.27.2':
+    optional: true
+
   '@esbuild/linux-riscv64@0.25.12':
     optional: true
 
+  '@esbuild/linux-riscv64@0.27.2':
+    optional: true
+
   '@esbuild/linux-s390x@0.25.12':
     optional: true
 
+  '@esbuild/linux-s390x@0.27.2':
+    optional: true
+
   '@esbuild/linux-x64@0.25.12':
     optional: true
 
+  '@esbuild/linux-x64@0.27.2':
+    optional: true
+
   '@esbuild/netbsd-arm64@0.25.12':
     optional: true
 
+  '@esbuild/netbsd-arm64@0.27.2':
+    optional: true
+
   '@esbuild/netbsd-x64@0.25.12':
     optional: true
 
+  '@esbuild/netbsd-x64@0.27.2':
+    optional: true
+
   '@esbuild/openbsd-arm64@0.25.12':
     optional: true
 
+  '@esbuild/openbsd-arm64@0.27.2':
+    optional: true
+
   '@esbuild/openbsd-x64@0.25.12':
     optional: true
 
+  '@esbuild/openbsd-x64@0.27.2':
+    optional: true
+
   '@esbuild/openharmony-arm64@0.25.12':
     optional: true
 
+  '@esbuild/openharmony-arm64@0.27.2':
+    optional: true
+
   '@esbuild/sunos-x64@0.25.12':
     optional: true
 
+  '@esbuild/sunos-x64@0.27.2':
+    optional: true
+
   '@esbuild/win32-arm64@0.25.12':
     optional: true
 
+  '@esbuild/win32-arm64@0.27.2':
+    optional: true
+
   '@esbuild/win32-ia32@0.25.12':
     optional: true
 
+  '@esbuild/win32-ia32@0.27.2':
+    optional: true
+
   '@esbuild/win32-x64@0.25.12':
     optional: true
 
+  '@esbuild/win32-x64@0.27.2':
+    optional: true
+
   '@eslint-community/eslint-utils@4.9.1(eslint@8.57.1)':
     dependencies:
       eslint: 8.57.1
@@ -8455,6 +9228,9 @@ snapshots:
 
   '@eslint/js@8.57.1': {}
 
+  '@exodus/bytes@1.9.0':
+    optional: true
+
   '@exodus/schemasafe@1.3.0': {}
 
   '@faker-js/faker@10.0.0': {}
@@ -8777,6 +9553,10 @@ snapshots:
     dependencies:
       '@opentelemetry/api': 1.9.0
 
+  '@opentelemetry/api-logs@0.209.0':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+
   '@opentelemetry/api@1.9.0': {}
 
   '@opentelemetry/context-async-hooks@2.2.0(@opentelemetry/api@1.9.0)':
@@ -8788,11 +9568,20 @@ snapshots:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/semantic-conventions': 1.38.0
 
+  '@opentelemetry/exporter-logs-otlp-http@0.208.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api-logs': 0.208.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-logs': 0.208.0(@opentelemetry/api@1.9.0)
+
   '@opentelemetry/instrumentation-amqplib@0.55.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.209.0(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -8800,7 +9589,7 @@ snapshots:
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.209.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.38.0
       '@types/connect': 3.4.38
     transitivePeerDependencies:
@@ -8809,7 +9598,7 @@ snapshots:
   '@opentelemetry/instrumentation-dataloader@0.26.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.209.0(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -8817,7 +9606,7 @@ snapshots:
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.209.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.38.0
     transitivePeerDependencies:
       - supports-color
@@ -8826,21 +9615,21 @@ snapshots:
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.209.0(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
 
   '@opentelemetry/instrumentation-generic-pool@0.52.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.209.0(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
 
   '@opentelemetry/instrumentation-graphql@0.56.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.209.0(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -8848,7 +9637,7 @@ snapshots:
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.209.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.38.0
     transitivePeerDependencies:
       - supports-color
@@ -8857,7 +9646,7 @@ snapshots:
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.209.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.38.0
       forwarded-parse: 2.1.2
     transitivePeerDependencies:
@@ -8866,7 +9655,7 @@ snapshots:
   '@opentelemetry/instrumentation-ioredis@0.56.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.209.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/redis-common': 0.38.2
     transitivePeerDependencies:
       - supports-color
@@ -8874,7 +9663,7 @@ snapshots:
   '@opentelemetry/instrumentation-kafkajs@0.18.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.209.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.38.0
     transitivePeerDependencies:
       - supports-color
@@ -8882,7 +9671,7 @@ snapshots:
   '@opentelemetry/instrumentation-knex@0.53.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.209.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.38.0
     transitivePeerDependencies:
       - supports-color
@@ -8891,7 +9680,7 @@ snapshots:
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.209.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.38.0
     transitivePeerDependencies:
       - supports-color
@@ -8899,14 +9688,14 @@ snapshots:
   '@opentelemetry/instrumentation-lru-memoizer@0.53.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.209.0(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
 
   '@opentelemetry/instrumentation-mongodb@0.61.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.209.0(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -8914,14 +9703,14 @@ snapshots:
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.209.0(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
 
   '@opentelemetry/instrumentation-mysql2@0.55.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.209.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.38.0
       '@opentelemetry/sql-common': 0.41.2(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
@@ -8930,7 +9719,7 @@ snapshots:
   '@opentelemetry/instrumentation-mysql@0.54.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.209.0(@opentelemetry/api@1.9.0)
       '@types/mysql': 2.15.27
     transitivePeerDependencies:
       - supports-color
@@ -8939,7 +9728,7 @@ snapshots:
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.209.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.38.0
       '@opentelemetry/sql-common': 0.41.2(@opentelemetry/api@1.9.0)
       '@types/pg': 8.15.6
@@ -8950,7 +9739,7 @@ snapshots:
   '@opentelemetry/instrumentation-redis@0.57.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.209.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/redis-common': 0.38.2
       '@opentelemetry/semantic-conventions': 1.38.0
     transitivePeerDependencies:
@@ -8959,7 +9748,7 @@ snapshots:
   '@opentelemetry/instrumentation-tedious@0.27.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.209.0(@opentelemetry/api@1.9.0)
       '@types/tedious': 4.0.14
     transitivePeerDependencies:
       - supports-color
@@ -8968,20 +9757,37 @@ snapshots:
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.209.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.38.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation@0.209.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/api-logs': 0.208.0
-      import-in-the-middle: 2.0.1
+      '@opentelemetry/api-logs': 0.209.0
+      import-in-the-middle: 2.0.2
       require-in-the-middle: 8.0.1
     transitivePeerDependencies:
       - supports-color
 
+  '@opentelemetry/otlp-exporter-base@0.208.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.208.0(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/otlp-transformer@0.208.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api-logs': 0.208.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-logs': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-metrics': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.2.0(@opentelemetry/api@1.9.0)
+      protobufjs: 7.5.4
+
   '@opentelemetry/redis-common@0.38.2': {}
 
   '@opentelemetry/resources@2.2.0(@opentelemetry/api@1.9.0)':
@@ -8990,6 +9796,19 @@ snapshots:
       '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.38.0
 
+  '@opentelemetry/sdk-logs@0.208.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api-logs': 0.208.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/sdk-metrics@2.2.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
+
   '@opentelemetry/sdk-trace-base@2.2.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
@@ -9154,17 +9973,70 @@ snapshots:
       type-fest: 4.41.0
       webpack-hot-middleware: 2.26.1
 
+  '@posthog/core@1.13.0':
+    dependencies:
+      cross-spawn: 7.0.6
+
+  '@posthog/react@1.7.0(@types/react@18.3.17)(posthog-js@1.334.1)(react@18.3.1)':
+    dependencies:
+      posthog-js: 1.334.1
+      react: 18.3.1
+    optionalDependencies:
+      '@types/react': 18.3.17
+
+  '@posthog/types@1.334.1': {}
+
   '@prisma/instrumentation@6.19.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.209.0(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
 
+  '@protobufjs/aspromise@1.1.2': {}
+
+  '@protobufjs/base64@1.1.2': {}
+
+  '@protobufjs/codegen@2.0.4': {}
+
+  '@protobufjs/eventemitter@1.1.0': {}
+
+  '@protobufjs/fetch@1.1.0':
+    dependencies:
+      '@protobufjs/aspromise': 1.1.2
+      '@protobufjs/inquire': 1.1.0
+
+  '@protobufjs/float@1.0.2': {}
+
+  '@protobufjs/inquire@1.1.0': {}
+
+  '@protobufjs/path@1.1.2': {}
+
+  '@protobufjs/pool@1.1.0': {}
+
+  '@protobufjs/utf8@1.1.0': {}
+
   '@radix-ui/number@1.1.1': {}
 
   '@radix-ui/primitive@1.1.3': {}
 
+  '@radix-ui/react-accordion@1.2.12(@types/react-dom@18.3.5(@types/react@18.3.17))(@types/react@18.3.17)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-collapsible': 1.1.12(@types/react-dom@18.3.5(@types/react@18.3.17))(@types/react@18.3.17)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-collection': 1.1.7(@types/react-dom@18.3.5(@types/react@18.3.17))(@types/react@18.3.17)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.17)(react@18.3.1)
+      '@radix-ui/react-context': 1.1.2(@types/react@18.3.17)(react@18.3.1)
+      '@radix-ui/react-direction': 1.1.1(@types/react@18.3.17)(react@18.3.1)
+      '@radix-ui/react-id': 1.1.1(@types/react@18.3.17)(react@18.3.1)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.3.5(@types/react@18.3.17))(@types/react@18.3.17)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.17)(react@18.3.1)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+    optionalDependencies:
+      '@types/react': 18.3.17
+      '@types/react-dom': 18.3.5(@types/react@18.3.17)
+
   '@radix-ui/react-alert-dialog@1.1.15(@types/react-dom@18.3.5(@types/react@18.3.17))(@types/react@18.3.17)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
@@ -9774,6 +10646,8 @@ snapshots:
       lodash: 4.17.21
       lodash-es: 4.17.22
 
+  '@rolldown/pluginutils@1.0.0-beta.53': {}
+
   '@rollup/plugin-commonjs@28.0.1(rollup@4.55.1)':
     dependencies:
       '@rollup/pluginutils': 5.3.0(rollup@4.55.1)
@@ -9989,19 +10863,19 @@ snapshots:
       - supports-color
       - webpack
 
-  '@sentry/node-core@10.27.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@2.2.0(@opentelemetry/api@1.9.0))(@opentelemetry/core@2.2.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@opentelemetry/resources@2.2.0(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@2.2.0(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.38.0)':
+  '@sentry/node-core@10.27.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@2.2.0(@opentelemetry/api@1.9.0))(@opentelemetry/core@2.2.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.209.0(@opentelemetry/api@1.9.0))(@opentelemetry/resources@2.2.0(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@2.2.0(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.38.0)':
     dependencies:
       '@apm-js-collab/tracing-hooks': 0.3.1
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/context-async-hooks': 2.2.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.209.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/sdk-trace-base': 2.2.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.38.0
       '@sentry/core': 10.27.0
       '@sentry/opentelemetry': 10.27.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@2.2.0(@opentelemetry/api@1.9.0))(@opentelemetry/core@2.2.0(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@2.2.0(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.38.0)
-      import-in-the-middle: 2.0.1
+      import-in-the-middle: 2.0.2
     transitivePeerDependencies:
       - supports-color
 
@@ -10010,7 +10884,7 @@ snapshots:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/context-async-hooks': 2.2.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.209.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/instrumentation-amqplib': 0.55.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/instrumentation-connect': 0.52.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/instrumentation-dataloader': 0.26.0(@opentelemetry/api@1.9.0)
@@ -10038,9 +10912,9 @@ snapshots:
       '@opentelemetry/semantic-conventions': 1.38.0
       '@prisma/instrumentation': 6.19.0(@opentelemetry/api@1.9.0)
       '@sentry/core': 10.27.0
-      '@sentry/node-core': 10.27.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@2.2.0(@opentelemetry/api@1.9.0))(@opentelemetry/core@2.2.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@opentelemetry/resources@2.2.0(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@2.2.0(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.38.0)
+      '@sentry/node-core': 10.27.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@2.2.0(@opentelemetry/api@1.9.0))(@opentelemetry/core@2.2.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.209.0(@opentelemetry/api@1.9.0))(@opentelemetry/resources@2.2.0(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@2.2.0(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.38.0)
       '@sentry/opentelemetry': 10.27.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@2.2.0(@opentelemetry/api@1.9.0))(@opentelemetry/core@2.2.0(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@2.2.0(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.38.0)
-      import-in-the-middle: 2.0.1
+      import-in-the-middle: 2.0.2
       minimatch: 9.0.5
     transitivePeerDependencies:
       - supports-color
@@ -10266,39 +11140,39 @@ snapshots:
       '@stoplight/yaml-ast-parser': 0.0.50
       tslib: 2.8.1
 
-  '@storybook/addon-a11y@9.1.5(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))':
+  '@storybook/addon-a11y@9.1.5(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))':
     dependencies:
       '@storybook/global': 5.0.0
       axe-core: 4.11.1
-      storybook: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)
+      storybook: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2))
 
-  '@storybook/addon-docs@9.1.5(@types/react@18.3.17)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))':
+  '@storybook/addon-docs@9.1.5(@types/react@18.3.17)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))':
     dependencies:
       '@mdx-js/react': 3.1.1(@types/react@18.3.17)(react@18.3.1)
-      '@storybook/csf-plugin': 9.1.5(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))
+      '@storybook/csf-plugin': 9.1.5(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))
       '@storybook/icons': 1.6.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/react-dom-shim': 9.1.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))
+      '@storybook/react-dom-shim': 9.1.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
-      storybook: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)
+      storybook: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2))
       ts-dedent: 2.2.0
     transitivePeerDependencies:
       - '@types/react'
 
-  '@storybook/addon-links@9.1.5(react@18.3.1)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))':
+  '@storybook/addon-links@9.1.5(react@18.3.1)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))':
     dependencies:
       '@storybook/global': 5.0.0
-      storybook: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)
+      storybook: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2))
     optionalDependencies:
       react: 18.3.1
 
-  '@storybook/addon-onboarding@9.1.5(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))':
+  '@storybook/addon-onboarding@9.1.5(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))':
     dependencies:
-      storybook: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)
+      storybook: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2))
 
-  '@storybook/builder-webpack5@9.1.5(esbuild@0.25.12)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))(typescript@5.9.3)':
+  '@storybook/builder-webpack5@9.1.5(esbuild@0.25.12)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))(typescript@5.9.3)':
     dependencies:
-      '@storybook/core-webpack': 9.1.5(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))
+      '@storybook/core-webpack': 9.1.5(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))
       case-sensitive-paths-webpack-plugin: 2.4.0
       cjs-module-lexer: 1.4.3
       css-loader: 6.11.0(webpack@5.104.1(esbuild@0.25.12))
@@ -10306,7 +11180,7 @@ snapshots:
       fork-ts-checker-webpack-plugin: 8.0.0(typescript@5.9.3)(webpack@5.104.1(esbuild@0.25.12))
       html-webpack-plugin: 5.6.5(webpack@5.104.1(esbuild@0.25.12))
       magic-string: 0.30.21
-      storybook: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)
+      storybook: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2))
       style-loader: 3.3.4(webpack@5.104.1(esbuild@0.25.12))
       terser-webpack-plugin: 5.3.16(esbuild@0.25.12)(webpack@5.104.1(esbuild@0.25.12))
       ts-dedent: 2.2.0
@@ -10323,14 +11197,14 @@ snapshots:
       - uglify-js
       - webpack-cli
 
-  '@storybook/core-webpack@9.1.5(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))':
+  '@storybook/core-webpack@9.1.5(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))':
     dependencies:
-      storybook: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)
+      storybook: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2))
       ts-dedent: 2.2.0
 
-  '@storybook/csf-plugin@9.1.5(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))':
+  '@storybook/csf-plugin@9.1.5(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))':
     dependencies:
-      storybook: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)
+      storybook: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2))
       unplugin: 1.16.1
 
   '@storybook/global@5.0.0': {}
@@ -10340,7 +11214,7 @@ snapshots:
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
 
-  '@storybook/nextjs@9.1.5(esbuild@0.25.12)(next@15.4.10(@babel/core@7.28.5)(@opentelemetry/api@1.9.0)(@playwright/test@1.56.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))(type-fest@4.41.0)(typescript@5.9.3)(webpack-hot-middleware@2.26.1)(webpack@5.104.1(esbuild@0.25.12))':
+  '@storybook/nextjs@9.1.5(esbuild@0.25.12)(next@15.4.10(@babel/core@7.28.5)(@opentelemetry/api@1.9.0)(@playwright/test@1.56.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))(type-fest@4.41.0)(typescript@5.9.3)(webpack-hot-middleware@2.26.1)(webpack@5.104.1(esbuild@0.25.12))':
     dependencies:
       '@babel/core': 7.28.5
       '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.28.5)
@@ -10356,9 +11230,9 @@ snapshots:
       '@babel/preset-typescript': 7.28.5(@babel/core@7.28.5)
       '@babel/runtime': 7.28.4
       '@pmmmwh/react-refresh-webpack-plugin': 0.5.17(react-refresh@0.14.2)(type-fest@4.41.0)(webpack-hot-middleware@2.26.1)(webpack@5.104.1(esbuild@0.25.12))
-      '@storybook/builder-webpack5': 9.1.5(esbuild@0.25.12)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))(typescript@5.9.3)
-      '@storybook/preset-react-webpack': 9.1.5(esbuild@0.25.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))(typescript@5.9.3)
-      '@storybook/react': 9.1.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))(typescript@5.9.3)
+      '@storybook/builder-webpack5': 9.1.5(esbuild@0.25.12)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))(typescript@5.9.3)
+      '@storybook/preset-react-webpack': 9.1.5(esbuild@0.25.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))(typescript@5.9.3)
+      '@storybook/react': 9.1.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))(typescript@5.9.3)
       '@types/semver': 7.7.1
       babel-loader: 9.2.1(@babel/core@7.28.5)(webpack@5.104.1(esbuild@0.25.12))
       css-loader: 6.11.0(webpack@5.104.1(esbuild@0.25.12))
@@ -10374,7 +11248,7 @@ snapshots:
       resolve-url-loader: 5.0.0
       sass-loader: 16.0.6(webpack@5.104.1(esbuild@0.25.12))
       semver: 7.7.3
-      storybook: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)
+      storybook: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2))
       style-loader: 3.3.4(webpack@5.104.1(esbuild@0.25.12))
       styled-jsx: 5.1.7(@babel/core@7.28.5)(react@18.3.1)
       tsconfig-paths: 4.2.0
@@ -10400,9 +11274,9 @@ snapshots:
       - webpack-hot-middleware
       - webpack-plugin-serve
 
-  '@storybook/preset-react-webpack@9.1.5(esbuild@0.25.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))(typescript@5.9.3)':
+  '@storybook/preset-react-webpack@9.1.5(esbuild@0.25.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))(typescript@5.9.3)':
     dependencies:
-      '@storybook/core-webpack': 9.1.5(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))
+      '@storybook/core-webpack': 9.1.5(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))
       '@storybook/react-docgen-typescript-plugin': 1.0.6--canary.9.0c3f3b7.0(typescript@5.9.3)(webpack@5.104.1(esbuild@0.25.12))
       '@types/semver': 7.7.1
       find-up: 7.0.0
@@ -10412,7 +11286,7 @@ snapshots:
       react-dom: 18.3.1(react@18.3.1)
       resolve: 1.22.11
       semver: 7.7.3
-      storybook: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)
+      storybook: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2))
       tsconfig-paths: 4.2.0
       webpack: 5.104.1(esbuild@0.25.12)
     optionalDependencies:
@@ -10438,19 +11312,19 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@storybook/react-dom-shim@9.1.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))':
+  '@storybook/react-dom-shim@9.1.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))':
     dependencies:
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
-      storybook: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)
+      storybook: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2))
 
-  '@storybook/react@9.1.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))(typescript@5.9.3)':
+  '@storybook/react@9.1.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))(typescript@5.9.3)':
     dependencies:
       '@storybook/global': 5.0.0
-      '@storybook/react-dom-shim': 9.1.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))
+      '@storybook/react-dom-shim': 9.1.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
-      storybook: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)
+      storybook: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2))
     optionalDependencies:
       typescript: 5.9.3
 
@@ -10561,6 +11435,16 @@ snapshots:
       picocolors: 1.1.1
       redent: 3.0.0
 
+  '@testing-library/react@16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@18.3.5(@types/react@18.3.17))(@types/react@18.3.17)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+    dependencies:
+      '@babel/runtime': 7.28.4
+      '@testing-library/dom': 10.4.1
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+    optionalDependencies:
+      '@types/react': 18.3.17
+      '@types/react-dom': 18.3.5(@types/react@18.3.17)
+
   '@testing-library/user-event@14.6.1(@testing-library/dom@10.4.1)':
     dependencies:
       '@testing-library/dom': 10.4.1
@@ -10746,12 +11630,13 @@ snapshots:
 
   '@types/statuses@2.0.6': {}
 
-  '@types/stylis@4.2.7': {}
-
   '@types/tedious@4.0.14':
     dependencies:
       '@types/node': 24.10.0
 
+  '@types/trusted-types@2.0.7':
+    optional: true
+
   '@types/unist@2.0.11': {}
 
   '@types/unist@3.0.3': {}
@@ -10760,6 +11645,8 @@ snapshots:
 
   '@types/use-sync-external-store@0.0.6': {}
 
+  '@types/whatwg-mimetype@3.0.2': {}
+
   '@types/ws@8.18.1':
     dependencies:
       '@types/node': 24.10.0
@@ -10926,6 +11813,18 @@ snapshots:
       next: 15.4.10(@babel/core@7.28.5)(@opentelemetry/api@1.9.0)(@playwright/test@1.56.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       react: 18.3.1
 
+  '@vitejs/plugin-react@5.1.2(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2))':
+    dependencies:
+      '@babel/core': 7.28.5
+      '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.28.5)
+      '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.28.5)
+      '@rolldown/pluginutils': 1.0.0-beta.53
+      '@types/babel__core': 7.20.5
+      react-refresh: 0.18.0
+      vite: 7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)
+    transitivePeerDependencies:
+      - supports-color
+
   '@vitest/expect@3.2.4':
     dependencies:
       '@types/chai': 5.2.3
@@ -10934,28 +11833,69 @@ snapshots:
       chai: 5.3.3
       tinyrainbow: 2.0.0
 
-  '@vitest/mocker@3.2.4(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))':
+  '@vitest/expect@4.0.17':
+    dependencies:
+      '@standard-schema/spec': 1.1.0
+      '@types/chai': 5.2.3
+      '@vitest/spy': 4.0.17
+      '@vitest/utils': 4.0.17
+      chai: 6.2.2
+      tinyrainbow: 3.0.3
+
+  '@vitest/mocker@3.2.4(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2))':
     dependencies:
       '@vitest/spy': 3.2.4
       estree-walker: 3.0.3
       magic-string: 0.30.21
     optionalDependencies:
       msw: 2.11.6(@types/node@24.10.0)(typescript@5.9.3)
+      vite: 7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)
+
+  '@vitest/mocker@4.0.17(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2))':
+    dependencies:
+      '@vitest/spy': 4.0.17
+      estree-walker: 3.0.3
+      magic-string: 0.30.21
+    optionalDependencies:
+      msw: 2.11.6(@types/node@24.10.0)(typescript@5.9.3)
+      vite: 7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)
 
   '@vitest/pretty-format@3.2.4':
     dependencies:
       tinyrainbow: 2.0.0
 
+  '@vitest/pretty-format@4.0.17':
+    dependencies:
+      tinyrainbow: 3.0.3
+
+  '@vitest/runner@4.0.17':
+    dependencies:
+      '@vitest/utils': 4.0.17
+      pathe: 2.0.3
+
+  '@vitest/snapshot@4.0.17':
+    dependencies:
+      '@vitest/pretty-format': 4.0.17
+      magic-string: 0.30.21
+      pathe: 2.0.3
+
   '@vitest/spy@3.2.4':
     dependencies:
       tinyspy: 4.0.4
 
+  '@vitest/spy@4.0.17': {}
+
   '@vitest/utils@3.2.4':
     dependencies:
       '@vitest/pretty-format': 3.2.4
       loupe: 3.2.1
       tinyrainbow: 2.0.0
 
+  '@vitest/utils@4.0.17':
+    dependencies:
+      '@vitest/pretty-format': 4.0.17
+      tinyrainbow: 3.0.3
+
   '@webassemblyjs/ast@1.14.1':
     dependencies:
       '@webassemblyjs/helper-numbers': 1.13.2
@@ -11092,6 +12032,9 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  agent-base@7.1.4:
+    optional: true
+
   ajv-draft-04@1.0.0(ajv@8.17.1):
     optionalDependencies:
       ajv: 8.17.1
@@ -11326,6 +12269,11 @@ snapshots:
     dependencies:
       open: 8.4.2
 
+  bidi-js@1.0.3:
+    dependencies:
+      require-from-string: 2.0.2
+    optional: true
+
   big.js@5.2.2: {}
 
   binary-extensions@2.3.0: {}
@@ -11444,8 +12392,6 @@ snapshots:
 
   camelcase-css@2.0.1: {}
 
-  camelize@1.0.1: {}
-
   caniuse-lite@1.0.30001762: {}
 
   case-sensitive-paths-webpack-plugin@2.4.0: {}
@@ -11460,6 +12406,8 @@ snapshots:
       loupe: 3.2.1
       pathval: 2.0.1
 
+  chai@6.2.2: {}
+
   chalk@4.1.2:
     dependencies:
       ansi-styles: 4.3.0
@@ -11590,6 +12538,8 @@ snapshots:
 
   core-js-pure@3.47.0: {}
 
+  core-js@3.48.0: {}
+
   core-util-is@1.0.3: {}
 
   cosmiconfig@7.1.0:
@@ -11657,8 +12607,6 @@ snapshots:
       randombytes: 2.1.0
       randomfill: 1.0.4
 
-  css-color-keywords@1.0.0: {}
-
   css-loader@6.11.0(webpack@5.104.1(esbuild@0.25.12)):
     dependencies:
       icss-utils: 5.1.0(postcss@8.5.6)
@@ -11680,11 +12628,11 @@ snapshots:
       domutils: 2.8.0
       nth-check: 2.1.1
 
-  css-to-react-native@3.2.0:
+  css-tree@3.1.0:
     dependencies:
-      camelize: 1.0.1
-      css-color-keywords: 1.0.0
-      postcss-value-parser: 4.2.0
+      mdn-data: 2.12.2
+      source-map-js: 1.2.1
+    optional: true
 
   css-what@6.2.2: {}
 
@@ -11692,6 +12640,14 @@ snapshots:
 
   cssesc@3.0.0: {}
 
+  cssstyle@5.3.7:
+    dependencies:
+      '@asamuzakjp/css-color': 4.1.1
+      '@csstools/css-syntax-patches-for-csstree': 1.0.25
+      css-tree: 3.1.0
+      lru-cache: 11.2.4
+    optional: true
+
   csstype@3.2.3: {}
 
   d3-array@3.2.4:
@@ -11760,6 +12716,12 @@ snapshots:
 
   damerau-levenshtein@1.0.8: {}
 
+  data-urls@6.0.1:
+    dependencies:
+      whatwg-mimetype: 5.0.0
+      whatwg-url: 15.1.0
+    optional: true
+
   data-view-buffer@1.0.2:
     dependencies:
       call-bound: 1.0.4
@@ -11792,6 +12754,9 @@ snapshots:
 
   decimal.js-light@2.5.1: {}
 
+  decimal.js@10.6.0:
+    optional: true
+
   decode-named-character-reference@1.2.0:
     dependencies:
       character-entities: 2.0.2
@@ -11884,6 +12849,10 @@ snapshots:
     dependencies:
       domelementtype: 2.3.0
 
+  dompurify@3.3.1:
+    optionalDependencies:
+      '@types/trusted-types': 2.0.7
+
   domutils@2.8.0:
     dependencies:
       dom-serializer: 1.4.1
@@ -12125,6 +13094,35 @@ snapshots:
       '@esbuild/win32-ia32': 0.25.12
       '@esbuild/win32-x64': 0.25.12
 
+  esbuild@0.27.2:
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.27.2
+      '@esbuild/android-arm': 0.27.2
+      '@esbuild/android-arm64': 0.27.2
+      '@esbuild/android-x64': 0.27.2
+      '@esbuild/darwin-arm64': 0.27.2
+      '@esbuild/darwin-x64': 0.27.2
+      '@esbuild/freebsd-arm64': 0.27.2
+      '@esbuild/freebsd-x64': 0.27.2
+      '@esbuild/linux-arm': 0.27.2
+      '@esbuild/linux-arm64': 0.27.2
+      '@esbuild/linux-ia32': 0.27.2
+      '@esbuild/linux-loong64': 0.27.2
+      '@esbuild/linux-mips64el': 0.27.2
+      '@esbuild/linux-ppc64': 0.27.2
+      '@esbuild/linux-riscv64': 0.27.2
+      '@esbuild/linux-s390x': 0.27.2
+      '@esbuild/linux-x64': 0.27.2
+      '@esbuild/netbsd-arm64': 0.27.2
+      '@esbuild/netbsd-x64': 0.27.2
+      '@esbuild/openbsd-arm64': 0.27.2
+      '@esbuild/openbsd-x64': 0.27.2
+      '@esbuild/openharmony-arm64': 0.27.2
+      '@esbuild/sunos-x64': 0.27.2
+      '@esbuild/win32-arm64': 0.27.2
+      '@esbuild/win32-ia32': 0.27.2
+      '@esbuild/win32-x64': 0.27.2
+
   escalade@3.2.0: {}
 
   escape-string-regexp@4.0.0: {}
@@ -12139,8 +13137,8 @@ snapshots:
       '@typescript-eslint/parser': 8.52.0(eslint@8.57.1)(typescript@5.9.3)
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.52.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint@8.57.1)
-      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.52.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.52.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
+      eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0)(eslint@8.57.1)
+      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.52.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.1)
       eslint-plugin-jsx-a11y: 6.10.2(eslint@8.57.1)
       eslint-plugin-react: 7.37.5(eslint@8.57.1)
       eslint-plugin-react-hooks: 5.2.0(eslint@8.57.1)
@@ -12159,7 +13157,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.52.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint@8.57.1):
+  eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0)(eslint@8.57.1):
     dependencies:
       '@nolyfill/is-core-module': 1.0.39
       debug: 4.4.3
@@ -12170,22 +13168,22 @@ snapshots:
       tinyglobby: 0.2.15
       unrs-resolver: 1.11.1
     optionalDependencies:
-      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.52.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.52.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
+      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.52.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.1)
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.12.1(@typescript-eslint/parser@8.52.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.52.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1):
+  eslint-module-utils@2.12.1(@typescript-eslint/parser@8.52.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.1):
     dependencies:
       debug: 3.2.7
     optionalDependencies:
       '@typescript-eslint/parser': 8.52.0(eslint@8.57.1)(typescript@5.9.3)
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.52.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint@8.57.1)
+      eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0)(eslint@8.57.1)
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.52.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.52.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1):
+  eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.52.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.1):
     dependencies:
       '@rtsao/scc': 1.1.0
       array-includes: 3.1.9
@@ -12196,7 +13194,7 @@ snapshots:
       doctrine: 2.1.0
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.12.1(@typescript-eslint/parser@8.52.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.52.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
+      eslint-module-utils: 2.12.1(@typescript-eslint/parser@8.52.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.1)
       hasown: 2.0.2
       is-core-module: 2.16.1
       is-glob: 4.0.3
@@ -12259,11 +13257,11 @@ snapshots:
       string.prototype.matchall: 4.0.12
       string.prototype.repeat: 1.0.0
 
-  eslint-plugin-storybook@9.1.5(eslint@8.57.1)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2))(typescript@5.9.3):
+  eslint-plugin-storybook@9.1.5(eslint@8.57.1)(storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)))(typescript@5.9.3):
     dependencies:
       '@typescript-eslint/utils': 8.52.0(eslint@8.57.1)(typescript@5.9.3)
       eslint: 8.57.1
-      storybook: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)
+      storybook: 9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2))
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -12380,6 +13378,8 @@ snapshots:
 
   exenv@1.2.2: {}
 
+  expect-type@1.3.0: {}
+
   extend@3.0.2: {}
 
   fast-deep-equal@2.0.1: {}
@@ -12422,6 +13422,8 @@ snapshots:
     optionalDependencies:
       picomatch: 4.0.3
 
+  fflate@0.4.8: {}
+
   file-entry-cache@6.0.1:
     dependencies:
       flat-cache: 3.2.0
@@ -12643,6 +13645,8 @@ snapshots:
       merge2: 1.4.1
       slash: 3.0.0
 
+  globrex@0.1.2: {}
+
   gopd@1.2.0: {}
 
   graceful-fs@4.2.11: {}
@@ -12651,6 +13655,18 @@ snapshots:
 
   graphql@16.12.0: {}
 
+  happy-dom@20.3.4:
+    dependencies:
+      '@types/node': 24.10.0
+      '@types/whatwg-mimetype': 3.0.2
+      '@types/ws': 8.18.1
+      entities: 4.5.0
+      whatwg-mimetype: 3.0.0
+      ws: 8.19.0
+    transitivePeerDependencies:
+      - bufferutil
+      - utf-8-validate
+
   has-bigints@1.1.0: {}
 
   has-flag@4.0.0: {}
@@ -12794,6 +13810,13 @@ snapshots:
     dependencies:
       react-is: 16.13.1
 
+  html-encoding-sniffer@6.0.0:
+    dependencies:
+      '@exodus/bytes': 1.9.0
+    transitivePeerDependencies:
+      - '@noble/hashes'
+    optional: true
+
   html-entities@2.6.0: {}
 
   html-minifier-terser@6.1.0:
@@ -12825,6 +13848,14 @@ snapshots:
       domutils: 2.8.0
       entities: 2.2.0
 
+  http-proxy-agent@7.0.2:
+    dependencies:
+      agent-base: 7.1.4
+      debug: 4.4.3
+    transitivePeerDependencies:
+      - supports-color
+    optional: true
+
   http2-client@1.3.5: {}
 
   https-browserify@1.0.0: {}
@@ -12836,6 +13867,14 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  https-proxy-agent@7.0.6:
+    dependencies:
+      agent-base: 7.1.4
+      debug: 4.4.3
+    transitivePeerDependencies:
+      - supports-color
+    optional: true
+
   human-signals@2.1.0: {}
 
   icss-utils@5.1.0(postcss@8.5.6):
@@ -12863,7 +13902,7 @@ snapshots:
       parent-module: 1.0.1
       resolve-from: 4.0.0
 
-  import-in-the-middle@2.0.1:
+  import-in-the-middle@2.0.2:
     dependencies:
       acorn: 8.15.0
       acorn-import-attributes: 1.9.5(acorn@8.15.0)
@@ -13003,6 +14042,9 @@ snapshots:
 
   is-plain-obj@4.1.0: {}
 
+  is-potential-custom-element-name@1.0.1:
+    optional: true
+
   is-reference@1.2.1:
     dependencies:
       '@types/estree': 1.0.8
@@ -13095,6 +14137,35 @@ snapshots:
     dependencies:
       argparse: 2.0.1
 
+  jsdom@27.4.0:
+    dependencies:
+      '@acemir/cssom': 0.9.31
+      '@asamuzakjp/dom-selector': 6.7.6
+      '@exodus/bytes': 1.9.0
+      cssstyle: 5.3.7
+      data-urls: 6.0.1
+      decimal.js: 10.6.0
+      html-encoding-sniffer: 6.0.0
+      http-proxy-agent: 7.0.2
+      https-proxy-agent: 7.0.6
+      is-potential-custom-element-name: 1.0.1
+      parse5: 8.0.0
+      saxes: 6.0.0
+      symbol-tree: 3.2.4
+      tough-cookie: 6.0.0
+      w3c-xmlserializer: 5.0.0
+      webidl-conversions: 8.0.1
+      whatwg-mimetype: 4.0.0
+      whatwg-url: 15.1.0
+      ws: 8.19.0
+      xml-name-validator: 5.0.0
+    transitivePeerDependencies:
+      - '@noble/hashes'
+      - bufferutil
+      - supports-color
+      - utf-8-validate
+    optional: true
+
   jsep@1.4.0: {}
 
   jsesc@3.1.0: {}
@@ -13253,6 +14324,8 @@ snapshots:
 
   loglevel@1.9.2: {}
 
+  long@5.3.2: {}
+
   longest-streak@3.1.0: {}
 
   loose-envify@1.4.0:
@@ -13273,6 +14346,9 @@ snapshots:
 
   lru-cache@10.4.3: {}
 
+  lru-cache@11.2.4:
+    optional: true
+
   lru-cache@5.1.1:
     dependencies:
       yallist: 3.1.1
@@ -13485,6 +14561,9 @@ snapshots:
     dependencies:
       '@types/mdast': 4.0.4
 
+  mdn-data@2.12.2:
+    optional: true
+
   mdurl@2.0.0: {}
 
   memfs@3.5.3:
@@ -13987,6 +15066,8 @@ snapshots:
 
   objectorarray@1.0.5: {}
 
+  obug@2.1.1: {}
+
   once@1.4.0:
     dependencies:
       wrappy: 1.0.2
@@ -14129,6 +15210,11 @@ snapshots:
     dependencies:
       entities: 6.0.1
 
+  parse5@8.0.0:
+    dependencies:
+      entities: 6.0.1
+    optional: true
+
   party-js@2.2.0: {}
 
   pascal-case@3.1.2:
@@ -14157,6 +15243,8 @@ snapshots:
 
   path-type@4.0.0: {}
 
+  pathe@2.0.3: {}
+
   pathval@2.0.1: {}
 
   pbkdf2@3.1.5:
@@ -14284,12 +15372,6 @@ snapshots:
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
-  postcss@8.4.49:
-    dependencies:
-      nanoid: 3.3.11
-      picocolors: 1.1.1
-      source-map-js: 1.2.1
-
   postcss@8.5.6:
     dependencies:
       nanoid: 3.3.11
@@ -14306,6 +15388,24 @@ snapshots:
     dependencies:
       xtend: 4.0.2
 
+  posthog-js@1.334.1:
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api-logs': 0.208.0
+      '@opentelemetry/exporter-logs-otlp-http': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-logs': 0.208.0(@opentelemetry/api@1.9.0)
+      '@posthog/core': 1.13.0
+      '@posthog/types': 1.334.1
+      core-js: 3.48.0
+      dompurify: 3.3.1
+      fflate: 0.4.8
+      preact: 10.28.2
+      query-selector-shadow-dom: 1.0.1
+      web-vitals: 5.1.0
+
+  preact@10.28.2: {}
+
   prelude-ls@1.2.1: {}
 
   prettier-plugin-tailwindcss@0.7.1(prettier@3.6.2):
@@ -14339,6 +15439,21 @@ snapshots:
 
   property-information@7.1.0: {}
 
+  protobufjs@7.5.4:
+    dependencies:
+      '@protobufjs/aspromise': 1.1.2
+      '@protobufjs/base64': 1.1.2
+      '@protobufjs/codegen': 2.0.4
+      '@protobufjs/eventemitter': 1.1.0
+      '@protobufjs/fetch': 1.1.0
+      '@protobufjs/float': 1.0.2
+      '@protobufjs/inquire': 1.1.0
+      '@protobufjs/path': 1.1.2
+      '@protobufjs/pool': 1.1.0
+      '@protobufjs/utf8': 1.1.0
+      '@types/node': 24.10.0
+      long: 5.3.2
+
   proxy-from-env@1.1.0: {}
 
   public-encrypt@4.0.3:
@@ -14360,6 +15475,8 @@ snapshots:
     dependencies:
       side-channel: 1.1.0
 
+  query-selector-shadow-dom@1.0.1: {}
+
   querystring-es3@0.2.1: {}
 
   queue-microtask@1.2.3: {}
@@ -14411,13 +15528,6 @@ snapshots:
       react: 18.3.1
       scheduler: 0.23.2
 
-  react-drag-drop-files@2.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
-    dependencies:
-      prop-types: 15.8.1
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
-      styled-components: 6.2.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-
   react-hook-form@7.66.0(react@18.3.1):
     dependencies:
       react: 18.3.1
@@ -14471,6 +15581,8 @@ snapshots:
 
   react-refresh@0.14.2: {}
 
+  react-refresh@0.18.0: {}
+
   react-remove-scroll-bar@2.3.8(@types/react@18.3.17)(react@18.3.1):
     dependencies:
       react: 18.3.1
@@ -14726,14 +15838,6 @@ snapshots:
 
   require-from-string@2.0.2: {}
 
-  require-in-the-middle@7.5.2:
-    dependencies:
-      debug: 4.4.3
-      module-details-from-path: 1.0.4
-      resolve: 1.22.11
-    transitivePeerDependencies:
-      - supports-color
-
   require-in-the-middle@8.0.1:
     dependencies:
       debug: 4.4.3
@@ -14856,6 +15960,11 @@ snapshots:
     optionalDependencies:
       webpack: 5.104.1(esbuild@0.25.12)
 
+  saxes@6.0.0:
+    dependencies:
+      xmlchars: 2.2.0
+    optional: true
+
   scheduler@0.23.2:
     dependencies:
       loose-envify: 1.4.0
@@ -14911,8 +16020,6 @@ snapshots:
       safe-buffer: 5.2.1
       to-buffer: 1.2.2
 
-  shallowequal@1.1.0: {}
-
   sharp@0.34.5:
     dependencies:
       '@img/colour': 1.0.0
@@ -15013,6 +16120,8 @@ snapshots:
       side-channel-map: 1.0.1
       side-channel-weakmap: 1.0.2
 
+  siginfo@2.0.0: {}
+
   signal-exit@3.0.7: {}
 
   signal-exit@4.1.0: {}
@@ -15043,6 +16152,8 @@ snapshots:
 
   stable-hash@0.0.5: {}
 
+  stackback@0.0.2: {}
+
   stackframe@1.3.4: {}
 
   stacktrace-parser@0.1.11:
@@ -15051,18 +16162,20 @@ snapshots:
 
   statuses@2.0.2: {}
 
+  std-env@3.10.0: {}
+
   stop-iteration-iterator@1.1.0:
     dependencies:
       es-errors: 1.3.0
       internal-slot: 1.1.0
 
-  storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2):
+  storybook@9.1.5(@testing-library/dom@10.4.1)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(prettier@3.6.2)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)):
     dependencies:
       '@storybook/global': 5.0.0
       '@testing-library/jest-dom': 6.9.1
       '@testing-library/user-event': 14.6.1(@testing-library/dom@10.4.1)
       '@vitest/expect': 3.2.4
-      '@vitest/mocker': 3.2.4(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))
+      '@vitest/mocker': 3.2.4(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2))
       '@vitest/spy': 3.2.4
       better-opn: 3.0.2
       esbuild: 0.25.12
@@ -15203,20 +16316,6 @@ snapshots:
     dependencies:
       inline-style-parser: 0.2.7
 
-  styled-components@6.2.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
-    dependencies:
-      '@emotion/is-prop-valid': 1.2.2
-      '@emotion/unitless': 0.8.1
-      '@types/stylis': 4.2.7
-      css-to-react-native: 3.2.0
-      csstype: 3.2.3
-      postcss: 8.4.49
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
-      shallowequal: 1.1.0
-      stylis: 4.3.6
-      tslib: 2.6.2
-
   styled-jsx@5.1.6(@babel/core@7.28.5)(react@18.3.1):
     dependencies:
       client-only: 0.0.1
@@ -15231,8 +16330,6 @@ snapshots:
     optionalDependencies:
       '@babel/core': 7.28.5
 
-  stylis@4.3.6: {}
-
   sucrase@3.35.1:
     dependencies:
       '@jridgewell/gen-mapping': 0.3.13
@@ -15269,6 +16366,9 @@ snapshots:
     transitivePeerDependencies:
       - encoding
 
+  symbol-tree@3.2.4:
+    optional: true
+
   tailwind-merge@2.6.0: {}
 
   tailwind-scrollbar@3.1.0(tailwindcss@3.4.17):
@@ -15344,6 +16444,10 @@ snapshots:
 
   tiny-invariant@1.3.3: {}
 
+  tinybench@2.9.0: {}
+
+  tinyexec@1.0.2: {}
+
   tinyglobby@0.2.15:
     dependencies:
       fdir: 6.5.0(picomatch@4.0.3)
@@ -15351,6 +16455,8 @@ snapshots:
 
   tinyrainbow@2.0.0: {}
 
+  tinyrainbow@3.0.3: {}
+
   tinyspy@4.0.4: {}
 
   tldts-core@7.0.19: {}
@@ -15375,6 +16481,11 @@ snapshots:
 
   tr46@0.0.3: {}
 
+  tr46@6.0.0:
+    dependencies:
+      punycode: 2.3.1
+    optional: true
+
   tree-kill@1.2.2: {}
 
   trim-lines@3.0.1: {}
@@ -15393,6 +16504,10 @@ snapshots:
     optionalDependencies:
       typescript: 5.9.3
 
+  tsconfck@3.1.6(typescript@5.9.3):
+    optionalDependencies:
+      typescript: 5.9.3
+
   tsconfig-paths-webpack-plugin@4.2.0:
     dependencies:
       chalk: 4.1.2
@@ -15415,8 +16530,6 @@ snapshots:
 
   tslib@1.14.1: {}
 
-  tslib@2.6.2: {}
-
   tslib@2.8.1: {}
 
   tty-browserify@0.0.1: {}
@@ -15691,8 +16804,79 @@ snapshots:
       d3-time: 3.1.0
       d3-timer: 3.0.1
 
+  vite-tsconfig-paths@6.0.4(typescript@5.9.3)(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)):
+    dependencies:
+      debug: 4.4.3
+      globrex: 0.1.2
+      tsconfck: 3.1.6(typescript@5.9.3)
+    optionalDependencies:
+      vite: 7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+
+  vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2):
+    dependencies:
+      esbuild: 0.27.2
+      fdir: 6.5.0(picomatch@4.0.3)
+      picomatch: 4.0.3
+      postcss: 8.5.6
+      rollup: 4.55.1
+      tinyglobby: 0.2.15
+    optionalDependencies:
+      '@types/node': 24.10.0
+      fsevents: 2.3.3
+      jiti: 2.6.1
+      terser: 5.44.1
+      yaml: 2.8.2
+
+  vitest@4.0.17(@opentelemetry/api@1.9.0)(@types/node@24.10.0)(happy-dom@20.3.4)(jiti@2.6.1)(jsdom@27.4.0)(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(terser@5.44.1)(yaml@2.8.2):
+    dependencies:
+      '@vitest/expect': 4.0.17
+      '@vitest/mocker': 4.0.17(msw@2.11.6(@types/node@24.10.0)(typescript@5.9.3))(vite@7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2))
+      '@vitest/pretty-format': 4.0.17
+      '@vitest/runner': 4.0.17
+      '@vitest/snapshot': 4.0.17
+      '@vitest/spy': 4.0.17
+      '@vitest/utils': 4.0.17
+      es-module-lexer: 1.7.0
+      expect-type: 1.3.0
+      magic-string: 0.30.21
+      obug: 2.1.1
+      pathe: 2.0.3
+      picomatch: 4.0.3
+      std-env: 3.10.0
+      tinybench: 2.9.0
+      tinyexec: 1.0.2
+      tinyglobby: 0.2.15
+      tinyrainbow: 3.0.3
+      vite: 7.3.1(@types/node@24.10.0)(jiti@2.6.1)(terser@5.44.1)(yaml@2.8.2)
+      why-is-node-running: 2.3.0
+    optionalDependencies:
+      '@opentelemetry/api': 1.9.0
+      '@types/node': 24.10.0
+      happy-dom: 20.3.4
+      jsdom: 27.4.0
+    transitivePeerDependencies:
+      - jiti
+      - less
+      - lightningcss
+      - msw
+      - sass
+      - sass-embedded
+      - stylus
+      - sugarss
+      - terser
+      - tsx
+      - yaml
+
   vm-browserify@1.1.2: {}
 
+  w3c-xmlserializer@5.0.0:
+    dependencies:
+      xml-name-validator: 5.0.0
+    optional: true
+
   warning@4.0.3:
     dependencies:
       loose-envify: 1.4.0
@@ -15704,8 +16888,13 @@ snapshots:
 
   web-namespaces@2.0.1: {}
 
+  web-vitals@5.1.0: {}
+
   webidl-conversions@3.0.1: {}
 
+  webidl-conversions@8.0.1:
+    optional: true
+
   webpack-dev-middleware@6.1.3(webpack@5.104.1(esbuild@0.25.12)):
     dependencies:
       colorette: 2.0.20
@@ -15760,6 +16949,20 @@ snapshots:
       - esbuild
       - uglify-js
 
+  whatwg-mimetype@3.0.0: {}
+
+  whatwg-mimetype@4.0.0:
+    optional: true
+
+  whatwg-mimetype@5.0.0:
+    optional: true
+
+  whatwg-url@15.1.0:
+    dependencies:
+      tr46: 6.0.0
+      webidl-conversions: 8.0.1
+    optional: true
+
   whatwg-url@5.0.0:
     dependencies:
       tr46: 0.0.3
@@ -15810,6 +17013,11 @@ snapshots:
     dependencies:
       isexe: 2.0.0
 
+  why-is-node-running@2.3.0:
+    dependencies:
+      siginfo: 2.0.0
+      stackback: 0.0.2
+
   word-wrap@1.2.5: {}
 
   wrap-ansi@6.2.0:
@@ -15834,8 +17042,14 @@ snapshots:
 
   ws@8.19.0: {}
 
+  xml-name-validator@5.0.0:
+    optional: true
+
   xmlbuilder@15.1.1: {}
 
+  xmlchars@2.2.0:
+    optional: true
+
   xtend@4.0.2: {}
 
   y18n@5.0.8: {}
diff --git a/autogpt_platform/frontend/public/integrations/amazon.png b/autogpt_platform/frontend/public/integrations/amazon.png
new file mode 100644
index 0000000000..4e8605abef
Binary files /dev/null and b/autogpt_platform/frontend/public/integrations/amazon.png differ
diff --git a/autogpt_platform/frontend/public/integrations/anthropic-color.png b/autogpt_platform/frontend/public/integrations/anthropic-color.png
new file mode 100644
index 0000000000..dfc85ecaa3
Binary files /dev/null and b/autogpt_platform/frontend/public/integrations/anthropic-color.png differ
diff --git a/autogpt_platform/frontend/public/integrations/cohere.png b/autogpt_platform/frontend/public/integrations/cohere.png
new file mode 100644
index 0000000000..3da0b83737
Binary files /dev/null and b/autogpt_platform/frontend/public/integrations/cohere.png differ
diff --git a/autogpt_platform/frontend/public/integrations/deepseek.png b/autogpt_platform/frontend/public/integrations/deepseek.png
new file mode 100644
index 0000000000..b11d0a9d86
Binary files /dev/null and b/autogpt_platform/frontend/public/integrations/deepseek.png differ
diff --git a/autogpt_platform/frontend/public/integrations/gemini.png b/autogpt_platform/frontend/public/integrations/gemini.png
new file mode 100644
index 0000000000..cd78455bc5
Binary files /dev/null and b/autogpt_platform/frontend/public/integrations/gemini.png differ
diff --git a/autogpt_platform/frontend/public/integrations/gryphe.png b/autogpt_platform/frontend/public/integrations/gryphe.png
new file mode 100644
index 0000000000..13d87e1d9d
Binary files /dev/null and b/autogpt_platform/frontend/public/integrations/gryphe.png differ
diff --git a/autogpt_platform/frontend/public/integrations/microsoft.webp b/autogpt_platform/frontend/public/integrations/microsoft.webp
new file mode 100644
index 0000000000..c416883b2a
Binary files /dev/null and b/autogpt_platform/frontend/public/integrations/microsoft.webp differ
diff --git a/autogpt_platform/frontend/public/integrations/mistral.png b/autogpt_platform/frontend/public/integrations/mistral.png
new file mode 100644
index 0000000000..a7169adcc8
Binary files /dev/null and b/autogpt_platform/frontend/public/integrations/mistral.png differ
diff --git a/autogpt_platform/frontend/public/integrations/moonshot.png b/autogpt_platform/frontend/public/integrations/moonshot.png
new file mode 100644
index 0000000000..01c7d5694a
Binary files /dev/null and b/autogpt_platform/frontend/public/integrations/moonshot.png differ
diff --git a/autogpt_platform/frontend/public/integrations/nousresearch.avif b/autogpt_platform/frontend/public/integrations/nousresearch.avif
new file mode 100644
index 0000000000..e55a0626b6
Binary files /dev/null and b/autogpt_platform/frontend/public/integrations/nousresearch.avif differ
diff --git a/autogpt_platform/frontend/public/integrations/perplexity.webp b/autogpt_platform/frontend/public/integrations/perplexity.webp
new file mode 100644
index 0000000000..29515cc066
Binary files /dev/null and b/autogpt_platform/frontend/public/integrations/perplexity.webp differ
diff --git a/autogpt_platform/frontend/public/integrations/qwen.png b/autogpt_platform/frontend/public/integrations/qwen.png
new file mode 100644
index 0000000000..e6fba24e8d
Binary files /dev/null and b/autogpt_platform/frontend/public/integrations/qwen.png differ
diff --git a/autogpt_platform/frontend/public/integrations/webshare_proxy.png b/autogpt_platform/frontend/public/integrations/webshare_proxy.png
new file mode 100644
index 0000000000..2b07ef8415
Binary files /dev/null and b/autogpt_platform/frontend/public/integrations/webshare_proxy.png differ
diff --git a/autogpt_platform/frontend/public/integrations/wordpress.png b/autogpt_platform/frontend/public/integrations/wordpress.png
new file mode 100644
index 0000000000..b8ba8bd3ff
Binary files /dev/null and b/autogpt_platform/frontend/public/integrations/wordpress.png differ
diff --git a/autogpt_platform/frontend/public/integrations/xai.webp b/autogpt_platform/frontend/public/integrations/xai.webp
new file mode 100644
index 0000000000..fe6050b103
Binary files /dev/null and b/autogpt_platform/frontend/public/integrations/xai.webp differ
diff --git a/autogpt_platform/frontend/src/app/(no-navbar)/logout/page.tsx b/autogpt_platform/frontend/src/app/(no-navbar)/logout/page.tsx
new file mode 100644
index 0000000000..ef3dc03f1a
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(no-navbar)/logout/page.tsx
@@ -0,0 +1,58 @@
+"use client";
+
+import { LoadingSpinner } from "@/components/atoms/LoadingSpinner/LoadingSpinner";
+import { Text } from "@/components/atoms/Text/Text";
+import { useToast } from "@/components/molecules/Toast/use-toast";
+import { useSupabase } from "@/lib/supabase/hooks/useSupabase";
+import { useRouter } from "next/navigation";
+import { useEffect, useRef } from "react";
+
+const LOGOUT_REDIRECT_DELAY_MS = 400;
+
+function wait(ms: number): Promise<void> {
+  return new Promise(function resolveAfterDelay(resolve) {
+    setTimeout(resolve, ms);
+  });
+}
+
+export default function LogoutPage() {
+  const { logOut } = useSupabase();
+  const { toast } = useToast();
+  const router = useRouter();
+  const hasStartedRef = useRef(false);
+
+  useEffect(
+    function handleLogoutEffect() {
+      if (hasStartedRef.current) return;
+      hasStartedRef.current = true;
+
+      async function runLogout() {
+        try {
+          await logOut();
+        } catch {
+          toast({
+            title: "Failed to log out. Redirecting to login.",
+            variant: "destructive",
+          });
+        } finally {
+          await wait(LOGOUT_REDIRECT_DELAY_MS);
+          router.replace("/login");
+        }
+      }
+
+      void runLogout();
+    },
+    [logOut, router, toast],
+  );
+
+  return (
+    <div className="flex min-h-screen items-center justify-center px-4">
+      <div className="flex flex-col items-center justify-center gap-4 py-8">
+        <LoadingSpinner size="large" />
+        <Text variant="body" className="text-center">
+          Logging you out...
+        </Text>
+      </div>
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/5-run/components/AgentOnboardingCredentials/AgentOnboardingCredentials.tsx b/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/5-run/components/AgentOnboardingCredentials/AgentOnboardingCredentials.tsx
index 3176ec7f70..f0bb652a06 100644
--- a/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/5-run/components/AgentOnboardingCredentials/AgentOnboardingCredentials.tsx
+++ b/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/5-run/components/AgentOnboardingCredentials/AgentOnboardingCredentials.tsx
@@ -1,6 +1,6 @@
-import { CredentialsInput } from "@/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/CredentialsInputs";
 import { CredentialsMetaInput } from "@/app/api/__generated__/models/credentialsMetaInput";
 import { GraphMeta } from "@/app/api/__generated__/models/graphMeta";
+import { CredentialsInput } from "@/components/contextual/CredentialsInput/CredentialsInput";
 import { useState } from "react";
 import { getSchemaDefaultCredentials } from "../../helpers";
 import { areAllCredentialsSet, getCredentialFields } from "./helpers";
diff --git a/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/5-run/page.tsx b/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/5-run/page.tsx
index 30e1b67090..db04278d80 100644
--- a/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/5-run/page.tsx
+++ b/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/5-run/page.tsx
@@ -1,12 +1,12 @@
 "use client";
 
-import { RunAgentInputs } from "@/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentInputs/RunAgentInputs";
 import {
   Card,
   CardContent,
   CardHeader,
   CardTitle,
 } from "@/components/__legacy__/ui/card";
+import { RunAgentInputs } from "@/components/contextual/RunAgentInputs/RunAgentInputs";
 import { ErrorCard } from "@/components/molecules/ErrorCard/ErrorCard";
 import { CircleNotchIcon } from "@phosphor-icons/react/dist/ssr";
 import { Play } from "lucide-react";
diff --git a/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/page.tsx b/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/page.tsx
index 1ebfe6b87b..246fe52826 100644
--- a/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/page.tsx
+++ b/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/page.tsx
@@ -1,9 +1,9 @@
 "use client";
+import { getV1OnboardingState } from "@/app/api/__generated__/endpoints/onboarding/onboarding";
+import { getOnboardingStatus, resolveResponse } from "@/app/api/helpers";
 import { LoadingSpinner } from "@/components/atoms/LoadingSpinner/LoadingSpinner";
 import { useRouter } from "next/navigation";
 import { useEffect } from "react";
-import { resolveResponse, shouldShowOnboarding } from "@/app/api/helpers";
-import { getV1OnboardingState } from "@/app/api/__generated__/endpoints/onboarding/onboarding";
 
 export default function OnboardingPage() {
   const router = useRouter();
@@ -11,9 +11,10 @@ export default function OnboardingPage() {
   useEffect(() => {
     async function redirectToStep() {
       try {
-        // Check if onboarding is enabled
-        const isEnabled = await shouldShowOnboarding();
-        if (!isEnabled) {
+        // Check if onboarding is enabled (also gets chat flag for redirect)
+        const { shouldShowOnboarding } = await getOnboardingStatus();
+
+        if (!shouldShowOnboarding) {
           router.replace("/");
           return;
         }
diff --git a/autogpt_platform/frontend/src/app/(platform)/admin/execution-analytics/components/AnalyticsResultsTable.tsx b/autogpt_platform/frontend/src/app/(platform)/admin/execution-analytics/components/AnalyticsResultsTable.tsx
index 56c52e2ceb..7ab251efb1 100644
--- a/autogpt_platform/frontend/src/app/(platform)/admin/execution-analytics/components/AnalyticsResultsTable.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/admin/execution-analytics/components/AnalyticsResultsTable.tsx
@@ -51,6 +51,8 @@ export function AnalyticsResultsTable({ results }: Props) {
       "Execution ID",
       "Status",
       "Score",
+      "Started At",
+      "Ended At",
       "Summary Text",
       "Error Message",
     ];
@@ -62,6 +64,8 @@ export function AnalyticsResultsTable({ results }: Props) {
       result.exec_id,
       result.status,
       result.score?.toString() || "",
+      result.started_at ? new Date(result.started_at).toLocaleString() : "",
+      result.ended_at ? new Date(result.ended_at).toLocaleString() : "",
       `"${(result.summary_text || "").replace(/"/g, '""')}"`, // Escape quotes in summary
       `"${(result.error_message || "").replace(/"/g, '""')}"`, // Escape quotes in error
     ]);
@@ -248,15 +252,13 @@ export function AnalyticsResultsTable({ results }: Props) {
                         )}
                       </td>
                       <td className="px-4 py-3">
-                        {(result.summary_text || result.error_message) && (
-                          <Button
-                            variant="ghost"
-                            size="small"
-                            onClick={() => toggleRowExpansion(result.exec_id)}
-                          >
-                            <EyeIcon size={16} />
-                          </Button>
-                        )}
+                        <Button
+                          variant="ghost"
+                          size="small"
+                          onClick={() => toggleRowExpansion(result.exec_id)}
+                        >
+                          <EyeIcon size={16} />
+                        </Button>
                       </td>
                     </tr>
 
@@ -264,6 +266,44 @@ export function AnalyticsResultsTable({ results }: Props) {
                       <tr>
                         <td colSpan={7} className="bg-gray-50 px-4 py-3">
                           <div className="space-y-3">
+                            {/* Timestamps section */}
+                            <div className="grid grid-cols-2 gap-4 border-b border-gray-200 pb-3">
+                              <div>
+                                <Text
+                                  variant="body"
+                                  className="text-xs font-medium text-gray-600"
+                                >
+                                  Started At:
+                                </Text>
+                                <Text
+                                  variant="body"
+                                  className="text-sm text-gray-700"
+                                >
+                                  {result.started_at
+                                    ? new Date(
+                                        result.started_at,
+                                      ).toLocaleString()
+                                    : "—"}
+                                </Text>
+                              </div>
+                              <div>
+                                <Text
+                                  variant="body"
+                                  className="text-xs font-medium text-gray-600"
+                                >
+                                  Ended At:
+                                </Text>
+                                <Text
+                                  variant="body"
+                                  className="text-sm text-gray-700"
+                                >
+                                  {result.ended_at
+                                    ? new Date(result.ended_at).toLocaleString()
+                                    : "—"}
+                                </Text>
+                              </div>
+                            </div>
+
                             {result.summary_text && (
                               <div>
                                 <Text
diff --git a/autogpt_platform/frontend/src/app/(platform)/admin/execution-analytics/components/ExecutionAnalyticsForm.tsx b/autogpt_platform/frontend/src/app/(platform)/admin/execution-analytics/components/ExecutionAnalyticsForm.tsx
index 5aced56090..fcdd60dde7 100644
--- a/autogpt_platform/frontend/src/app/(platform)/admin/execution-analytics/components/ExecutionAnalyticsForm.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/admin/execution-analytics/components/ExecutionAnalyticsForm.tsx
@@ -541,7 +541,19 @@ export function ExecutionAnalyticsForm() {
       {/* Accuracy Trends Display */}
       {trendsData && (
         <div className="space-y-4">
-          <h3 className="text-lg font-semibold">Execution Accuracy Trends</h3>
+          <div className="flex items-start justify-between">
+            <h3 className="text-lg font-semibold">Execution Accuracy Trends</h3>
+            <div className="rounded-md bg-blue-50 px-3 py-2 text-xs text-blue-700">
+              <p className="font-medium">
+                Chart Filters (matches monitoring system):
+              </p>
+              <ul className="mt-1 list-inside list-disc space-y-1">
+                <li>Only days with ≥1 execution with correctness score</li>
+                <li>Last 30 days</li>
+                <li>Averages calculated from scored executions only</li>
+              </ul>
+            </div>
+          </div>
 
           {/* Alert Section */}
           {trendsData.alert && (
diff --git a/autogpt_platform/frontend/src/app/(platform)/auth/callback/route.ts b/autogpt_platform/frontend/src/app/(platform)/auth/callback/route.ts
index 13f8d988fe..e7e2997d0d 100644
--- a/autogpt_platform/frontend/src/app/(platform)/auth/callback/route.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/auth/callback/route.ts
@@ -1,15 +1,15 @@
-import { getServerSupabase } from "@/lib/supabase/server/getServerSupabase";
+import { getOnboardingStatus } from "@/app/api/helpers";
 import BackendAPI from "@/lib/autogpt-server-api";
-import { NextResponse } from "next/server";
+import { getServerSupabase } from "@/lib/supabase/server/getServerSupabase";
 import { revalidatePath } from "next/cache";
-import { shouldShowOnboarding } from "@/app/api/helpers";
+import { NextResponse } from "next/server";
 
 // Handle the callback to complete the user session login
 export async function GET(request: Request) {
   const { searchParams, origin } = new URL(request.url);
   const code = searchParams.get("code");
 
-  let next = "/marketplace";
+  let next = "/";
 
   if (code) {
     const supabase = await getServerSupabase();
@@ -25,11 +25,14 @@ export async function GET(request: Request) {
         const api = new BackendAPI();
         await api.createUser();
 
-        if (await shouldShowOnboarding()) {
+        // Get onboarding status from backend (includes chat flag evaluated for this user)
+        const { shouldShowOnboarding } = await getOnboardingStatus();
+        if (shouldShowOnboarding) {
           next = "/onboarding";
           revalidatePath("/onboarding", "layout");
         } else {
-          revalidatePath("/", "layout");
+          next = "/";
+          revalidatePath(next, "layout");
         }
       } catch (createUserError) {
         console.error("Error creating user:", createUserError);
diff --git a/autogpt_platform/frontend/src/app/(platform)/auth/integrations/oauth_callback/route.ts b/autogpt_platform/frontend/src/app/(platform)/auth/integrations/oauth_callback/route.ts
index 41d05a9afb..fd67519957 100644
--- a/autogpt_platform/frontend/src/app/(platform)/auth/integrations/oauth_callback/route.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/auth/integrations/oauth_callback/route.ts
@@ -1,6 +1,17 @@
 import { OAuthPopupResultMessage } from "./types";
 import { NextResponse } from "next/server";
 
+/**
+ * Safely encode a value as JSON for embedding in a script tag.
+ * Escapes characters that could break out of the script context to prevent XSS.
+ */
+function safeJsonStringify(value: unknown): string {
+  return JSON.stringify(value)
+    .replace(/</g, "\\u003c")
+    .replace(/>/g, "\\u003e")
+    .replace(/&/g, "\\u0026");
+}
+
 // This route is intended to be used as the callback for integration OAuth flows,
 // controlled by the CredentialsInput component. The CredentialsInput opens the login
 // page in a pop-up window, which then redirects to this route to close the loop.
@@ -23,12 +34,13 @@ export async function GET(request: Request) {
   console.debug("Sending message to opener:", message);
 
   // Return a response with the message as JSON and a script to close the window
+  // Use safeJsonStringify to prevent XSS by escaping <, >, and & characters
   return new NextResponse(
     `
     <html>
       <body>
         <script>
-          window.opener.postMessage(${JSON.stringify(message)});
+          window.opener.postMessage(${safeJsonStringify(message)});
           window.close();
         </script>
       </body>
diff --git a/autogpt_platform/frontend/src/app/(platform)/auth/integrations/setup-wizard/page.tsx b/autogpt_platform/frontend/src/app/(platform)/auth/integrations/setup-wizard/page.tsx
index 3372772c89..9e2e637ef6 100644
--- a/autogpt_platform/frontend/src/app/(platform)/auth/integrations/setup-wizard/page.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/auth/integrations/setup-wizard/page.tsx
@@ -1,22 +1,22 @@
 "use client";
 
-import Image from "next/image";
-import Link from "next/link";
-import { useSearchParams } from "next/navigation";
-import { useState, useMemo, useRef } from "react";
-import { AuthCard } from "@/components/auth/AuthCard";
-import { Text } from "@/components/atoms/Text/Text";
+import { useGetOauthGetOauthAppInfo } from "@/app/api/__generated__/endpoints/oauth/oauth";
+import { okData } from "@/app/api/helpers";
 import { Button } from "@/components/atoms/Button/Button";
+import { Text } from "@/components/atoms/Text/Text";
+import { AuthCard } from "@/components/auth/AuthCard";
+import { CredentialsInput } from "@/components/contextual/CredentialsInput/CredentialsInput";
 import { ErrorCard } from "@/components/molecules/ErrorCard/ErrorCard";
-import { CredentialsInput } from "@/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/CredentialsInputs";
 import type {
   BlockIOCredentialsSubSchema,
   CredentialsMetaInput,
   CredentialsType,
 } from "@/lib/autogpt-server-api";
 import { CheckIcon, CircleIcon } from "@phosphor-icons/react";
-import { useGetOauthGetOauthAppInfo } from "@/app/api/__generated__/endpoints/oauth/oauth";
-import { okData } from "@/app/api/helpers";
+import Image from "next/image";
+import Link from "next/link";
+import { useSearchParams } from "next/navigation";
+import { useMemo, useRef, useState } from "react";
 
 // All credential types - we accept any type of credential
 const ALL_CREDENTIAL_TYPES: CredentialsType[] = [
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/BuilderActions.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/BuilderActions.tsx
index 64eb624621..86e4a3eb9c 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/BuilderActions.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/BuilderActions.tsx
@@ -10,7 +10,10 @@ export const BuilderActions = memo(() => {
     flowID: parseAsString,
   });
   return (
-    <div className="absolute bottom-4 left-[50%] z-[100] flex -translate-x-1/2 items-center gap-4 rounded-full bg-white p-2 px-2 shadow-lg">
+    <div
+      data-id="builder-actions"
+      className="absolute bottom-4 left-[50%] z-[100] flex -translate-x-1/2 items-center gap-4 rounded-full bg-white p-2 px-2 shadow-lg"
+    >
       <AgentOutputs flowID={flowID} />
       <RunGraph flowID={flowID} />
       <ScheduleGraph flowID={flowID} />
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/AgentOutputs/AgentOutputs.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/AgentOutputs/AgentOutputs.tsx
index de56bb46b8..8ec1ba8be3 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/AgentOutputs/AgentOutputs.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/AgentOutputs/AgentOutputs.tsx
@@ -1,11 +1,6 @@
 import { BlockUIType } from "@/app/(platform)/build/components/types";
 import { useGraphStore } from "@/app/(platform)/build/stores/graphStore";
 import { useNodeStore } from "@/app/(platform)/build/stores/nodeStore";
-import {
-  globalRegistry,
-  OutputActions,
-  OutputItem,
-} from "@/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/OutputRenderers";
 import { Label } from "@/components/__legacy__/ui/label";
 import { ScrollArea } from "@/components/__legacy__/ui/scroll-area";
 import {
@@ -23,6 +18,11 @@ import {
   TooltipProvider,
   TooltipTrigger,
 } from "@/components/atoms/Tooltip/BaseTooltip";
+import {
+  globalRegistry,
+  OutputActions,
+  OutputItem,
+} from "@/components/contextual/OutputRenderers";
 import { BookOpenIcon } from "@phosphor-icons/react";
 import { useMemo } from "react";
 import { useShallow } from "zustand/react/shallow";
@@ -38,8 +38,12 @@ export const AgentOutputs = ({ flowID }: { flowID: string | null }) => {
 
     return outputNodes
       .map((node) => {
-        const executionResult = node.data.nodeExecutionResult;
-        const outputData = executionResult?.output_data?.output;
+        const executionResults = node.data.nodeExecutionResults || [];
+        const latestResult =
+          executionResults.length > 0
+            ? executionResults[executionResults.length - 1]
+            : undefined;
+        const outputData = latestResult?.output_data?.output;
 
         const renderer = globalRegistry.getRenderer(outputData);
 
@@ -79,6 +83,7 @@ export const AgentOutputs = ({ flowID }: { flowID: string | null }) => {
               <Button
                 variant="outline"
                 size="icon"
+                data-id="agent-outputs-button"
                 disabled={!flowID || !hasOutputs()}
               >
                 <BookOpenIcon className="size-4" />
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/RunGraph/RunGraph.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/RunGraph/RunGraph.tsx
index 7ee00ec285..57890b1f17 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/RunGraph/RunGraph.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/RunGraph/RunGraph.tsx
@@ -5,10 +5,11 @@ import {
   TooltipContent,
   TooltipTrigger,
 } from "@/components/atoms/Tooltip/BaseTooltip";
-import { PlayIcon, StopIcon } from "@phosphor-icons/react";
+import { CircleNotchIcon, PlayIcon, StopIcon } from "@phosphor-icons/react";
 import { useShallow } from "zustand/react/shallow";
 import { RunInputDialog } from "../RunInputDialog/RunInputDialog";
 import { useRunGraph } from "./useRunGraph";
+import { cn } from "@/lib/utils";
 
 export const RunGraph = ({ flowID }: { flowID: string | null }) => {
   const {
@@ -24,6 +25,31 @@ export const RunGraph = ({ flowID }: { flowID: string | null }) => {
     useShallow((state) => state.isGraphRunning),
   );
 
+  const isLoading = isExecutingGraph || isTerminatingGraph || isSaving;
+
+  // Determine which icon to show with proper animation
+  const renderIcon = () => {
+    const iconClass = cn(
+      "size-4 transition-transform duration-200 ease-out",
+      !isLoading && "group-hover:scale-110",
+    );
+
+    if (isLoading) {
+      return (
+        <CircleNotchIcon
+          className={cn(iconClass, "animate-spin")}
+          weight="bold"
+        />
+      );
+    }
+
+    if (isGraphRunning) {
+      return <StopIcon className={iconClass} weight="fill" />;
+    }
+
+    return <PlayIcon className={iconClass} weight="fill" />;
+  };
+
   return (
     <>
       <Tooltip>
@@ -31,19 +57,20 @@ export const RunGraph = ({ flowID }: { flowID: string | null }) => {
           <Button
             size="icon"
             variant={isGraphRunning ? "destructive" : "primary"}
+            data-id={isGraphRunning ? "stop-graph-button" : "run-graph-button"}
             onClick={isGraphRunning ? handleStopGraph : handleRunGraph}
-            disabled={!flowID || isExecutingGraph || isTerminatingGraph}
-            loading={isExecutingGraph || isTerminatingGraph || isSaving}
+            disabled={!flowID || isLoading}
+            className="group"
           >
-            {!isGraphRunning ? (
-              <PlayIcon className="size-4" />
-            ) : (
-              <StopIcon className="size-4" />
-            )}
+            {renderIcon()}
           </Button>
         </TooltipTrigger>
         <TooltipContent>
-          {isGraphRunning ? "Stop agent" : "Run agent"}
+          {isLoading
+            ? "Processing..."
+            : isGraphRunning
+              ? "Stop agent"
+              : "Run agent"}
         </TooltipContent>
       </Tooltip>
       <RunInputDialog
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/RunGraph/useRunGraph.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/RunGraph/useRunGraph.ts
index b827cfdcb4..6980e95f11 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/RunGraph/useRunGraph.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/RunGraph/useRunGraph.ts
@@ -7,10 +7,11 @@ import { parseAsInteger, parseAsString, useQueryStates } from "nuqs";
 import { GraphExecutionMeta } from "@/app/(platform)/library/agents/[id]/components/OldAgentLibraryView/use-agent-runs";
 import { useGraphStore } from "@/app/(platform)/build/stores/graphStore";
 import { useShallow } from "zustand/react/shallow";
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { useSaveGraph } from "@/app/(platform)/build/hooks/useSaveGraph";
 import { useNodeStore } from "@/app/(platform)/build/stores/nodeStore";
 import { ApiError } from "@/lib/autogpt-server-api/helpers"; // Check if this exists
+import { useTutorialStore } from "@/app/(platform)/build/stores/tutorialStore";
 
 export const useRunGraph = () => {
   const { saveGraph, isSaving } = useSaveGraph({
@@ -33,6 +34,29 @@ export const useRunGraph = () => {
     useShallow((state) => state.clearAllNodeErrors),
   );
 
+  // Tutorial integration - force open dialog when tutorial requests it
+  const forceOpenRunInputDialog = useTutorialStore(
+    (state) => state.forceOpenRunInputDialog,
+  );
+  const setForceOpenRunInputDialog = useTutorialStore(
+    (state) => state.setForceOpenRunInputDialog,
+  );
+
+  // Sync tutorial state with dialog state
+  useEffect(() => {
+    if (forceOpenRunInputDialog && !openRunInputDialog) {
+      setOpenRunInputDialog(true);
+    }
+  }, [forceOpenRunInputDialog, openRunInputDialog]);
+
+  // Reset tutorial state when dialog closes
+  const handleSetOpenRunInputDialog = (isOpen: boolean) => {
+    setOpenRunInputDialog(isOpen);
+    if (!isOpen && forceOpenRunInputDialog) {
+      setForceOpenRunInputDialog(false);
+    }
+  };
+
   const [{ flowID, flowVersion, flowExecutionID }, setQueryStates] =
     useQueryStates({
       flowID: parseAsString,
@@ -138,6 +162,6 @@ export const useRunGraph = () => {
     isExecutingGraph,
     isTerminatingGraph,
     openRunInputDialog,
-    setOpenRunInputDialog,
+    setOpenRunInputDialog: handleSetOpenRunInputDialog,
   };
 };
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/RunInputDialog/RunInputDialog.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/RunInputDialog/RunInputDialog.tsx
index 431feeaade..51308a4a82 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/RunInputDialog/RunInputDialog.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/RunInputDialog/RunInputDialog.tsx
@@ -8,6 +8,9 @@ import { Text } from "@/components/atoms/Text/Text";
 import { FormRenderer } from "@/components/renderers/InputRenderer/FormRenderer";
 import { useRunInputDialog } from "./useRunInputDialog";
 import { CronSchedulerDialog } from "../CronSchedulerDialog/CronSchedulerDialog";
+import { useTutorialStore } from "@/app/(platform)/build/stores/tutorialStore";
+import { useEffect } from "react";
+import { CredentialsGroupedView } from "@/components/contextual/CredentialsInput/components/CredentialsGroupedView/CredentialsGroupedView";
 
 export const RunInputDialog = ({
   isOpen,
@@ -21,22 +24,35 @@ export const RunInputDialog = ({
   const hasInputs = useGraphStore((state) => state.hasInputs);
   const hasCredentials = useGraphStore((state) => state.hasCredentials);
   const inputSchema = useGraphStore((state) => state.inputSchema);
-  const credentialsSchema = useGraphStore(
-    (state) => state.credentialsInputSchema,
-  );
 
   const {
-    credentialsUiSchema,
+    credentialFields,
+    requiredCredentials,
     handleManualRun,
     handleInputChange,
     openCronSchedulerDialog,
     setOpenCronSchedulerDialog,
     inputValues,
     credentialValues,
-    handleCredentialChange,
+    handleCredentialFieldChange,
     isExecutingGraph,
   } = useRunInputDialog({ setIsOpen });
 
+  // Tutorial integration - track input values for the tutorial
+  const setTutorialInputValues = useTutorialStore(
+    (state) => state.setTutorialInputValues,
+  );
+  const isTutorialRunning = useTutorialStore(
+    (state) => state.isTutorialRunning,
+  );
+
+  // Update tutorial store when input values change
+  useEffect(() => {
+    if (isTutorialRunning) {
+      setTutorialInputValues(inputValues);
+    }
+  }, [inputValues, isTutorialRunning, setTutorialInputValues]);
+
   return (
     <>
       <Dialog
@@ -45,65 +61,70 @@ export const RunInputDialog = ({
           isOpen,
           set: setIsOpen,
         }}
-        styling={{ maxWidth: "600px", minWidth: "600px" }}
+        styling={{ maxWidth: "700px", minWidth: "700px" }}
       >
         <Dialog.Content>
-          <div className="space-y-6 p-1">
-            {/* Credentials Section */}
-            {hasCredentials() && (
-              <div>
-                <div className="mb-4">
-                  <Text variant="h4" className="text-gray-900">
-                    Credentials
-                  </Text>
+          <div
+            className="grid grid-cols-[1fr_auto] gap-10 p-1"
+            data-id="run-input-dialog-content"
+          >
+            <div className="space-y-6">
+              {/* Credentials Section */}
+              {hasCredentials() && credentialFields.length > 0 && (
+                <div data-id="run-input-credentials-section">
+                  <div className="mb-4">
+                    <Text variant="h4" className="text-gray-900">
+                      Credentials
+                    </Text>
+                  </div>
+                  <div className="px-2" data-id="run-input-credentials-form">
+                    <CredentialsGroupedView
+                      credentialFields={credentialFields}
+                      requiredCredentials={requiredCredentials}
+                      inputCredentials={credentialValues}
+                      inputValues={inputValues}
+                      onCredentialChange={handleCredentialFieldChange}
+                    />
+                  </div>
                 </div>
-                <div className="px-2">
-                  <FormRenderer
-                    jsonSchema={credentialsSchema as RJSFSchema}
-                    handleChange={(v) => handleCredentialChange(v.formData)}
-                    uiSchema={credentialsUiSchema}
-                    initialValues={{}}
-                    formContext={{
-                      showHandles: false,
-                      size: "large",
-                    }}
-                  />
-                </div>
-              </div>
-            )}
+              )}
 
-            {/* Inputs Section */}
-            {hasInputs() && (
-              <div>
-                <div className="mb-4">
-                  <Text variant="h4" className="text-gray-900">
-                    Inputs
-                  </Text>
+              {/* Inputs Section */}
+              {hasInputs() && (
+                <div data-id="run-input-inputs-section">
+                  <div className="mb-4">
+                    <Text variant="h4" className="text-gray-900">
+                      Inputs
+                    </Text>
+                  </div>
+                  <div data-id="run-input-inputs-form">
+                    <FormRenderer
+                      jsonSchema={inputSchema as RJSFSchema}
+                      handleChange={(v) => handleInputChange(v.formData)}
+                      uiSchema={uiSchema}
+                      initialValues={{}}
+                      formContext={{
+                        showHandles: false,
+                        size: "large",
+                      }}
+                    />
+                  </div>
                 </div>
-                <div className="px-2">
-                  <FormRenderer
-                    jsonSchema={inputSchema as RJSFSchema}
-                    handleChange={(v) => handleInputChange(v.formData)}
-                    uiSchema={uiSchema}
-                    initialValues={{}}
-                    formContext={{
-                      showHandles: false,
-                      size: "large",
-                    }}
-                  />
-                </div>
-              </div>
-            )}
+              )}
+            </div>
 
-            {/* Action Button */}
-            <div className="flex justify-end pt-2">
+            <div
+              className="flex flex-col items-end justify-start"
+              data-id="run-input-actions-section"
+            >
               {purpose === "run" && (
                 <Button
                   variant="primary"
                   size="large"
-                  className="group h-fit min-w-0 gap-2"
+                  className="group h-fit min-w-0 gap-2 px-10"
                   onClick={handleManualRun}
                   loading={isExecutingGraph}
+                  data-id="run-input-manual-run-button"
                 >
                   {!isExecutingGraph && (
                     <PlayIcon className="size-5 transition-transform group-hover:scale-110" />
@@ -115,8 +136,9 @@ export const RunInputDialog = ({
                 <Button
                   variant="primary"
                   size="large"
-                  className="group h-fit min-w-0 gap-2"
+                  className="group h-fit min-w-0 gap-2 px-10"
                   onClick={() => setOpenCronSchedulerDialog(true)}
+                  data-id="run-input-schedule-button"
                 >
                   <ClockIcon className="size-5 transition-transform group-hover:scale-110" />
                   <span className="font-semibold">Schedule Run</span>
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/RunInputDialog/useRunInputDialog.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/RunInputDialog/useRunInputDialog.ts
index a71ad0bd07..629d4662a9 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/RunInputDialog/useRunInputDialog.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/RunInputDialog/useRunInputDialog.ts
@@ -1,14 +1,17 @@
 import { useGraphStore } from "@/app/(platform)/build/stores/graphStore";
 import { usePostV1ExecuteGraphAgent } from "@/app/api/__generated__/endpoints/graphs/graphs";
-import { useToast } from "@/components/molecules/Toast/use-toast";
+
 import {
+  ApiError,
   CredentialsMetaInput,
   GraphExecutionMeta,
 } from "@/lib/autogpt-server-api";
 import { parseAsInteger, parseAsString, useQueryStates } from "nuqs";
-import { useMemo, useState } from "react";
-import { uiSchema } from "../../../FlowEditor/nodes/uiSchema";
-import { isCredentialFieldSchema } from "@/components/renderers/InputRenderer/custom/CredentialField/helpers";
+import { useCallback, useMemo, useState } from "react";
+import { useNodeStore } from "@/app/(platform)/build/stores/nodeStore";
+import { useToast } from "@/components/molecules/Toast/use-toast";
+import { useReactFlow } from "@xyflow/react";
+import type { CredentialField } from "@/components/contextual/CredentialsInput/components/CredentialsGroupedView/helpers";
 
 export const useRunInputDialog = ({
   setIsOpen,
@@ -31,6 +34,7 @@ export const useRunInputDialog = ({
     flowVersion: parseAsInteger,
   });
   const { toast } = useToast();
+  const { setViewport } = useReactFlow();
 
   const { mutateAsync: executeGraph, isPending: isExecutingGraph } =
     usePostV1ExecuteGraphAgent({
@@ -42,46 +46,122 @@ export const useRunInputDialog = ({
           });
         },
         onError: (error) => {
-          // Reset running state on error
+          if (error instanceof ApiError && error.isGraphValidationError()) {
+            const errorData = error.response?.detail || {
+              node_errors: {},
+              message: undefined,
+            };
+            const nodeErrors = errorData.node_errors || {};
+
+            if (Object.keys(nodeErrors).length > 0) {
+              Object.entries(nodeErrors).forEach(
+                ([nodeId, nodeErrorsForNode]) => {
+                  useNodeStore
+                    .getState()
+                    .updateNodeErrors(
+                      nodeId,
+                      nodeErrorsForNode as { [key: string]: string },
+                    );
+                },
+              );
+            } else {
+              useNodeStore.getState().nodes.forEach((node) => {
+                useNodeStore.getState().updateNodeErrors(node.id, {});
+              });
+            }
+
+            toast({
+              title: errorData?.message || "Graph validation failed",
+              description:
+                "Please fix the validation errors on the highlighted nodes and try again.",
+              variant: "destructive",
+            });
+            setIsOpen(false);
+
+            const firstBackendId = Object.keys(nodeErrors)[0];
+
+            if (firstBackendId) {
+              const firstErrorNode = useNodeStore
+                .getState()
+                .nodes.find(
+                  (n) =>
+                    n.data.metadata?.backend_id === firstBackendId ||
+                    n.id === firstBackendId,
+                );
+
+              if (firstErrorNode) {
+                setTimeout(() => {
+                  setViewport(
+                    {
+                      x:
+                        -firstErrorNode.position.x * 0.8 +
+                        window.innerWidth / 2 -
+                        150,
+                      y: -firstErrorNode.position.y * 0.8 + 50,
+                      zoom: 0.8,
+                    },
+                    { duration: 500 },
+                  );
+                }, 50);
+              }
+            }
+          } else {
+            toast({
+              title: "Error running graph",
+              description:
+                (error as Error).message || "An unexpected error occurred.",
+              variant: "destructive",
+            });
+            setIsOpen(false);
+          }
           setIsGraphRunning(false);
-          toast({
-            title: (error.detail as string) ?? "An unexpected error occurred.",
-            description: "An unexpected error occurred.",
-            variant: "destructive",
-          });
         },
       },
     });
 
-  // We are rendering the credentials field differently compared to other fields.
-  // In the node, we have the field name as "credential" - so our library catches it and renders it differently.
-  // But here we have a different name, something like `Firecrawl credentials`, so here we are telling the library that this field is a credential field type.
-
-  const credentialsUiSchema = useMemo(() => {
-    const dynamicUiSchema: any = { ...uiSchema };
-
-    if (credentialsSchema?.properties) {
-      Object.keys(credentialsSchema.properties).forEach((fieldName) => {
-        const fieldSchema = credentialsSchema.properties[fieldName];
-        if (isCredentialFieldSchema(fieldSchema)) {
-          dynamicUiSchema[fieldName] = {
-            ...dynamicUiSchema[fieldName],
-            "ui:field": "credentials",
-          };
-        }
-      });
-    }
-
-    return dynamicUiSchema;
+  // Convert credentials schema to credential fields array for CredentialsGroupedView
+  const credentialFields: CredentialField[] = useMemo(() => {
+    if (!credentialsSchema?.properties) return [];
+    return Object.entries(credentialsSchema.properties);
   }, [credentialsSchema]);
 
+  // Get required credentials as a Set
+  const requiredCredentials = useMemo(() => {
+    return new Set<string>(credentialsSchema?.required || []);
+  }, [credentialsSchema]);
+
+  // Handler for individual credential changes
+  const handleCredentialFieldChange = useCallback(
+    (key: string, value?: CredentialsMetaInput) => {
+      setCredentialValues((prev) => {
+        if (value) {
+          return { ...prev, [key]: value };
+        } else {
+          const next = { ...prev };
+          delete next[key];
+          return next;
+        }
+      });
+    },
+    [],
+  );
+
   const handleManualRun = async () => {
+    // Filter out incomplete credentials (those without a valid id)
+    // RJSF auto-populates const values (provider, type) but not id field
+    const validCredentials = Object.fromEntries(
+      Object.entries(credentialValues).filter(([_, cred]) => cred && cred.id),
+    );
+
+    useNodeStore.getState().clearAllNodeExecutionResults();
+    useNodeStore.getState().cleanNodesStatuses();
+
     await executeGraph({
       graphId: flowID ?? "",
       graphVersion: flowVersion || null,
       data: {
         inputs: inputValues,
-        credentials_inputs: credentialValues,
+        credentials_inputs: validCredentials,
         source: "builder",
       },
     });
@@ -100,12 +180,14 @@ export const useRunInputDialog = ({
   };
 
   return {
-    credentialsUiSchema,
+    credentialFields,
+    requiredCredentials,
     inputValues,
     credentialValues,
     isExecutingGraph,
     handleInputChange,
     handleCredentialChange,
+    handleCredentialFieldChange,
     handleManualRun,
     openCronSchedulerDialog,
     setOpenCronSchedulerDialog,
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/ScheduleGraph/ScheduleGraph.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/ScheduleGraph/ScheduleGraph.tsx
index 5cc8538de1..854917154e 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/ScheduleGraph/ScheduleGraph.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/ScheduleGraph/ScheduleGraph.tsx
@@ -26,6 +26,7 @@ export const ScheduleGraph = ({ flowID }: { flowID: string | null }) => {
             <Button
               variant="outline"
               size="icon"
+              data-id="schedule-graph-button"
               onClick={handleScheduleGraph}
               disabled={!flowID}
             >
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FloatingSafeModeToogle.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FloatingSafeModeToogle.tsx
index c1a7ef3b35..227d892fff 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FloatingSafeModeToogle.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FloatingSafeModeToogle.tsx
@@ -18,69 +18,110 @@ interface Props {
   fullWidth?: boolean;
 }
 
+interface SafeModeButtonProps {
+  isEnabled: boolean;
+  label: string;
+  tooltipEnabled: string;
+  tooltipDisabled: string;
+  onToggle: () => void;
+  isPending: boolean;
+  fullWidth?: boolean;
+}
+
+function SafeModeButton({
+  isEnabled,
+  label,
+  tooltipEnabled,
+  tooltipDisabled,
+  onToggle,
+  isPending,
+  fullWidth = false,
+}: SafeModeButtonProps) {
+  return (
+    <Tooltip delayDuration={100}>
+      <TooltipTrigger asChild>
+        <Button
+          variant={isEnabled ? "primary" : "outline"}
+          size="small"
+          onClick={onToggle}
+          disabled={isPending}
+          className={cn("justify-start", fullWidth ? "w-full" : "")}
+        >
+          {isEnabled ? (
+            <>
+              <ShieldCheckIcon weight="bold" size={16} />
+              <Text variant="body" className="text-zinc-200">
+                {label}: ON
+              </Text>
+            </>
+          ) : (
+            <>
+              <ShieldIcon weight="bold" size={16} />
+              <Text variant="body" className="text-zinc-600">
+                {label}: OFF
+              </Text>
+            </>
+          )}
+        </Button>
+      </TooltipTrigger>
+      <TooltipContent>
+        <div className="text-center">
+          <div className="font-medium">
+            {label}: {isEnabled ? "ON" : "OFF"}
+          </div>
+          <div className="mt-1 text-xs text-muted-foreground">
+            {isEnabled ? tooltipEnabled : tooltipDisabled}
+          </div>
+        </div>
+      </TooltipContent>
+    </Tooltip>
+  );
+}
+
 export function FloatingSafeModeToggle({
   graph,
   className,
   fullWidth = false,
 }: Props) {
   const {
-    currentSafeMode,
+    currentHITLSafeMode,
+    showHITLToggle,
+    handleHITLToggle,
+    currentSensitiveActionSafeMode,
+    showSensitiveActionToggle,
+    handleSensitiveActionToggle,
     isPending,
     shouldShowToggle,
-    isStateUndetermined,
-    handleToggle,
   } = useAgentSafeMode(graph);
 
-  if (!shouldShowToggle || isStateUndetermined || isPending) {
+  if (!shouldShowToggle || isPending) {
     return null;
   }
 
   return (
-    <div className={cn("fixed z-50", className)}>
-      <Tooltip delayDuration={100}>
-        <TooltipTrigger asChild>
-          <Button
-            variant={currentSafeMode! ? "primary" : "outline"}
-            key={graph.id}
-            size="small"
-            title={
-              currentSafeMode!
-                ? "Safe Mode: ON. Human in the loop blocks require manual review"
-                : "Safe Mode: OFF. Human in the loop blocks proceed automatically"
-            }
-            onClick={handleToggle}
-            className={cn(fullWidth ? "w-full" : "")}
-          >
-            {currentSafeMode! ? (
-              <>
-                <ShieldCheckIcon weight="bold" size={16} />
-                <Text variant="body" className="text-zinc-200">
-                  Safe Mode: ON
-                </Text>
-              </>
-            ) : (
-              <>
-                <ShieldIcon weight="bold" size={16} />
-                <Text variant="body" className="text-zinc-600">
-                  Safe Mode: OFF
-                </Text>
-              </>
-            )}
-          </Button>
-        </TooltipTrigger>
-        <TooltipContent>
-          <div className="text-center">
-            <div className="font-medium">
-              Safe Mode: {currentSafeMode! ? "ON" : "OFF"}
-            </div>
-            <div className="mt-1 text-xs text-muted-foreground">
-              {currentSafeMode!
-                ? "Human in the loop blocks require manual review"
-                : "Human in the loop blocks proceed automatically"}
-            </div>
-          </div>
-        </TooltipContent>
-      </Tooltip>
+    <div className={cn("fixed z-50 flex flex-col gap-2", className)}>
+      {showHITLToggle && (
+        <SafeModeButton
+          isEnabled={currentHITLSafeMode}
+          label="Human in the loop block approval"
+          tooltipEnabled="The agent will pause at human-in-the-loop blocks and wait for your approval"
+          tooltipDisabled="Human in the loop blocks will proceed automatically"
+          onToggle={handleHITLToggle}
+          isPending={isPending}
+          fullWidth={fullWidth}
+        />
+      )}
+      {showSensitiveActionToggle && (
+        <SafeModeButton
+          isEnabled={currentSensitiveActionSafeMode}
+          label="Sensitive actions blocks approval"
+          tooltipEnabled="The agent will pause at sensitive action blocks and wait for your approval"
+          tooltipDisabled="Sensitive action blocks will proceed automatically"
+          onToggle={handleSensitiveActionToggle}
+          isPending={isPending}
+          fullWidth={fullWidth}
+        />
+      )}
     </div>
   );
 }
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/Flow.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/Flow.tsx
index faaebb6b35..87ae4300b8 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/Flow.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/Flow.tsx
@@ -55,14 +55,16 @@ export const Flow = () => {
   const edgeTypes = useMemo(() => ({ custom: CustomEdge }), []);
 
   const onNodeDragStop = useCallback(() => {
+    const currentNodes = useNodeStore.getState().nodes;
     setNodes(
-      resolveCollisions(nodes, {
+      resolveCollisions(currentNodes, {
         maxIterations: Infinity,
         overlapThreshold: 0.5,
         margin: 15,
       }),
     );
-  }, [setNodes, nodes]);
+  }, [setNodes]);
+
   const { edges, onConnect, onEdgesChange } = useCustomEdge();
 
   // for loading purpose
@@ -97,6 +99,9 @@ export const Flow = () => {
           onConnect={onConnect}
           onEdgesChange={onEdgesChange}
           onNodeDragStop={onNodeDragStop}
+          onNodeContextMenu={(event) => {
+            event.preventDefault();
+          }}
           maxZoom={2}
           minZoom={0.1}
           onDragOver={onDragOver}
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/components/CustomControl.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/components/CustomControl.tsx
index c6f8e8ded4..7b723d73b3 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/components/CustomControl.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/components/CustomControl.tsx
@@ -6,12 +6,17 @@ import {
   TooltipTrigger,
 } from "@/components/atoms/Tooltip/BaseTooltip";
 import {
+  ChalkboardIcon,
+  CircleNotchIcon,
   FrameCornersIcon,
   MinusIcon,
   PlusIcon,
 } from "@phosphor-icons/react/dist/ssr";
 import { LockIcon, LockOpenIcon } from "lucide-react";
-import { memo } from "react";
+import { memo, useEffect, useState } from "react";
+import { useSearchParams, useRouter } from "next/navigation";
+import { useTutorialStore } from "@/app/(platform)/build/stores/tutorialStore";
+import { startTutorial, setTutorialLoadingCallback } from "../../tutorial";
 
 export const CustomControls = memo(
   ({
@@ -22,31 +27,69 @@ export const CustomControls = memo(
     setIsLocked: (isLocked: boolean) => void;
   }) => {
     const { zoomIn, zoomOut, fitView } = useReactFlow();
+    const { isTutorialRunning, setIsTutorialRunning } = useTutorialStore();
+    const [isTutorialLoading, setIsTutorialLoading] = useState(false);
+    const searchParams = useSearchParams();
+    const router = useRouter();
+
+    useEffect(() => {
+      setTutorialLoadingCallback(setIsTutorialLoading);
+      return () => setTutorialLoadingCallback(() => {});
+    }, []);
+
+    const handleTutorialClick = () => {
+      if (isTutorialLoading) return;
+
+      const flowId = searchParams.get("flowID");
+      if (flowId) {
+        router.push("/build?view=new");
+        return;
+      }
+
+      startTutorial();
+      setIsTutorialRunning(true);
+    };
 
     const controls = [
       {
-        icon: <PlusIcon className="size-4" />,
+        id: "zoom-in-button",
+        icon: <PlusIcon className="size-3.5 text-zinc-600" />,
         label: "Zoom In",
         onClick: () => zoomIn(),
         className: "h-10 w-10 border-none",
       },
       {
-        icon: <MinusIcon className="size-4" />,
+        id: "zoom-out-button",
+        icon: <MinusIcon className="size-3.5 text-zinc-600" />,
         label: "Zoom Out",
         onClick: () => zoomOut(),
         className: "h-10 w-10 border-none",
       },
       {
-        icon: <FrameCornersIcon className="size-4" />,
+        id: "tutorial-button",
+        icon: isTutorialLoading ? (
+          <CircleNotchIcon className="size-3.5 animate-spin text-zinc-600" />
+        ) : (
+          <ChalkboardIcon className="size-3.5 text-zinc-600" />
+        ),
+        label: isTutorialLoading ? "Loading Tutorial..." : "Start Tutorial",
+        onClick: handleTutorialClick,
+        className: `h-10 w-10 border-none ${isTutorialRunning || isTutorialLoading ? "bg-zinc-100" : "bg-white"}`,
+        disabled: isTutorialLoading,
+      },
+      {
+        id: "fit-view-button",
+        icon: <FrameCornersIcon className="size-3.5 text-zinc-600" />,
         label: "Fit View",
         onClick: () => fitView({ padding: 0.2, duration: 800, maxZoom: 1 }),
         className: "h-10 w-10 border-none",
       },
       {
+        id: "lock-button",
         icon: !isLocked ? (
-          <LockOpenIcon className="size-4" />
+          <LockOpenIcon className="size-3.5 text-zinc-600" />
         ) : (
-          <LockIcon className="size-4" />
+          <LockIcon className="size-3.5 text-zinc-600" />
         ),
         label: "Toggle Lock",
         onClick: () => setIsLocked(!isLocked),
@@ -55,15 +98,20 @@ export const CustomControls = memo(
     ];
 
     return (
-      <div className="absolute bottom-4 left-4 z-10 flex flex-col items-center gap-2 rounded-full bg-white px-1 py-2 shadow-lg">
-        {controls.map((control, index) => (
-          <Tooltip key={index} delayDuration={300}>
+      <div
+        data-id="custom-controls"
+        className="absolute bottom-4 left-4 z-10 flex flex-col items-center gap-2 rounded-full bg-white px-1 py-2 shadow-lg"
+      >
+        {controls.map((control) => (
+          <Tooltip key={control.id} delayDuration={0}>
             <TooltipTrigger asChild>
               <Button
                 variant="icon"
                 size={"small"}
                 onClick={control.onClick}
                 className={control.className}
+                data-id={control.id}
+                disabled={"disabled" in control ? control.disabled : false}
               >
                 {control.icon}
                 <span className="sr-only">{control.label}</span>
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/useFlow.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/useFlow.ts
index 407482073f..f5533848d2 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/useFlow.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/useFlow.ts
@@ -3,6 +3,7 @@ import { useGetV2GetSpecificBlocks } from "@/app/api/__generated__/endpoints/def
 import {
   useGetV1GetExecutionDetails,
   useGetV1GetSpecificGraph,
+  useGetV1ListUserGraphs,
 } from "@/app/api/__generated__/endpoints/graphs/graphs";
 import { BlockInfo } from "@/app/api/__generated__/models/blockInfo";
 import { GraphModel } from "@/app/api/__generated__/models/graphModel";
@@ -17,6 +18,7 @@ import { useReactFlow } from "@xyflow/react";
 import { useControlPanelStore } from "../../../stores/controlPanelStore";
 import { useHistoryStore } from "../../../stores/historyStore";
 import { AgentExecutionStatus } from "@/app/api/__generated__/models/agentExecutionStatus";
+import { okData } from "@/app/api/helpers";
 
 export const useFlow = () => {
   const [isLocked, setIsLocked] = useState(false);
@@ -36,6 +38,9 @@ export const useFlow = () => {
   const setGraphExecutionStatus = useGraphStore(
     useShallow((state) => state.setGraphExecutionStatus),
   );
+  const setAvailableSubGraphs = useGraphStore(
+    useShallow((state) => state.setAvailableSubGraphs),
+  );
   const updateEdgeBeads = useEdgeStore(
     useShallow((state) => state.updateEdgeBeads),
   );
@@ -62,6 +67,11 @@ export const useFlow = () => {
     },
   );
 
+  // Fetch all available graphs for sub-agent update detection
+  const { data: availableGraphs } = useGetV1ListUserGraphs({
+    query: { select: okData },
+  });
+
   const { data: graph, isLoading: isGraphLoading } = useGetV1GetSpecificGraph(
     flowID ?? "",
     flowVersion !== null ? { version: flowVersion } : {},
@@ -116,19 +126,19 @@ export const useFlow = () => {
     }
   }, [graph]);
 
+  // Update available sub-graphs in store for sub-agent update detection
+  useEffect(() => {
+    if (availableGraphs) {
+      setAvailableSubGraphs(availableGraphs);
+    }
+  }, [availableGraphs, setAvailableSubGraphs]);
+
   // adding nodes
   useEffect(() => {
     if (customNodes.length > 0) {
       useNodeStore.getState().setNodes([]);
+      useNodeStore.getState().clearResolutionState();
       addNodes(customNodes);
-
-      // Sync hardcoded values with handle IDs.
-      // If a key–value field has a key without a value, the backend omits it from hardcoded values.
-      // But if a handleId exists for that key, it causes inconsistency.
-      // This ensures hardcoded values stay in sync with handle IDs.
-      customNodes.forEach((node) => {
-        useNodeStore.getState().syncHardcodedValuesWithHandleIds(node.id);
-      });
     }
   }, [customNodes, addNodes]);
 
@@ -140,6 +150,14 @@ export const useFlow = () => {
     }
   }, [graph?.links, addLinks]);
 
+  useEffect(() => {
+    if (customNodes.length > 0 && graph?.links) {
+      customNodes.forEach((node) => {
+        useNodeStore.getState().syncHardcodedValuesWithHandleIds(node.id);
+      });
+    }
+  }, [customNodes, graph?.links]);
+
   // update node execution status in nodes
   useEffect(() => {
     if (
@@ -203,6 +221,7 @@ export const useFlow = () => {
   useEffect(() => {
     return () => {
       useNodeStore.getState().setNodes([]);
+      useNodeStore.getState().clearResolutionState();
       useEdgeStore.getState().setEdges([]);
       useGraphStore.getState().reset();
       useEdgeStore.getState().resetEdgeBeads();
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/edges/CustomEdge.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/edges/CustomEdge.tsx
index ff80fdc8ac..3b6425a7c6 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/edges/CustomEdge.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/edges/CustomEdge.tsx
@@ -8,6 +8,7 @@ import {
   getBezierPath,
 } from "@xyflow/react";
 import { useEdgeStore } from "@/app/(platform)/build/stores/edgeStore";
+import { useNodeStore } from "@/app/(platform)/build/stores/nodeStore";
 import { XIcon } from "@phosphor-icons/react";
 import { cn } from "@/lib/utils";
 import { NodeExecutionResult } from "@/lib/autogpt-server-api";
@@ -18,6 +19,8 @@ export type CustomEdgeData = {
   beadUp?: number;
   beadDown?: number;
   beadData?: Map<string, NodeExecutionResult["status"]>;
+  edgeColorClass?: string;
+  edgeHexColor?: string;
 };
 
 export type CustomEdge = XYEdge<CustomEdgeData, "custom">;
@@ -35,6 +38,7 @@ const CustomEdge = ({
   selected,
 }: EdgeProps<CustomEdge>) => {
   const removeConnection = useEdgeStore((state) => state.removeEdge);
+  const isBroken = useNodeStore((state) => state.isEdgeBroken(id));
   const [isHovered, setIsHovered] = useState(false);
 
   const [edgePath, labelX, labelY] = getBezierPath({
@@ -49,6 +53,13 @@ const CustomEdge = ({
   const isStatic = data?.isStatic ?? false;
   const beadUp = data?.beadUp ?? 0;
   const beadDown = data?.beadDown ?? 0;
+  const edgeColorClass = data?.edgeColorClass;
+
+  const handleRemoveEdge = () => {
+    removeConnection(id);
+    // Note: broken edge tracking is cleaned up automatically by useSubAgentUpdateState
+    // when it detects the edge no longer exists
+  };
 
   return (
     <>
@@ -57,9 +68,13 @@ const CustomEdge = ({
         markerEnd={markerEnd}
         className={cn(
           isStatic && "!stroke-[1.5px] [stroke-dasharray:6]",
-          selected
-            ? "stroke-zinc-800"
-            : "stroke-zinc-500/50 hover:stroke-zinc-500",
+          isBroken
+            ? "!stroke-red-500 !stroke-[2px] [stroke-dasharray:4]"
+            : selected
+              ? "stroke-zinc-800"
+              : edgeColorClass
+                ? cn(edgeColorClass, "opacity-70 hover:opacity-100")
+                : "stroke-zinc-500/50 hover:stroke-zinc-500",
         )}
       />
       <JSBeads
@@ -70,12 +85,16 @@ const CustomEdge = ({
       />
       <EdgeLabelRenderer>
         <Button
-          onClick={() => removeConnection(id)}
+          onClick={handleRemoveEdge}
           className={cn(
             "absolute h-fit min-w-0 p-1 transition-opacity",
-            isHovered ? "opacity-100" : "opacity-0",
+            isBroken
+              ? "bg-red-500 opacity-100 hover:bg-red-600"
+              : isHovered
+                ? "opacity-100"
+                : "opacity-0",
           )}
-          variant="secondary"
+          variant={isBroken ? "primary" : "secondary"}
           style={{
             transform: `translate(-50%, -50%) translate(${labelX}px, ${labelY}px)`,
             pointerEvents: "all",
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/edges/useCustomEdge.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/edges/useCustomEdge.ts
index bf4ba3a418..6342008948 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/edges/useCustomEdge.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/edges/useCustomEdge.ts
@@ -6,7 +6,9 @@ import {
 import { useEdgeStore } from "@/app/(platform)/build/stores/edgeStore";
 import { useCallback } from "react";
 import { useNodeStore } from "../../../stores/nodeStore";
+import { useHistoryStore } from "../../../stores/historyStore";
 import { CustomEdge } from "./CustomEdge";
+import { getEdgeColorFromOutputType } from "../nodes/helpers";
 
 export const useCustomEdge = () => {
   const edges = useEdgeStore((s) => s.edges);
@@ -33,8 +35,13 @@ export const useCustomEdge = () => {
       if (exists) return;
 
       const nodes = useNodeStore.getState().nodes;
-      const isStatic = nodes.find((n) => n.id === conn.source)?.data
-        ?.staticOutput;
+      const sourceNode = nodes.find((n) => n.id === conn.source);
+      const isStatic = sourceNode?.data?.staticOutput;
+
+      const { colorClass, hexColor } = getEdgeColorFromOutputType(
+        sourceNode?.data?.outputSchema,
+        conn.sourceHandle,
+      );
 
       addEdge({
         source: conn.source,
@@ -43,6 +50,8 @@ export const useCustomEdge = () => {
         targetHandle: conn.targetHandle,
         data: {
           isStatic,
+          edgeColorClass: colorClass,
+          edgeHexColor: hexColor,
         },
       });
     },
@@ -51,7 +60,20 @@ export const useCustomEdge = () => {
 
   const onEdgesChange = useCallback(
     (changes: EdgeChange<CustomEdge>[]) => {
+      const hasRemoval = changes.some((change) => change.type === "remove");
+
+      const prevState = hasRemoval
+        ? {
+            nodes: useNodeStore.getState().nodes,
+            edges: edges,
+          }
+        : null;
+
       setEdges(applyEdgeChanges(changes, edges));
+
+      if (prevState) {
+        useHistoryStore.getState().pushState(prevState);
+      }
     },
     [edges, setEdges],
   );
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/handlers/NodeHandle.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/handlers/NodeHandle.tsx
index 99edb00c45..fdec177788 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/handlers/NodeHandle.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/handlers/NodeHandle.tsx
@@ -3,6 +3,7 @@ import { Handle, Position } from "@xyflow/react";
 import { useEdgeStore } from "../../../stores/edgeStore";
 import { cleanUpHandleId } from "@/components/renderers/InputRenderer/helpers";
 import { cn } from "@/lib/utils";
+import { useNodeStore } from "../../../stores/nodeStore";
 
 const InputNodeHandle = ({
   handleId,
@@ -15,6 +16,9 @@ const InputNodeHandle = ({
   const isInputConnected = useEdgeStore((state) =>
     state.isInputConnected(nodeId ?? "", cleanedHandleId),
   );
+  const isInputBroken = useNodeStore((state) =>
+    state.isInputBroken(nodeId, cleanedHandleId),
+  );
 
   return (
     <Handle
@@ -22,12 +26,16 @@ const InputNodeHandle = ({
       position={Position.Left}
       id={cleanedHandleId}
       className={"-ml-6 mr-2"}
+      data-tutorial-id={`input-handler-${nodeId}-${cleanedHandleId}`}
     >
       <div className="pointer-events-none">
         <CircleIcon
           size={16}
           weight={isInputConnected ? "fill" : "duotone"}
-          className={"text-gray-400 opacity-100"}
+          className={cn(
+            "text-gray-400 opacity-100",
+            isInputBroken && "text-red-500",
+          )}
         />
       </div>
     </Handle>
@@ -38,27 +46,34 @@ const OutputNodeHandle = ({
   field_name,
   nodeId,
   hexColor,
+  isBroken,
 }: {
   field_name: string;
   nodeId: string;
   hexColor: string;
+  isBroken: boolean;
 }) => {
   const isOutputConnected = useEdgeStore((state) =>
     state.isOutputConnected(nodeId, field_name),
   );
+
   return (
     <Handle
       type={"source"}
       position={Position.Right}
       id={field_name}
       className={"-mr-2 ml-2"}
+      data-tutorial-id={`output-handler-${nodeId}-${field_name}`}
     >
       <div className="pointer-events-none">
         <CircleIcon
           size={16}
           weight={"duotone"}
           color={isOutputConnected ? hexColor : "gray"}
-          className={cn("text-gray-400 opacity-100")}
+          className={cn(
+            "text-gray-400 opacity-100",
+            isBroken && "text-red-500",
+          )}
         />
       </div>
     </Handle>
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/CustomNode.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/CustomNode.tsx
index 3523079b71..d4aa26480d 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/CustomNode.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/CustomNode.tsx
@@ -1,24 +1,27 @@
-import React from "react";
-import { Node as XYNode, NodeProps } from "@xyflow/react";
-import { RJSFSchema } from "@rjsf/utils";
-import { BlockUIType } from "../../../types";
-import { StickyNoteBlock } from "./components/StickyNoteBlock";
-import { BlockInfoCategoriesItem } from "@/app/api/__generated__/models/blockInfoCategoriesItem";
-import { BlockCost } from "@/app/api/__generated__/models/blockCost";
 import { AgentExecutionStatus } from "@/app/api/__generated__/models/agentExecutionStatus";
+import { BlockCost } from "@/app/api/__generated__/models/blockCost";
+import { BlockInfoCategoriesItem } from "@/app/api/__generated__/models/blockInfoCategoriesItem";
 import { NodeExecutionResult } from "@/app/api/__generated__/models/nodeExecutionResult";
-import { NodeContainer } from "./components/NodeContainer";
-import { NodeHeader } from "./components/NodeHeader";
-import { FormCreator } from "../FormCreator";
-import { preprocessInputSchema } from "@/components/renderers/InputRenderer/utils/input-schema-pre-processor";
-import { OutputHandler } from "../OutputHandler";
-import { NodeAdvancedToggle } from "./components/NodeAdvancedToggle";
-import { NodeDataRenderer } from "./components/NodeOutput/NodeOutput";
-import { NodeExecutionBadge } from "./components/NodeExecutionBadge";
-import { cn } from "@/lib/utils";
-import { WebhookDisclaimer } from "./components/WebhookDisclaimer";
-import { AyrshareConnectButton } from "./components/AyrshareConnectButton";
 import { NodeModelMetadata } from "@/app/api/__generated__/models/nodeModelMetadata";
+import { preprocessInputSchema } from "@/components/renderers/InputRenderer/utils/input-schema-pre-processor";
+import { cn } from "@/lib/utils";
+import { RJSFSchema } from "@rjsf/utils";
+import { NodeProps, Node as XYNode } from "@xyflow/react";
+import React from "react";
+import { BlockUIType } from "../../../types";
+import { FormCreator } from "../FormCreator";
+import { OutputHandler } from "../OutputHandler";
+import { AyrshareConnectButton } from "./components/AyrshareConnectButton";
+import { NodeAdvancedToggle } from "./components/NodeAdvancedToggle";
+import { NodeContainer } from "./components/NodeContainer";
+import { NodeExecutionBadge } from "./components/NodeExecutionBadge";
+import { NodeHeader } from "./components/NodeHeader";
+import { NodeDataRenderer } from "./components/NodeOutput/NodeOutput";
+import { NodeRightClickMenu } from "./components/NodeRightClickMenu";
+import { StickyNoteBlock } from "./components/StickyNoteBlock";
+import { WebhookDisclaimer } from "./components/WebhookDisclaimer";
+import { SubAgentUpdateFeature } from "./components/SubAgentUpdate/SubAgentUpdateFeature";
+import { useCustomNode } from "./useCustomNode";
 
 export type CustomNodeData = {
   hardcodedValues: {
@@ -31,7 +34,7 @@ export type CustomNodeData = {
   uiType: BlockUIType;
   block_id: string;
   status?: AgentExecutionStatus;
-  nodeExecutionResult?: NodeExecutionResult;
+  nodeExecutionResults?: NodeExecutionResult[];
   staticOutput?: boolean;
   // TODO : We need better type safety for the following backend fields.
   costs: BlockCost[];
@@ -44,6 +47,10 @@ export type CustomNode = XYNode<CustomNodeData, "custom">;
 
 export const CustomNode: React.FC<NodeProps<CustomNode>> = React.memo(
   ({ data, id: nodeId, selected }) => {
+    const { inputSchema, outputSchema } = useCustomNode({ data, nodeId });
+
+    const isAgent = data.uiType === BlockUIType.AGENT;
+
     if (data.uiType === BlockUIType.NOTE) {
       return (
         <StickyNoteBlock data={data} selected={selected} nodeId={nodeId} />
@@ -62,23 +69,17 @@ export const CustomNode: React.FC<NodeProps<CustomNode>> = React.memo(
 
     const isAyrshare = data.uiType === BlockUIType.AYRSHARE;
 
-    const inputSchema =
-      data.uiType === BlockUIType.AGENT
-        ? (data.hardcodedValues.input_schema ?? {})
-        : data.inputSchema;
-
-    const outputSchema =
-      data.uiType === BlockUIType.AGENT
-        ? (data.hardcodedValues.output_schema ?? {})
-        : data.outputSchema;
-
     const hasConfigErrors =
       data.errors &&
       Object.values(data.errors).some(
         (value) => value !== null && value !== undefined && value !== "",
       );
 
-    const outputData = data.nodeExecutionResult?.output_data;
+    const latestResult =
+      data.nodeExecutionResults && data.nodeExecutionResults.length > 0
+        ? data.nodeExecutionResults[data.nodeExecutionResults.length - 1]
+        : undefined;
+    const outputData = latestResult?.output_data;
     const hasOutputError =
       typeof outputData === "object" &&
       outputData !== null &&
@@ -86,12 +87,11 @@ export const CustomNode: React.FC<NodeProps<CustomNode>> = React.memo(
 
     const hasErrors = hasConfigErrors || hasOutputError;
 
-    // Currently all blockTypes design are similar - that's why i am using the same component for all of them
-    // If in future - if we need some drastic change in some blockTypes design - we can create separate components for them
-    return (
+    const node = (
       <NodeContainer selected={selected} nodeId={nodeId} hasErrors={hasErrors}>
         <div className="rounded-xlarge bg-white">
           <NodeHeader data={data} nodeId={nodeId} />
+          {isAgent && <SubAgentUpdateFeature nodeID={nodeId} nodeData={data} />}
           {isWebhook && <WebhookDisclaimer nodeId={nodeId} />}
           {isAyrshare && <AyrshareConnectButton />}
           <FormCreator
@@ -117,6 +117,15 @@ export const CustomNode: React.FC<NodeProps<CustomNode>> = React.memo(
         <NodeExecutionBadge nodeId={nodeId} />
       </NodeContainer>
     );
+
+    return (
+      <NodeRightClickMenu
+        nodeId={nodeId}
+        subGraphID={data.hardcodedValues?.graph_id}
+      >
+        {node}
+      </NodeRightClickMenu>
+    );
   },
 );
 
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeContainer.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeContainer.tsx
index da9c13335f..00004c3a8a 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeContainer.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeContainer.tsx
@@ -27,6 +27,7 @@ export const NodeContainer = ({
         status && nodeStyleBasedOnStatus[status],
         hasErrors ? nodeStyleBasedOnStatus[AgentExecutionStatus.FAILED] : "",
       )}
+      data-id={`custom-node-${nodeId}`}
     >
       {children}
     </div>
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeContextMenu.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeContextMenu.tsx
index 6e482122f6..1a0e23fead 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeContextMenu.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeContextMenu.tsx
@@ -1,26 +1,31 @@
-import { Separator } from "@/components/__legacy__/ui/separator";
+import { useCopyPasteStore } from "@/app/(platform)/build/stores/copyPasteStore";
+import { useNodeStore } from "@/app/(platform)/build/stores/nodeStore";
 import {
   DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
   DropdownMenuTrigger,
 } from "@/components/molecules/DropdownMenu/DropdownMenu";
-import { DotsThreeOutlineVerticalIcon } from "@phosphor-icons/react";
-import { Copy, Trash2, ExternalLink } from "lucide-react";
-import { useNodeStore } from "@/app/(platform)/build/stores/nodeStore";
-import { useCopyPasteStore } from "@/app/(platform)/build/stores/copyPasteStore";
+import {
+  SecondaryDropdownMenuContent,
+  SecondaryDropdownMenuItem,
+  SecondaryDropdownMenuSeparator,
+} from "@/components/molecules/SecondaryMenu/SecondaryMenu";
+import {
+  ArrowSquareOutIcon,
+  CopyIcon,
+  DotsThreeOutlineVerticalIcon,
+  TrashIcon,
+} from "@phosphor-icons/react";
 import { useReactFlow } from "@xyflow/react";
 
-export const NodeContextMenu = ({
-  nodeId,
-  subGraphID,
-}: {
+type Props = {
   nodeId: string;
   subGraphID?: string;
-}) => {
+};
+
+export const NodeContextMenu = ({ nodeId, subGraphID }: Props) => {
   const { deleteElements } = useReactFlow();
 
-  const handleCopy = () => {
+  function handleCopy() {
     useNodeStore.setState((state) => ({
       nodes: state.nodes.map((node) => ({
         ...node,
@@ -30,47 +35,47 @@ export const NodeContextMenu = ({
 
     useCopyPasteStore.getState().copySelectedNodes();
     useCopyPasteStore.getState().pasteNodes();
-  };
+  }
 
-  const handleDelete = () => {
+  function handleDelete() {
     deleteElements({ nodes: [{ id: nodeId }] });
-  };
+  }
 
   return (
     <DropdownMenu>
       <DropdownMenuTrigger className="py-2">
         <DotsThreeOutlineVerticalIcon size={16} weight="fill" />
       </DropdownMenuTrigger>
-      <DropdownMenuContent
-        side="right"
-        align="start"
-        className="rounded-xlarge"
-      >
-        <DropdownMenuItem onClick={handleCopy} className="hover:rounded-xlarge">
-          <Copy className="mr-2 h-4 w-4" />
-          Copy Node
-        </DropdownMenuItem>
+      <SecondaryDropdownMenuContent side="right" align="start">
+        <SecondaryDropdownMenuItem onClick={handleCopy}>
+          <CopyIcon size={20} className="mr-2 dark:text-gray-100" />
+          <span className="dark:text-gray-100">Copy</span>
+        </SecondaryDropdownMenuItem>
+        <SecondaryDropdownMenuSeparator />
 
         {subGraphID && (
-          <DropdownMenuItem
-            onClick={() => window.open(`/build?flowID=${subGraphID}`)}
-            className="hover:rounded-xlarge"
-          >
-            <ExternalLink className="mr-2 h-4 w-4" />
-            Open Agent
-          </DropdownMenuItem>
+          <>
+            <SecondaryDropdownMenuItem
+              onClick={() => window.open(`/build?flowID=${subGraphID}`)}
+            >
+              <ArrowSquareOutIcon
+                size={20}
+                className="mr-2 dark:text-gray-100"
+              />
+              <span className="dark:text-gray-100">Open agent</span>
+            </SecondaryDropdownMenuItem>
+            <SecondaryDropdownMenuSeparator />
+          </>
         )}
 
-        <Separator className="my-2" />
-
-        <DropdownMenuItem
-          onClick={handleDelete}
-          className="text-red-600 hover:rounded-xlarge"
-        >
-          <Trash2 className="mr-2 h-4 w-4" />
-          Delete
-        </DropdownMenuItem>
-      </DropdownMenuContent>
+        <SecondaryDropdownMenuItem variant="destructive" onClick={handleDelete}>
+          <TrashIcon
+            size={20}
+            className="mr-2 text-red-500 dark:text-red-400"
+          />
+          <span className="dark:text-red-400">Delete</span>
+        </SecondaryDropdownMenuItem>
+      </SecondaryDropdownMenuContent>
     </DropdownMenu>
   );
 };
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeHeader.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeHeader.tsx
index 4dadccef2b..c4659b8dcf 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeHeader.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeHeader.tsx
@@ -1,31 +1,32 @@
-import { Text } from "@/components/atoms/Text/Text";
-import { beautifyString, cn } from "@/lib/utils";
-import { NodeCost } from "./NodeCost";
-import { NodeBadges } from "./NodeBadges";
-import { NodeContextMenu } from "./NodeContextMenu";
-import { CustomNodeData } from "../CustomNode";
 import { useNodeStore } from "@/app/(platform)/build/stores/nodeStore";
-import { useState } from "react";
+import { Text } from "@/components/atoms/Text/Text";
 import {
   Tooltip,
   TooltipContent,
   TooltipProvider,
   TooltipTrigger,
 } from "@/components/atoms/Tooltip/BaseTooltip";
+import { beautifyString, cn } from "@/lib/utils";
+import { useState } from "react";
+import { CustomNodeData } from "../CustomNode";
+import { NodeBadges } from "./NodeBadges";
+import { NodeContextMenu } from "./NodeContextMenu";
+import { NodeCost } from "./NodeCost";
 
-export const NodeHeader = ({
-  data,
-  nodeId,
-}: {
+type Props = {
   data: CustomNodeData;
   nodeId: string;
-}) => {
+};
+
+export const NodeHeader = ({ data, nodeId }: Props) => {
   const updateNodeData = useNodeStore((state) => state.updateNodeData);
-  const title = (data.metadata?.customized_name as string) || data.title;
+  const title =
+    (data.metadata?.customized_name as string) ||
+    data.hardcodedValues?.agent_name ||
+    data.title;
+
   const [isEditingTitle, setIsEditingTitle] = useState(false);
-  const [editedTitle, setEditedTitle] = useState(
-    beautifyString(title).replace("Block", "").trim(),
-  );
+  const [editedTitle, setEditedTitle] = useState(title);
 
   const handleTitleEdit = () => {
     updateNodeData(nodeId, {
@@ -69,7 +70,10 @@ export const NodeHeader = ({
                 <Tooltip>
                   <TooltipTrigger asChild>
                     <div>
-                      <Text variant="large-semibold" className="line-clamp-1">
+                      <Text
+                        variant="large-semibold"
+                        className="line-clamp-1 hover:cursor-text"
+                      >
                         {beautifyString(title).replace("Block", "").trim()}
                       </Text>
                     </div>
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/NodeOutput.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/NodeOutput.tsx
index 3f0ae6e350..c5df24e0e6 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/NodeOutput.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/NodeOutput.tsx
@@ -1,7 +1,13 @@
 import { Button } from "@/components/atoms/Button/Button";
 import { Text } from "@/components/atoms/Text/Text";
+import {
+  Accordion,
+  AccordionContent,
+  AccordionItem,
+  AccordionTrigger,
+} from "@/components/molecules/Accordion/Accordion";
 import { beautifyString, cn } from "@/lib/utils";
-import { CaretDownIcon, CopyIcon, CheckIcon } from "@phosphor-icons/react";
+import { CopyIcon, CheckIcon } from "@phosphor-icons/react";
 import { NodeDataViewer } from "./components/NodeDataViewer/NodeDataViewer";
 import { ContentRenderer } from "./components/ContentRenderer";
 import { useNodeOutput } from "./useNodeOutput";
@@ -9,135 +15,134 @@ import { ViewMoreData } from "./components/ViewMoreData";
 
 export const NodeDataRenderer = ({ nodeId }: { nodeId: string }) => {
   const {
-    outputData,
-    isExpanded,
-    setIsExpanded,
+    latestOutputData,
     copiedKey,
     handleCopy,
     executionResultId,
-    inputData,
+    latestInputData,
   } = useNodeOutput(nodeId);
 
-  if (Object.keys(outputData).length === 0) {
+  if (Object.keys(latestOutputData).length === 0) {
     return null;
   }
 
   return (
-    <div className="flex flex-col gap-3 rounded-b-xl border-t border-zinc-200 px-4 py-4">
-      <div className="flex items-center justify-between">
-        <Text variant="body-medium" className="!font-semibold text-slate-700">
-          Node Output
-        </Text>
-        <Button
-          variant="ghost"
-          size="small"
-          onClick={() => setIsExpanded(!isExpanded)}
-          className="h-fit min-w-0 p-1 text-slate-600 hover:text-slate-900"
-        >
-          <CaretDownIcon
-            size={16}
-            weight="bold"
-            className={`transition-transform ${isExpanded ? "rotate-180" : ""}`}
-          />
-        </Button>
-      </div>
+    <div
+      data-tutorial-id={`node-output`}
+      className="rounded-b-xl border-t border-zinc-200 px-4 py-2"
+    >
+      <Accordion type="single" collapsible defaultValue="node-output">
+        <AccordionItem value="node-output" className="border-none">
+          <AccordionTrigger className="py-2 hover:no-underline">
+            <Text
+              variant="body-medium"
+              className="!font-semibold text-slate-700"
+            >
+              Node Output
+            </Text>
+          </AccordionTrigger>
+          <AccordionContent className="pt-2">
+            <div className="flex max-w-[350px] flex-col gap-4">
+              <div className="space-y-2">
+                <Text variant="small-medium">Input</Text>
 
-      {isExpanded && (
-        <>
-          <div className="flex max-w-[350px] flex-col gap-4">
-            <div className="space-y-2">
-              <Text variant="small-medium">Input</Text>
+                <ContentRenderer value={latestInputData} shortContent={false} />
 
-              <ContentRenderer value={inputData} shortContent={false} />
-
-              <div className="mt-1 flex justify-end gap-1">
-                <NodeDataViewer
-                  data={inputData}
-                  pinName="Input"
-                  execId={executionResultId}
-                />
-                <Button
-                  variant="secondary"
-                  size="small"
-                  onClick={() => handleCopy("input", inputData)}
-                  className={cn(
-                    "h-fit min-w-0 gap-1.5 border border-zinc-200 p-2 text-black hover:text-slate-900",
-                    copiedKey === "input" &&
-                      "border-green-400 bg-green-100 hover:border-green-400 hover:bg-green-200",
-                  )}
-                >
-                  {copiedKey === "input" ? (
-                    <CheckIcon size={12} className="text-green-600" />
-                  ) : (
-                    <CopyIcon size={12} />
-                  )}
-                </Button>
+                <div className="mt-1 flex justify-end gap-1">
+                  <NodeDataViewer
+                    pinName="Input"
+                    nodeId={nodeId}
+                    execId={executionResultId}
+                    dataType="input"
+                  />
+                  <Button
+                    variant="secondary"
+                    size="small"
+                    onClick={() => handleCopy("input", latestInputData)}
+                    className={cn(
+                      "h-fit min-w-0 gap-1.5 border border-zinc-200 p-2 text-black hover:text-slate-900",
+                      copiedKey === "input" &&
+                        "border-green-400 bg-green-100 hover:border-green-400 hover:bg-green-200",
+                    )}
+                  >
+                    {copiedKey === "input" ? (
+                      <CheckIcon size={12} className="text-green-600" />
+                    ) : (
+                      <CopyIcon size={12} />
+                    )}
+                  </Button>
+                </div>
               </div>
-            </div>
 
-            {Object.entries(outputData)
-              .slice(0, 2)
-              .map(([key, value]) => (
-                <div key={key} className="flex flex-col gap-2">
-                  <div className="flex items-center gap-2">
-                    <Text
-                      variant="small-medium"
-                      className="!font-semibold text-slate-600"
-                    >
-                      Pin:
-                    </Text>
-                    <Text variant="small" className="text-slate-700">
-                      {beautifyString(key)}
-                    </Text>
-                  </div>
-                  <div className="w-full space-y-2">
-                    <Text
-                      variant="small"
-                      className="!font-semibold text-slate-600"
-                    >
-                      Data:
-                    </Text>
-                    <div className="relative space-y-2">
-                      {value.map((item, index) => (
-                        <div key={index}>
-                          <ContentRenderer value={item} shortContent={true} />
-                        </div>
-                      ))}
-
-                      <div className="mt-1 flex justify-end gap-1">
-                        <NodeDataViewer
-                          data={value}
-                          pinName={key}
-                          execId={executionResultId}
-                        />
-                        <Button
-                          variant="secondary"
-                          size="small"
-                          onClick={() => handleCopy(key, value)}
-                          className={cn(
-                            "h-fit min-w-0 gap-1.5 border border-zinc-200 p-2 text-black hover:text-slate-900",
-                            copiedKey === key &&
-                              "border-green-400 bg-green-100 hover:border-green-400 hover:bg-green-200",
-                          )}
+              {Object.entries(latestOutputData)
+                .slice(0, 2)
+                .map(([key, value]) => {
+                  return (
+                    <div key={key} className="flex flex-col gap-2">
+                      <div className="flex items-center gap-2">
+                        <Text
+                          variant="small-medium"
+                          className="!font-semibold text-slate-600"
                         >
-                          {copiedKey === key ? (
-                            <CheckIcon size={12} className="text-green-600" />
-                          ) : (
-                            <CopyIcon size={12} />
-                          )}
-                        </Button>
+                          Pin:
+                        </Text>
+                        <Text variant="small" className="text-slate-700">
+                          {beautifyString(key)}
+                        </Text>
+                      </div>
+                      <div className="w-full space-y-2">
+                        <Text
+                          variant="small"
+                          className="!font-semibold text-slate-600"
+                        >
+                          Data:
+                        </Text>
+                        <div className="relative space-y-2">
+                          {value.map((item, index) => (
+                            <div key={index}>
+                              <ContentRenderer
+                                value={item}
+                                shortContent={true}
+                              />
+                            </div>
+                          ))}
+
+                          <div className="mt-1 flex justify-end gap-1">
+                            <NodeDataViewer
+                              pinName={key}
+                              nodeId={nodeId}
+                              execId={executionResultId}
+                            />
+                            <Button
+                              variant="secondary"
+                              size="small"
+                              onClick={() => handleCopy(key, value)}
+                              className={cn(
+                                "h-fit min-w-0 gap-1.5 border border-zinc-200 p-2 text-black hover:text-slate-900",
+                                copiedKey === key &&
+                                  "border-green-400 bg-green-100 hover:border-green-400 hover:bg-green-200",
+                              )}
+                            >
+                              {copiedKey === key ? (
+                                <CheckIcon
+                                  size={12}
+                                  className="text-green-600"
+                                />
+                              ) : (
+                                <CopyIcon size={12} />
+                              )}
+                            </Button>
+                          </div>
+                        </div>
                       </div>
                     </div>
-                  </div>
-                </div>
-              ))}
-          </div>
-
-          {Object.keys(outputData).length > 2 && (
-            <ViewMoreData outputData={outputData} execId={executionResultId} />
-          )}
-        </>
-      )}
+                  );
+                })}
+            </div>
+            <ViewMoreData nodeId={nodeId} />
+          </AccordionContent>
+        </AccordionItem>
+      </Accordion>
     </div>
   );
 };
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/components/ContentRenderer.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/components/ContentRenderer.tsx
index 9cb1a62e3d..6571bc7b6f 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/components/ContentRenderer.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/components/ContentRenderer.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import type { OutputMetadata } from "@/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/OutputRenderers";
-import { globalRegistry } from "@/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/OutputRenderers";
+import type { OutputMetadata } from "@/components/contextual/OutputRenderers";
+import { globalRegistry } from "@/components/contextual/OutputRenderers";
 
 export const TextRenderer: React.FC<{
   value: any;
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/components/NodeDataViewer/NodeDataViewer.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/components/NodeDataViewer/NodeDataViewer.tsx
index c505282e7b..680b6bc44a 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/components/NodeDataViewer/NodeDataViewer.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/components/NodeDataViewer/NodeDataViewer.tsx
@@ -1,7 +1,3 @@
-import {
-  OutputActions,
-  OutputItem,
-} from "@/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/OutputRenderers";
 import { ScrollArea } from "@/components/__legacy__/ui/scroll-area";
 import { Button } from "@/components/atoms/Button/Button";
 import { Text } from "@/components/atoms/Text/Text";
@@ -11,6 +7,10 @@ import {
   TooltipProvider,
   TooltipTrigger,
 } from "@/components/atoms/Tooltip/BaseTooltip";
+import {
+  OutputActions,
+  OutputItem,
+} from "@/components/contextual/OutputRenderers";
 import { Dialog } from "@/components/molecules/Dialog/Dialog";
 import { beautifyString } from "@/lib/utils";
 import {
@@ -19,22 +19,51 @@ import {
   CopyIcon,
   DownloadIcon,
 } from "@phosphor-icons/react";
-import { FC } from "react";
+import React, { FC } from "react";
 import { useNodeDataViewer } from "./useNodeDataViewer";
+import { useNodeStore } from "@/app/(platform)/build/stores/nodeStore";
+import { useShallow } from "zustand/react/shallow";
+import { NodeDataType } from "../../helpers";
 
-interface NodeDataViewerProps {
-  data: any;
+export interface NodeDataViewerProps {
+  data?: any;
   pinName: string;
+  nodeId?: string;
   execId?: string;
   isViewMoreData?: boolean;
+  dataType?: NodeDataType;
 }
 
 export const NodeDataViewer: FC<NodeDataViewerProps> = ({
   data,
   pinName,
+  nodeId,
   execId = "N/A",
   isViewMoreData = false,
+  dataType = "output",
 }) => {
+  const executionResults = useNodeStore(
+    useShallow((state) =>
+      nodeId ? state.getNodeExecutionResults(nodeId) : [],
+    ),
+  );
+  const latestInputData = useNodeStore(
+    useShallow((state) =>
+      nodeId ? state.getLatestNodeInputData(nodeId) : undefined,
+    ),
+  );
+  const accumulatedOutputData = useNodeStore(
+    useShallow((state) =>
+      nodeId ? state.getAccumulatedNodeOutputData(nodeId) : {},
+    ),
+  );
+
+  const resolvedData =
+    data ??
+    (dataType === "input"
+      ? (latestInputData ?? {})
+      : (accumulatedOutputData[pinName] ?? []));
+
   const {
     outputItems,
     copyExecutionId,
@@ -42,7 +71,20 @@ export const NodeDataViewer: FC<NodeDataViewerProps> = ({
     handleDownloadItem,
     dataArray,
     copiedIndex,
-  } = useNodeDataViewer(data, pinName, execId);
+    groupedExecutions,
+    totalGroupedItems,
+    handleCopyGroupedItem,
+    handleDownloadGroupedItem,
+    copiedKey,
+  } = useNodeDataViewer(
+    resolvedData,
+    pinName,
+    execId,
+    executionResults,
+    dataType,
+  );
+
+  const shouldGroupExecutions = groupedExecutions.length > 0;
   return (
     <Dialog styling={{ width: "600px" }}>
       <TooltipProvider>
@@ -68,44 +110,141 @@ export const NodeDataViewer: FC<NodeDataViewerProps> = ({
           <div className="flex items-center gap-4">
             <div className="flex items-center gap-2">
               <Text variant="large-medium" className="text-slate-900">
-                Full Output Preview
+                Full {dataType === "input" ? "Input" : "Output"} Preview
               </Text>
             </div>
             <div className="rounded-full border border-slate-300 bg-slate-100 px-3 py-1.5 text-xs font-medium text-black">
-              {dataArray.length} item{dataArray.length !== 1 ? "s" : ""} total
+              {shouldGroupExecutions ? totalGroupedItems : dataArray.length}{" "}
+              item
+              {shouldGroupExecutions
+                ? totalGroupedItems !== 1
+                  ? "s"
+                  : ""
+                : dataArray.length !== 1
+                  ? "s"
+                  : ""}{" "}
+              total
             </div>
           </div>
           <div className="text-sm text-gray-600">
-            <div className="flex items-center gap-2">
-              <Text variant="body" className="text-slate-600">
-                Execution ID:
-              </Text>
-              <Text
-                variant="body-medium"
-                className="rounded-full border border-gray-300 bg-gray-50 px-2 py-1 font-mono text-xs"
-              >
-                {execId}
-              </Text>
-              <Button
-                variant="ghost"
-                size="small"
-                onClick={copyExecutionId}
-                className="h-6 w-6 min-w-0 p-0"
-              >
-                <CopyIcon size={14} />
-              </Button>
-            </div>
-            <div className="mt-2">
-              Pin:{" "}
-              <span className="font-semibold">{beautifyString(pinName)}</span>
-            </div>
+            {shouldGroupExecutions ? (
+              <div>
+                Pin:{" "}
+                <span className="font-semibold">{beautifyString(pinName)}</span>
+              </div>
+            ) : (
+              <>
+                <div className="flex items-center gap-2">
+                  <Text variant="body" className="text-slate-600">
+                    Execution ID:
+                  </Text>
+                  <Text
+                    variant="body-medium"
+                    className="rounded-full border border-gray-300 bg-gray-50 px-2 py-1 font-mono text-xs"
+                  >
+                    {execId}
+                  </Text>
+                  <Button
+                    variant="ghost"
+                    size="small"
+                    onClick={copyExecutionId}
+                    className="h-6 w-6 min-w-0 p-0"
+                  >
+                    <CopyIcon size={14} />
+                  </Button>
+                </div>
+                <div className="mt-2">
+                  Pin:{" "}
+                  <span className="font-semibold">
+                    {beautifyString(pinName)}
+                  </span>
+                </div>
+              </>
+            )}
           </div>
         </div>
 
         <div className="flex-1 overflow-hidden">
           <ScrollArea className="h-full">
             <div className="my-4">
-              {dataArray.length > 0 ? (
+              {shouldGroupExecutions ? (
+                <div className="space-y-4">
+                  {groupedExecutions.map((execution) => (
+                    <div
+                      key={execution.execId}
+                      className="rounded-3xl border border-slate-200 bg-white p-4 shadow-sm"
+                    >
+                      <div className="flex items-center gap-2">
+                        <Text variant="body" className="text-slate-600">
+                          Execution ID:
+                        </Text>
+                        <Text
+                          variant="body-medium"
+                          className="rounded-full border border-gray-300 bg-gray-50 px-2 py-1 font-mono text-xs"
+                        >
+                          {execution.execId}
+                        </Text>
+                      </div>
+                      <div className="mt-2 space-y-4">
+                        {execution.outputItems.length > 0 ? (
+                          execution.outputItems.map((item, index) => (
+                            <div
+                              key={item.key}
+                              className="group flex items-start gap-4"
+                            >
+                              <div className="w-full flex-1">
+                                <OutputItem
+                                  value={item.value}
+                                  metadata={item.metadata}
+                                  renderer={item.renderer}
+                                />
+                              </div>
+
+                              <div className="flex w-fit gap-3">
+                                <Button
+                                  variant="secondary"
+                                  className="min-w-0 p-1"
+                                  size="icon"
+                                  onClick={() =>
+                                    handleCopyGroupedItem(
+                                      execution.execId,
+                                      index,
+                                      item,
+                                    )
+                                  }
+                                  aria-label="Copy item"
+                                >
+                                  {copiedKey ===
+                                  `${execution.execId}-${index}` ? (
+                                    <CheckIcon className="size-4 text-green-600" />
+                                  ) : (
+                                    <CopyIcon className="size-4 text-black" />
+                                  )}
+                                </Button>
+                                <Button
+                                  variant="secondary"
+                                  size="icon"
+                                  className="min-w-0 p-1"
+                                  onClick={() =>
+                                    handleDownloadGroupedItem(item)
+                                  }
+                                  aria-label="Download item"
+                                >
+                                  <DownloadIcon className="size-4 text-black" />
+                                </Button>
+                              </div>
+                            </div>
+                          ))
+                        ) : (
+                          <div className="py-4 text-center text-gray-500">
+                            No data available
+                          </div>
+                        )}
+                      </div>
+                    </div>
+                  ))}
+                </div>
+              ) : dataArray.length > 0 ? (
                 <div className="space-y-4">
                   {outputItems.map((item, index) => (
                     <div key={item.key} className="group relative">
@@ -151,7 +290,7 @@ export const NodeDataViewer: FC<NodeDataViewerProps> = ({
         </div>
 
         <div className="flex justify-end pt-4">
-          {outputItems.length > 0 && (
+          {outputItems.length > 1 && (
             <OutputActions
               items={outputItems.map((item) => ({
                 value: item.value,
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/components/NodeDataViewer/useNodeDataViewer.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/components/NodeDataViewer/useNodeDataViewer.ts
index 1adec625a0..818d1266c1 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/components/NodeDataViewer/useNodeDataViewer.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/components/NodeDataViewer/useNodeDataViewer.ts
@@ -1,82 +1,70 @@
-import type { OutputMetadata } from "@/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/OutputRenderers";
-import { globalRegistry } from "@/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/OutputRenderers";
-import { downloadOutputs } from "@/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/OutputRenderers/utils/download";
+import { downloadOutputs } from "@/components/contextual/OutputRenderers/utils/download";
 import { useToast } from "@/components/molecules/Toast/use-toast";
 import { beautifyString } from "@/lib/utils";
-import React, { useMemo, useState } from "react";
+import { useState } from "react";
+import type { NodeExecutionResult } from "@/app/api/__generated__/models/nodeExecutionResult";
+import {
+  NodeDataType,
+  createOutputItems,
+  getExecutionData,
+  normalizeToArray,
+  type OutputItem,
+} from "../../helpers";
+
+export type GroupedExecution = {
+  execId: string;
+  outputItems: Array<OutputItem>;
+};
 
 export const useNodeDataViewer = (
   data: any,
   pinName: string,
   execId: string,
+  executionResults?: NodeExecutionResult[],
+  dataType?: NodeDataType,
 ) => {
   const { toast } = useToast();
   const [copiedIndex, setCopiedIndex] = useState<number | null>(null);
+  const [copiedKey, setCopiedKey] = useState<string | null>(null);
 
-  // Normalize data to array format
-  const dataArray = useMemo(() => {
-    return Array.isArray(data) ? data : [data];
-  }, [data]);
+  const dataArray = Array.isArray(data) ? data : [data];
 
-  // Prepare items for the enhanced renderer system
-  const outputItems = useMemo(() => {
-    if (!dataArray) return [];
-
-    const items: Array<{
-      key: string;
-      label: string;
-      value: unknown;
-      metadata?: OutputMetadata;
-      renderer: any;
-    }> = [];
-
-    dataArray.forEach((value, index) => {
-      const metadata: OutputMetadata = {};
-
-      // Extract metadata from the value if it's an object
-      if (
-        typeof value === "object" &&
-        value !== null &&
-        !React.isValidElement(value)
-      ) {
-        const objValue = value as any;
-        if (objValue.type) metadata.type = objValue.type;
-        if (objValue.mimeType) metadata.mimeType = objValue.mimeType;
-        if (objValue.filename) metadata.filename = objValue.filename;
-        if (objValue.language) metadata.language = objValue.language;
-      }
-
-      const renderer = globalRegistry.getRenderer(value, metadata);
-      if (renderer) {
-        items.push({
-          key: `item-${index}`,
+  const outputItems =
+    !dataArray || dataArray.length === 0
+      ? []
+      : createOutputItems(dataArray).map((item, index) => ({
+          ...item,
           label: index === 0 ? beautifyString(pinName) : "",
-          value,
-          metadata,
-          renderer,
-        });
-      } else {
-        // Fallback to text renderer
-        const textRenderer = globalRegistry
-          .getAllRenderers()
-          .find((r) => r.name === "TextRenderer");
-        if (textRenderer) {
-          items.push({
-            key: `item-${index}`,
-            label: index === 0 ? beautifyString(pinName) : "",
-            value:
-              typeof value === "string"
-                ? value
-                : JSON.stringify(value, null, 2),
-            metadata,
-            renderer: textRenderer,
-          });
-        }
-      }
-    });
+        }));
 
-    return items;
-  }, [dataArray, pinName]);
+  const groupedExecutions =
+    !executionResults || executionResults.length === 0
+      ? []
+      : [...executionResults].reverse().map((result) => {
+          const rawData = getExecutionData(
+            result,
+            dataType || "output",
+            pinName,
+          );
+          let dataArray: unknown[];
+          if (dataType === "input") {
+            dataArray =
+              rawData !== undefined && rawData !== null ? [rawData] : [];
+          } else {
+            dataArray = normalizeToArray(rawData);
+          }
+
+          const outputItems = createOutputItems(dataArray);
+          return {
+            execId: result.node_exec_id,
+            outputItems,
+          };
+        });
+
+  const totalGroupedItems = groupedExecutions.reduce(
+    (total, execution) => total + execution.outputItems.length,
+    0,
+  );
 
   const copyExecutionId = () => {
     navigator.clipboard.writeText(execId).then(() => {
@@ -122,6 +110,45 @@ export const useNodeDataViewer = (
     ]);
   };
 
+  const handleCopyGroupedItem = async (
+    execId: string,
+    index: number,
+    item: OutputItem,
+  ) => {
+    const copyContent = item.renderer.getCopyContent(item.value, item.metadata);
+
+    if (!copyContent) {
+      return;
+    }
+
+    try {
+      let text: string;
+      if (typeof copyContent.data === "string") {
+        text = copyContent.data;
+      } else if (copyContent.fallbackText) {
+        text = copyContent.fallbackText;
+      } else {
+        return;
+      }
+
+      await navigator.clipboard.writeText(text);
+      setCopiedKey(`${execId}-${index}`);
+      setTimeout(() => setCopiedKey(null), 2000);
+    } catch (error) {
+      console.error("Failed to copy:", error);
+    }
+  };
+
+  const handleDownloadGroupedItem = (item: OutputItem) => {
+    downloadOutputs([
+      {
+        value: item.value,
+        metadata: item.metadata,
+        renderer: item.renderer,
+      },
+    ]);
+  };
+
   return {
     outputItems,
     dataArray,
@@ -129,5 +156,10 @@ export const useNodeDataViewer = (
     handleCopyItem,
     handleDownloadItem,
     copiedIndex,
+    groupedExecutions,
+    totalGroupedItems,
+    handleCopyGroupedItem,
+    handleDownloadGroupedItem,
+    copiedKey,
   };
 };
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/components/ViewMoreData.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/components/ViewMoreData.tsx
index 7bf026fe43..74d0da06c2 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/components/ViewMoreData.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/components/ViewMoreData.tsx
@@ -8,16 +8,28 @@ import { useState } from "react";
 import { NodeDataViewer } from "./NodeDataViewer/NodeDataViewer";
 import { useToast } from "@/components/molecules/Toast/use-toast";
 import { CheckIcon, CopyIcon } from "@phosphor-icons/react";
+import { useNodeStore } from "@/app/(platform)/build/stores/nodeStore";
+import { useShallow } from "zustand/react/shallow";
+import {
+  NodeDataType,
+  getExecutionEntries,
+  normalizeToArray,
+} from "../helpers";
 
 export const ViewMoreData = ({
-  outputData,
-  execId,
+  nodeId,
+  dataType = "output",
 }: {
-  outputData: Record<string, Array<any>>;
-  execId?: string;
+  nodeId: string;
+  dataType?: NodeDataType;
 }) => {
   const [copiedKey, setCopiedKey] = useState<string | null>(null);
   const { toast } = useToast();
+  const executionResults = useNodeStore(
+    useShallow((state) => state.getNodeExecutionResults(nodeId)),
+  );
+
+  const reversedExecutionResults = [...executionResults].reverse();
 
   const handleCopy = (key: string, value: any) => {
     const textToCopy =
@@ -29,8 +41,8 @@ export const ViewMoreData = ({
     setTimeout(() => setCopiedKey(null), 2000);
   };
 
-  const copyExecutionId = () => {
-    navigator.clipboard.writeText(execId || "N/A").then(() => {
+  const copyExecutionId = (executionId: string) => {
+    navigator.clipboard.writeText(executionId || "N/A").then(() => {
       toast({
         title: "Execution ID copied to clipboard!",
         duration: 2000,
@@ -42,7 +54,7 @@ export const ViewMoreData = ({
     <Dialog styling={{ width: "600px", paddingRight: "16px" }}>
       <Dialog.Trigger>
         <Button
-          variant="primary"
+          variant="secondary"
           size="small"
           className="h-fit w-fit min-w-0 !text-xs"
         >
@@ -52,83 +64,114 @@ export const ViewMoreData = ({
       <Dialog.Content>
         <div className="flex flex-col gap-4">
           <Text variant="h4" className="text-slate-900">
-            Complete Output Data
+            Complete {dataType === "input" ? "Input" : "Output"} Data
           </Text>
 
-          <div className="flex items-center gap-2">
-            <Text variant="body" className="text-slate-600">
-              Execution ID:
-            </Text>
-            <Text
-              variant="body-medium"
-              className="rounded-full border border-gray-300 bg-gray-50 px-2 py-1 font-mono text-xs"
-            >
-              {execId}
-            </Text>
-            <Button
-              variant="ghost"
-              size="small"
-              onClick={copyExecutionId}
-              className="h-6 w-6 min-w-0 p-0"
-            >
-              <CopyIcon size={14} />
-            </Button>
-          </div>
-
           <ScrollArea className="h-full">
             <div className="flex flex-col gap-4">
-              {Object.entries(outputData).map(([key, value]) => (
-                <div key={key} className="flex flex-col gap-2">
+              {reversedExecutionResults.map((result) => (
+                <div
+                  key={result.node_exec_id}
+                  className="rounded-3xl border border-slate-200 bg-white p-4 shadow-sm"
+                >
                   <div className="flex items-center gap-2">
+                    <Text variant="body" className="text-slate-600">
+                      Execution ID:
+                    </Text>
                     <Text
                       variant="body-medium"
-                      className="!font-semibold text-slate-600"
+                      className="rounded-full border border-gray-300 bg-gray-50 px-2 py-1 font-mono text-xs"
                     >
-                      Pin:
-                    </Text>
-                    <Text variant="body-medium" className="text-slate-700">
-                      {beautifyString(key)}
+                      {result.node_exec_id}
                     </Text>
+                    <Button
+                      variant="ghost"
+                      size="small"
+                      onClick={() => copyExecutionId(result.node_exec_id)}
+                      className="h-6 w-6 min-w-0 p-0"
+                    >
+                      <CopyIcon size={14} />
+                    </Button>
                   </div>
-                  <div className="w-full space-y-2">
-                    <Text
-                      variant="body-medium"
-                      className="!font-semibold text-slate-600"
-                    >
-                      Data:
-                    </Text>
-                    <div className="relative space-y-2">
-                      {value.map((item, index) => (
-                        <div key={index}>
-                          <ContentRenderer value={item} shortContent={false} />
-                        </div>
-                      ))}
 
-                      <div className="mt-1 flex justify-end gap-1">
-                        <NodeDataViewer
-                          data={value}
-                          pinName={key}
-                          execId={execId}
-                          isViewMoreData={true}
-                        />
-                        <Button
-                          variant="secondary"
-                          size="small"
-                          onClick={() => handleCopy(key, value)}
-                          className={cn(
-                            "h-fit min-w-0 gap-1.5 border border-zinc-200 p-2 text-black hover:text-slate-900",
-                            copiedKey === key &&
-                              "border-green-400 bg-green-100 hover:border-green-400 hover:bg-green-200",
-                          )}
-                        >
-                          {copiedKey === key ? (
-                            <CheckIcon size={16} className="text-green-600" />
-                          ) : (
-                            <CopyIcon size={16} />
-                          )}
-                        </Button>
-                      </div>
-                    </div>
+                  <div className="mt-4 flex flex-col gap-4">
+                    {getExecutionEntries(result, dataType).map(
+                      ([key, value]) => {
+                        const normalizedValue = normalizeToArray(value);
+                        return (
+                          <div key={key} className="flex flex-col gap-2">
+                            <div className="flex items-center gap-2">
+                              <Text
+                                variant="body-medium"
+                                className="!font-semibold text-slate-600"
+                              >
+                                Pin:
+                              </Text>
+                              <Text
+                                variant="body-medium"
+                                className="text-slate-700"
+                              >
+                                {beautifyString(key)}
+                              </Text>
+                            </div>
+                            <div className="w-full space-y-2">
+                              <Text
+                                variant="body-medium"
+                                className="!font-semibold text-slate-600"
+                              >
+                                Data:
+                              </Text>
+                              <div className="relative space-y-2">
+                                {normalizedValue.map((item, index) => (
+                                  <div key={index}>
+                                    <ContentRenderer
+                                      value={item}
+                                      shortContent={false}
+                                    />
+                                  </div>
+                                ))}
+
+                                <div className="mt-1 flex justify-end gap-1">
+                                  <NodeDataViewer
+                                    data={normalizedValue}
+                                    pinName={key}
+                                    execId={result.node_exec_id}
+                                    isViewMoreData={true}
+                                    dataType={dataType}
+                                  />
+                                  <Button
+                                    variant="secondary"
+                                    size="small"
+                                    onClick={() =>
+                                      handleCopy(
+                                        `${result.node_exec_id}-${key}`,
+                                        normalizedValue,
+                                      )
+                                    }
+                                    className={cn(
+                                      "h-fit min-w-0 gap-1.5 border border-zinc-200 p-2 text-black hover:text-slate-900",
+                                      copiedKey ===
+                                        `${result.node_exec_id}-${key}` &&
+                                        "border-green-400 bg-green-100 hover:border-green-400 hover:bg-green-200",
+                                    )}
+                                  >
+                                    {copiedKey ===
+                                    `${result.node_exec_id}-${key}` ? (
+                                      <CheckIcon
+                                        size={16}
+                                        className="text-green-600"
+                                      />
+                                    ) : (
+                                      <CopyIcon size={16} />
+                                    )}
+                                  </Button>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        );
+                      },
+                    )}
                   </div>
                 </div>
               ))}
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/helpers.ts
new file mode 100644
index 0000000000..c75cd83cac
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/helpers.ts
@@ -0,0 +1,83 @@
+import type { NodeExecutionResult } from "@/app/api/__generated__/models/nodeExecutionResult";
+import type { OutputMetadata } from "@/components/contextual/OutputRenderers";
+import { globalRegistry } from "@/components/contextual/OutputRenderers";
+import React from "react";
+
+export type NodeDataType = "input" | "output";
+
+export type OutputItem = {
+  key: string;
+  value: unknown;
+  metadata?: OutputMetadata;
+  renderer: any;
+};
+
+export const normalizeToArray = (value: unknown) => {
+  if (value === undefined) return [];
+  return Array.isArray(value) ? value : [value];
+};
+
+export const getExecutionData = (
+  result: NodeExecutionResult,
+  dataType: NodeDataType,
+  pinName: string,
+) => {
+  if (dataType === "input") {
+    return result.input_data;
+  }
+
+  return result.output_data?.[pinName];
+};
+
+export const createOutputItems = (dataArray: unknown[]): Array<OutputItem> => {
+  const items: Array<OutputItem> = [];
+
+  dataArray.forEach((value, index) => {
+    const metadata: OutputMetadata = {};
+
+    if (
+      typeof value === "object" &&
+      value !== null &&
+      !React.isValidElement(value)
+    ) {
+      const objValue = value as any;
+      if (objValue.type) metadata.type = objValue.type;
+      if (objValue.mimeType) metadata.mimeType = objValue.mimeType;
+      if (objValue.filename) metadata.filename = objValue.filename;
+      if (objValue.language) metadata.language = objValue.language;
+    }
+
+    const renderer = globalRegistry.getRenderer(value, metadata);
+    if (renderer) {
+      items.push({
+        key: `item-${index}`,
+        value,
+        metadata,
+        renderer,
+      });
+    } else {
+      const textRenderer = globalRegistry
+        .getAllRenderers()
+        .find((r) => r.name === "TextRenderer");
+      if (textRenderer) {
+        items.push({
+          key: `item-${index}`,
+          value:
+            typeof value === "string" ? value : JSON.stringify(value, null, 2),
+          metadata,
+          renderer: textRenderer,
+        });
+      }
+    }
+  });
+
+  return items;
+};
+
+export const getExecutionEntries = (
+  result: NodeExecutionResult,
+  dataType: NodeDataType,
+) => {
+  const data = dataType === "input" ? result.input_data : result.output_data;
+  return Object.entries(data || {});
+};
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/useNodeOutput.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/useNodeOutput.tsx
index ba8559a66c..8ebf1dfaf3 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/useNodeOutput.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/useNodeOutput.tsx
@@ -4,19 +4,21 @@ import { useShallow } from "zustand/react/shallow";
 import { useState } from "react";
 
 export const useNodeOutput = (nodeId: string) => {
-  const [isExpanded, setIsExpanded] = useState(true);
   const [copiedKey, setCopiedKey] = useState<string | null>(null);
   const { toast } = useToast();
 
-  const nodeExecutionResult = useNodeStore(
-    useShallow((state) => state.getNodeExecutionResult(nodeId)),
+  const latestResult = useNodeStore(
+    useShallow((state) => state.getLatestNodeExecutionResult(nodeId)),
   );
 
-  const inputData = nodeExecutionResult?.input_data;
+  const latestInputData = useNodeStore(
+    useShallow((state) => state.getLatestNodeInputData(nodeId)),
+  );
+
+  const latestOutputData: Record<string, Array<any>> = useNodeStore(
+    useShallow((state) => state.getLatestNodeOutputData(nodeId) || {}),
+  );
 
-  const outputData: Record<string, Array<any>> = {
-    ...nodeExecutionResult?.output_data,
-  };
   const handleCopy = async (key: string, value: any) => {
     try {
       const text = JSON.stringify(value, null, 2);
@@ -36,14 +38,12 @@ export const useNodeOutput = (nodeId: string) => {
       });
     }
   };
+
   return {
-    outputData: outputData,
-    inputData: inputData,
-    isExpanded: isExpanded,
-    setIsExpanded: setIsExpanded,
-    copiedKey: copiedKey,
-    setCopiedKey: setCopiedKey,
-    handleCopy: handleCopy,
-    executionResultId: nodeExecutionResult?.node_exec_id,
+    latestOutputData,
+    latestInputData,
+    copiedKey,
+    handleCopy,
+    executionResultId: latestResult?.node_exec_id,
   };
 };
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeRightClickMenu.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeRightClickMenu.tsx
new file mode 100644
index 0000000000..a56e42544f
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeRightClickMenu.tsx
@@ -0,0 +1,104 @@
+import { useCopyPasteStore } from "@/app/(platform)/build/stores/copyPasteStore";
+import { useNodeStore } from "@/app/(platform)/build/stores/nodeStore";
+import {
+  SecondaryMenuContent,
+  SecondaryMenuItem,
+  SecondaryMenuSeparator,
+} from "@/components/molecules/SecondaryMenu/SecondaryMenu";
+import { ArrowSquareOutIcon, CopyIcon, TrashIcon } from "@phosphor-icons/react";
+import * as ContextMenu from "@radix-ui/react-context-menu";
+import { useReactFlow } from "@xyflow/react";
+import { useEffect, useRef } from "react";
+import { CustomNode } from "../CustomNode";
+
+type Props = {
+  nodeId: string;
+  subGraphID?: string;
+  children: React.ReactNode;
+};
+
+const DOUBLE_CLICK_TIMEOUT = 300;
+
+export function NodeRightClickMenu({ nodeId, subGraphID, children }: Props) {
+  const { deleteElements } = useReactFlow<CustomNode>();
+  const lastRightClickTime = useRef<number>(0);
+  const containerRef = useRef<HTMLDivElement>(null);
+
+  function copyNode() {
+    useNodeStore.setState((state) => ({
+      nodes: state.nodes.map((node) => ({
+        ...node,
+        selected: node.id === nodeId,
+      })),
+    }));
+
+    useCopyPasteStore.getState().copySelectedNodes();
+    useCopyPasteStore.getState().pasteNodes();
+  }
+
+  function deleteNode() {
+    deleteElements({ nodes: [{ id: nodeId }] });
+  }
+
+  useEffect(() => {
+    const container = containerRef.current;
+    if (!container) return;
+
+    function handleContextMenu(e: MouseEvent) {
+      const now = Date.now();
+      const timeSinceLastClick = now - lastRightClickTime.current;
+
+      if (timeSinceLastClick < DOUBLE_CLICK_TIMEOUT) {
+        e.stopImmediatePropagation();
+        lastRightClickTime.current = 0;
+        return;
+      }
+
+      lastRightClickTime.current = now;
+    }
+
+    container.addEventListener("contextmenu", handleContextMenu, true);
+
+    return () => {
+      container.removeEventListener("contextmenu", handleContextMenu, true);
+    };
+  }, []);
+
+  return (
+    <ContextMenu.Root>
+      <ContextMenu.Trigger asChild>
+        <div ref={containerRef}>{children}</div>
+      </ContextMenu.Trigger>
+      <SecondaryMenuContent>
+        <SecondaryMenuItem onSelect={copyNode}>
+          <CopyIcon size={20} className="mr-2 dark:text-gray-100" />
+          <span className="dark:text-gray-100">Copy</span>
+        </SecondaryMenuItem>
+        <SecondaryMenuSeparator />
+
+        {subGraphID && (
+          <>
+            <SecondaryMenuItem
+              onClick={() => window.open(`/build?flowID=${subGraphID}`)}
+            >
+              <ArrowSquareOutIcon
+                size={20}
+                className="mr-2 dark:text-gray-100"
+              />
+              <span className="dark:text-gray-100">Open agent</span>
+            </SecondaryMenuItem>
+            <SecondaryMenuSeparator />
+          </>
+        )}
+
+        <SecondaryMenuItem variant="destructive" onSelect={deleteNode}>
+          <TrashIcon
+            size={20}
+            className="mr-2 text-red-500 dark:text-red-400"
+          />
+          <span className="dark:text-red-400">Delete</span>
+        </SecondaryMenuItem>
+      </SecondaryMenuContent>
+    </ContextMenu.Root>
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/SubAgentUpdate/SubAgentUpdateFeature.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/SubAgentUpdate/SubAgentUpdateFeature.tsx
new file mode 100644
index 0000000000..388349b2e0
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/SubAgentUpdate/SubAgentUpdateFeature.tsx
@@ -0,0 +1,118 @@
+import React from "react";
+import { ArrowUpIcon, WarningIcon } from "@phosphor-icons/react";
+import { Button } from "@/components/atoms/Button/Button";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "@/components/atoms/Tooltip/BaseTooltip";
+import { cn, beautifyString } from "@/lib/utils";
+import { CustomNodeData } from "../../CustomNode";
+import { useSubAgentUpdateState } from "./useSubAgentUpdateState";
+import { IncompatibleUpdateDialog } from "./components/IncompatibleUpdateDialog";
+import { ResolutionModeBar } from "./components/ResolutionModeBar";
+
+/**
+ * Inline component for the update bar that can be placed after the header.
+ * Use this inside the node content where you want the bar to appear.
+ */
+type SubAgentUpdateFeatureProps = {
+  nodeID: string;
+  nodeData: CustomNodeData;
+};
+
+export function SubAgentUpdateFeature({
+  nodeID,
+  nodeData,
+}: SubAgentUpdateFeatureProps) {
+  const {
+    updateInfo,
+    isInResolutionMode,
+    handleUpdateClick,
+    showIncompatibilityDialog,
+    setShowIncompatibilityDialog,
+    handleConfirmIncompatibleUpdate,
+  } = useSubAgentUpdateState({ nodeID: nodeID, nodeData: nodeData });
+
+  const agentName = nodeData.title || "Agent";
+
+  if (!updateInfo.hasUpdate && !isInResolutionMode) {
+    return null;
+  }
+
+  return (
+    <>
+      {isInResolutionMode ? (
+        <ResolutionModeBar incompatibilities={updateInfo.incompatibilities} />
+      ) : (
+        <SubAgentUpdateAvailableBar
+          currentVersion={updateInfo.currentVersion}
+          latestVersion={updateInfo.latestVersion}
+          isCompatible={updateInfo.isCompatible}
+          onUpdate={handleUpdateClick}
+        />
+      )}
+      {/* Incompatibility dialog - rendered here since this component owns the state */}
+      {updateInfo.incompatibilities && (
+        <IncompatibleUpdateDialog
+          isOpen={showIncompatibilityDialog}
+          onClose={() => setShowIncompatibilityDialog(false)}
+          onConfirm={handleConfirmIncompatibleUpdate}
+          currentVersion={updateInfo.currentVersion}
+          latestVersion={updateInfo.latestVersion}
+          agentName={beautifyString(agentName)}
+          incompatibilities={updateInfo.incompatibilities}
+        />
+      )}
+    </>
+  );
+}
+
+type SubAgentUpdateAvailableBarProps = {
+  currentVersion: number;
+  latestVersion: number;
+  isCompatible: boolean;
+  onUpdate: () => void;
+};
+
+function SubAgentUpdateAvailableBar({
+  currentVersion,
+  latestVersion,
+  isCompatible,
+  onUpdate,
+}: SubAgentUpdateAvailableBarProps): React.ReactElement {
+  return (
+    <div className="flex items-center justify-between gap-2 rounded-t-xl bg-blue-50 px-3 py-2 dark:bg-blue-900/30">
+      <div className="flex items-center gap-2">
+        <ArrowUpIcon className="h-4 w-4 text-blue-600 dark:text-blue-400" />
+        <span className="text-sm text-blue-700 dark:text-blue-300">
+          Update available (v{currentVersion} → v{latestVersion})
+        </span>
+        {!isCompatible && (
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <WarningIcon className="h-4 w-4 text-amber-500" />
+            </TooltipTrigger>
+            <TooltipContent className="max-w-xs">
+              <p className="font-medium">Incompatible changes detected</p>
+              <p className="text-xs text-gray-400">
+                Click Update to see details
+              </p>
+            </TooltipContent>
+          </Tooltip>
+        )}
+      </div>
+      <Button
+        size="small"
+        variant={isCompatible ? "primary" : "outline"}
+        onClick={onUpdate}
+        className={cn(
+          "h-7 text-xs",
+          !isCompatible && "border-amber-500 text-amber-600 hover:bg-amber-50",
+        )}
+      >
+        Update
+      </Button>
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/SubAgentUpdate/components/IncompatibleUpdateDialog.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/SubAgentUpdate/components/IncompatibleUpdateDialog.tsx
new file mode 100644
index 0000000000..67f20789ed
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/SubAgentUpdate/components/IncompatibleUpdateDialog.tsx
@@ -0,0 +1,274 @@
+import React from "react";
+import {
+  WarningIcon,
+  XCircleIcon,
+  PlusCircleIcon,
+} from "@phosphor-icons/react";
+import { Button } from "@/components/atoms/Button/Button";
+import { Alert, AlertDescription } from "@/components/molecules/Alert/Alert";
+import { Dialog } from "@/components/molecules/Dialog/Dialog";
+import { beautifyString } from "@/lib/utils";
+import { IncompatibilityInfo } from "@/app/(platform)/build/hooks/useSubAgentUpdate/types";
+
+type IncompatibleUpdateDialogProps = {
+  isOpen: boolean;
+  onClose: () => void;
+  onConfirm: () => void;
+  currentVersion: number;
+  latestVersion: number;
+  agentName: string;
+  incompatibilities: IncompatibilityInfo;
+};
+
+export function IncompatibleUpdateDialog({
+  isOpen,
+  onClose,
+  onConfirm,
+  currentVersion,
+  latestVersion,
+  agentName,
+  incompatibilities,
+}: IncompatibleUpdateDialogProps) {
+  const hasMissingInputs = incompatibilities.missingInputs.length > 0;
+  const hasMissingOutputs = incompatibilities.missingOutputs.length > 0;
+  const hasNewInputs = incompatibilities.newInputs.length > 0;
+  const hasNewOutputs = incompatibilities.newOutputs.length > 0;
+  const hasNewRequired = incompatibilities.newRequiredInputs.length > 0;
+  const hasTypeMismatches = incompatibilities.inputTypeMismatches.length > 0;
+
+  const hasInputChanges = hasMissingInputs || hasNewInputs;
+  const hasOutputChanges = hasMissingOutputs || hasNewOutputs;
+
+  return (
+    <Dialog
+      title={
+        <div className="flex items-center gap-2">
+          <WarningIcon className="h-5 w-5 text-amber-500" weight="fill" />
+          Incompatible Update
+        </div>
+      }
+      controlled={{
+        isOpen,
+        set: async (open) => {
+          if (!open) onClose();
+        },
+      }}
+      onClose={onClose}
+      styling={{ maxWidth: "32rem" }}
+    >
+      <Dialog.Content>
+        <div className="space-y-4">
+          <p className="text-sm text-gray-600 dark:text-gray-400">
+            Updating <strong>{beautifyString(agentName)}</strong> from v
+            {currentVersion} to v{latestVersion} will break some connections.
+          </p>
+
+          {/* Input changes - two column layout */}
+          {hasInputChanges && (
+            <TwoColumnSection
+              title="Input Changes"
+              leftIcon={
+                <XCircleIcon className="h-4 w-4 text-red-500" weight="fill" />
+              }
+              leftTitle="Removed"
+              leftItems={incompatibilities.missingInputs}
+              rightIcon={
+                <PlusCircleIcon
+                  className="h-4 w-4 text-green-500"
+                  weight="fill"
+                />
+              }
+              rightTitle="Added"
+              rightItems={incompatibilities.newInputs}
+            />
+          )}
+
+          {/* Output changes - two column layout */}
+          {hasOutputChanges && (
+            <TwoColumnSection
+              title="Output Changes"
+              leftIcon={
+                <XCircleIcon className="h-4 w-4 text-red-500" weight="fill" />
+              }
+              leftTitle="Removed"
+              leftItems={incompatibilities.missingOutputs}
+              rightIcon={
+                <PlusCircleIcon
+                  className="h-4 w-4 text-green-500"
+                  weight="fill"
+                />
+              }
+              rightTitle="Added"
+              rightItems={incompatibilities.newOutputs}
+            />
+          )}
+
+          {hasTypeMismatches && (
+            <SingleColumnSection
+              icon={
+                <XCircleIcon className="h-4 w-4 text-red-500" weight="fill" />
+              }
+              title="Type Changed"
+              description="These connected inputs have a different type:"
+              items={incompatibilities.inputTypeMismatches.map(
+                (m) => `${m.name} (${m.oldType} → ${m.newType})`,
+              )}
+            />
+          )}
+
+          {hasNewRequired && (
+            <SingleColumnSection
+              icon={
+                <PlusCircleIcon
+                  className="h-4 w-4 text-amber-500"
+                  weight="fill"
+                />
+              }
+              title="New Required Inputs"
+              description="These inputs are now required:"
+              items={incompatibilities.newRequiredInputs}
+            />
+          )}
+
+          <Alert variant="warning">
+            <AlertDescription>
+              If you proceed, you&apos;ll need to remove the broken connections
+              before you can save or run your agent.
+            </AlertDescription>
+          </Alert>
+
+          <Dialog.Footer>
+            <Button variant="ghost" size="small" onClick={onClose}>
+              Cancel
+            </Button>
+            <Button
+              variant="primary"
+              size="small"
+              onClick={onConfirm}
+              className="border-amber-700 bg-amber-600 hover:bg-amber-700"
+            >
+              Update Anyway
+            </Button>
+          </Dialog.Footer>
+        </div>
+      </Dialog.Content>
+    </Dialog>
+  );
+}
+
+type TwoColumnSectionProps = {
+  title: string;
+  leftIcon: React.ReactNode;
+  leftTitle: string;
+  leftItems: string[];
+  rightIcon: React.ReactNode;
+  rightTitle: string;
+  rightItems: string[];
+};
+
+function TwoColumnSection({
+  title,
+  leftIcon,
+  leftTitle,
+  leftItems,
+  rightIcon,
+  rightTitle,
+  rightItems,
+}: TwoColumnSectionProps) {
+  return (
+    <div className="rounded-md border border-gray-200 p-3 dark:border-gray-700">
+      <span className="font-medium">{title}</span>
+      <div className="mt-2 grid grid-cols-2 items-start gap-4">
+        {/* Left column - Breaking changes */}
+        <div className="min-w-0">
+          <div className="flex items-center gap-1.5 text-sm text-gray-500 dark:text-gray-400">
+            {leftIcon}
+            <span>{leftTitle}</span>
+          </div>
+          <ul className="mt-1.5 space-y-1">
+            {leftItems.length > 0 ? (
+              leftItems.map((item) => (
+                <li
+                  key={item}
+                  className="text-sm text-gray-700 dark:text-gray-300"
+                >
+                  <code className="rounded bg-red-50 px-1 py-0.5 font-mono text-xs text-red-700 dark:bg-red-900/30 dark:text-red-300">
+                    {item}
+                  </code>
+                </li>
+              ))
+            ) : (
+              <li className="text-sm italic text-gray-400 dark:text-gray-500">
+                None
+              </li>
+            )}
+          </ul>
+        </div>
+
+        {/* Right column - Possible solutions */}
+        <div className="min-w-0">
+          <div className="flex items-center gap-1.5 text-sm text-gray-500 dark:text-gray-400">
+            {rightIcon}
+            <span>{rightTitle}</span>
+          </div>
+          <ul className="mt-1.5 space-y-1">
+            {rightItems.length > 0 ? (
+              rightItems.map((item) => (
+                <li
+                  key={item}
+                  className="text-sm text-gray-700 dark:text-gray-300"
+                >
+                  <code className="rounded bg-green-50 px-1 py-0.5 font-mono text-xs text-green-700 dark:bg-green-900/30 dark:text-green-300">
+                    {item}
+                  </code>
+                </li>
+              ))
+            ) : (
+              <li className="text-sm italic text-gray-400 dark:text-gray-500">
+                None
+              </li>
+            )}
+          </ul>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+type SingleColumnSectionProps = {
+  icon: React.ReactNode;
+  title: string;
+  description: string;
+  items: string[];
+};
+
+function SingleColumnSection({
+  icon,
+  title,
+  description,
+  items,
+}: SingleColumnSectionProps) {
+  return (
+    <div className="rounded-md border border-gray-200 p-3 dark:border-gray-700">
+      <div className="flex items-center gap-2">
+        {icon}
+        <span className="font-medium">{title}</span>
+      </div>
+      <p className="mt-1 text-sm text-gray-500 dark:text-gray-400">
+        {description}
+      </p>
+      <ul className="mt-2 space-y-1">
+        {items.map((item) => (
+          <li
+            key={item}
+            className="ml-4 list-disc text-sm text-gray-700 dark:text-gray-300"
+          >
+            <code className="rounded bg-gray-100 px-1 py-0.5 font-mono text-xs dark:bg-gray-800">
+              {item}
+            </code>
+          </li>
+        ))}
+      </ul>
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/SubAgentUpdate/components/ResolutionModeBar.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/SubAgentUpdate/components/ResolutionModeBar.tsx
new file mode 100644
index 0000000000..f60bd60c52
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/SubAgentUpdate/components/ResolutionModeBar.tsx
@@ -0,0 +1,107 @@
+import React from "react";
+import { InfoIcon, WarningIcon } from "@phosphor-icons/react";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "@/components/atoms/Tooltip/BaseTooltip";
+import { IncompatibilityInfo } from "@/app/(platform)/build/hooks/useSubAgentUpdate/types";
+
+type ResolutionModeBarProps = {
+  incompatibilities: IncompatibilityInfo | null;
+};
+
+export function ResolutionModeBar({
+  incompatibilities,
+}: ResolutionModeBarProps): React.ReactElement {
+  const renderIncompatibilities = () => {
+    if (!incompatibilities) return <span>No incompatibilities</span>;
+
+    const sections: React.ReactNode[] = [];
+
+    if (incompatibilities.missingInputs.length > 0) {
+      sections.push(
+        <div key="missing-inputs" className="mb-1">
+          <span className="font-semibold">Missing inputs: </span>
+          {incompatibilities.missingInputs.map((name, i) => (
+            <React.Fragment key={name}>
+              <code className="font-mono">{name}</code>
+              {i < incompatibilities.missingInputs.length - 1 && ", "}
+            </React.Fragment>
+          ))}
+        </div>,
+      );
+    }
+    if (incompatibilities.missingOutputs.length > 0) {
+      sections.push(
+        <div key="missing-outputs" className="mb-1">
+          <span className="font-semibold">Missing outputs: </span>
+          {incompatibilities.missingOutputs.map((name, i) => (
+            <React.Fragment key={name}>
+              <code className="font-mono">{name}</code>
+              {i < incompatibilities.missingOutputs.length - 1 && ", "}
+            </React.Fragment>
+          ))}
+        </div>,
+      );
+    }
+    if (incompatibilities.newRequiredInputs.length > 0) {
+      sections.push(
+        <div key="new-required" className="mb-1">
+          <span className="font-semibold">New required inputs: </span>
+          {incompatibilities.newRequiredInputs.map((name, i) => (
+            <React.Fragment key={name}>
+              <code className="font-mono">{name}</code>
+              {i < incompatibilities.newRequiredInputs.length - 1 && ", "}
+            </React.Fragment>
+          ))}
+        </div>,
+      );
+    }
+    if (incompatibilities.inputTypeMismatches.length > 0) {
+      sections.push(
+        <div key="type-mismatches" className="mb-1">
+          <span className="font-semibold">Type changed: </span>
+          {incompatibilities.inputTypeMismatches.map((m, i) => (
+            <React.Fragment key={m.name}>
+              <code className="font-mono">{m.name}</code>
+              <span className="text-gray-400">
+                {" "}
+                ({m.oldType} → {m.newType})
+              </span>
+              {i < incompatibilities.inputTypeMismatches.length - 1 && ", "}
+            </React.Fragment>
+          ))}
+        </div>,
+      );
+    }
+
+    return <>{sections}</>;
+  };
+
+  return (
+    <div className="flex items-center justify-between gap-2 rounded-t-xl bg-amber-50 px-3 py-2 dark:bg-amber-900/30">
+      <div className="flex items-center gap-2">
+        <WarningIcon className="h-4 w-4 text-amber-600 dark:text-amber-400" />
+        <span className="text-sm text-amber-700 dark:text-amber-300">
+          Remove incompatible connections
+        </span>
+        <Tooltip>
+          <TooltipTrigger asChild>
+            <InfoIcon className="h-4 w-4 cursor-help text-amber-500" />
+          </TooltipTrigger>
+          <TooltipContent className="max-w-sm">
+            <p className="mb-2 font-semibold">Incompatible changes:</p>
+            <div className="text-xs">{renderIncompatibilities()}</div>
+            <p className="mt-2 text-xs text-gray-400">
+              {(incompatibilities?.newRequiredInputs.length ?? 0) > 0
+                ? "Replace / delete"
+                : "Delete"}{" "}
+              the red connections to continue
+            </p>
+          </TooltipContent>
+        </Tooltip>
+      </div>
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/SubAgentUpdate/useSubAgentUpdateState.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/SubAgentUpdate/useSubAgentUpdateState.ts
new file mode 100644
index 0000000000..143cd58509
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/SubAgentUpdate/useSubAgentUpdateState.ts
@@ -0,0 +1,192 @@
+import { useState, useCallback, useEffect } from "react";
+import { useShallow } from "zustand/react/shallow";
+import { useGraphStore } from "@/app/(platform)/build/stores/graphStore";
+import { useNodeStore } from "@/app/(platform)/build/stores/nodeStore";
+import { useEdgeStore } from "@/app/(platform)/build/stores/edgeStore";
+import {
+  useSubAgentUpdate,
+  createUpdatedAgentNodeInputs,
+  getBrokenEdgeIDs,
+} from "@/app/(platform)/build/hooks/useSubAgentUpdate";
+import { GraphInputSchema, GraphOutputSchema } from "@/lib/autogpt-server-api";
+import { CustomNodeData } from "../../CustomNode";
+import { NodeResolutionData } from "@/app/(platform)/build/stores/types";
+
+// Stable empty set to avoid creating new references in selectors
+const EMPTY_SET: Set<string> = new Set();
+
+type UseSubAgentUpdateParams = {
+  nodeID: string;
+  nodeData: CustomNodeData;
+};
+
+export function useSubAgentUpdateState({
+  nodeID,
+  nodeData,
+}: UseSubAgentUpdateParams) {
+  const [showIncompatibilityDialog, setShowIncompatibilityDialog] =
+    useState(false);
+
+  // Get store actions
+  const updateNodeData = useNodeStore(
+    useShallow((state) => state.updateNodeData),
+  );
+  const setNodeResolutionMode = useNodeStore(
+    useShallow((state) => state.setNodeResolutionMode),
+  );
+  const isNodeInResolutionMode = useNodeStore(
+    useShallow((state) => state.isNodeInResolutionMode),
+  );
+  const setBrokenEdgeIDs = useNodeStore(
+    useShallow((state) => state.setBrokenEdgeIDs),
+  );
+  // Get this node's broken edge IDs from the per-node map
+  // Use EMPTY_SET as fallback to maintain referential stability
+  const brokenEdgeIDs = useNodeStore(
+    (state) => state.brokenEdgeIDs.get(nodeID) || EMPTY_SET,
+  );
+  const getNodeResolutionData = useNodeStore(
+    useShallow((state) => state.getNodeResolutionData),
+  );
+  const connectedEdges = useEdgeStore(
+    useShallow((state) => state.getNodeEdges(nodeID)),
+  );
+  const availableSubGraphs = useGraphStore(
+    useShallow((state) => state.availableSubGraphs),
+  );
+
+  // Extract agent-specific data
+  const graphID = nodeData.hardcodedValues?.graph_id as string | undefined;
+  const graphVersion = nodeData.hardcodedValues?.graph_version as
+    | number
+    | undefined;
+  const currentInputSchema = nodeData.hardcodedValues?.input_schema as
+    | GraphInputSchema
+    | undefined;
+  const currentOutputSchema = nodeData.hardcodedValues?.output_schema as
+    | GraphOutputSchema
+    | undefined;
+
+  // Use the sub-agent update hook
+  const updateInfo = useSubAgentUpdate(
+    nodeID,
+    graphID,
+    graphVersion,
+    currentInputSchema,
+    currentOutputSchema,
+    connectedEdges,
+    availableSubGraphs,
+  );
+
+  const isInResolutionMode = isNodeInResolutionMode(nodeID);
+
+  // Handle update button click
+  const handleUpdateClick = useCallback(() => {
+    if (!updateInfo.hasUpdate || !updateInfo.latestGraph) return;
+
+    if (updateInfo.isCompatible) {
+      // Compatible update - apply directly
+      const newHardcodedValues = createUpdatedAgentNodeInputs(
+        nodeData.hardcodedValues,
+        updateInfo.latestGraph,
+      );
+      updateNodeData(nodeID, { hardcodedValues: newHardcodedValues });
+    } else {
+      // Incompatible update - show dialog
+      setShowIncompatibilityDialog(true);
+    }
+  }, [
+    updateInfo.hasUpdate,
+    updateInfo.latestGraph,
+    updateInfo.isCompatible,
+    nodeData.hardcodedValues,
+    updateNodeData,
+    nodeID,
+  ]);
+
+  // Handle confirming an incompatible update
+  function handleConfirmIncompatibleUpdate() {
+    if (!updateInfo.latestGraph || !updateInfo.incompatibilities) return;
+
+    const latestGraph = updateInfo.latestGraph;
+
+    // Get the new schemas from the latest graph version
+    const newInputSchema =
+      (latestGraph.input_schema as Record<string, unknown>) || {};
+    const newOutputSchema =
+      (latestGraph.output_schema as Record<string, unknown>) || {};
+
+    // Create the updated hardcoded values but DON'T apply them yet
+    // We'll apply them when resolution is complete
+    const pendingHardcodedValues = createUpdatedAgentNodeInputs(
+      nodeData.hardcodedValues,
+      latestGraph,
+    );
+
+    // Get broken edge IDs and store them for this node
+    const brokenIds = getBrokenEdgeIDs(
+      connectedEdges,
+      updateInfo.incompatibilities,
+      nodeID,
+    );
+    setBrokenEdgeIDs(nodeID, brokenIds);
+
+    // Enter resolution mode with both old and new schemas
+    // DON'T apply the update yet - keep old schema so connections remain visible
+    const resolutionData: NodeResolutionData = {
+      incompatibilities: updateInfo.incompatibilities,
+      pendingUpdate: {
+        input_schema: newInputSchema,
+        output_schema: newOutputSchema,
+      },
+      currentSchema: {
+        input_schema: (currentInputSchema as Record<string, unknown>) || {},
+        output_schema: (currentOutputSchema as Record<string, unknown>) || {},
+      },
+      pendingHardcodedValues,
+    };
+    setNodeResolutionMode(nodeID, true, resolutionData);
+
+    setShowIncompatibilityDialog(false);
+  }
+
+  // Check if resolution is complete (all broken edges removed)
+  const resolutionData = getNodeResolutionData(nodeID);
+
+  // Auto-check resolution on edge changes
+  useEffect(() => {
+    if (!isInResolutionMode) return;
+
+    // Check if any broken edges still exist
+    const remainingBroken = Array.from(brokenEdgeIDs).filter((edgeId) =>
+      connectedEdges.some((e) => e.id === edgeId),
+    );
+
+    if (remainingBroken.length === 0) {
+      // Resolution complete - now apply the pending update
+      if (resolutionData?.pendingHardcodedValues) {
+        updateNodeData(nodeID, {
+          hardcodedValues: resolutionData.pendingHardcodedValues,
+        });
+      }
+      // setNodeResolutionMode will clean up this node's broken edges automatically
+      setNodeResolutionMode(nodeID, false);
+    }
+  }, [
+    isInResolutionMode,
+    brokenEdgeIDs,
+    connectedEdges,
+    resolutionData,
+    nodeID,
+  ]);
+
+  return {
+    updateInfo,
+    isInResolutionMode,
+    resolutionData,
+    showIncompatibilityDialog,
+    setShowIncompatibilityDialog,
+    handleUpdateClick,
+    handleConfirmIncompatibleUpdate,
+  };
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/WebhookDisclaimer.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/WebhookDisclaimer.tsx
index 044bf994ad..1fdee05a2a 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/WebhookDisclaimer.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/WebhookDisclaimer.tsx
@@ -1,10 +1,10 @@
-import { Alert, AlertDescription } from "@/components/molecules/Alert/Alert";
-import { Text } from "@/components/atoms/Text/Text";
-import Link from "next/link";
 import { useGetV2GetLibraryAgentByGraphId } from "@/app/api/__generated__/endpoints/library/library";
 import { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";
-import { useQueryStates, parseAsString } from "nuqs";
-import { isValidUUID } from "@/app/(platform)/chat/helpers";
+import { Text } from "@/components/atoms/Text/Text";
+import { Alert, AlertDescription } from "@/components/molecules/Alert/Alert";
+import { isValidUUID } from "@/lib/utils";
+import Link from "next/link";
+import { parseAsString, useQueryStates } from "nuqs";
 
 export const WebhookDisclaimer = ({ nodeId }: { nodeId: string }) => {
   const [{ flowID }] = useQueryStates({
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/helpers.ts
index 8d228d0cd0..50326a03e6 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/helpers.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/helpers.ts
@@ -1,4 +1,6 @@
 import { AgentExecutionStatus } from "@/app/api/__generated__/models/agentExecutionStatus";
+import { NodeResolutionData } from "@/app/(platform)/build/stores/types";
+import { RJSFSchema } from "@rjsf/utils";
 
 export const nodeStyleBasedOnStatus: Record<AgentExecutionStatus, string> = {
   INCOMPLETE: "ring-slate-300 bg-slate-300",
@@ -9,3 +11,48 @@ export const nodeStyleBasedOnStatus: Record<AgentExecutionStatus, string> = {
   TERMINATED: "ring-orange-300 bg-orange-300 ",
   FAILED: "ring-red-300 bg-red-300",
 };
+
+/**
+ * Merges schemas during resolution mode to include removed inputs/outputs
+ * that still have connections, so users can see and delete them.
+ */
+export function mergeSchemaForResolution(
+  currentSchema: Record<string, unknown>,
+  newSchema: Record<string, unknown>,
+  resolutionData: NodeResolutionData,
+  type: "input" | "output",
+): Record<string, unknown> {
+  const newProps = (newSchema.properties as RJSFSchema) || {};
+  const currentProps = (currentSchema.properties as RJSFSchema) || {};
+  const mergedProps = { ...newProps };
+  const incomp = resolutionData.incompatibilities;
+
+  if (type === "input") {
+    // Add back missing inputs that have connections
+    incomp.missingInputs.forEach((inputName: string) => {
+      if (currentProps[inputName]) {
+        mergedProps[inputName] = currentProps[inputName];
+      }
+    });
+    // Add back inputs with type mismatches (keep old type so connection works visually)
+    incomp.inputTypeMismatches.forEach(
+      (mismatch: { name: string; oldType: string; newType: string }) => {
+        if (currentProps[mismatch.name]) {
+          mergedProps[mismatch.name] = currentProps[mismatch.name];
+        }
+      },
+    );
+  } else {
+    // Add back missing outputs that have connections
+    incomp.missingOutputs.forEach((outputName: string) => {
+      if (currentProps[outputName]) {
+        mergedProps[outputName] = currentProps[outputName];
+      }
+    });
+  }
+
+  return {
+    ...newSchema,
+    properties: mergedProps,
+  };
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/useCustomNode.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/useCustomNode.tsx
new file mode 100644
index 0000000000..e58d0ab12b
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/useCustomNode.tsx
@@ -0,0 +1,58 @@
+import { useNodeStore } from "@/app/(platform)/build/stores/nodeStore";
+import { CustomNodeData } from "./CustomNode";
+import { BlockUIType } from "../../../types";
+import { useMemo } from "react";
+import { mergeSchemaForResolution } from "./helpers";
+
+export const useCustomNode = ({
+  data,
+  nodeId,
+}: {
+  data: CustomNodeData;
+  nodeId: string;
+}) => {
+  const isInResolutionMode = useNodeStore((state) =>
+    state.nodesInResolutionMode.has(nodeId),
+  );
+  const resolutionData = useNodeStore((state) =>
+    state.nodeResolutionData.get(nodeId),
+  );
+
+  const isAgent = data.uiType === BlockUIType.AGENT;
+
+  const currentInputSchema = isAgent
+    ? (data.hardcodedValues.input_schema ?? {})
+    : data.inputSchema;
+  const currentOutputSchema = isAgent
+    ? (data.hardcodedValues.output_schema ?? {})
+    : data.outputSchema;
+
+  const inputSchema = useMemo(() => {
+    if (isAgent && isInResolutionMode && resolutionData) {
+      return mergeSchemaForResolution(
+        resolutionData.currentSchema.input_schema,
+        resolutionData.pendingUpdate.input_schema,
+        resolutionData,
+        "input",
+      );
+    }
+    return currentInputSchema;
+  }, [isAgent, isInResolutionMode, resolutionData, currentInputSchema]);
+
+  const outputSchema = useMemo(() => {
+    if (isAgent && isInResolutionMode && resolutionData) {
+      return mergeSchemaForResolution(
+        resolutionData.currentSchema.output_schema,
+        resolutionData.pendingUpdate.output_schema,
+        resolutionData,
+        "output",
+      );
+    }
+    return currentOutputSchema;
+  }, [isAgent, isInResolutionMode, resolutionData, currentOutputSchema]);
+
+  return {
+    inputSchema,
+    outputSchema,
+  };
+};
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/FormCreator.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/FormCreator.tsx
index 28d1bcc0ab..d6a3fabffa 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/FormCreator.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/FormCreator.tsx
@@ -5,20 +5,16 @@ import { useNodeStore } from "../../../stores/nodeStore";
 import { BlockUIType } from "../../types";
 import { FormRenderer } from "@/components/renderers/InputRenderer/FormRenderer";
 
-export const FormCreator = React.memo(
-  ({
-    jsonSchema,
-    nodeId,
-    uiType,
-    showHandles = true,
-    className,
-  }: {
-    jsonSchema: RJSFSchema;
-    nodeId: string;
-    uiType: BlockUIType;
-    showHandles?: boolean;
-    className?: string;
-  }) => {
+interface FormCreatorProps {
+  jsonSchema: RJSFSchema;
+  nodeId: string;
+  uiType: BlockUIType;
+  showHandles?: boolean;
+  className?: string;
+}
+
+export const FormCreator: React.FC<FormCreatorProps> = React.memo(
+  ({ jsonSchema, nodeId, uiType, showHandles = true, className }) => {
     const updateNodeData = useNodeStore((state) => state.updateNodeData);
 
     const getHardCodedValues = useNodeStore(
@@ -48,7 +44,10 @@ export const FormCreator = React.memo(
         : hardcodedValues;
 
     return (
-      <div className={className}>
+      <div
+        className={className}
+        data-id={`form-creator-container-${nodeId}-node`}
+      >
         <FormRenderer
           jsonSchema={jsonSchema}
           handleChange={handleChange}
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/OutputHandler.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/OutputHandler.tsx
index b70a8e239b..665a5bb7be 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/OutputHandler.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/OutputHandler.tsx
@@ -14,6 +14,8 @@ import {
 import { useEdgeStore } from "@/app/(platform)/build/stores/edgeStore";
 import { getTypeDisplayInfo } from "./helpers";
 import { BlockUIType } from "../../types";
+import { cn } from "@/lib/utils";
+import { useBrokenOutputs } from "./useBrokenOutputs";
 
 export const OutputHandler = ({
   outputSchema,
@@ -27,6 +29,7 @@ export const OutputHandler = ({
   const { isOutputConnected } = useEdgeStore();
   const properties = outputSchema?.properties || {};
   const [isOutputVisible, setIsOutputVisible] = useState(true);
+  const brokenOutputs = useBrokenOutputs(nodeId);
 
   const showHandles = uiType !== BlockUIType.OUTPUT;
 
@@ -44,9 +47,14 @@ export const OutputHandler = ({
         const shouldShow = isConnected || isOutputVisible;
         const { displayType, colorClass, hexColor } =
           getTypeDisplayInfo(fieldSchema);
+        const isBroken = brokenOutputs.has(fullKey);
 
         return shouldShow ? (
-          <div key={fullKey} className="flex flex-col items-end gap-2">
+          <div
+            key={fullKey}
+            className="flex flex-col items-end gap-2"
+            data-tutorial-id={`output-handler-${nodeId}-${fieldTitle}`}
+          >
             <div className="relative flex items-center gap-2">
               {fieldSchema?.description && (
                 <TooltipProvider>
@@ -64,15 +72,29 @@ export const OutputHandler = ({
                   </Tooltip>
                 </TooltipProvider>
               )}
-              <Text variant="body" className="text-slate-700">
+              <Text
+                variant="body"
+                className={cn(
+                  "text-slate-700",
+                  isBroken && "text-red-500 line-through",
+                )}
+              >
                 {fieldTitle}
               </Text>
-              <Text variant="small" as="span" className={colorClass}>
+              <Text
+                variant="small"
+                as="span"
+                className={cn(
+                  colorClass,
+                  isBroken && "!text-red-500 line-through",
+                )}
+              >
                 ({displayType})
               </Text>
 
               {showHandles && (
                 <OutputNodeHandle
+                  isBroken={isBroken}
                   field_name={fullKey}
                   nodeId={nodeId}
                   hexColor={hexColor}
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/helpers.ts
index 39384485f5..48f4fc19c7 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/helpers.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/helpers.ts
@@ -89,6 +89,18 @@ export function extractOptions(
 
 // get display type and color for schema types [need for type display next to field name]
 export const getTypeDisplayInfo = (schema: any) => {
+  if (
+    schema?.type === "array" &&
+    "format" in schema &&
+    schema.format === "table"
+  ) {
+    return {
+      displayType: "table",
+      colorClass: "!text-indigo-500",
+      hexColor: "#6366f1",
+    };
+  }
+
   if (schema?.type === "string" && schema?.format) {
     const formatMap: Record<
       string,
@@ -175,3 +187,38 @@ export const getTypeDisplayInfo = (schema: any) => {
     hexColor,
   };
 };
+
+export function getEdgeColorFromOutputType(
+  outputSchema: RJSFSchema | undefined,
+  sourceHandle: string,
+): { colorClass: string; hexColor: string } {
+  const defaultColor = {
+    colorClass: "stroke-zinc-500/50",
+    hexColor: "#6b7280",
+  };
+
+  if (!outputSchema?.properties) return defaultColor;
+
+  const properties = outputSchema.properties as Record<string, unknown>;
+  const handleParts = sourceHandle.split("_#_");
+  let currentSchema: Record<string, unknown> = properties;
+
+  for (let i = 0; i < handleParts.length; i++) {
+    const part = handleParts[i];
+    const fieldSchema = currentSchema[part] as Record<string, unknown>;
+    if (!fieldSchema) return defaultColor;
+
+    if (i === handleParts.length - 1) {
+      const { hexColor, colorClass } = getTypeDisplayInfo(fieldSchema);
+      return { colorClass: colorClass.replace("!text-", "stroke-"), hexColor };
+    }
+
+    if (fieldSchema.properties) {
+      currentSchema = fieldSchema.properties as Record<string, unknown>;
+    } else {
+      return defaultColor;
+    }
+  }
+
+  return defaultColor;
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/uiSchema.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/uiSchema.ts
index ad1fab7c95..065e697828 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/uiSchema.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/uiSchema.ts
@@ -1,6 +1,6 @@
 export const uiSchema = {
   credentials: {
-    "ui:field": "credentials",
+    "ui:field": "custom/credential_field",
     provider: { "ui:widget": "hidden" },
     type: { "ui:widget": "hidden" },
     id: { "ui:autofocus": true },
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/useBrokenOutputs.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/useBrokenOutputs.ts
new file mode 100644
index 0000000000..61ef992a13
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/useBrokenOutputs.ts
@@ -0,0 +1,23 @@
+import { useMemo } from "react";
+import { useNodeStore } from "@/app/(platform)/build/stores/nodeStore";
+
+/**
+ * Hook to get the set of broken output names for a node in resolution mode.
+ */
+export function useBrokenOutputs(nodeID: string): Set<string> {
+  // Subscribe to the actual state values, not just methods
+  const isInResolution = useNodeStore((state) =>
+    state.nodesInResolutionMode.has(nodeID),
+  );
+  const resolutionData = useNodeStore((state) =>
+    state.nodeResolutionData.get(nodeID),
+  );
+
+  return useMemo(() => {
+    if (!isInResolution || !resolutionData) {
+      return new Set<string>();
+    }
+
+    return new Set(resolutionData.incompatibilities.missingOutputs);
+  }, [isInResolution, resolutionData]);
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/constants.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/constants.ts
new file mode 100644
index 0000000000..1a7e4176c6
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/constants.ts
@@ -0,0 +1,129 @@
+// Block IDs for tutorial blocks
+export const BLOCK_IDS = {
+  CALCULATOR: "b1ab9b19-67a6-406d-abf5-2dba76d00c79",
+  AGENT_INPUT: "c0a8e994-ebf1-4a9c-a4d8-89d09c86741b",
+  AGENT_OUTPUT: "363ae599-353e-4804-937e-b2ee3cef3da4",
+} as const;
+
+export const TUTORIAL_SELECTORS = {
+  // Custom nodes - These are all before saving
+  INPUT_NODE: '[data-id="custom-node-2"]',
+  OUTPUT_NODE: '[data-id="custom-node-3 "]',
+  CALCULATOR_NODE: '[data-id="custom-node-1"]',
+
+  // Paricular field selector
+  NAME_FIELD_OUTPUT_NODE: '[data-id="field-3-root_name"]',
+
+  // Output Handlers
+  SECOND_CALCULATOR_RESULT_OUTPUT_HANDLER:
+    '[data-tutorial-id="output-handler-2-result"]',
+  FIRST_CALCULATOR_RESULT_OUTPUT_HANDLER:
+    '[data-tutorial-id="output-handler-1-result"]',
+
+  // Input Handler
+  SECOND_CALCULATOR_NUMBER_A_INPUT_HANDLER:
+    '[data-tutorial-id="input-handler-2-a"]',
+  OUTPUT_VALUE_INPUT_HANDLEER: '[data-tutorial-id="label-3-root_value"]',
+
+  // Block Menu
+  BLOCKS_TRIGGER: '[data-id="blocks-control-popover-trigger"]',
+  BLOCKS_CONTENT: '[data-id="blocks-control-popover-content"]',
+  BLOCKS_SEARCH_INPUT:
+    '[data-id="blocks-control-search-bar"] input[type="text"]',
+  BLOCKS_SEARCH_INPUT_BOX: '[data-id="blocks-control-search-bar"]',
+
+  // Add a new selector that checks within search results
+
+  // Block Menu Sidebar
+  MENU_ITEM_INPUT_BLOCKS: '[data-id="menu-item-input_blocks"]',
+  MENU_ITEM_ALL_BLOCKS: '[data-id="menu-item-all_blocks"]',
+  MENU_ITEM_ACTION_BLOCKS: '[data-id="menu-item-action_blocks"]',
+  MENU_ITEM_OUTPUT_BLOCKS: '[data-id="menu-item-output_blocks"]',
+  MENU_ITEM_INTEGRATIONS: '[data-id="menu-item-integrations"]',
+  MENU_ITEM_MY_AGENTS: '[data-id="menu-item-my_agents"]',
+  MENU_ITEM_MARKETPLACE: '[data-id="menu-item-marketplace_agents"]',
+  MENU_ITEM_SUGGESTION: '[data-id="menu-item-suggestion"]',
+
+  // Block Cards
+  BLOCK_CARD_PREFIX: '[data-id^="block-card-"]',
+  BLOCK_CARD_AGENT_INPUT: '[data-id="block-card-AgentInputBlock"]',
+  // Calculator block - legacy ID used in old tutorial
+  BLOCK_CARD_CALCULATOR:
+    '[data-id="block-card-b1ab9b1967a6406dabf52dba76d00c79"]',
+  BLOCK_CARD_CALCULATOR_IN_SEARCH:
+    '[data-id="blocks-control-search-results"] [data-id="block-card-b1ab9b1967a6406dabf52dba76d00c79"]',
+
+  // Save Control
+  SAVE_TRIGGER: '[data-id="save-control-popover-trigger"]',
+  SAVE_CONTENT: '[data-id="save-control-popover-content"]',
+  SAVE_AGENT_BUTTON: '[data-id="save-control-save-agent"]',
+  SAVE_NAME_INPUT: '[data-id="save-control-name-input"]',
+  SAVE_DESCRIPTION_INPUT: '[data-id="save-control-description-input"]',
+
+  // Builder Actions (Run, Schedule, Outputs)
+  BUILDER_ACTIONS: '[data-id="builder-actions"]',
+  RUN_BUTTON: '[data-id="run-graph-button"]',
+  STOP_BUTTON: '[data-id="stop-graph-button"]',
+  SCHEDULE_BUTTON: '[data-id="schedule-graph-button"]',
+  AGENT_OUTPUTS_BUTTON: '[data-id="agent-outputs-button"]',
+
+  // Run Input Dialog
+  RUN_INPUT_DIALOG_CONTENT: '[data-id="run-input-dialog-content"]',
+  RUN_INPUT_CREDENTIALS_SECTION: '[data-id="run-input-credentials-section"]',
+  RUN_INPUT_CREDENTIALS_FORM: '[data-id="run-input-credentials-form"]',
+  RUN_INPUT_INPUTS_SECTION: '[data-id="run-input-inputs-section"]',
+  RUN_INPUT_INPUTS_FORM: '[data-id="run-input-inputs-form"]',
+  RUN_INPUT_ACTIONS_SECTION: '[data-id="run-input-actions-section"]',
+  RUN_INPUT_MANUAL_RUN_BUTTON: '[data-id="run-input-manual-run-button"]',
+  RUN_INPUT_SCHEDULE_BUTTON: '[data-id="run-input-schedule-button"]',
+
+  // Custom Controls (bottom left)
+  CUSTOM_CONTROLS: '[data-id="custom-controls"]',
+  ZOOM_IN_BUTTON: '[data-id="zoom-in-button"]',
+  ZOOM_OUT_BUTTON: '[data-id="zoom-out-button"]',
+  FIT_VIEW_BUTTON: '[data-id="fit-view-button"]',
+  LOCK_BUTTON: '[data-id="lock-button"]',
+  TUTORIAL_BUTTON: '[data-id="tutorial-button"]',
+
+  // Canvas
+  REACT_FLOW_CANVAS: ".react-flow__pane",
+  REACT_FLOW_NODE: ".react-flow__node",
+  REACT_FLOW_NODE_FIRST: '[data-testid^="rf__node-"]:first-child',
+  REACT_FLOW_EDGE: '[data-testid^="rf__edge-"]',
+
+  // Node elements
+  NODE_CONTAINER: '[data-id^="custom-node-"]',
+  NODE_HEADER: '[data-id^="node-header-"]',
+  NODE_INPUT_HANDLES: '[data-tutorial-id="input-handles"]',
+  NODE_OUTPUT_HANDLE: '[data-handlepos="right"]',
+  NODE_INPUT_HANDLE: "[data-nodeid]",
+  FIRST_CALCULATOR_NODE_OUTPUT: '[data-tutorial-id="node-output"]',
+  // These are the Id's of the nodes before saving
+  CALCULATOR_NODE_FORM_CONTAINER: '[data-id^="form-creator-container-1-node"]', // <-- Add this line
+  AGENT_INPUT_NODE_FORM_CONTAINER: '[data-id^="form-creator-container-2-node"]', // <-- Add this line
+  AGENT_OUTPUT_NODE_FORM_CONTAINER:
+    '[data-id^="form-creator-container-3-node"]', // <-- Add this line
+
+  // Execution badges
+  BADGE_QUEUED: '[data-id^="badge-"][data-id$="-QUEUED"]',
+  BADGE_COMPLETED: '[data-id^="badge-"][data-id$="-COMPLETED"]',
+
+  // Undo/Redo
+  UNDO_BUTTON: '[data-id="undo-button"]',
+  REDO_BUTTON: '[data-id="redo-button"]',
+} as const;
+
+export const CSS_CLASSES = {
+  DISABLE: "new-builder-tutorial-disable",
+  HIGHLIGHT: "new-builder-tutorial-highlight",
+  PULSE: "new-builder-tutorial-pulse",
+} as const;
+
+export const TUTORIAL_CONFIG = {
+  ELEMENT_CHECK_INTERVAL: 50, // ms
+  INPUT_CHECK_INTERVAL: 100, // ms
+  USE_MODAL_OVERLAY: true,
+  SCROLL_BEHAVIOR: "smooth" as const,
+  SCROLL_BLOCK: "center" as const,
+  SEARCH_TERM_CALCULATOR: "Calculator",
+} as const;
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/helpers/blocks.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/helpers/blocks.ts
new file mode 100644
index 0000000000..040991450f
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/helpers/blocks.ts
@@ -0,0 +1,89 @@
+import { BLOCK_IDS } from "../constants";
+import { useNodeStore } from "../../../../stores/nodeStore";
+import { getV2GetSpecificBlocks } from "@/app/api/__generated__/endpoints/default/default";
+import { BlockInfo } from "@/app/api/__generated__/models/blockInfo";
+
+const prefetchedBlocks: Map<string, BlockInfo> = new Map();
+
+export const prefetchTutorialBlocks = async (): Promise<void> => {
+  try {
+    const blockIds = [BLOCK_IDS.CALCULATOR];
+    const response = await getV2GetSpecificBlocks({ block_ids: blockIds });
+
+    if (response.status === 200 && response.data) {
+      response.data.forEach((block) => {
+        prefetchedBlocks.set(block.id, block);
+      });
+      console.debug("Tutorial blocks prefetched:", prefetchedBlocks.size);
+    }
+  } catch (error) {
+    console.error("Failed to prefetch tutorial blocks:", error);
+  }
+};
+
+export const getPrefetchedBlock = (blockId: string): BlockInfo | undefined => {
+  return prefetchedBlocks.get(blockId);
+};
+
+export const clearPrefetchedBlocks = (): void => {
+  prefetchedBlocks.clear();
+};
+
+export const addPrefetchedBlock = (
+  blockId: string,
+  position?: { x: number; y: number },
+): void => {
+  const block = prefetchedBlocks.get(blockId);
+  if (block) {
+    useNodeStore.getState().addBlock(block, {}, position);
+  } else {
+    console.error(`Block ${blockId} not found in prefetched blocks`);
+  }
+};
+
+export const getNodeByBlockId = (blockId: string) => {
+  const nodes = useNodeStore.getState().nodes;
+  return nodes.find((n) => n.data?.block_id === blockId);
+};
+
+export const addSecondCalculatorBlock = (): void => {
+  const firstCalculatorNode = getNodeByBlockId(BLOCK_IDS.CALCULATOR);
+
+  if (firstCalculatorNode) {
+    const calcX = firstCalculatorNode.position.x;
+    const calcY = firstCalculatorNode.position.y;
+
+    addPrefetchedBlock(BLOCK_IDS.CALCULATOR, {
+      x: calcX + 500,
+      y: calcY,
+    });
+  } else {
+    addPrefetchedBlock(BLOCK_IDS.CALCULATOR);
+  }
+};
+
+export const getCalculatorNodes = () => {
+  const nodes = useNodeStore.getState().nodes;
+  return nodes.filter((n) => n.data?.block_id === BLOCK_IDS.CALCULATOR);
+};
+
+export const getSecondCalculatorNode = () => {
+  const calculatorNodes = getCalculatorNodes();
+  return calculatorNodes.length >= 2 ? calculatorNodes[1] : null;
+};
+
+export const getFormContainerSelector = (blockId: string): string | null => {
+  const node = getNodeByBlockId(blockId);
+  if (node) {
+    return `[data-id="form-creator-container-${node.id}"]`;
+  }
+  return null;
+};
+
+export const getFormContainerElement = (blockId: string): Element | null => {
+  const selector = getFormContainerSelector(blockId);
+  if (selector) {
+    return document.querySelector(selector);
+  }
+  return null;
+};
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/helpers/canvas.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/helpers/canvas.ts
new file mode 100644
index 0000000000..dd3d8576d9
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/helpers/canvas.ts
@@ -0,0 +1,83 @@
+import { TUTORIAL_CONFIG, TUTORIAL_SELECTORS } from "../constants";
+import { useNodeStore } from "../../../../stores/nodeStore";
+
+export const waitForNodeOnCanvas = (
+  timeout = 10000,
+): Promise<Element | null> => {
+  return new Promise((resolve) => {
+    const startTime = Date.now();
+
+    const checkNode = () => {
+      const storeNodes = useNodeStore.getState().nodes;
+      if (storeNodes.length > 0) {
+        const domNode = document.querySelector(
+          TUTORIAL_SELECTORS.REACT_FLOW_NODE,
+        );
+        if (domNode) {
+          resolve(domNode);
+          return;
+        }
+      }
+
+      if (Date.now() - startTime > timeout) {
+        resolve(null);
+      } else {
+        setTimeout(checkNode, TUTORIAL_CONFIG.ELEMENT_CHECK_INTERVAL);
+      }
+    };
+    checkNode();
+  });
+};
+
+export const waitForNodesCount = (
+  count: number,
+  timeout = 10000,
+): Promise<boolean> => {
+  return new Promise((resolve) => {
+    const startTime = Date.now();
+
+    const checkNodes = () => {
+      const currentCount = useNodeStore.getState().nodes.length;
+      if (currentCount >= count) {
+        resolve(true);
+      } else if (Date.now() - startTime > timeout) {
+        resolve(false);
+      } else {
+        setTimeout(checkNodes, TUTORIAL_CONFIG.ELEMENT_CHECK_INTERVAL);
+      }
+    };
+    checkNodes();
+  });
+};
+
+export const getNodesCount = (): number => {
+  return useNodeStore.getState().nodes.length;
+};
+
+export const getFirstNode = () => {
+  const nodes = useNodeStore.getState().nodes;
+  return nodes.length > 0 ? nodes[0] : null;
+};
+
+export const getNodeById = (nodeId: string) => {
+  const nodes = useNodeStore.getState().nodes;
+  return nodes.find((n) => n.id === nodeId);
+};
+
+export const nodeHasValues = (nodeId: string): boolean => {
+  const node = getNodeById(nodeId);
+  if (!node) return false;
+  const hardcodedValues = node.data?.hardcodedValues || {};
+  return Object.values(hardcodedValues).some(
+    (value) => value !== undefined && value !== null && value !== "",
+  );
+};
+
+export const fitViewToScreen = () => {
+  const fitViewButton = document.querySelector(
+    TUTORIAL_SELECTORS.FIT_VIEW_BUTTON,
+  ) as HTMLButtonElement;
+  if (fitViewButton) {
+    fitViewButton.click();
+  }
+};
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/helpers/connections.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/helpers/connections.ts
new file mode 100644
index 0000000000..4ec8c4df74
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/helpers/connections.ts
@@ -0,0 +1,19 @@
+import { useNodeStore } from "../../../../stores/nodeStore";
+import { useEdgeStore } from "../../../../stores/edgeStore";
+
+export const isConnectionMade = (
+  sourceBlockId: string,
+  targetBlockId: string,
+): boolean => {
+  const edges = useEdgeStore.getState().edges;
+  const nodes = useNodeStore.getState().nodes;
+
+  const sourceNode = nodes.find((n) => n.data?.block_id === sourceBlockId);
+  const targetNode = nodes.find((n) => n.data?.block_id === targetBlockId);
+
+  if (!sourceNode || !targetNode) return false;
+
+  return edges.some((edge) => {
+    return edge.source === sourceNode.id && edge.target === targetNode.id;
+  });
+};
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/helpers/dom.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/helpers/dom.ts
new file mode 100644
index 0000000000..3ae9359cd9
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/helpers/dom.ts
@@ -0,0 +1,180 @@
+import { TUTORIAL_CONFIG, TUTORIAL_SELECTORS } from "../constants";
+
+export const waitForElement = (
+  selector: string,
+  timeout = 10000,
+): Promise<Element> => {
+  return new Promise((resolve, reject) => {
+    const startTime = Date.now();
+
+    const checkElement = () => {
+      const element = document.querySelector(selector);
+      if (element) {
+        resolve(element);
+      } else if (Date.now() - startTime > timeout) {
+        reject(new Error(`Element ${selector} not found within ${timeout}ms`));
+      } else {
+        setTimeout(checkElement, TUTORIAL_CONFIG.ELEMENT_CHECK_INTERVAL);
+      }
+    };
+    checkElement();
+  });
+};
+
+export const waitForInputValue = (
+  selector: string,
+  targetValue: string,
+  timeout = 30000,
+): Promise<void> => {
+  return new Promise((resolve) => {
+    const startTime = Date.now();
+
+    const checkInput = () => {
+      const input = document.querySelector(selector) as HTMLInputElement;
+      if (input) {
+        const currentValue = input.value.toLowerCase().trim();
+        const target = targetValue.toLowerCase().trim();
+
+        if (currentValue.includes(target) || target.includes(currentValue)) {
+          if (currentValue.length >= 4 || currentValue === target) {
+            resolve();
+            return;
+          }
+        }
+      }
+
+      if (Date.now() - startTime > timeout) {
+        resolve();
+      } else {
+        setTimeout(checkInput, TUTORIAL_CONFIG.INPUT_CHECK_INTERVAL);
+      }
+    };
+    checkInput();
+  });
+};
+
+export const waitForSearchResult = (
+  selector: string,
+  timeout = 15000,
+): Promise<Element | null> => {
+  return new Promise((resolve) => {
+    const startTime = Date.now();
+
+    const checkResult = () => {
+      const element = document.querySelector(selector);
+      if (element) {
+        resolve(element);
+      } else if (Date.now() - startTime > timeout) {
+        resolve(null);
+      } else {
+        setTimeout(checkResult, TUTORIAL_CONFIG.ELEMENT_CHECK_INTERVAL);
+      }
+    };
+    checkResult();
+  });
+};
+
+export const waitForAnyBlockCard = (
+  timeout = 10000,
+): Promise<Element | null> => {
+  return new Promise((resolve) => {
+    const startTime = Date.now();
+
+    const checkBlock = () => {
+      const block = document.querySelector(
+        TUTORIAL_SELECTORS.BLOCK_CARD_PREFIX,
+      );
+      if (block) {
+        resolve(block);
+      } else if (Date.now() - startTime > timeout) {
+        resolve(null);
+      } else {
+        setTimeout(checkBlock, TUTORIAL_CONFIG.ELEMENT_CHECK_INTERVAL);
+      }
+    };
+    checkBlock();
+  });
+};
+
+export const focusElement = (selector: string): void => {
+  const element = document.querySelector(selector) as HTMLElement;
+  if (element) {
+    element.focus();
+  }
+};
+
+export const scrollIntoView = (selector: string): void => {
+  const element = document.querySelector(selector);
+  if (element) {
+    element.scrollIntoView({
+      behavior: "smooth",
+      block: "center",
+    });
+  }
+};
+
+export const typeIntoInput = (selector: string, text: string) => {
+  const input = document.querySelector(selector) as HTMLInputElement;
+  if (input) {
+    input.focus();
+    input.value = text;
+    input.dispatchEvent(new Event("input", { bubbles: true }));
+    input.dispatchEvent(new Event("change", { bubbles: true }));
+  }
+};
+
+export const observeElement = (
+  selector: string,
+  callback: (element: Element) => void,
+): MutationObserver => {
+  const observer = new MutationObserver((mutations, obs) => {
+    const element = document.querySelector(selector);
+    if (element) {
+      callback(element);
+      obs.disconnect();
+    }
+  });
+
+  observer.observe(document.body, {
+    childList: true,
+    subtree: true,
+  });
+
+  const element = document.querySelector(selector);
+  if (element) {
+    callback(element);
+    observer.disconnect();
+  }
+
+  return observer;
+};
+
+export const watchSearchInput = (
+  targetValue: string,
+  onMatch: () => void,
+): (() => void) => {
+  const input = document.querySelector(
+    TUTORIAL_SELECTORS.BLOCKS_SEARCH_INPUT,
+  ) as HTMLInputElement;
+  if (!input) return () => {};
+
+  let hasMatched = false;
+
+  const handler = () => {
+    if (hasMatched) return;
+
+    const currentValue = input.value.toLowerCase().trim();
+    const target = targetValue.toLowerCase().trim();
+
+    if (currentValue.length >= 4 && target.startsWith(currentValue)) {
+      hasMatched = true;
+      onMatch();
+    }
+  };
+
+  input.addEventListener("input", handler);
+
+  return () => {
+    input.removeEventListener("input", handler);
+  };
+};
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/helpers/highlights.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/helpers/highlights.ts
new file mode 100644
index 0000000000..4f425f5c9c
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/helpers/highlights.ts
@@ -0,0 +1,56 @@
+import { CSS_CLASSES, TUTORIAL_SELECTORS } from "../constants";
+
+export const disableOtherBlocks = (targetBlockSelector: string) => {
+  document
+    .querySelectorAll(TUTORIAL_SELECTORS.BLOCK_CARD_PREFIX)
+    .forEach((block) => {
+      const isTarget = block.matches(targetBlockSelector);
+      block.classList.toggle(CSS_CLASSES.DISABLE, !isTarget);
+      block.classList.toggle(CSS_CLASSES.HIGHLIGHT, isTarget);
+    });
+};
+
+export const enableAllBlocks = () => {
+  document
+    .querySelectorAll(TUTORIAL_SELECTORS.BLOCK_CARD_PREFIX)
+    .forEach((block) => {
+      block.classList.remove(
+        CSS_CLASSES.DISABLE,
+        CSS_CLASSES.HIGHLIGHT,
+        CSS_CLASSES.PULSE,
+      );
+    });
+};
+
+export const highlightElement = (selector: string) => {
+  const element = document.querySelector(selector);
+  if (element) {
+    element.classList.add(CSS_CLASSES.HIGHLIGHT);
+  }
+};
+
+export const removeAllHighlights = () => {
+  document.querySelectorAll(`.${CSS_CLASSES.HIGHLIGHT}`).forEach((el) => {
+    el.classList.remove(CSS_CLASSES.HIGHLIGHT);
+  });
+  document.querySelectorAll(`.${CSS_CLASSES.PULSE}`).forEach((el) => {
+    el.classList.remove(CSS_CLASSES.PULSE);
+  });
+};
+
+export const pulseElement = (selector: string) => {
+  const element = document.querySelector(selector);
+  if (element) {
+    element.classList.add(CSS_CLASSES.PULSE);
+  }
+};
+
+export const highlightFirstBlockInSearch = () => {
+  const firstBlock = document.querySelector(
+    TUTORIAL_SELECTORS.BLOCK_CARD_PREFIX,
+  );
+  if (firstBlock) {
+    firstBlock.classList.add(CSS_CLASSES.PULSE);
+    firstBlock.scrollIntoView({ behavior: "smooth", block: "center" });
+  }
+};
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/helpers/index.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/helpers/index.ts
new file mode 100644
index 0000000000..bd60ef06bb
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/helpers/index.ts
@@ -0,0 +1,66 @@
+export {
+  waitForElement,
+  waitForInputValue,
+  waitForSearchResult,
+  waitForAnyBlockCard,
+  focusElement,
+  scrollIntoView,
+  typeIntoInput,
+  observeElement,
+  watchSearchInput,
+} from "./dom";
+
+export {
+  disableOtherBlocks,
+  enableAllBlocks,
+  highlightElement,
+  removeAllHighlights,
+  pulseElement,
+  highlightFirstBlockInSearch,
+} from "./highlights";
+
+export {
+  prefetchTutorialBlocks,
+  getPrefetchedBlock,
+  clearPrefetchedBlocks,
+  addPrefetchedBlock,
+  getNodeByBlockId,
+  addSecondCalculatorBlock,
+  getCalculatorNodes,
+  getSecondCalculatorNode,
+  getFormContainerSelector,
+  getFormContainerElement,
+} from "./blocks";
+
+export {
+  waitForNodeOnCanvas,
+  waitForNodesCount,
+  getNodesCount,
+  getFirstNode,
+  getNodeById,
+  nodeHasValues,
+  fitViewToScreen,
+} from "./canvas";
+
+export { isConnectionMade } from "./connections";
+
+export {
+  forceBlockMenuOpen,
+  openBlockMenu,
+  closeBlockMenu,
+  clearBlockMenuSearch,
+} from "./menu";
+
+export {
+  openSaveControl,
+  closeSaveControl,
+  forceSaveOpen,
+  clickSaveButton,
+  isAgentSaved,
+} from "./save";
+
+export {
+  handleTutorialCancel,
+  handleTutorialSkip,
+  handleTutorialComplete,
+} from "./state";
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/helpers/menu.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/helpers/menu.ts
new file mode 100644
index 0000000000..905e34dfb9
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/helpers/menu.ts
@@ -0,0 +1,25 @@
+import { TUTORIAL_SELECTORS } from "../constants";
+import { useControlPanelStore } from "../../../../stores/controlPanelStore";
+
+export const forceBlockMenuOpen = (force: boolean) => {
+  useControlPanelStore.getState().setForceOpenBlockMenu(force);
+};
+
+export const openBlockMenu = () => {
+  useControlPanelStore.getState().setBlockMenuOpen(true);
+};
+
+export const closeBlockMenu = () => {
+  useControlPanelStore.getState().setBlockMenuOpen(false);
+  useControlPanelStore.getState().setForceOpenBlockMenu(false);
+};
+
+export const clearBlockMenuSearch = () => {
+  const input = document.querySelector(
+    TUTORIAL_SELECTORS.BLOCKS_SEARCH_INPUT,
+  ) as HTMLInputElement;
+  if (input) {
+    input.value = "";
+    input.dispatchEvent(new Event("input", { bubbles: true }));
+  }
+};
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/helpers/save.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/helpers/save.ts
new file mode 100644
index 0000000000..e932ee1b84
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/helpers/save.ts
@@ -0,0 +1,31 @@
+import { TUTORIAL_SELECTORS } from "../constants";
+import { useControlPanelStore } from "../../../../stores/controlPanelStore";
+
+export const openSaveControl = () => {
+  useControlPanelStore.getState().setSaveControlOpen(true);
+};
+
+export const closeSaveControl = () => {
+  useControlPanelStore.getState().setSaveControlOpen(false);
+  useControlPanelStore.getState().setForceOpenSave(false);
+};
+
+export const forceSaveOpen = (force: boolean) => {
+  useControlPanelStore.getState().setForceOpenSave(force);
+};
+
+export const clickSaveButton = () => {
+  const saveButton = document.querySelector(
+    TUTORIAL_SELECTORS.SAVE_AGENT_BUTTON,
+  ) as HTMLButtonElement;
+  if (saveButton && !saveButton.disabled) {
+    saveButton.click();
+  }
+};
+
+export const isAgentSaved = (): boolean => {
+  const versionInput = document.querySelector(
+    '[data-tutorial-id="save-control-version-output"]',
+  ) as HTMLInputElement;
+  return !!(versionInput && versionInput.value && versionInput.value !== "-");
+};
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/helpers/state.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/helpers/state.ts
new file mode 100644
index 0000000000..43e19c40d4
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/helpers/state.ts
@@ -0,0 +1,49 @@
+import { Key, storage } from "@/services/storage/local-storage";
+import { closeBlockMenu } from "./menu";
+import { closeSaveControl, forceSaveOpen } from "./save";
+import { removeAllHighlights, enableAllBlocks } from "./highlights";
+
+const clearTutorialIntervals = () => {
+  const intervalKeys = [
+    "__tutorialCalcInterval",
+    "__tutorialCheckInterval",
+    "__tutorialSecondCalcInterval",
+  ];
+
+  intervalKeys.forEach((key) => {
+    if ((window as any)[key]) {
+      clearInterval((window as any)[key]);
+      delete (window as any)[key];
+    }
+  });
+};
+
+export const handleTutorialCancel = (_tour?: any) => {
+  clearTutorialIntervals();
+  closeBlockMenu();
+  closeSaveControl();
+  forceSaveOpen(false);
+  removeAllHighlights();
+  enableAllBlocks();
+  storage.set(Key.SHEPHERD_TOUR, "canceled");
+};
+
+export const handleTutorialSkip = (_tour?: any) => {
+  clearTutorialIntervals();
+  closeBlockMenu();
+  closeSaveControl();
+  forceSaveOpen(false);
+  removeAllHighlights();
+  enableAllBlocks();
+  storage.set(Key.SHEPHERD_TOUR, "skipped");
+};
+
+export const handleTutorialComplete = () => {
+  clearTutorialIntervals();
+  closeBlockMenu();
+  closeSaveControl();
+  forceSaveOpen(false);
+  removeAllHighlights();
+  enableAllBlocks();
+  storage.set(Key.SHEPHERD_TOUR, "completed");
+};
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/icons.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/icons.ts
new file mode 100644
index 0000000000..2c7a22b423
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/icons.ts
@@ -0,0 +1,32 @@
+type IconOptions = {
+  size?: number;
+  color?: string;
+};
+
+const DEFAULT_SIZE = 16;
+const DEFAULT_COLOR = "#52525b"; // zinc-600
+
+const iconPaths = {
+  ClickIcon: `M88,24V16a8,8,0,0,1,16,0v8a8,8,0,0,1-16,0ZM16,104h8a8,8,0,0,0,0-16H16a8,8,0,0,0,0,16ZM124.42,39.16a8,8,0,0,0,10.74-3.58l8-16a8,8,0,0,0-14.31-7.16l-8,16A8,8,0,0,0,124.42,39.16Zm-96,81.69-16,8a8,8,0,0,0,7.16,14.31l16-8a8,8,0,1,0-7.16-14.31ZM219.31,184a16,16,0,0,1,0,22.63l-12.68,12.68a16,16,0,0,1-22.63,0L132.7,168,115,214.09c0,.1-.08.21-.13.32a15.83,15.83,0,0,1-14.6,9.59l-.79,0a15.83,15.83,0,0,1-14.41-11L32.8,52.92A16,16,0,0,1,52.92,32.8L213,85.07a16,16,0,0,1,1.41,29.8l-.32.13L168,132.69ZM208,195.31,156.69,144h0a16,16,0,0,1,4.93-26l.32-.14,45.95-17.64L48,48l52.2,159.86,17.65-46c0-.11.08-.22.13-.33a16,16,0,0,1,11.69-9.34,16.72,16.72,0,0,1,3-.28,16,16,0,0,1,11.3,4.69L195.31,208Z`,
+  Keyboard: `M224,48H32A16,16,0,0,0,16,64V192a16,16,0,0,0,16,16H224a16,16,0,0,0,16-16V64A16,16,0,0,0,224,48Zm0,144H32V64H224V192Zm-16-64a8,8,0,0,1-8,8H56a8,8,0,0,1,0-16H200A8,8,0,0,1,208,128Zm0-32a8,8,0,0,1-8,8H56a8,8,0,0,1,0-16H200A8,8,0,0,1,208,96ZM72,160a8,8,0,0,1-8,8H56a8,8,0,0,1,0-16h8A8,8,0,0,1,72,160Zm96,0a8,8,0,0,1-8,8H96a8,8,0,0,1,0-16h64A8,8,0,0,1,168,160Zm40,0a8,8,0,0,1-8,8h-8a8,8,0,0,1,0-16h8A8,8,0,0,1,208,160Z`,
+  Drag: `M188,80a27.79,27.79,0,0,0-13.36,3.4,28,28,0,0,0-46.64-11A28,28,0,0,0,80,92v20H68a28,28,0,0,0-28,28v12a88,88,0,0,0,176,0V108A28,28,0,0,0,188,80Zm12,72a72,72,0,0,1-144,0V140a12,12,0,0,1,12-12H80v24a8,8,0,0,0,16,0V92a12,12,0,0,1,24,0v28a8,8,0,0,0,16,0V92a12,12,0,0,1,24,0v28a8,8,0,0,0,16,0V108a12,12,0,0,1,24,0Z`,
+};
+
+function createIcon(path: string, options: IconOptions = {}): string {
+  const size = options.size ?? DEFAULT_SIZE;
+  const color = options.color ?? DEFAULT_COLOR;
+  return `<svg xmlns="http://www.w3.org/2000/svg" width="${size}" height="${size}" fill="${color}" viewBox="0 0 256 256"><path d="${path}"></path></svg>`;
+}
+
+export const ICONS = {
+  ClickIcon: createIcon(iconPaths.ClickIcon),
+  Keyboard: createIcon(iconPaths.Keyboard),
+  Drag: createIcon(iconPaths.Drag),
+};
+
+export function getIcon(
+  name: keyof typeof iconPaths,
+  options?: IconOptions,
+): string {
+  return createIcon(iconPaths[name], options);
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/index.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/index.ts
new file mode 100644
index 0000000000..49f505054b
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/index.ts
@@ -0,0 +1,84 @@
+import Shepherd from "shepherd.js";
+import { analytics } from "@/services/analytics";
+import { TUTORIAL_CONFIG } from "./constants";
+import { createTutorialSteps } from "./steps";
+import { injectTutorialStyles, removeTutorialStyles } from "./styles";
+import {
+  handleTutorialComplete,
+  handleTutorialCancel,
+  prefetchTutorialBlocks,
+  clearPrefetchedBlocks,
+} from "./helpers";
+import { useNodeStore } from "../../../stores/nodeStore";
+import { useEdgeStore } from "../../../stores/edgeStore";
+import { useTutorialStore } from "../../../stores/tutorialStore";
+
+let isTutorialLoading = false;
+let tutorialLoadingCallback: ((loading: boolean) => void) | null = null;
+
+export const setTutorialLoadingCallback = (
+  callback: (loading: boolean) => void,
+) => {
+  tutorialLoadingCallback = callback;
+};
+
+export const getTutorialLoadingState = () => isTutorialLoading;
+
+export const startTutorial = async () => {
+  isTutorialLoading = true;
+  tutorialLoadingCallback?.(true);
+
+  useNodeStore.getState().setNodes([]);
+  useEdgeStore.getState().setEdges([]);
+  useNodeStore.getState().setNodeCounter(0);
+
+  try {
+    await prefetchTutorialBlocks();
+  } finally {
+    isTutorialLoading = false;
+    tutorialLoadingCallback?.(false);
+  }
+
+  const tour = new Shepherd.Tour({
+    useModalOverlay: TUTORIAL_CONFIG.USE_MODAL_OVERLAY,
+    defaultStepOptions: {
+      cancelIcon: { enabled: true },
+      scrollTo: {
+        behavior: TUTORIAL_CONFIG.SCROLL_BEHAVIOR,
+        block: TUTORIAL_CONFIG.SCROLL_BLOCK,
+      },
+      classes: "new-builder-tour",
+      modalOverlayOpeningRadius: 4,
+    },
+  });
+
+  injectTutorialStyles();
+
+  const steps = createTutorialSteps(tour);
+  steps.forEach((step) => tour.addStep(step));
+
+  tour.on("complete", () => {
+    handleTutorialComplete();
+    removeTutorialStyles();
+    clearPrefetchedBlocks();
+    useTutorialStore.getState().setIsTutorialRunning(false);
+  });
+
+  tour.on("cancel", () => {
+    handleTutorialCancel(tour);
+    removeTutorialStyles();
+    clearPrefetchedBlocks();
+    useTutorialStore.getState().setIsTutorialRunning(false);
+  });
+
+  for (const step of tour.steps) {
+    step.on("show", () => {
+      console.debug("sendTutorialStep", step.id);
+      analytics.sendGAEvent("event", "tutorial_step_shown", {
+        value: step.id,
+      });
+    });
+  }
+
+  tour.start();
+};
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/block-basics.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/block-basics.ts
new file mode 100644
index 0000000000..89be102a74
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/block-basics.ts
@@ -0,0 +1,114 @@
+import { StepOptions } from "shepherd.js";
+import { TUTORIAL_SELECTORS } from "../constants";
+import {
+  waitForElement,
+  waitForNodeOnCanvas,
+  closeBlockMenu,
+  fitViewToScreen,
+  highlightElement,
+  removeAllHighlights,
+} from "../helpers";
+import { ICONS } from "../icons";
+import { banner } from "../styles";
+
+export const createBlockBasicsSteps = (tour: any): StepOptions[] => [
+  {
+    id: "focus-new-block",
+    title: "Your First Block!",
+    text: `
+      <div class="text-sm leading-[1.375rem] text-zinc-800">
+        <p class="text-sm font-normal leading-[1.375rem] text-zinc-800 m-0">Excellent! This is your <strong>Calculator Block</strong>.</p>
+        <p class="text-sm font-normal leading-[1.375rem] text-zinc-800 m-0" style="margin-top: 0.5rem;">Let's explore how blocks work.</p>
+      </div>
+    `,
+    attachTo: {
+      element: TUTORIAL_SELECTORS.REACT_FLOW_NODE,
+      on: "right",
+    },
+    beforeShowPromise: async () => {
+      closeBlockMenu();
+      await waitForNodeOnCanvas(5000);
+      await new Promise((resolve) => setTimeout(resolve, 300));
+      fitViewToScreen();
+    },
+    when: {
+      show: () => {
+        const node = document.querySelector(TUTORIAL_SELECTORS.REACT_FLOW_NODE);
+        if (node) {
+          highlightElement(TUTORIAL_SELECTORS.REACT_FLOW_NODE);
+        }
+      },
+      hide: () => {
+        removeAllHighlights();
+      },
+    },
+    buttons: [
+      {
+        text: "Show me",
+        action: () => tour.next(),
+      },
+    ],
+  },
+
+  {
+    id: "input-handles",
+    title: "Input Handles",
+    text: `
+      <div class="text-sm leading-[1.375rem] text-zinc-800">
+        <p class="text-sm font-normal leading-[1.375rem] text-zinc-800 m-0">On the <strong>left side</strong> of the block are <strong>input handles</strong>.</p>
+        <p class="text-sm font-normal leading-[1.375rem] text-zinc-800 m-0" style="margin-top: 0.5rem;">These are where data flows <em>into</em> the block from other blocks.</p>
+      </div>
+    `,
+    attachTo: {
+      element: TUTORIAL_SELECTORS.NODE_INPUT_HANDLE,
+      on: "bottom",
+    },
+    classes: "new-builder-tour input-handles-step",
+    beforeShowPromise: () =>
+      waitForElement(TUTORIAL_SELECTORS.NODE_INPUT_HANDLE, 3000).catch(
+        () => {},
+      ),
+    buttons: [
+      {
+        text: "Back",
+        action: () => tour.back(),
+        classes: "shepherd-button-secondary",
+      },
+      {
+        text: "Next",
+        action: () => tour.next(),
+      },
+    ],
+  },
+
+  {
+    id: "output-handles",
+    title: "Output Handles",
+    text: `
+      <div class="text-sm leading-[1.375rem] text-zinc-800">
+        <p class="text-sm font-normal leading-[1.375rem] text-zinc-800 m-0">On the <strong>right side</strong> is the <strong>output handle</strong>.</p>
+        <p class="text-sm font-normal leading-[1.375rem] text-zinc-800 m-0" style="margin-top: 0.5rem;">This is where the result flows <em>out</em> to connect to other blocks.</p>
+        ${banner(ICONS.Drag, "You can drag from output to input handler to connect blocks", "info")}
+      </div>
+    `,
+    attachTo: {
+      element: TUTORIAL_SELECTORS.NODE_OUTPUT_HANDLE,
+      on: "right",
+    },
+    beforeShowPromise: () =>
+      waitForElement(TUTORIAL_SELECTORS.NODE_OUTPUT_HANDLE, 3000).catch(
+        () => {},
+      ),
+    buttons: [
+      {
+        text: "Back",
+        action: () => tour.back(),
+        classes: "shepherd-button-secondary",
+      },
+      {
+        text: "Next →",
+        action: () => tour.next(),
+      },
+    ],
+  },
+];
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/block-menu.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/block-menu.ts
new file mode 100644
index 0000000000..6a1eaf33d5
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/block-menu.ts
@@ -0,0 +1,198 @@
+import { StepOptions } from "shepherd.js";
+import { TUTORIAL_CONFIG, TUTORIAL_SELECTORS, BLOCK_IDS } from "../constants";
+import {
+  waitForElement,
+  forceBlockMenuOpen,
+  focusElement,
+  highlightElement,
+  removeAllHighlights,
+  disableOtherBlocks,
+  enableAllBlocks,
+  pulseElement,
+  highlightFirstBlockInSearch,
+} from "../helpers";
+import { ICONS } from "../icons";
+import { banner } from "../styles";
+import { useNodeStore } from "../../../../stores/nodeStore";
+
+export const createBlockMenuSteps = (tour: any): StepOptions[] => [
+  {
+    id: "open-block-menu",
+    title: "Open the Block Menu",
+    text: `
+      <div class="text-sm leading-[1.375rem] text-zinc-800">
+        <p class="text-sm font-normal leading-[1.375rem] text-zinc-800 m-0">Let's start by opening the Block Menu.</p>
+        ${banner(ICONS.ClickIcon, "Click this button to open the menu", "action")}
+      </div>
+    `,
+    attachTo: {
+      element: TUTORIAL_SELECTORS.BLOCKS_TRIGGER,
+      on: "right",
+    },
+    advanceOn: {
+      selector: TUTORIAL_SELECTORS.BLOCKS_TRIGGER,
+      event: "click",
+    },
+    buttons: [],
+    when: {
+      show: () => {
+        highlightElement(TUTORIAL_SELECTORS.BLOCKS_TRIGGER);
+      },
+      hide: () => {
+        removeAllHighlights();
+      },
+    },
+  },
+
+  {
+    id: "block-menu-overview",
+    title: "The Block Menu",
+    text: `
+      <div class="text-sm leading-[1.375rem] text-zinc-800">
+        <p class="text-sm font-normal leading-[1.375rem] text-zinc-800 m-0">This is the <strong>Block Menu</strong> — your toolbox for building agents.</p>
+        <p class="text-sm font-medium leading-[1.375rem] text-zinc-800 m-0" style="margin-top: 0.5rem;">Here you'll find:</p>
+        <ul>
+          <li><strong>Input Blocks</strong> — Entry points for data</li>
+          <li><strong>Action Blocks</strong> — Processing and AI operations</li>
+          <li><strong>Output Blocks</strong> — Results and responses</li>
+          <li><strong>Integrations</strong> — Third-party service blocks</li>
+          <li><strong>Library Agents</strong> — Your personal agents</li>
+          <li><strong>Marketplace Agents</strong> — Community agents</li>
+        </ul>
+      </div>
+    `,
+    attachTo: {
+      element: TUTORIAL_SELECTORS.BLOCKS_CONTENT,
+      on: "left",
+    },
+    beforeShowPromise: () => waitForElement(TUTORIAL_SELECTORS.BLOCKS_CONTENT),
+    when: {
+      show: () => forceBlockMenuOpen(true),
+    },
+    buttons: [
+      {
+        text: "Next",
+        action: () => tour.next(),
+      },
+    ],
+  },
+
+  {
+    id: "search-calculator",
+    title: "Search for a Block",
+    text: `
+      <div class="text-sm leading-[1.375rem] text-zinc-800">
+        <p class="text-sm font-normal leading-[1.375rem] text-zinc-800 m-0">Let's add a Calculator block to start.</p>
+        ${banner(ICONS.Keyboard, "Type Calculator in the search bar", "action")}
+        <p class="text-xs font-normal leading-[1.125rem] text-zinc-500 m-0" style="margin-top: 0.5rem;">The search will filter blocks as you type.</p>
+      </div>
+    `,
+    attachTo: {
+      element: TUTORIAL_SELECTORS.BLOCKS_SEARCH_INPUT_BOX,
+      on: "bottom",
+    },
+    beforeShowPromise: () =>
+      waitForElement(TUTORIAL_SELECTORS.BLOCKS_SEARCH_INPUT_BOX),
+    when: {
+      show: () => {
+        forceBlockMenuOpen(true);
+        setTimeout(() => {
+          focusElement(TUTORIAL_SELECTORS.BLOCKS_SEARCH_INPUT_BOX);
+        }, 100);
+
+        const checkForCalculator = setInterval(() => {
+          const calcBlock = document.querySelector(
+            TUTORIAL_SELECTORS.BLOCK_CARD_CALCULATOR_IN_SEARCH,
+          );
+          if (calcBlock) {
+            clearInterval(checkForCalculator);
+
+            const searchInput = document.querySelector(
+              TUTORIAL_SELECTORS.BLOCKS_SEARCH_INPUT,
+            ) as HTMLInputElement;
+            if (searchInput) {
+              searchInput.blur();
+            }
+
+            disableOtherBlocks(
+              TUTORIAL_SELECTORS.BLOCK_CARD_CALCULATOR_IN_SEARCH,
+            );
+            pulseElement(TUTORIAL_SELECTORS.BLOCK_CARD_CALCULATOR_IN_SEARCH);
+            calcBlock.scrollIntoView({ behavior: "smooth", block: "center" });
+            setTimeout(() => {
+              tour.next();
+            }, 300);
+          }
+        }, TUTORIAL_CONFIG.ELEMENT_CHECK_INTERVAL);
+
+        (window as any).__tutorialCalcInterval = checkForCalculator;
+      },
+      hide: () => {
+        if ((window as any).__tutorialCalcInterval) {
+          clearInterval((window as any).__tutorialCalcInterval);
+          delete (window as any).__tutorialCalcInterval;
+        }
+        enableAllBlocks();
+      },
+    },
+    buttons: [],
+  },
+
+  {
+    id: "select-calculator",
+    title: "Add the Calculator Block",
+    text: `
+      <div class="text-sm leading-[1.375rem] text-zinc-800">
+        <p class="text-sm font-normal leading-[1.375rem] text-zinc-800 m-0">You should see the <strong>Calculator</strong> block in the results.</p>
+        ${banner(ICONS.ClickIcon, "Click on the Calculator block to add it", "action")}
+        
+        <div class="bg-zinc-100 ring-1 ring-zinc-200 rounded-2xl p-2 px-4 mt-2 flex items-start gap-2 text-sm font-medium text-zinc-600">  
+          <span class="flex-shrink-0">${ICONS.Drag}</span>
+          <span>You can also drag blocks onto the canvas</span>
+        </div>
+      </div>
+    `,
+    attachTo: {
+      element: TUTORIAL_SELECTORS.BLOCK_CARD_CALCULATOR,
+      on: "left",
+    },
+    beforeShowPromise: async () => {
+      forceBlockMenuOpen(true);
+      await waitForElement(TUTORIAL_SELECTORS.BLOCK_CARD_CALCULATOR, 5000);
+      await new Promise((resolve) => setTimeout(resolve, 100));
+    },
+    when: {
+      show: () => {
+        const calcBlock = document.querySelector(
+          TUTORIAL_SELECTORS.BLOCK_CARD_CALCULATOR,
+        );
+        if (calcBlock) {
+          disableOtherBlocks(TUTORIAL_SELECTORS.BLOCK_CARD_CALCULATOR);
+        } else {
+          highlightFirstBlockInSearch();
+        }
+
+        const CALCULATOR_BLOCK_ID = BLOCK_IDS.CALCULATOR;
+
+        const initialNodeCount = useNodeStore.getState().nodes.length;
+
+        const unsubscribe = useNodeStore.subscribe((state) => {
+          if (state.nodes.length > initialNodeCount) {
+            const calculatorNode = state.nodes.find(
+              (node) => node.data?.block_id === CALCULATOR_BLOCK_ID,
+            );
+
+            if (calculatorNode) {
+              unsubscribe();
+              enableAllBlocks();
+              forceBlockMenuOpen(false);
+              tour.next();
+            }
+          }
+        });
+
+        (tour.getCurrentStep() as any)._nodeUnsubscribe = unsubscribe;
+      },
+    },
+  },
+];
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/completion.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/completion.ts
new file mode 100644
index 0000000000..12d3f3fd92
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/completion.ts
@@ -0,0 +1,51 @@
+import { StepOptions } from "shepherd.js";
+
+export const createCompletionSteps = (tour: any): StepOptions[] => [
+  {
+    id: "congratulations",
+    title: "Congratulations! 🎉",
+    text: `
+      <div class="text-sm leading-[1.375rem] text-zinc-800">
+        <p class="text-sm font-normal leading-[1.375rem] text-zinc-800 m-0">You have successfully created and run your first agent flow!</p>
+        
+        <div class="mt-3 p-3 bg-green-50 ring-1 ring-green-200 rounded-2xl">
+          <p class="text-sm font-medium text-green-600 m-0">You learned how to:</p>
+          <ul class="text-[0.8125rem] text-green-600 m-0 pl-4 mt-2 space-y-1">
+            <li>• Add blocks from the Block Menu</li>
+            <li>• Understand input and output handles</li>
+            <li>• Configure block values</li>
+            <li>• Connect blocks together</li>
+            <li>• Save and run your agent</li>
+            <li>• View execution status and output</li>
+          </ul>
+        </div>
+        
+        <p class="text-sm font-medium leading-[1.375rem] text-zinc-800 m-0" style="margin-top: 0.75rem;">Happy building! 🚀</p>
+      </div>
+    `,
+    when: {
+      show: () => {
+        const modal = document.querySelector(
+          ".shepherd-modal-overlay-container",
+        );
+        if (modal) {
+          (modal as HTMLElement).style.opacity = "0.3";
+        }
+      },
+    },
+    buttons: [
+      {
+        text: "Restart Tutorial",
+        action: () => {
+          tour.cancel();
+          setTimeout(() => tour.start(), 100);
+        },
+        classes: "shepherd-button-secondary",
+      },
+      {
+        text: "Finish",
+        action: () => tour.complete(),
+      },
+    ],
+  },
+];
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/configure-calculator.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/configure-calculator.ts
new file mode 100644
index 0000000000..9a4a542437
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/configure-calculator.ts
@@ -0,0 +1,197 @@
+import { StepOptions } from "shepherd.js";
+import { TUTORIAL_SELECTORS } from "../constants";
+import {
+  fitViewToScreen,
+  highlightElement,
+  removeAllHighlights,
+  getFirstNode,
+} from "../helpers";
+import { ICONS } from "../icons";
+import { banner } from "../styles";
+
+const getRequirementsHtml = () => `
+  <div id="requirements-box" class="mt-3 p-3 bg-amber-50 ring-1 ring-amber-200 rounded-2xl">
+    <p id="requirements-title" class="text-sm font-medium text-amber-600 m-0 mb-2">⚠️ Required to continue:</p>
+    <ul id="requirements-list" class="text-[0.8125rem] text-amber-600 m-0 pl-4 space-y-1">
+      <li id="req-a" class="flex items-center gap-2">
+        <span class="req-icon">○</span> Enter a number in field <strong>A</strong> (e.g., 10)
+      </li>
+      <li id="req-b" class="flex items-center gap-2">
+        <span class="req-icon">○</span> Enter a number in field <strong>B</strong> (e.g., 5)
+      </li>
+      <li id="req-op" class="flex items-center gap-2">
+        <span class="req-icon">○</span> Select an <strong>Operation</strong> (Add, Multiply, etc.)
+      </li>
+    </ul>
+  </div>
+`;
+
+const updateToSuccessState = () => {
+  const reqBox = document.querySelector("#requirements-box");
+  const reqTitle = document.querySelector("#requirements-title");
+  const reqList = document.querySelector("#requirements-list");
+
+  if (reqBox && reqTitle) {
+    reqBox.classList.remove("bg-amber-50", "ring-amber-200");
+    reqBox.classList.add("bg-green-50", "ring-green-200");
+    reqTitle.classList.remove("text-amber-600");
+    reqTitle.classList.add("text-green-600");
+    reqTitle.innerHTML = "🎉 Hurray! All values are completed!";
+    if (reqList) {
+      reqList.classList.add("hidden");
+    }
+  }
+};
+
+const updateToWarningState = () => {
+  const reqBox = document.querySelector("#requirements-box");
+  const reqTitle = document.querySelector("#requirements-title");
+  const reqList = document.querySelector("#requirements-list");
+
+  if (reqBox && reqTitle) {
+    reqBox.classList.remove("bg-green-50", "ring-green-200");
+    reqBox.classList.add("bg-amber-50", "ring-amber-200");
+    reqTitle.classList.remove("text-green-600");
+    reqTitle.classList.add("text-amber-600");
+    reqTitle.innerHTML = "⚠️ Required to continue:";
+    if (reqList) {
+      reqList.classList.remove("hidden");
+    }
+  }
+};
+
+export const createConfigureCalculatorSteps = (tour: any): StepOptions[] => [
+  {
+    id: "enter-values",
+    title: "Enter Values",
+    text: `
+      <div class="text-sm leading-[1.375rem] text-zinc-800">
+        <p class="text-sm font-normal leading-[1.375rem] text-zinc-800 m-0">Now let's configure the block with actual values.</p>
+        ${getRequirementsHtml()}
+        ${banner(ICONS.ClickIcon, "Fill in all the required fields above", "action")}
+      </div>
+    `,
+    beforeShowPromise: () => {
+      fitViewToScreen();
+      return Promise.resolve();
+    },
+    attachTo: {
+      element: TUTORIAL_SELECTORS.CALCULATOR_NODE_FORM_CONTAINER,
+      on: "right",
+    },
+    when: {
+      show: () => {
+        const node = getFirstNode();
+        if (node) {
+          highlightElement(`[data-id="custom-node-${node.id}"]`);
+        }
+
+        let wasComplete = false;
+
+        const checkInterval = setInterval(() => {
+          const node = getFirstNode();
+          if (!node) return;
+
+          const hardcodedValues = node.data?.hardcodedValues || {};
+          const hasA =
+            hardcodedValues.a !== undefined &&
+            hardcodedValues.a !== null &&
+            hardcodedValues.a !== "";
+          const hasB =
+            hardcodedValues.b !== undefined &&
+            hardcodedValues.b !== null &&
+            hardcodedValues.b !== "";
+          const hasOp =
+            hardcodedValues.operation !== undefined &&
+            hardcodedValues.operation !== null &&
+            hardcodedValues.operation !== "";
+
+          const allComplete = hasA && hasB && hasOp;
+
+          const reqA = document.querySelector("#req-a .req-icon");
+          const reqB = document.querySelector("#req-b .req-icon");
+          const reqOp = document.querySelector("#req-op .req-icon");
+
+          if (reqA) reqA.textContent = hasA ? "✓" : "○";
+          if (reqB) reqB.textContent = hasB ? "✓" : "○";
+          if (reqOp) reqOp.textContent = hasOp ? "✓" : "○";
+
+          const reqAEl = document.querySelector("#req-a");
+          const reqBEl = document.querySelector("#req-b");
+          const reqOpEl = document.querySelector("#req-op");
+
+          if (reqAEl) {
+            reqAEl.classList.toggle("text-green-600", hasA);
+            reqAEl.classList.toggle("text-amber-600", !hasA);
+          }
+          if (reqBEl) {
+            reqBEl.classList.toggle("text-green-600", hasB);
+            reqBEl.classList.toggle("text-amber-600", !hasB);
+          }
+          if (reqOpEl) {
+            reqOpEl.classList.toggle("text-green-600", hasOp);
+            reqOpEl.classList.toggle("text-amber-600", !hasOp);
+          }
+
+          if (allComplete && !wasComplete) {
+            updateToSuccessState();
+            wasComplete = true;
+          } else if (!allComplete && wasComplete) {
+            updateToWarningState();
+            wasComplete = false;
+          }
+
+          const nextBtn = document.querySelector(
+            ".shepherd-button-primary",
+          ) as HTMLButtonElement;
+          if (nextBtn) {
+            nextBtn.style.opacity = allComplete ? "1" : "0.5";
+            nextBtn.style.pointerEvents = allComplete ? "auto" : "none";
+          }
+        }, 300);
+
+        (window as any).__tutorialCheckInterval = checkInterval;
+      },
+      hide: () => {
+        removeAllHighlights();
+        if ((window as any).__tutorialCheckInterval) {
+          clearInterval((window as any).__tutorialCheckInterval);
+          delete (window as any).__tutorialCheckInterval;
+        }
+      },
+    },
+    buttons: [
+      {
+        text: "Back",
+        action: () => tour.back(),
+        classes: "shepherd-button-secondary",
+      },
+      {
+        text: "Continue",
+        action: () => {
+          const node = getFirstNode();
+          if (!node) return;
+
+          const hardcodedValues = node.data?.hardcodedValues || {};
+          const hasA =
+            hardcodedValues.a !== undefined &&
+            hardcodedValues.a !== null &&
+            hardcodedValues.a !== "";
+          const hasB =
+            hardcodedValues.b !== undefined &&
+            hardcodedValues.b !== null &&
+            hardcodedValues.b !== "";
+          const hasOp =
+            hardcodedValues.operation !== undefined &&
+            hardcodedValues.operation !== null &&
+            hardcodedValues.operation !== "";
+
+          if (hasA && hasB && hasOp) {
+            tour.next();
+          }
+        },
+        classes: "shepherd-button-primary",
+      },
+    ],
+  },
+];
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/connections.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/connections.ts
new file mode 100644
index 0000000000..7d0ebc9116
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/connections.ts
@@ -0,0 +1,276 @@
+import { StepOptions } from "shepherd.js";
+import {
+  fitViewToScreen,
+  highlightElement,
+  removeAllHighlights,
+} from "../helpers";
+import { ICONS } from "../icons";
+import { banner } from "../styles";
+import { useEdgeStore } from "../../../../stores/edgeStore";
+import { TUTORIAL_SELECTORS } from "../constants";
+
+const getConnectionStatusHtml = (id: string, isConnected: boolean = false) => `
+  <div id="${id}" class="mt-3 p-2 ${isConnected ? "bg-green-50 ring-1 ring-green-200" : "bg-amber-50 ring-1 ring-amber-200"} rounded-2xl text-center text-sm ${isConnected ? "text-green-600" : "text-amber-600"}">
+    ${isConnected ? "✅ Connected!" : "Waiting for connection..."}
+  </div>
+`;
+
+const updateConnectionStatus = (
+  id: string,
+  isConnected: boolean,
+  message?: string,
+) => {
+  const statusEl = document.querySelector(`#${id}`);
+  if (statusEl) {
+    statusEl.innerHTML =
+      message || (isConnected ? "✅ Connected!" : "Waiting for connection...");
+    statusEl.classList.remove(
+      "bg-amber-50",
+      "ring-amber-200",
+      "text-amber-600",
+      "bg-green-50",
+      "ring-green-200",
+      "text-green-600",
+    );
+    if (isConnected) {
+      statusEl.classList.add("bg-green-50", "ring-green-200", "text-green-600");
+    } else {
+      statusEl.classList.add("bg-amber-50", "ring-amber-200", "text-amber-600");
+    }
+  }
+};
+
+const hasAnyEdge = (): boolean => {
+  return useEdgeStore.getState().edges.length > 0;
+};
+
+export const createConnectionSteps = (tour: any): StepOptions[] => {
+  let isConnecting = false;
+
+  const handleMouseDown = () => {
+    isConnecting = true;
+
+    const inputSelector =
+      TUTORIAL_SELECTORS.FIRST_CALCULATOR_RESULT_OUTPUT_HANDLER;
+    if (inputSelector) {
+      highlightElement(inputSelector);
+    }
+
+    setTimeout(() => {
+      if (isConnecting) {
+        tour.next();
+      }
+    }, 100);
+  };
+
+  const resetConnectionState = () => {
+    isConnecting = false;
+  };
+
+  return [
+    {
+      id: "connect-blocks-output",
+      title: "Connect the Blocks: Output",
+      text: `
+        <div class="text-sm leading-[1.375rem] text-zinc-800">
+          <p class="text-sm font-normal leading-[1.375rem] text-zinc-800 m-0">Now, let's connect the <strong>Result output</strong> of the first Calculator to the <strong>input (A)</strong> of the second Calculator.</p>
+          
+          <div class="mt-3 p-3 bg-blue-50 ring-1 ring-blue-200 rounded-2xl">
+            <p class="text-sm font-medium text-blue-600 m-0 mb-2">Drag from the Result output:</p>
+            <p class="text-[0.8125rem] text-blue-600 m-0">Click and drag from the <strong>Result</strong> output pin (right side) of the <strong>first Calculator block</strong>.</p>
+          </div>
+          ${getConnectionStatusHtml("connection-status-output", false)}
+          ${banner(ICONS.Drag, "Drag from the Result output pin", "action")}
+        </div>
+      `,
+      attachTo: {
+        element: TUTORIAL_SELECTORS.FIRST_CALCULATOR_RESULT_OUTPUT_HANDLER,
+        on: "left",
+      },
+
+      when: {
+        show: () => {
+          resetConnectionState();
+
+          if (hasAnyEdge()) {
+            updateConnectionStatus(
+              "connection-status-output",
+              true,
+              "✅ Connection already exists!",
+            );
+            setTimeout(() => {
+              tour.next();
+            }, 1000);
+            return;
+          }
+
+          const outputSelector =
+            TUTORIAL_SELECTORS.FIRST_CALCULATOR_RESULT_OUTPUT_HANDLER;
+          if (outputSelector) {
+            const outputHandle = document.querySelector(outputSelector);
+            if (outputHandle) {
+              highlightElement(outputSelector);
+              outputHandle.addEventListener("mousedown", handleMouseDown);
+            }
+          }
+
+          const unsubscribe = useEdgeStore.subscribe(() => {
+            if (hasAnyEdge()) {
+              updateConnectionStatus("connection-status-output", true);
+              setTimeout(() => {
+                unsubscribe();
+                tour.next();
+              }, 500);
+            }
+          });
+
+          (tour.getCurrentStep() as any)._edgeUnsubscribe = unsubscribe;
+        },
+        hide: () => {
+          removeAllHighlights();
+          const step = tour.getCurrentStep() as any;
+          if (step?._edgeUnsubscribe) {
+            step._edgeUnsubscribe();
+          }
+          const outputSelector =
+            TUTORIAL_SELECTORS.FIRST_CALCULATOR_RESULT_OUTPUT_HANDLER;
+          if (outputSelector) {
+            const outputHandle = document.querySelector(outputSelector);
+            if (outputHandle) {
+              outputHandle.removeEventListener("mousedown", handleMouseDown);
+            }
+          }
+        },
+      },
+      buttons: [
+        {
+          text: "Back",
+          action: () => tour.back(),
+          classes: "shepherd-button-secondary",
+        },
+        {
+          text: "Skip (already connected)",
+          action: () => tour.show("connection-complete"),
+          classes: "shepherd-button-secondary",
+        },
+      ],
+    },
+
+    {
+      id: "connect-blocks-input",
+      title: "Connect the Blocks: Input",
+      text: `
+        <div class="text-sm leading-[1.375rem] text-zinc-800">
+          <p class="text-sm font-normal leading-[1.375rem] text-zinc-800 m-0">Now, connect to the <strong>input (A)</strong> of the second Calculator block.</p>
+          
+          <div class="mt-3 p-3 bg-blue-50 ring-1 ring-blue-200 rounded-2xl">
+            <p class="text-sm font-medium text-blue-600 m-0 mb-2">Drop on the A input:</p>
+            <p class="text-[0.8125rem] text-blue-600 m-0">Drag to the <strong>A</strong> input handle (left side) of the <strong>second Calculator block</strong>.</p>
+          </div>
+          ${getConnectionStatusHtml("connection-status-input", false)}
+        </div>
+      `,
+      attachTo: {
+        element: TUTORIAL_SELECTORS.SECOND_CALCULATOR_NUMBER_A_INPUT_HANDLER,
+        on: "right",
+      },
+      when: {
+        show: () => {
+          const inputSelector =
+            TUTORIAL_SELECTORS.SECOND_CALCULATOR_NUMBER_A_INPUT_HANDLER;
+          if (inputSelector) {
+            highlightElement(inputSelector);
+          }
+
+          if (hasAnyEdge()) {
+            updateConnectionStatus(
+              "connection-status-input",
+              true,
+              "✅ Connected!",
+            );
+            setTimeout(() => {
+              tour.next();
+            }, 500);
+            return;
+          }
+
+          const unsubscribe = useEdgeStore.subscribe(() => {
+            if (hasAnyEdge()) {
+              updateConnectionStatus("connection-status-input", true);
+              setTimeout(() => {
+                unsubscribe();
+                tour.next();
+              }, 500);
+            }
+          });
+
+          (tour.getCurrentStep() as any)._edgeUnsubscribe = unsubscribe;
+
+          const handleMouseUp = () => {
+            setTimeout(() => {
+              if (!hasAnyEdge()) {
+                isConnecting = false;
+                tour.show("connect-blocks-output");
+              }
+            }, 200);
+          };
+          document.addEventListener("mouseup", handleMouseUp, true);
+          (tour.getCurrentStep() as any)._mouseUpHandler = handleMouseUp;
+        },
+        hide: () => {
+          removeAllHighlights();
+          const step = tour.getCurrentStep() as any;
+          if (step?._edgeUnsubscribe) {
+            step._edgeUnsubscribe();
+          }
+          if (step?._mouseUpHandler) {
+            document.removeEventListener("mouseup", step._mouseUpHandler, true);
+          }
+        },
+      },
+      buttons: [
+        {
+          text: "Back",
+          action: () => tour.show("connect-blocks-output"),
+          classes: "shepherd-button-secondary",
+        },
+        {
+          text: "Skip (already connected)",
+          action: () => tour.next(),
+          classes: "shepherd-button-secondary",
+        },
+      ],
+    },
+
+    {
+      id: "connection-complete",
+      title: "Blocks Connected! 🎉",
+      text: `
+        <div class="text-sm leading-[1.375rem] text-zinc-800">
+          <p class="text-sm font-normal leading-[1.375rem] text-zinc-800 m-0">Excellent! Your Calculator blocks are now connected:</p>
+          
+          <div class="mt-3 p-3 bg-green-50 ring-1 ring-green-200 rounded-2xl">
+            <div class="flex items-center justify-center gap-2 text-sm font-medium text-green-600">
+              <span>Calculator 1</span>
+              <span>→</span>
+              <span>Calculator 2</span>
+            </div>
+            <p class="text-[0.75rem] text-green-500 m-0 mt-2 text-center italic">The result of Calculator 1 flows into Calculator 2's input A</p>
+          </div>
+          
+          <p class="text-sm font-normal leading-[1.375rem] text-zinc-800 m-0" style="margin-top: 0.75rem;">Now let's save and run your agent!</p>
+        </div>
+      `,
+      beforeShowPromise: async () => {
+        fitViewToScreen();
+        return Promise.resolve();
+      },
+      buttons: [
+        {
+          text: "Save My Agent",
+          action: () => tour.next(),
+        },
+      ],
+    },
+  ];
+};
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/index.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/index.ts
new file mode 100644
index 0000000000..657dbf76bb
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/index.ts
@@ -0,0 +1,22 @@
+import { StepOptions } from "shepherd.js";
+import { createWelcomeSteps } from "./welcome";
+import { createBlockMenuSteps } from "./block-menu";
+import { createBlockBasicsSteps } from "./block-basics";
+import { createConfigureCalculatorSteps } from "./configure-calculator";
+import { createSecondCalculatorSteps } from "./second-calculator";
+import { createConnectionSteps } from "./connections";
+import { createSaveSteps } from "./save";
+import { createRunSteps } from "./run";
+import { createCompletionSteps } from "./completion";
+
+export const createTutorialSteps = (tour: any): StepOptions[] => [
+  ...createWelcomeSteps(tour),
+  ...createBlockMenuSteps(tour),
+  ...createBlockBasicsSteps(tour),
+  ...createConfigureCalculatorSteps(tour),
+  ...createSecondCalculatorSteps(tour),
+  ...createConnectionSteps(tour),
+  ...createSaveSteps(),
+  ...createRunSteps(tour),
+  ...createCompletionSteps(tour),
+];
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/run.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/run.ts
new file mode 100644
index 0000000000..bebe69480d
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/run.ts
@@ -0,0 +1,97 @@
+import { StepOptions } from "shepherd.js";
+import { TUTORIAL_SELECTORS } from "../constants";
+import {
+  waitForElement,
+  fitViewToScreen,
+  highlightElement,
+  removeAllHighlights,
+} from "../helpers";
+import { ICONS } from "../icons";
+import { banner } from "../styles";
+
+export const createRunSteps = (tour: any): StepOptions[] => [
+  {
+    id: "press-run",
+    title: "Run Your Agent",
+    text: `
+      <div class="text-sm leading-[1.375rem] text-zinc-800">
+        <p class="text-sm font-normal leading-[1.375rem] text-zinc-800 m-0">Your agent is saved and ready! Now let's <strong>run it</strong> to see it in action.</p>
+        ${banner(ICONS.ClickIcon, "Click the Run button", "action")}
+      </div>
+    `,
+    attachTo: {
+      element: TUTORIAL_SELECTORS.RUN_BUTTON,
+      on: "top",
+    },
+    advanceOn: {
+      selector: TUTORIAL_SELECTORS.RUN_BUTTON,
+      event: "click",
+    },
+    beforeShowPromise: () =>
+      waitForElement(TUTORIAL_SELECTORS.RUN_BUTTON, 3000).catch(() => {}),
+    when: {
+      show: () => {
+        highlightElement(TUTORIAL_SELECTORS.RUN_BUTTON);
+      },
+      hide: () => {
+        removeAllHighlights();
+        setTimeout(() => {
+          fitViewToScreen();
+        }, 500);
+      },
+    },
+    buttons: [],
+  },
+
+  {
+    id: "show-output",
+    title: "View the Output",
+    text: `
+      <div class="text-sm leading-[1.375rem] text-zinc-800">
+        <p class="text-sm font-normal leading-[1.375rem] text-zinc-800 m-0">Here's the <strong>output</strong> of your block!</p>
+        
+        <div class="mt-3 p-3 bg-blue-50 ring-1 ring-blue-200 rounded-2xl">
+          <p class="text-sm font-medium text-blue-600 m-0">Latest Output:</p>
+          <p class="text-[0.8125rem] text-blue-600 m-0 mt-1">After each run, you can see the result of each block at the bottom of the block.</p>
+        </div>
+        
+        <div class="mt-2 p-2 bg-zinc-100 ring-1 ring-zinc-200 rounded-xl">
+          <p class="text-[0.8125rem] text-zinc-600 m-0">The output shows:</p>
+          <ul class="text-[0.8125rem] text-zinc-500 m-0 mt-1 pl-4">
+            <li>• The calculated result</li>
+            <li>• Execution timestamp</li>
+          </ul>
+        </div>
+      </div>
+    `,
+    attachTo: {
+      element: TUTORIAL_SELECTORS.FIRST_CALCULATOR_NODE_OUTPUT,
+      on: "top",
+    },
+    beforeShowPromise: () =>
+      new Promise((resolve) => {
+        setTimeout(() => {
+          waitForElement(TUTORIAL_SELECTORS.FIRST_CALCULATOR_NODE_OUTPUT, 5000)
+            .then(() => {
+              fitViewToScreen();
+              resolve(undefined);
+            })
+            .catch(resolve);
+        }, 300);
+      }),
+    when: {
+      show: () => {
+        highlightElement(TUTORIAL_SELECTORS.FIRST_CALCULATOR_NODE_OUTPUT);
+      },
+      hide: () => {
+        removeAllHighlights();
+      },
+    },
+    buttons: [
+      {
+        text: "Finish Tutorial",
+        action: () => tour.next(),
+      },
+    ],
+  },
+];
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/save.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/save.ts
new file mode 100644
index 0000000000..32c13844ff
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/save.ts
@@ -0,0 +1,71 @@
+import { StepOptions } from "shepherd.js";
+import { TUTORIAL_SELECTORS } from "../constants";
+import {
+  waitForElement,
+  highlightElement,
+  removeAllHighlights,
+  forceSaveOpen,
+} from "../helpers";
+import { ICONS } from "../icons";
+import { banner } from "../styles";
+export const createSaveSteps = (): StepOptions[] => [
+  {
+    id: "open-save",
+    title: "Save Your Agent",
+    text: `
+      <div class="text-sm leading-[1.375rem] text-zinc-800">
+        <p class="text-sm font-normal leading-[1.375rem] text-zinc-800 m-0">Before running, we need to <strong>save</strong> your agent.</p>
+        ${banner(ICONS.ClickIcon, "Click the Save button", "action")}
+      </div>
+    `,
+    attachTo: {
+      element: TUTORIAL_SELECTORS.SAVE_TRIGGER,
+      on: "right",
+    },
+    advanceOn: {
+      selector: TUTORIAL_SELECTORS.SAVE_TRIGGER,
+      event: "click",
+    },
+    beforeShowPromise: () =>
+      waitForElement(TUTORIAL_SELECTORS.SAVE_TRIGGER, 3000).catch(() => {}),
+    buttons: [],
+    when: {
+      show: () => {
+        highlightElement(TUTORIAL_SELECTORS.SAVE_TRIGGER);
+      },
+      hide: () => {
+        removeAllHighlights();
+      },
+    },
+  },
+
+  {
+    id: "save-details",
+    title: "Name Your Agent",
+    text: `
+      <div class="text-sm leading-[1.375rem] text-zinc-800">
+        <p class="text-sm font-normal leading-[1.375rem] text-zinc-800 m-0">Give your agent a <strong>name</strong> and optional description.</p>
+        ${banner(ICONS.ClickIcon, 'Enter a name and click "Save Agent"', "action")}
+        <p class="text-xs font-normal leading-[1.125rem] text-zinc-500 m-0" style="margin-top: 0.5rem;">Example: "My Calculator Agent"</p>
+      </div>
+    `,
+    attachTo: {
+      element: TUTORIAL_SELECTORS.SAVE_CONTENT,
+      on: "right",
+    },
+    advanceOn: {
+      selector: TUTORIAL_SELECTORS.SAVE_AGENT_BUTTON,
+      event: "click",
+    },
+    beforeShowPromise: () => waitForElement(TUTORIAL_SELECTORS.SAVE_CONTENT),
+    when: {
+      show: () => {
+        forceSaveOpen(true);
+      },
+      hide: () => {
+        forceSaveOpen(false);
+      },
+    },
+    buttons: [],
+  },
+];
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/second-calculator.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/second-calculator.ts
new file mode 100644
index 0000000000..276b2f88b9
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/second-calculator.ts
@@ -0,0 +1,272 @@
+import { StepOptions } from "shepherd.js";
+import {
+  waitForNodesCount,
+  fitViewToScreen,
+  highlightElement,
+  removeAllHighlights,
+  addSecondCalculatorBlock,
+  getSecondCalculatorNode,
+} from "../helpers";
+import { ICONS } from "../icons";
+import { banner } from "../styles";
+
+const getSecondCalculatorFormSelector = (): string | HTMLElement => {
+  const secondNode = getSecondCalculatorNode();
+  if (secondNode) {
+    const selector = `[data-id="form-creator-container-${secondNode.id}-node"]`;
+    const element = document.querySelector(selector);
+    if (element) {
+      return element as HTMLElement;
+    }
+    return selector;
+  }
+  const formContainers = document.querySelectorAll(
+    '[data-id^="form-creator-container-"]',
+  );
+  if (formContainers.length >= 2) {
+    return formContainers[1] as HTMLElement;
+  }
+  return '[data-id^="form-creator-container-"]';
+};
+
+const getSecondCalcRequirementsHtml = () => `
+  <div id="second-calc-requirements-box" class="mt-3 p-3 bg-amber-50 ring-1 ring-amber-200 rounded-2xl">
+    <p id="second-calc-requirements-title" class="text-sm font-medium text-amber-600 m-0 mb-2">⚠️ Required to continue:</p>
+    <ul id="second-calc-requirements-list" class="text-[0.8125rem] text-amber-600 m-0 pl-4 space-y-1">
+      <li id="req2-b" class="flex items-center gap-2">
+        <span class="req-icon">○</span> Enter a number in field <strong>B</strong> (e.g., 2)
+      </li>
+      <li id="req2-op" class="flex items-center gap-2">
+        <span class="req-icon">○</span> Select an <strong>Operation</strong> (e.g., Multiply)
+      </li>
+    </ul>
+    <p class="text-[0.75rem] text-amber-500 m-0 mt-2 italic">Note: Field A will be connected from the first Calculator's output</p>
+  </div>
+`;
+
+const updateSecondCalcToSuccessState = () => {
+  const reqBox = document.querySelector("#second-calc-requirements-box");
+  const reqTitle = document.querySelector("#second-calc-requirements-title");
+  const reqList = document.querySelector("#second-calc-requirements-list");
+
+  if (reqBox && reqTitle) {
+    reqBox.classList.remove("bg-amber-50", "ring-amber-200");
+    reqBox.classList.add("bg-green-50", "ring-green-200");
+    reqTitle.classList.remove("text-amber-600");
+    reqTitle.classList.add("text-green-600");
+    reqTitle.innerHTML = "🎉 Hurray! All values are completed!";
+    if (reqList) {
+      reqList.classList.add("hidden");
+    }
+  }
+};
+
+const updateSecondCalcToWarningState = () => {
+  const reqBox = document.querySelector("#second-calc-requirements-box");
+  const reqTitle = document.querySelector("#second-calc-requirements-title");
+  const reqList = document.querySelector("#second-calc-requirements-list");
+
+  if (reqBox && reqTitle) {
+    reqBox.classList.remove("bg-green-50", "ring-green-200");
+    reqBox.classList.add("bg-amber-50", "ring-amber-200");
+    reqTitle.classList.remove("text-green-600");
+    reqTitle.classList.add("text-amber-600");
+    reqTitle.innerHTML = "⚠️ Required to continue:";
+    if (reqList) {
+      reqList.classList.remove("hidden");
+    }
+  }
+};
+
+export const createSecondCalculatorSteps = (tour: any): StepOptions[] => [
+  {
+    id: "adding-second-calculator",
+    title: "Adding Second Calculator",
+    text: `
+      <div class="text-sm leading-[1.375rem] text-zinc-800">
+        <p class="text-sm font-normal leading-[1.375rem] text-zinc-800 m-0">Great job configuring the first Calculator!</p>
+        <p class="text-sm font-normal leading-[1.375rem] text-zinc-800 m-0" style="margin-top: 0.5rem;">Now let's add a <strong>second Calculator block</strong> and connect them together.</p>
+        
+        <div class="mt-3 p-3 bg-blue-50 ring-1 ring-blue-200 rounded-2xl">
+          <p class="text-sm font-medium text-blue-600 m-0 mb-1">We'll create a chain:</p>
+          <p class="text-[0.8125rem] text-blue-600 m-0">Calculator 1 → Calculator 2</p>
+          <p class="text-[0.75rem] text-blue-500 m-0 mt-1 italic">The output of the first will feed into the second!</p>
+        </div>
+      </div>
+    `,
+    buttons: [
+      {
+        text: "Back",
+        action: () => tour.back(),
+        classes: "shepherd-button-secondary",
+      },
+      {
+        text: "Add Second Calculator",
+        action: () => tour.next(),
+      },
+    ],
+  },
+
+  {
+    id: "second-calculator-added",
+    title: "Second Calculator Added! ✅",
+    text: `
+      <div class="text-sm leading-[1.375rem] text-zinc-800">
+        <p class="text-sm font-normal leading-[1.375rem] text-zinc-800 m-0">I've added a <strong>second Calculator block</strong> to your canvas.</p>
+        <p class="text-sm font-normal leading-[1.375rem] text-zinc-800 m-0" style="margin-top: 0.5rem;">Now let's configure it and connect them together.</p>
+        
+        <div class="mt-3 p-3 bg-green-50 ring-1 ring-green-200 rounded-2xl">
+          <p class="text-sm font-medium text-green-600 m-0">You now have 2 Calculator blocks!</p>
+        </div>
+      </div>
+    `,
+    beforeShowPromise: async () => {
+      addSecondCalculatorBlock();
+      await waitForNodesCount(2, 5000);
+      await new Promise((resolve) => setTimeout(resolve, 500));
+      fitViewToScreen();
+    },
+    buttons: [
+      {
+        text: "Let's configure it",
+        action: () => tour.next(),
+      },
+    ],
+  },
+
+  {
+    id: "configure-second-calculator",
+    title: "Configure Second Calculator",
+    text: `
+      <div class="text-sm leading-[1.375rem] text-zinc-800">
+        <p class="text-sm font-normal leading-[1.375rem] text-zinc-800 m-0">Now configure the <strong>second Calculator block</strong>.</p>
+        ${getSecondCalcRequirementsHtml()}
+        ${banner(ICONS.ClickIcon, "Fill in field B and select an Operation", "action")}
+      </div>
+    `,
+    beforeShowPromise: async () => {
+      fitViewToScreen();
+      await new Promise<void>((resolve) => {
+        const checkNode = () => {
+          const secondNode = getSecondCalculatorNode();
+          if (secondNode) {
+            const formContainer = document.querySelector(
+              `[data-id="form-creator-container-${secondNode.id}-node"]`,
+            );
+            if (formContainer) {
+              resolve();
+            } else {
+              setTimeout(checkNode, 100);
+            }
+          } else {
+            setTimeout(checkNode, 100);
+          }
+        };
+        checkNode();
+      });
+    },
+    attachTo: {
+      element: getSecondCalculatorFormSelector,
+      on: "right",
+    },
+    when: {
+      show: () => {
+        const secondNode = getSecondCalculatorNode();
+        if (secondNode) {
+          highlightElement(`[data-id="custom-node-${secondNode.id}"]`);
+        }
+
+        let wasComplete = false;
+
+        const checkInterval = setInterval(() => {
+          const secondNode = getSecondCalculatorNode();
+          if (!secondNode) return;
+
+          const hardcodedValues = secondNode.data?.hardcodedValues || {};
+          const hasB =
+            hardcodedValues.b !== undefined &&
+            hardcodedValues.b !== null &&
+            hardcodedValues.b !== "";
+          const hasOp =
+            hardcodedValues.operation !== undefined &&
+            hardcodedValues.operation !== null &&
+            hardcodedValues.operation !== "";
+
+          const allComplete = hasB && hasOp;
+
+          const reqB = document.querySelector("#req2-b .req-icon");
+          const reqOp = document.querySelector("#req2-op .req-icon");
+
+          if (reqB) reqB.textContent = hasB ? "✓" : "○";
+          if (reqOp) reqOp.textContent = hasOp ? "✓" : "○";
+
+          const reqBEl = document.querySelector("#req2-b");
+          const reqOpEl = document.querySelector("#req2-op");
+
+          if (reqBEl) {
+            reqBEl.classList.toggle("text-green-600", hasB);
+            reqBEl.classList.toggle("text-amber-600", !hasB);
+          }
+          if (reqOpEl) {
+            reqOpEl.classList.toggle("text-green-600", hasOp);
+            reqOpEl.classList.toggle("text-amber-600", !hasOp);
+          }
+
+          if (allComplete && !wasComplete) {
+            updateSecondCalcToSuccessState();
+            wasComplete = true;
+          } else if (!allComplete && wasComplete) {
+            updateSecondCalcToWarningState();
+            wasComplete = false;
+          }
+
+          const nextBtn = document.querySelector(
+            ".shepherd-button-primary",
+          ) as HTMLButtonElement;
+          if (nextBtn) {
+            nextBtn.style.opacity = allComplete ? "1" : "0.5";
+            nextBtn.style.pointerEvents = allComplete ? "auto" : "none";
+          }
+        }, 300);
+
+        (window as any).__tutorialSecondCalcInterval = checkInterval;
+      },
+      hide: () => {
+        removeAllHighlights();
+        if ((window as any).__tutorialSecondCalcInterval) {
+          clearInterval((window as any).__tutorialSecondCalcInterval);
+          delete (window as any).__tutorialSecondCalcInterval;
+        }
+      },
+    },
+    buttons: [
+      {
+        text: "Back",
+        action: () => tour.back(),
+        classes: "shepherd-button-secondary",
+      },
+      {
+        text: "Continue",
+        action: () => {
+          const secondNode = getSecondCalculatorNode();
+          if (!secondNode) return;
+
+          const hardcodedValues = secondNode.data?.hardcodedValues || {};
+          const hasB =
+            hardcodedValues.b !== undefined &&
+            hardcodedValues.b !== null &&
+            hardcodedValues.b !== "";
+          const hasOp =
+            hardcodedValues.operation !== undefined &&
+            hardcodedValues.operation !== null &&
+            hardcodedValues.operation !== "";
+
+          if (hasB && hasOp) {
+            tour.next();
+          }
+        },
+        classes: "shepherd-button-primary",
+      },
+    ],
+  },
+];
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/welcome.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/welcome.ts
new file mode 100644
index 0000000000..78c7d078b9
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/steps/welcome.ts
@@ -0,0 +1,33 @@
+import { StepOptions } from "shepherd.js";
+import { handleTutorialSkip } from "../helpers";
+
+export const createWelcomeSteps = (tour: any): StepOptions[] => [
+  {
+    id: "welcome",
+    title: "Welcome to AutoGPT Builder! 👋🏻",
+    text: `
+      <div class="text-sm leading-[1.375rem] text-zinc-800">
+        <p class="text-sm font-normal leading-[1.375rem] text-zinc-800 m-0">This interactive tutorial will teach you how to build your first AI agent.</p>
+        <p class="text-sm font-medium leading-[1.375rem] text-zinc-800 m-0" style="margin-top: 0.75rem;">You'll learn how to:</p>
+        <ul class="pl-2 text-sm pt-2">
+          <li>- Add blocks to your workflow</li>
+          <li>- Understand block inputs and outputs</li>
+          <li>- Save and run your agent</li>
+          <li>- and much more...</li>
+        </ul>
+        <p class="text-xs font-normal leading-[1.125rem] text-zinc-500 m-0" style="margin-top: 0.75rem;">Estimated time: 3-4 minutes</p>
+      </div>
+    `,
+    buttons: [
+      {
+        text: "Skip Tutorial",
+        action: () => handleTutorialSkip(tour),
+        classes: "shepherd-button-secondary",
+      },
+      {
+        text: "Let's Begin",
+        action: () => tour.next(),
+      },
+    ],
+  },
+];
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/styles.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/styles.ts
new file mode 100644
index 0000000000..1b0cc5359e
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/styles.ts
@@ -0,0 +1,101 @@
+/**
+ * Tutorial Styles for New Builder
+ *
+ * CSS file contains:
+ * - Dynamic classes: .new-builder-tutorial-disable, .new-builder-tutorial-highlight, .new-builder-tutorial-pulse
+ * - Shepherd.js overrides
+ *
+ * Typography (body, small, action, info, tip, warning) uses Tailwind utilities directly in steps.ts
+ */
+import "./tutorial.css";
+
+export const injectTutorialStyles = () => {
+  if (typeof window !== "undefined") {
+    document.documentElement.setAttribute("data-tutorial-styles", "loaded");
+  }
+};
+
+export const removeTutorialStyles = () => {
+  if (typeof window !== "undefined") {
+    document.documentElement.removeAttribute("data-tutorial-styles");
+  }
+};
+
+// Reusable banner components with consistent styling
+
+type BannerVariant = "action" | "info" | "warning" | "success";
+
+const bannerStyles: Record<
+  BannerVariant,
+  { bg: string; ring: string; text: string }
+> = {
+  action: {
+    bg: "bg-violet-50",
+    ring: "ring-violet-200",
+    text: "text-violet-800",
+  },
+  info: {
+    bg: "bg-blue-50",
+    ring: "ring-blue-200",
+    text: "text-blue-800",
+  },
+  warning: {
+    bg: "bg-amber-50",
+    ring: "ring-amber-200",
+    text: "text-amber-800",
+  },
+  success: {
+    bg: "bg-green-50",
+    ring: "ring-green-200",
+    text: "text-green-800",
+  },
+};
+
+export const banner = (
+  icon: string,
+  content: string,
+  variant: BannerVariant = "action",
+  className?: string,
+) => {
+  const styles = bannerStyles[variant];
+  return `
+  <div class="${styles.bg} ring-1 ${styles.ring} rounded-2xl p-2 px-4 mt-2 flex items-start gap-2 text-sm font-medium ${styles.text} ${className || ""}">  
+    <span class="flex-shrink-0">${icon}</span>
+    <span>${content}</span>
+  </div>
+`;
+};
+
+// Requirement box components
+export const requirementBox = (
+  title: string,
+  items: string,
+  variant: "warning" | "success" = "warning",
+) => {
+  const isSuccess = variant === "success";
+  return `
+  <div id="requirements-box" class="mt-3 p-3 ${isSuccess ? "bg-green-50 ring-1 ring-green-200" : "bg-amber-50 ring-1 ring-amber-200"} rounded-2xl">
+    <p class="text-sm font-medium ${isSuccess ? "text-green-600" : "text-amber-600"} m-0 mb-2">${title}</p>
+    ${items}
+  </div>
+`;
+};
+
+export const requirementItem = (id: string, content: string) => `
+  <li id="${id}" class="flex items-center gap-2 text-amber-600">
+    <span class="req-icon">○</span> ${content}
+  </li>
+`;
+
+// Connection status box
+export const connectionStatusBox = (
+  id: string,
+  variant: "waiting" | "connected" = "waiting",
+) => {
+  const isConnected = variant === "connected";
+  return `
+  <div id="${id}" class="mt-3 p-2 ${isConnected ? "bg-green-50 ring-1 ring-green-200" : "bg-amber-50 ring-1 ring-amber-200"} rounded-2xl text-center text-sm ${isConnected ? "text-green-600" : "text-amber-600"}">
+    ${isConnected ? "✅ Connection already exists!" : "Waiting for connection..."}
+  </div>
+`;
+};
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/tutorial.css b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/tutorial.css
new file mode 100644
index 0000000000..6564a61888
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/tutorial/tutorial.css
@@ -0,0 +1,149 @@
+.new-builder-tutorial-highlight * {
+  opacity: 1 !important;
+  filter: none !important;
+}
+
+.new-builder-tutorial-pulse {
+  animation: new-builder-tutorial-pulse 2s ease-in-out infinite;
+}
+
+@keyframes new-builder-tutorial-pulse {
+  0%,
+  100% {
+    box-shadow:
+      0 0 0 4px white,
+      0 0 0 6px #7c3aed,
+      0 0 30px 8px rgba(124, 58, 237, 0.4);
+  }
+  50% {
+    box-shadow:
+      0 0 0 4px white,
+      0 0 0 8px #8b5cf6,
+      0 0 40px 12px rgba(124, 58, 237, 0.55);
+  }
+}
+
+.shepherd-element.new-builder-tour {
+  max-width: 420px !important;
+  border-radius: 1rem !important;
+  box-shadow:
+    0 0 0 1px rgba(0, 0, 0, 0.08),
+    0px 4px 6px -1px rgba(0, 0, 0, 0.1),
+    0 20px 25px -5px rgba(0, 0, 0, 0.1) !important;
+  background: white !important;
+  font-family: var(--font-geist-sans), system-ui, sans-serif !important;
+}
+
+.shepherd-element.new-builder-tour .shepherd-header {
+  padding: 1rem 1.25rem 0.5rem !important;
+  border-radius: 1rem 1rem 0 0 !important;
+  background: transparent !important;
+}
+
+.shepherd-element.new-builder-tour .shepherd-title {
+  font-family: var(--font-poppins), system-ui, sans-serif !important;
+  font-size: 1rem !important;
+  font-weight: 600 !important;
+  line-height: 1.5rem !important;
+  color: #18181b !important; /* zinc-900 */
+}
+
+.shepherd-element.new-builder-tour .shepherd-text {
+  padding: 0 1.25rem 1rem !important;
+  color: #52525b !important; /* zinc-600 */
+}
+
+.shepherd-element.new-builder-tour .shepherd-footer {
+  padding: 0.75rem 1.25rem 1rem !important;
+  border-top: 1px solid #e4e4e7 !important; /* zinc-200 */
+  gap: 0.5rem !important;
+  display: flex !important;
+  justify-content: flex-end !important;
+}
+
+.shepherd-element.new-builder-tour .shepherd-button {
+  display: inline-flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+  white-space: nowrap !important;
+  font-family: var(--font-geist-sans), system-ui, sans-serif !important;
+  font-weight: 500 !important;
+  font-size: 0.875rem !important;
+  line-height: 1.25rem !important;
+  transition: all 150ms ease !important;
+  border-radius: 9999px !important; /* rounded-full */
+  min-width: 5rem !important;
+  padding: 0.5rem 1rem !important;
+  height: 2.25rem !important;
+  gap: 0.375rem !important;
+  cursor: pointer !important;
+}
+
+.shepherd-element.new-builder-tour
+  .shepherd-button:not(.shepherd-button-secondary) {
+  background-color: #27272a !important; /* zinc-800 */
+  border: 1px solid #27272a !important;
+  color: white !important;
+}
+
+.shepherd-element.new-builder-tour
+  .shepherd-button:not(.shepherd-button-secondary):hover {
+  background-color: #18181b !important; /* zinc-900 */
+  border-color: #18181b !important;
+}
+
+.shepherd-element.new-builder-tour
+  .shepherd-button:not(.shepherd-button-secondary):active {
+  transform: scale(0.98);
+}
+
+.shepherd-element.new-builder-tour .shepherd-button-secondary {
+  background-color: #f4f4f5 !important; /* zinc-100 */
+  border: 1px solid #f4f4f5 !important;
+  color: #52525b !important; /* zinc-600 */
+}
+
+.shepherd-element.new-builder-tour .shepherd-button-secondary:hover {
+  background-color: #e4e4e7 !important; /* zinc-200 */
+  border-color: #e4e4e7 !important;
+  color: #27272a !important; /* zinc-800 */
+}
+
+.shepherd-element.new-builder-tour .shepherd-button-secondary:active {
+  transform: scale(0.98);
+}
+
+.shepherd-element.new-builder-tour .shepherd-cancel-icon {
+  color: #a1a1aa !important; /* zinc-400 */
+  transition: color 150ms ease !important;
+  width: 1.5rem !important;
+  height: 1.5rem !important;
+}
+
+.shepherd-element.new-builder-tour .shepherd-cancel-icon:hover {
+  color: #52525b !important; /* zinc-600 */
+}
+
+.shepherd-element.new-builder-tour .shepherd-arrow {
+  transform: scale(1.2) !important;
+}
+
+.shepherd-element.new-builder-tour .shepherd-arrow:before {
+  background: white !important;
+}
+
+.shepherd-element.new-builder-tour[data-popper-placement^="top"] {
+  margin-bottom: 40px !important;
+}
+
+.shepherd-element.new-builder-tour[data-popper-placement^="bottom"] {
+  margin-top: 40px !important;
+}
+
+.shepherd-element.new-builder-tour[data-popper-placement^="left"] {
+  margin-right: 30px !important;
+}
+
+.shepherd-element.new-builder-tour[data-popper-placement^="right"] {
+  margin-left: 30px !important;
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/Block.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/Block.tsx
index 435aa62c61..10f4fc8a44 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/Block.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/Block.tsx
@@ -65,9 +65,15 @@ export const Block: BlockComponent = ({
     setTimeout(() => document.body.removeChild(dragPreview), 0);
   };
 
+  // Generate a data-id from the block id (e.g., "AgentInputBlock" -> "block-card-AgentInputBlock")
+  const blockDataId = blockData.id
+    ? `block-card-${blockData.id.replace(/[^a-zA-Z0-9]/g, "")}`
+    : undefined;
+
   return (
     <Button
       draggable={true}
+      data-id={blockDataId}
       className={cn(
         "group flex h-16 w-full min-w-[7.5rem] items-center justify-start space-x-3 whitespace-normal rounded-[0.75rem] bg-zinc-50 px-[0.875rem] py-[0.625rem] text-start shadow-none",
         "hover:cursor-default hover:bg-zinc-100 focus:ring-0 active:bg-zinc-100 active:ring-1 active:ring-zinc-300 disabled:cursor-not-allowed",
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenu/BlockMenu.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenu/BlockMenu.tsx
index 7533f501df..74b4485c80 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenu/BlockMenu.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenu/BlockMenu.tsx
@@ -14,10 +14,17 @@ import { ControlPanelButton } from "../../ControlPanelButton";
 import { BlockMenuContent } from "../BlockMenuContent/BlockMenuContent";
 
 export const BlockMenu = () => {
-  const { blockMenuOpen, setBlockMenuOpen } = useControlPanelStore();
+  const { blockMenuOpen, setBlockMenuOpen, forceOpenBlockMenu } =
+    useControlPanelStore();
   return (
-    // pinBlocksPopover ? true : open
-    <Popover onOpenChange={setBlockMenuOpen} open={blockMenuOpen}>
+    <Popover
+      onOpenChange={(open) => {
+        if (!forceOpenBlockMenu || open) {
+          setBlockMenuOpen(open);
+        }
+      }}
+      open={forceOpenBlockMenu ? true : blockMenuOpen}
+    >
       <Tooltip delayDuration={100}>
         <TooltipTrigger asChild>
           <PopoverTrigger className="hover:cursor-pointer">
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuFilters/BlockMenuFilters.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuFilters/BlockMenuFilters.tsx
new file mode 100644
index 0000000000..ebcea9eee6
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuFilters/BlockMenuFilters.tsx
@@ -0,0 +1,57 @@
+import { useBlockMenuStore } from "@/app/(platform)/build/stores/blockMenuStore";
+import { FilterChip } from "../FilterChip";
+import { categories } from "./constants";
+import { FilterSheet } from "../FilterSheet/FilterSheet";
+import { GetV2BuilderSearchFilterAnyOfItem } from "@/app/api/__generated__/models/getV2BuilderSearchFilterAnyOfItem";
+
+export const BlockMenuFilters = () => {
+  const {
+    filters,
+    addFilter,
+    removeFilter,
+    categoryCounts,
+    creators,
+    addCreator,
+    removeCreator,
+  } = useBlockMenuStore();
+
+  const handleFilterClick = (filter: GetV2BuilderSearchFilterAnyOfItem) => {
+    if (filters.includes(filter)) {
+      removeFilter(filter);
+    } else {
+      addFilter(filter);
+    }
+  };
+
+  const handleCreatorClick = (creator: string) => {
+    if (creators.includes(creator)) {
+      removeCreator(creator);
+    } else {
+      addCreator(creator);
+    }
+  };
+
+  return (
+    <div className="flex flex-wrap gap-2">
+      <FilterSheet categories={categories} />
+      {creators.length > 0 &&
+        creators.map((creator) => (
+          <FilterChip
+            key={creator}
+            name={"Created by " + creator.slice(0, 10) + "..."}
+            selected={creators.includes(creator)}
+            onClick={() => handleCreatorClick(creator)}
+          />
+        ))}
+      {categories.map((category) => (
+        <FilterChip
+          key={category.key}
+          name={category.name}
+          selected={filters.includes(category.key)}
+          onClick={() => handleFilterClick(category.key)}
+          number={categoryCounts[category.key] ?? 0}
+        />
+      ))}
+    </div>
+  );
+};
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuFilters/constants.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuFilters/constants.ts
new file mode 100644
index 0000000000..b438aae91b
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuFilters/constants.ts
@@ -0,0 +1,15 @@
+import { GetV2BuilderSearchFilterAnyOfItem } from "@/app/api/__generated__/models/getV2BuilderSearchFilterAnyOfItem";
+import { CategoryKey } from "./types";
+
+export const categories: Array<{ key: CategoryKey; name: string }> = [
+  { key: GetV2BuilderSearchFilterAnyOfItem.blocks, name: "Blocks" },
+  {
+    key: GetV2BuilderSearchFilterAnyOfItem.integrations,
+    name: "Integrations",
+  },
+  {
+    key: GetV2BuilderSearchFilterAnyOfItem.marketplace_agents,
+    name: "Marketplace agents",
+  },
+  { key: GetV2BuilderSearchFilterAnyOfItem.my_agents, name: "My agents" },
+];
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuFilters/types.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuFilters/types.ts
new file mode 100644
index 0000000000..8fec9ef64d
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuFilters/types.ts
@@ -0,0 +1,26 @@
+import { GetV2BuilderSearchFilterAnyOfItem } from "@/app/api/__generated__/models/getV2BuilderSearchFilterAnyOfItem";
+
+export type DefaultStateType =
+  | "suggestion"
+  | "all_blocks"
+  | "input_blocks"
+  | "action_blocks"
+  | "output_blocks"
+  | "integrations"
+  | "marketplace_agents"
+  | "my_agents";
+
+export type CategoryKey = GetV2BuilderSearchFilterAnyOfItem;
+
+export interface Filters {
+  categories: {
+    blocks: boolean;
+    integrations: boolean;
+    marketplace_agents: boolean;
+    my_agents: boolean;
+    providers: boolean;
+  };
+  createdBy: string[];
+}
+
+export type CategoryCounts = Record<CategoryKey, number>;
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSearch/BlockMenuSearch.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSearch/BlockMenuSearch.tsx
index de339431e8..70055b77a9 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSearch/BlockMenuSearch.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSearch/BlockMenuSearch.tsx
@@ -1,111 +1,17 @@
 import { Text } from "@/components/atoms/Text/Text";
-import { useBlockMenuSearch } from "./useBlockMenuSearch";
-import { InfiniteScroll } from "@/components/contextual/InfiniteScroll/InfiniteScroll";
-import { LoadingSpinner } from "@/components/__legacy__/ui/loading";
-import { SearchResponseItemsItem } from "@/app/api/__generated__/models/searchResponseItemsItem";
-import { MarketplaceAgentBlock } from "../MarketplaceAgentBlock";
-import { Block } from "../Block";
-import { UGCAgentBlock } from "../UGCAgentBlock";
-import { getSearchItemType } from "./helper";
-import { useBlockMenuStore } from "../../../../stores/blockMenuStore";
 import { blockMenuContainerStyle } from "../style";
-import { cn } from "@/lib/utils";
-import { NoSearchResult } from "../NoSearchResult";
+import { BlockMenuFilters } from "../BlockMenuFilters/BlockMenuFilters";
+import { BlockMenuSearchContent } from "../BlockMenuSearchContent/BlockMenuSearchContent";
 
 export const BlockMenuSearch = () => {
-  const {
-    searchResults,
-    isFetchingNextPage,
-    fetchNextPage,
-    hasNextPage,
-    searchLoading,
-    handleAddLibraryAgent,
-    handleAddMarketplaceAgent,
-    addingLibraryAgentId,
-    addingMarketplaceAgentSlug,
-  } = useBlockMenuSearch();
-  const { searchQuery } = useBlockMenuStore();
-
-  if (searchLoading) {
-    return (
-      <div
-        className={cn(
-          blockMenuContainerStyle,
-          "flex items-center justify-center",
-        )}
-      >
-        <LoadingSpinner className="size-13" />
-      </div>
-    );
-  }
-
-  if (searchResults.length === 0) {
-    return <NoSearchResult />;
-  }
-
   return (
-    <div className={blockMenuContainerStyle}>
+    <div
+      className={blockMenuContainerStyle}
+      data-id="blocks-control-search-results"
+    >
+      <BlockMenuFilters />
       <Text variant="body-medium">Search results</Text>
-      <InfiniteScroll
-        isFetchingNextPage={isFetchingNextPage}
-        fetchNextPage={fetchNextPage}
-        hasNextPage={hasNextPage}
-        loader={<LoadingSpinner className="size-13" />}
-        className="space-y-2.5"
-      >
-        {searchResults.map((item: SearchResponseItemsItem, index: number) => {
-          const { type, data } = getSearchItemType(item);
-          // backend give support to these 3 types only [right now] - we need to give support to integration and ai agent types in follow up PRs
-          switch (type) {
-            case "store_agent":
-              return (
-                <MarketplaceAgentBlock
-                  key={index}
-                  slug={data.slug}
-                  highlightedText={searchQuery}
-                  title={data.agent_name}
-                  image_url={data.agent_image}
-                  creator_name={data.creator}
-                  number_of_runs={data.runs}
-                  loading={addingMarketplaceAgentSlug === data.slug}
-                  onClick={() =>
-                    handleAddMarketplaceAgent({
-                      creator_name: data.creator,
-                      slug: data.slug,
-                    })
-                  }
-                />
-              );
-            case "block":
-              return (
-                <Block
-                  key={index}
-                  title={data.name}
-                  highlightedText={searchQuery}
-                  description={data.description}
-                  blockData={data}
-                />
-              );
-
-            case "library_agent":
-              return (
-                <UGCAgentBlock
-                  key={index}
-                  title={data.name}
-                  highlightedText={searchQuery}
-                  image_url={data.image_url}
-                  version={data.graph_version}
-                  edited_time={data.updated_at}
-                  isLoading={addingLibraryAgentId === data.id}
-                  onClick={() => handleAddLibraryAgent(data)}
-                />
-              );
-
-            default:
-              return null;
-          }
-        })}
-      </InfiniteScroll>
+      <BlockMenuSearchContent />
     </div>
   );
 };
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSearchBar/BlockMenuSearchBar.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSearchBar/BlockMenuSearchBar.tsx
index 165a3f05ea..57a7b711b0 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSearchBar/BlockMenuSearchBar.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSearchBar/BlockMenuSearchBar.tsx
@@ -22,6 +22,7 @@ export const BlockMenuSearchBar: React.FC<BlockMenuSearchBarProps> = ({
 
   return (
     <div
+      data-id="blocks-control-search-bar"
       className={cn(
         "flex min-h-[3.5625rem] items-center gap-2.5 px-4",
         className,
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSearchContent/BlockMenuSearchContent.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSearchContent/BlockMenuSearchContent.tsx
new file mode 100644
index 0000000000..7229c44ed7
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSearchContent/BlockMenuSearchContent.tsx
@@ -0,0 +1,108 @@
+import { SearchResponseItemsItem } from "@/app/api/__generated__/models/searchResponseItemsItem";
+import { LoadingSpinner } from "@/components/atoms/LoadingSpinner/LoadingSpinner";
+import { InfiniteScroll } from "@/components/contextual/InfiniteScroll/InfiniteScroll";
+import { getSearchItemType } from "./helper";
+import { MarketplaceAgentBlock } from "../MarketplaceAgentBlock";
+import { Block } from "../Block";
+import { UGCAgentBlock } from "../UGCAgentBlock";
+import { useBlockMenuSearchContent } from "./useBlockMenuSearchContent";
+import { useBlockMenuStore } from "@/app/(platform)/build/stores/blockMenuStore";
+import { cn } from "@/lib/utils";
+import { blockMenuContainerStyle } from "../style";
+import { NoSearchResult } from "../NoSearchResult";
+
+export const BlockMenuSearchContent = () => {
+  const {
+    searchResults,
+    isFetchingNextPage,
+    fetchNextPage,
+    hasNextPage,
+    searchLoading,
+    handleAddLibraryAgent,
+    handleAddMarketplaceAgent,
+    addingLibraryAgentId,
+    addingMarketplaceAgentSlug,
+  } = useBlockMenuSearchContent();
+
+  const { searchQuery } = useBlockMenuStore();
+
+  if (searchLoading) {
+    return (
+      <div
+        className={cn(
+          blockMenuContainerStyle,
+          "flex items-center justify-center",
+        )}
+      >
+        <LoadingSpinner className="size-13" />
+      </div>
+    );
+  }
+
+  if (searchResults.length === 0) {
+    return <NoSearchResult />;
+  }
+
+  return (
+    <InfiniteScroll
+      isFetchingNextPage={isFetchingNextPage}
+      fetchNextPage={fetchNextPage}
+      hasNextPage={hasNextPage}
+      loader={<LoadingSpinner className="size-13" />}
+      className="space-y-2.5"
+    >
+      {searchResults.map((item: SearchResponseItemsItem, index: number) => {
+        const { type, data } = getSearchItemType(item);
+        // backend give support to these 3 types only [right now] - we need to give support to integration and ai agent types in follow up PRs
+        switch (type) {
+          case "store_agent":
+            return (
+              <MarketplaceAgentBlock
+                key={index}
+                slug={data.slug}
+                highlightedText={searchQuery}
+                title={data.agent_name}
+                image_url={data.agent_image}
+                creator_name={data.creator}
+                number_of_runs={data.runs}
+                loading={addingMarketplaceAgentSlug === data.slug}
+                onClick={() =>
+                  handleAddMarketplaceAgent({
+                    creator_name: data.creator,
+                    slug: data.slug,
+                  })
+                }
+              />
+            );
+          case "block":
+            return (
+              <Block
+                key={index}
+                title={data.name}
+                highlightedText={searchQuery}
+                description={data.description}
+                blockData={data}
+              />
+            );
+
+          case "library_agent":
+            return (
+              <UGCAgentBlock
+                key={index}
+                title={data.name}
+                highlightedText={searchQuery}
+                image_url={data.image_url}
+                version={data.graph_version}
+                edited_time={data.updated_at}
+                isLoading={addingLibraryAgentId === data.id}
+                onClick={() => handleAddLibraryAgent(data)}
+              />
+            );
+
+          default:
+            return null;
+        }
+      })}
+    </InfiniteScroll>
+  );
+};
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSearch/helper.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSearchContent/helper.ts
similarity index 100%
rename from autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSearch/helper.ts
rename to autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSearchContent/helper.ts
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSearch/useBlockMenuSearch.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSearchContent/useBlockMenuSearchContent.tsx
similarity index 83%
rename from autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSearch/useBlockMenuSearch.ts
rename to autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSearchContent/useBlockMenuSearchContent.tsx
index beff80a984..9da9cb4cbc 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSearch/useBlockMenuSearch.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSearchContent/useBlockMenuSearchContent.tsx
@@ -23,9 +23,19 @@ import { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";
 import { getQueryClient } from "@/lib/react-query/queryClient";
 import { useToast } from "@/components/molecules/Toast/use-toast";
 import * as Sentry from "@sentry/nextjs";
+import { GetV2BuilderSearchFilterAnyOfItem } from "@/app/api/__generated__/models/getV2BuilderSearchFilterAnyOfItem";
+
+export const useBlockMenuSearchContent = () => {
+  const {
+    searchQuery,
+    searchId,
+    setSearchId,
+    filters,
+    setCreatorsList,
+    creators,
+    setCategoryCounts,
+  } = useBlockMenuStore();
 
-export const useBlockMenuSearch = () => {
-  const { searchQuery, searchId, setSearchId } = useBlockMenuStore();
   const { toast } = useToast();
   const { addAgentToBuilder, addLibraryAgentToBuilder } =
     useAddAgentToBuilder();
@@ -57,6 +67,8 @@ export const useBlockMenuSearch = () => {
       page_size: 8,
       search_query: searchQuery,
       search_id: searchId,
+      filter: filters.length > 0 ? filters : undefined,
+      by_creator: creators.length > 0 ? creators : undefined,
     },
     {
       query: { getNextPageParam: getPaginationNextPageNumber },
@@ -98,6 +110,26 @@ export const useBlockMenuSearch = () => {
     }
   }, [searchQueryData, searchId, setSearchId]);
 
+  // from all the results, we need to get all the unique creators
+  useEffect(() => {
+    if (!searchQueryData?.pages?.length) {
+      return;
+    }
+    const latestData = okData(searchQueryData.pages.at(-1));
+    setCategoryCounts(
+      (latestData?.total_items as Record<
+        GetV2BuilderSearchFilterAnyOfItem,
+        number
+      >) || {
+        blocks: 0,
+        integrations: 0,
+        marketplace_agents: 0,
+        my_agents: 0,
+      },
+    );
+    setCreatorsList(latestData?.items || []);
+  }, [searchQueryData]);
+
   useEffect(() => {
     if (searchId && !searchQuery) {
       resetSearchSession();
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSidebar/BlockMenuSidebar.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSidebar/BlockMenuSidebar.tsx
index 16b0ccb8fb..1872e610b6 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSidebar/BlockMenuSidebar.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSidebar/BlockMenuSidebar.tsx
@@ -101,6 +101,7 @@ export const BlockMenuSidebar = () => {
           key={item.type}
           name={item.name}
           number={item.number}
+          menuItemType={item.type}
           selected={defaultState === item.type}
           onClick={() => setDefaultState(item.type as DefaultStateType)}
         />
@@ -111,6 +112,7 @@ export const BlockMenuSidebar = () => {
             key={item.type}
             name={item.name}
             number={item.number}
+            menuItemType={item.type}
             className="max-w-[11.5339rem]"
             selected={defaultState === item.type}
             onClick={() => setDefaultState(item.type as DefaultStateType)}
@@ -122,6 +124,7 @@ export const BlockMenuSidebar = () => {
           key={item.type}
           name={item.name}
           number={item.number}
+          menuItemType={item.type}
           selected={defaultState === item.type}
           onClick={
             item.onClick ||
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/FilterChip.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/FilterChip.tsx
index 69931958b3..23197ab612 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/FilterChip.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/FilterChip.tsx
@@ -1,7 +1,9 @@
 import { Button } from "@/components/__legacy__/ui/button";
 import { cn } from "@/lib/utils";
-import { X } from "lucide-react";
-import React, { ButtonHTMLAttributes } from "react";
+import { XIcon } from "@phosphor-icons/react";
+import { AnimatePresence, motion } from "framer-motion";
+
+import React, { ButtonHTMLAttributes, useState } from "react";
 
 interface Props extends ButtonHTMLAttributes<HTMLButtonElement> {
   selected?: boolean;
@@ -16,39 +18,51 @@ export const FilterChip: React.FC<Props> = ({
   className,
   ...rest
 }) => {
+  const [isHovered, setIsHovered] = useState(false);
   return (
-    <Button
-      className={cn(
-        "group w-fit space-x-1 rounded-[1.5rem] border border-zinc-300 bg-transparent px-[0.625rem] py-[0.375rem] shadow-none transition-transform duration-300 ease-in-out",
-        "hover:border-violet-500 hover:bg-transparent focus:ring-0 disabled:cursor-not-allowed",
-        selected && "border-0 bg-violet-700 hover:border",
-        className,
-      )}
-      {...rest}
-    >
-      <span
+    <AnimatePresence mode="wait">
+      <Button
+        onMouseEnter={() => setIsHovered(true)}
+        onMouseLeave={() => setIsHovered(false)}
         className={cn(
-          "font-sans text-sm font-medium leading-[1.375rem] text-zinc-600 group-hover:text-zinc-600 group-disabled:text-zinc-400",
-          selected && "text-zinc-50",
+          "group w-fit space-x-1 rounded-[1.5rem] border border-zinc-300 bg-transparent px-[0.625rem] py-[0.375rem] shadow-none",
+          "hover:border-violet-500 hover:bg-transparent focus:ring-0 disabled:cursor-not-allowed",
+          selected && "border-0 bg-violet-700 hover:border",
+          className,
         )}
+        {...rest}
       >
-        {name}
-      </span>
-      {selected && (
-        <>
-          <span className="flex h-4 w-4 items-center justify-center rounded-full bg-zinc-50 transition-all duration-300 ease-in-out group-hover:hidden">
-            <X
-              className="h-3 w-3 rounded-full text-violet-700"
-              strokeWidth={2}
-            />
-          </span>
-          {number !== undefined && (
-            <span className="hidden h-[1.375rem] items-center rounded-[1.25rem] bg-violet-700 p-[0.375rem] text-zinc-50 transition-all duration-300 ease-in-out animate-in fade-in zoom-in group-hover:flex">
-              {number > 100 ? "100+" : number}
-            </span>
+        <span
+          className={cn(
+            "font-sans text-sm font-medium leading-[1.375rem] text-zinc-600 group-hover:text-zinc-600 group-disabled:text-zinc-400",
+            selected && "text-zinc-50",
           )}
-        </>
-      )}
-    </Button>
+        >
+          {name}
+        </span>
+        {selected && !isHovered && (
+          <motion.span
+            initial={{ opacity: 0.5, scale: 0.5, filter: "blur(20px)" }}
+            animate={{ opacity: 1, scale: 1, filter: "blur(0px)" }}
+            exit={{ opacity: 0.5, scale: 0.5, filter: "blur(20px)" }}
+            transition={{ duration: 0.3, type: "spring", bounce: 0.2 }}
+            className="flex h-4 w-4 items-center justify-center rounded-full bg-zinc-50"
+          >
+            <XIcon size={12} weight="bold" className="text-violet-700" />
+          </motion.span>
+        )}
+        {number !== undefined && isHovered && (
+          <motion.span
+            initial={{ opacity: 0.5, scale: 0.5, filter: "blur(10px)" }}
+            animate={{ opacity: 1, scale: 1, filter: "blur(0px)" }}
+            exit={{ opacity: 0.5, scale: 0.5, filter: "blur(10px)" }}
+            transition={{ duration: 0.3, type: "spring", bounce: 0.2 }}
+            className="flex h-[1.375rem] items-center rounded-[1.25rem] bg-violet-700 p-[0.375rem] text-zinc-50"
+          >
+            {number > 100 ? "100+" : number}
+          </motion.span>
+        )}
+      </Button>
+    </AnimatePresence>
   );
 };
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/FilterSheet/FilterSheet.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/FilterSheet/FilterSheet.tsx
new file mode 100644
index 0000000000..dc7c428245
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/FilterSheet/FilterSheet.tsx
@@ -0,0 +1,156 @@
+import { FilterChip } from "../FilterChip";
+import { cn } from "@/lib/utils";
+import { CategoryKey } from "../BlockMenuFilters/types";
+import { AnimatePresence, motion } from "framer-motion";
+import { XIcon } from "@phosphor-icons/react";
+import { Button } from "@/components/atoms/Button/Button";
+import { Text } from "@/components/atoms/Text/Text";
+import { Separator } from "@/components/__legacy__/ui/separator";
+import { Checkbox } from "@/components/__legacy__/ui/checkbox";
+import { useFilterSheet } from "./useFilterSheet";
+import { INITIAL_CREATORS_TO_SHOW } from "./constant";
+
+export function FilterSheet({
+  categories,
+}: {
+  categories: Array<{ key: CategoryKey; name: string }>;
+}) {
+  const {
+    isOpen,
+    localCategories,
+    localCreators,
+    displayedCreatorsCount,
+    handleLocalCategoryChange,
+    handleToggleShowMoreCreators,
+    handleLocalCreatorChange,
+    handleClearFilters,
+    handleCloseButton,
+    handleApplyFilters,
+    hasLocalActiveFilters,
+    visibleCreators,
+    creators,
+    handleOpenFilters,
+    hasActiveFilters,
+  } = useFilterSheet();
+
+  return (
+    <div className="m-0 inline w-fit p-0">
+      <FilterChip
+        name={hasActiveFilters() ? "Edit filters" : "All filters"}
+        onClick={handleOpenFilters}
+      />
+
+      <AnimatePresence>
+        {isOpen && (
+          <motion.div
+            className={cn(
+              "absolute bottom-2 left-2 top-2 z-20 w-3/4 max-w-[22.5rem] space-y-4 overflow-hidden rounded-[0.75rem] bg-white pb-4 shadow-[0_4px_12px_2px_rgba(0,0,0,0.1)]",
+            )}
+            initial={{ x: "-100%", filter: "blur(10px)" }}
+            animate={{ x: 0, filter: "blur(0px)" }}
+            exit={{ x: "-110%", filter: "blur(10px)" }}
+            transition={{ duration: 0.4, type: "spring", bounce: 0.2 }}
+          >
+            {/* Top section */}
+            <div className="flex items-center justify-between px-5 pt-4">
+              <Text variant="body">Filters</Text>
+              <Button
+                className="p-0"
+                variant="ghost"
+                size="icon"
+                onClick={handleCloseButton}
+              >
+                <XIcon size={20} />
+              </Button>
+            </div>
+
+            <Separator className="h-[1px] w-full text-zinc-300" />
+
+            {/* Category section */}
+            <div className="space-y-4 px-5">
+              <Text variant="large">Categories</Text>
+              <div className="space-y-2">
+                {categories.map((category) => (
+                  <div
+                    key={category.key}
+                    className="flex items-center space-x-2"
+                  >
+                    <Checkbox
+                      id={category.key}
+                      checked={localCategories.includes(category.key)}
+                      onCheckedChange={() =>
+                        handleLocalCategoryChange(category.key)
+                      }
+                      className="border border-[#D4D4D4] shadow-none data-[state=checked]:border-none data-[state=checked]:bg-violet-700 data-[state=checked]:text-white"
+                    />
+                    <label
+                      htmlFor={category.key}
+                      className="font-sans text-sm leading-[1.375rem] text-zinc-600"
+                    >
+                      {category.name}
+                    </label>
+                  </div>
+                ))}
+              </div>
+            </div>
+
+            {/* Created by section */}
+            <div className="space-y-4 px-5">
+              <p className="font-sans text-base font-medium text-zinc-800">
+                Created by
+              </p>
+              <div className="space-y-2">
+                {visibleCreators.map((creator, i) => (
+                  <div key={i} className="flex items-center space-x-2">
+                    <Checkbox
+                      id={`creator-${creator}`}
+                      checked={localCreators.includes(creator)}
+                      onCheckedChange={() => handleLocalCreatorChange(creator)}
+                      className="border border-[#D4D4D4] shadow-none data-[state=checked]:border-none data-[state=checked]:bg-violet-700 data-[state=checked]:text-white"
+                    />
+                    <label
+                      htmlFor={`creator-${creator}`}
+                      className="font-sans text-sm leading-[1.375rem] text-zinc-600"
+                    >
+                      {creator}
+                    </label>
+                  </div>
+                ))}
+              </div>
+              {creators.length > INITIAL_CREATORS_TO_SHOW && (
+                <Button
+                  variant={"link"}
+                  className="m-0 p-0 font-sans text-sm font-medium leading-[1.375rem] text-zinc-800 underline hover:text-zinc-600"
+                  onClick={handleToggleShowMoreCreators}
+                >
+                  {displayedCreatorsCount < creators.length ? "More" : "Less"}
+                </Button>
+              )}
+            </div>
+
+            {/* Footer section */}
+            <div className="fixed bottom-0 flex w-full justify-between gap-3 border-t border-zinc-200 bg-white px-5 py-3">
+              <Button
+                size="small"
+                variant={"outline"}
+                onClick={handleClearFilters}
+                className="rounded-[8px] px-2 py-1.5"
+              >
+                Clear
+              </Button>
+
+              <Button
+                size="small"
+                onClick={handleApplyFilters}
+                disabled={!hasLocalActiveFilters()}
+                className="rounded-[8px] px-2 py-1.5"
+              >
+                Apply filters
+              </Button>
+            </div>
+          </motion.div>
+        )}
+      </AnimatePresence>
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/FilterSheet/constant.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/FilterSheet/constant.ts
new file mode 100644
index 0000000000..8e05dc1037
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/FilterSheet/constant.ts
@@ -0,0 +1 @@
+export const INITIAL_CREATORS_TO_SHOW = 5;
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/FilterSheet/useFilterSheet.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/FilterSheet/useFilterSheet.ts
new file mode 100644
index 0000000000..200671f4e7
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/FilterSheet/useFilterSheet.ts
@@ -0,0 +1,100 @@
+import { useBlockMenuStore } from "@/app/(platform)/build/stores/blockMenuStore";
+import { useState } from "react";
+import { INITIAL_CREATORS_TO_SHOW } from "./constant";
+import { GetV2BuilderSearchFilterAnyOfItem } from "@/app/api/__generated__/models/getV2BuilderSearchFilterAnyOfItem";
+
+export const useFilterSheet = () => {
+  const { filters, creators_list, creators, setFilters, setCreators } =
+    useBlockMenuStore();
+
+  const [isOpen, setIsOpen] = useState(false);
+  const [localCategories, setLocalCategories] =
+    useState<GetV2BuilderSearchFilterAnyOfItem[]>(filters);
+  const [localCreators, setLocalCreators] = useState<string[]>(creators);
+  const [displayedCreatorsCount, setDisplayedCreatorsCount] = useState(
+    INITIAL_CREATORS_TO_SHOW,
+  );
+
+  const handleLocalCategoryChange = (
+    category: GetV2BuilderSearchFilterAnyOfItem,
+  ) => {
+    setLocalCategories((prev) => {
+      if (prev.includes(category)) {
+        return prev.filter((c) => c !== category);
+      }
+      return [...prev, category];
+    });
+  };
+
+  const hasActiveFilters = () => {
+    return filters.length > 0 || creators.length > 0;
+  };
+
+  const handleToggleShowMoreCreators = () => {
+    if (displayedCreatorsCount < creators.length) {
+      setDisplayedCreatorsCount(creators.length);
+    } else {
+      setDisplayedCreatorsCount(INITIAL_CREATORS_TO_SHOW);
+    }
+  };
+
+  const handleLocalCreatorChange = (creator: string) => {
+    setLocalCreators((prev) => {
+      if (prev.includes(creator)) {
+        return prev.filter((c) => c !== creator);
+      }
+      return [...prev, creator];
+    });
+  };
+
+  const handleClearFilters = () => {
+    setLocalCategories([]);
+    setLocalCreators([]);
+    setDisplayedCreatorsCount(INITIAL_CREATORS_TO_SHOW);
+  };
+
+  const handleCloseButton = () => {
+    setIsOpen(false);
+    setLocalCategories(filters);
+    setLocalCreators(creators);
+    setDisplayedCreatorsCount(INITIAL_CREATORS_TO_SHOW);
+  };
+
+  const handleApplyFilters = () => {
+    setFilters(localCategories);
+    setCreators(localCreators);
+    setIsOpen(false);
+  };
+
+  const handleOpenFilters = () => {
+    setIsOpen(true);
+    setLocalCategories(filters);
+    setLocalCreators(creators);
+  };
+
+  const hasLocalActiveFilters = () => {
+    return localCategories.length > 0 || localCreators.length > 0;
+  };
+
+  const visibleCreators = creators_list.slice(0, displayedCreatorsCount);
+
+  return {
+    creators,
+    isOpen,
+    setIsOpen,
+    localCategories,
+    localCreators,
+    displayedCreatorsCount,
+    setDisplayedCreatorsCount,
+    handleLocalCategoryChange,
+    handleToggleShowMoreCreators,
+    handleLocalCreatorChange,
+    handleClearFilters,
+    handleCloseButton,
+    handleOpenFilters,
+    handleApplyFilters,
+    hasLocalActiveFilters,
+    visibleCreators,
+    hasActiveFilters,
+  };
+};
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/MenuItem.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/MenuItem.tsx
index a1dbbb4c6a..b846c02cb7 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/MenuItem.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/MenuItem.tsx
@@ -8,6 +8,7 @@ interface Props extends ButtonHTMLAttributes<HTMLButtonElement> {
   selected?: boolean;
   number?: number;
   name?: string;
+  menuItemType?: string;
 }
 
 export const MenuItem: React.FC<Props> = ({
@@ -15,10 +16,12 @@ export const MenuItem: React.FC<Props> = ({
   number,
   name,
   className,
+  menuItemType,
   ...rest
 }) => {
   return (
     <Button
+      data-id={menuItemType ? `menu-item-${menuItemType}` : undefined}
       className={cn(
         "flex h-[2.375rem] w-[12.875rem] justify-between whitespace-normal rounded-[0.5rem] bg-transparent p-2 pl-3 shadow-none",
         "hover:cursor-default hover:bg-zinc-100 focus:ring-0",
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewSaveControl/NewSaveControl.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewSaveControl/NewSaveControl.tsx
index cbf06af1c6..6769490ab3 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewSaveControl/NewSaveControl.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewSaveControl/NewSaveControl.tsx
@@ -19,10 +19,18 @@ import { useNewSaveControl } from "./useNewSaveControl";
 
 export const NewSaveControl = () => {
   const { form, isSaving, graphVersion, handleSave } = useNewSaveControl();
-  const { saveControlOpen, setSaveControlOpen } = useControlPanelStore();
+  const { saveControlOpen, setSaveControlOpen, forceOpenSave } =
+    useControlPanelStore();
 
   return (
-    <Popover onOpenChange={setSaveControlOpen}>
+    <Popover
+      onOpenChange={(open) => {
+        if (!forceOpenSave || open) {
+          setSaveControlOpen(open);
+        }
+      }}
+      open={forceOpenSave ? true : saveControlOpen}
+    >
       <Tooltip delayDuration={100}>
         <TooltipTrigger asChild>
           <PopoverTrigger asChild>
@@ -94,6 +102,7 @@ export const NewSaveControl = () => {
                       value={graphVersion || "-"}
                       disabled
                       data-testid="save-control-version-output"
+                      data-tutorial-id="save-control-version-output"
                       label="Version"
                       wrapperClassName="!mb-0"
                     />
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/UndoRedoButtons.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/UndoRedoButtons.tsx
index 5510335104..379f2743f8 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/UndoRedoButtons.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/UndoRedoButtons.tsx
@@ -42,7 +42,12 @@ export const UndoRedoButtons = () => {
     <>
       <Tooltip delayDuration={100}>
         <TooltipTrigger asChild>
-          <ControlPanelButton as="button" disabled={!canUndo()} onClick={undo}>
+          <ControlPanelButton
+            as="button"
+            data-id="undo-button"
+            disabled={!canUndo()}
+            onClick={undo}
+          >
             <ArrowUUpLeftIcon className="size-5" />
           </ControlPanelButton>
         </TooltipTrigger>
@@ -51,7 +56,12 @@ export const UndoRedoButtons = () => {
       <Separator className="text-[#E1E1E1]" />
       <Tooltip delayDuration={100}>
         <TooltipTrigger asChild>
-          <ControlPanelButton as="button" disabled={!canRedo()} onClick={redo}>
+          <ControlPanelButton
+            as="button"
+            data-id="redo-button"
+            disabled={!canRedo()}
+            onClick={redo}
+          >
             <ArrowUUpRightIcon className="size-5" />
           </ControlPanelButton>
         </TooltipTrigger>
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/RIghtSidebar.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/RIghtSidebar.tsx
index 5e4211ce5d..cc0c7ff765 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/RIghtSidebar.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/RIghtSidebar.tsx
@@ -25,7 +25,7 @@ export const RightSidebar = () => {
     >
       <div className="mb-4">
         <h2 className="text-lg font-semibold text-slate-800 dark:text-slate-200">
-          Flow Debug Panel
+          Graph Debug Panel
         </h2>
       </div>
 
@@ -65,7 +65,7 @@ export const RightSidebar = () => {
                 {l.source_id}[{l.source_name}] → {l.sink_id}[{l.sink_name}]
               </div>
               <div className="mt-1 text-slate-500 dark:text-slate-400">
-                edge_id: {l.id}
+                edge.id: {l.id}
               </div>
             </div>
           ))}
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/helper.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/helper.ts
index 7b3c5b1d01..00c151d35b 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/helper.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/helper.ts
@@ -61,12 +61,18 @@ export const convertNodesPlusBlockInfoIntoCustomNodes = (
   return customNode;
 };
 
+const isToolSourceName = (sourceName: string): boolean =>
+  sourceName.startsWith("tools_^_");
+
+const cleanupSourceName = (sourceName: string): string =>
+  isToolSourceName(sourceName) ? "tools" : sourceName;
+
 export const linkToCustomEdge = (link: Link): CustomEdge => ({
   id: link.id ?? "",
   type: "custom" as const,
   source: link.source_id,
   target: link.sink_id,
-  sourceHandle: link.source_name,
+  sourceHandle: cleanupSourceName(link.source_name),
   targetHandle: link.sink_name,
   data: {
     isStatic: link.is_static,
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/BlocksControl.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/BlocksControl.tsx
index d3383cdc4f..f5451e6d4d 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/BlocksControl.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/BlocksControl.tsx
@@ -12,7 +12,14 @@ import {
   PopoverContent,
   PopoverTrigger,
 } from "@/components/__legacy__/ui/popover";
-import { Block, BlockUIType, SpecialBlockID } from "@/lib/autogpt-server-api";
+import {
+  Block,
+  BlockIORootSchema,
+  BlockUIType,
+  GraphInputSchema,
+  GraphOutputSchema,
+  SpecialBlockID,
+} from "@/lib/autogpt-server-api";
 import { MagnifyingGlassIcon, PlusIcon } from "@radix-ui/react-icons";
 import { IconToyBrick } from "@/components/__legacy__/ui/icons";
 import { getPrimaryCategoryColor } from "@/lib/utils";
@@ -24,8 +31,10 @@ import {
 import { GraphMeta } from "@/lib/autogpt-server-api";
 import jaro from "jaro-winkler";
 
-type _Block = Block & {
+type _Block = Omit<Block, "inputSchema" | "outputSchema"> & {
   uiKey?: string;
+  inputSchema: BlockIORootSchema | GraphInputSchema;
+  outputSchema: BlockIORootSchema | GraphOutputSchema;
   hardcodedValues?: Record<string, any>;
   _cached?: {
     blockName: string;
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/BuildActionBar.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/BuildActionBar.tsx
index 9671109422..9d12439d8d 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/BuildActionBar.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/BuildActionBar.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import { cn } from "@/lib/utils";
 import { Button } from "@/components/__legacy__/ui/button";
 import { LogOut } from "lucide-react";
-import { ClockIcon } from "@phosphor-icons/react";
+import { ClockIcon, WarningIcon } from "@phosphor-icons/react";
 import { IconPlay, IconSquare } from "@/components/__legacy__/ui/icons";
 
 interface Props {
@@ -13,6 +13,7 @@ interface Props {
   isRunning: boolean;
   isDisabled: boolean;
   className?: string;
+  resolutionModeActive?: boolean;
 }
 
 export const BuildActionBar: React.FC<Props> = ({
@@ -23,9 +24,30 @@ export const BuildActionBar: React.FC<Props> = ({
   isRunning,
   isDisabled,
   className,
+  resolutionModeActive = false,
 }) => {
   const buttonClasses =
     "flex items-center gap-2 text-sm font-medium md:text-lg";
+
+  // Show resolution mode message instead of action buttons
+  if (resolutionModeActive) {
+    return (
+      <div
+        className={cn(
+          "flex w-fit select-none items-center justify-center p-4",
+          className,
+        )}
+      >
+        <div className="flex items-center gap-3 rounded-lg border border-amber-300 bg-amber-50 px-4 py-3 dark:border-amber-700 dark:bg-amber-900/30">
+          <WarningIcon className="size-5 text-amber-600 dark:text-amber-400" />
+          <span className="text-sm font-medium text-amber-800 dark:text-amber-200">
+            Remove incompatible connections to continue
+          </span>
+        </div>
+      </div>
+    );
+  }
+
   return (
     <div
       className={cn(
@@ -61,6 +83,7 @@ export const BuildActionBar: React.FC<Props> = ({
             title="Run the agent"
             aria-label="Run the agent"
             data-testid="primary-action-run-agent"
+            data-tutorial-id="primary-action-run-agent"
           >
             <IconPlay /> Run
           </Button>
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/CustomEdge/CustomEdge.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/CustomEdge/CustomEdge.tsx
index ce14add315..5ca5393d69 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/CustomEdge/CustomEdge.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/CustomEdge/CustomEdge.tsx
@@ -60,10 +60,16 @@ export function CustomEdge({
     targetY - 5,
   );
   const { deleteElements } = useReactFlow<Node, CustomEdge>();
-  const { visualizeBeads } = useContext(BuilderContext) ?? {
+  const builderContext = useContext(BuilderContext);
+  const { visualizeBeads } = builderContext ?? {
     visualizeBeads: "no",
   };
 
+  // Check if this edge is broken (during resolution mode)
+  const isBroken =
+    builderContext?.resolutionMode?.active &&
+    builderContext?.resolutionMode?.brokenEdgeIds?.includes(id);
+
   const onEdgeRemoveClick = () => {
     deleteElements({ edges: [{ id }] });
   };
@@ -171,12 +177,27 @@ export function CustomEdge({
 
   const middle = getPointForT(0.5);
 
+  // Determine edge color - red for broken edges
+  const baseColor = data?.edgeColor ?? "#555555";
+  const edgeColor = isBroken ? "#ef4444" : baseColor;
+  // Add opacity to hex color (99 = 60% opacity, 80 = 50% opacity)
+  const strokeColor = isBroken
+    ? `${edgeColor}99`
+    : selected
+      ? edgeColor
+      : `${edgeColor}80`;
+
   return (
     <>
       <BaseEdge
         path={svgPath}
         markerEnd={markerEnd}
-        className={`data-sentry-unmask transition-all duration-200 ${data?.isStatic ? "[stroke-dasharray:5_3]" : "[stroke-dasharray:0]"} [stroke-width:${data?.isStatic ? 2.5 : 2}px] hover:[stroke-width:${data?.isStatic ? 3.5 : 3}px] ${selected ? `[stroke:${data?.edgeColor ?? "#555555"}]` : `[stroke:${data?.edgeColor ?? "#555555"}80] hover:[stroke:${data?.edgeColor ?? "#555555"}]`}`}
+        style={{
+          stroke: strokeColor,
+          strokeWidth: data?.isStatic ? 2.5 : 2,
+          strokeDasharray: data?.isStatic ? "5 3" : undefined,
+        }}
+        className="data-sentry-unmask transition-all duration-200"
       />
       <path
         d={svgPath}
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/CustomNode/CustomNode.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/CustomNode/CustomNode.tsx
index f0a49080fa..834603cc4a 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/CustomNode/CustomNode.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/CustomNode/CustomNode.tsx
@@ -18,6 +18,8 @@ import {
   BlockIOSubSchema,
   BlockUIType,
   Category,
+  GraphInputSchema,
+  GraphOutputSchema,
   NodeExecutionResult,
 } from "@/lib/autogpt-server-api";
 import {
@@ -62,14 +64,21 @@ import { NodeGenericInputField, NodeTextBoxInput } from "../NodeInputs";
 import NodeOutputs from "../NodeOutputs";
 import OutputModalComponent from "../OutputModalComponent";
 import "./customnode.css";
+import { SubAgentUpdateBar } from "./SubAgentUpdateBar";
+import { IncompatibilityDialog } from "./IncompatibilityDialog";
+import {
+  useSubAgentUpdate,
+  createUpdatedAgentNodeInputs,
+  getBrokenEdgeIDs,
+} from "../../../hooks/useSubAgentUpdate";
 
-export type ConnectionData = Array<{
-  edge_id: string;
+export type ConnectedEdge = {
+  id: string;
   source: string;
   sourceHandle: string;
   target: string;
   targetHandle: string;
-}>;
+};
 
 export type CustomNodeData = {
   blockType: string;
@@ -80,7 +89,7 @@ export type CustomNodeData = {
   inputSchema: BlockIORootSchema;
   outputSchema: BlockIORootSchema;
   hardcodedValues: { [key: string]: any };
-  connections: ConnectionData;
+  connections: ConnectedEdge[];
   isOutputOpen: boolean;
   status?: NodeExecutionResult["status"];
   /** executionResults contains outputs across multiple executions
@@ -127,20 +136,199 @@ export const CustomNode = React.memo(
 
     let subGraphID = "";
 
-    if (data.uiType === BlockUIType.AGENT) {
-      // Display the graph's schema instead AgentExecutorBlock's schema.
-      data.inputSchema = data.hardcodedValues?.input_schema || {};
-      data.outputSchema = data.hardcodedValues?.output_schema || {};
-      subGraphID = data.hardcodedValues?.graph_id || subGraphID;
-    }
-
     if (!builderContext) {
       throw new Error(
         "BuilderContext consumer must be inside FlowEditor component",
       );
     }
 
-    const { libraryAgent, setIsAnyModalOpen, getNextNodeId } = builderContext;
+    const {
+      libraryAgent,
+      setIsAnyModalOpen,
+      getNextNodeId,
+      availableFlows,
+      resolutionMode,
+      enterResolutionMode,
+    } = builderContext;
+
+    // Check if this node is in resolution mode (moved up for schema merge logic)
+    const isInResolutionMode =
+      resolutionMode.active && resolutionMode.nodeId === id;
+
+    if (data.uiType === BlockUIType.AGENT) {
+      // Display the graph's schema instead AgentExecutorBlock's schema.
+      const currentInputSchema = data.hardcodedValues?.input_schema || {};
+      const currentOutputSchema = data.hardcodedValues?.output_schema || {};
+      subGraphID = data.hardcodedValues?.graph_id || subGraphID;
+
+      // During resolution mode, merge old connected inputs/outputs with new schema
+      if (isInResolutionMode && resolutionMode.pendingUpdate) {
+        const newInputSchema =
+          (resolutionMode.pendingUpdate.input_schema as BlockIORootSchema) ||
+          {};
+        const newOutputSchema =
+          (resolutionMode.pendingUpdate.output_schema as BlockIORootSchema) ||
+          {};
+
+        // Merge input schemas: start with new schema, add old connected inputs that are missing
+        const mergedInputProps = { ...newInputSchema.properties };
+        const incomp = resolutionMode.incompatibilities;
+        if (incomp && currentInputSchema.properties) {
+          // Add back missing inputs that have connections (so user can see/delete them)
+          incomp.missingInputs.forEach((inputName) => {
+            if (currentInputSchema.properties[inputName]) {
+              mergedInputProps[inputName] =
+                currentInputSchema.properties[inputName];
+            }
+          });
+          // Add back inputs with type mismatches (keep old type so connection still works visually)
+          incomp.inputTypeMismatches.forEach((mismatch) => {
+            if (currentInputSchema.properties[mismatch.name]) {
+              mergedInputProps[mismatch.name] =
+                currentInputSchema.properties[mismatch.name];
+            }
+          });
+        }
+
+        // Merge output schemas: start with new schema, add old connected outputs that are missing
+        const mergedOutputProps = { ...newOutputSchema.properties };
+        if (incomp && currentOutputSchema.properties) {
+          incomp.missingOutputs.forEach((outputName) => {
+            if (currentOutputSchema.properties[outputName]) {
+              mergedOutputProps[outputName] =
+                currentOutputSchema.properties[outputName];
+            }
+          });
+        }
+
+        data.inputSchema = {
+          ...newInputSchema,
+          properties: mergedInputProps,
+        };
+        data.outputSchema = {
+          ...newOutputSchema,
+          properties: mergedOutputProps,
+        };
+      } else {
+        data.inputSchema = currentInputSchema;
+        data.outputSchema = currentOutputSchema;
+      }
+    }
+
+    const setHardcodedValues = useCallback(
+      (values: any) => {
+        updateNodeData(id, { hardcodedValues: values });
+      },
+      [id, updateNodeData],
+    );
+
+    // Sub-agent update detection
+    const isAgentBlock = data.uiType === BlockUIType.AGENT;
+    const graphId = isAgentBlock ? data.hardcodedValues?.graph_id : undefined;
+    const graphVersion = isAgentBlock
+      ? data.hardcodedValues?.graph_version
+      : undefined;
+
+    const subAgentUpdate = useSubAgentUpdate(
+      id,
+      graphId,
+      graphVersion,
+      isAgentBlock
+        ? (data.hardcodedValues?.input_schema as GraphInputSchema)
+        : undefined,
+      isAgentBlock
+        ? (data.hardcodedValues?.output_schema as GraphOutputSchema)
+        : undefined,
+      data.connections,
+      availableFlows,
+    );
+
+    const [showIncompatibilityDialog, setShowIncompatibilityDialog] =
+      useState(false);
+
+    // Helper to check if a handle is broken (for resolution mode)
+    const isInputHandleBroken = useCallback(
+      (handleName: string): boolean => {
+        if (!isInResolutionMode || !resolutionMode.incompatibilities) {
+          return false;
+        }
+        const incomp = resolutionMode.incompatibilities;
+        return (
+          incomp.missingInputs.includes(handleName) ||
+          incomp.inputTypeMismatches.some((m) => m.name === handleName)
+        );
+      },
+      [isInResolutionMode, resolutionMode.incompatibilities],
+    );
+
+    const isOutputHandleBroken = useCallback(
+      (handleName: string): boolean => {
+        if (!isInResolutionMode || !resolutionMode.incompatibilities) {
+          return false;
+        }
+        return resolutionMode.incompatibilities.missingOutputs.includes(
+          handleName,
+        );
+      },
+      [isInResolutionMode, resolutionMode.incompatibilities],
+    );
+
+    // Handle update button click
+    const handleUpdateClick = useCallback(() => {
+      if (!subAgentUpdate.latestGraph) return;
+
+      if (subAgentUpdate.isCompatible) {
+        // Compatible update - directly apply
+        const updatedValues = createUpdatedAgentNodeInputs(
+          data.hardcodedValues,
+          subAgentUpdate.latestGraph,
+        );
+        setHardcodedValues(updatedValues);
+        toast({
+          title: "Agent updated",
+          description: `Updated to version ${subAgentUpdate.latestVersion}`,
+        });
+      } else {
+        // Incompatible update - show dialog
+        setShowIncompatibilityDialog(true);
+      }
+    }, [subAgentUpdate, data.hardcodedValues, setHardcodedValues]);
+
+    // Handle confirm incompatible update
+    const handleConfirmIncompatibleUpdate = useCallback(() => {
+      if (!subAgentUpdate.latestGraph || !subAgentUpdate.incompatibilities) {
+        return;
+      }
+
+      // Create the updated values but DON'T apply them yet
+      const updatedValues = createUpdatedAgentNodeInputs(
+        data.hardcodedValues,
+        subAgentUpdate.latestGraph,
+      );
+
+      // Get broken edge IDs
+      const brokenEdgeIds = getBrokenEdgeIDs(
+        data.connections,
+        subAgentUpdate.incompatibilities,
+        id,
+      );
+
+      // Enter resolution mode with pending update (don't apply schema yet)
+      enterResolutionMode(
+        id,
+        subAgentUpdate.incompatibilities,
+        brokenEdgeIds,
+        updatedValues,
+      );
+
+      setShowIncompatibilityDialog(false);
+    }, [
+      subAgentUpdate,
+      data.hardcodedValues,
+      data.connections,
+      id,
+      enterResolutionMode,
+    ]);
 
     useEffect(() => {
       if (data.executionResults || data.status) {
@@ -156,13 +344,6 @@ export const CustomNode = React.memo(
       setIsAnyModalOpen?.(isModalOpen || isOutputModalOpen);
     }, [isModalOpen, isOutputModalOpen, data, setIsAnyModalOpen]);
 
-    const setHardcodedValues = useCallback(
-      (values: any) => {
-        updateNodeData(id, { hardcodedValues: values });
-      },
-      [id, updateNodeData],
-    );
-
     const handleTitleEdit = useCallback(() => {
       setIsEditingTitle(true);
       setTimeout(() => {
@@ -255,6 +436,7 @@ export const CustomNode = React.memo(
                 isConnected={isOutputHandleConnected(propKey)}
                 schema={fieldSchema}
                 side="right"
+                isBroken={isOutputHandleBroken(propKey)}
               />
               {"properties" in fieldSchema &&
                 renderHandles(
@@ -385,6 +567,7 @@ export const CustomNode = React.memo(
                       isRequired={isRequired}
                       schema={propSchema}
                       side="left"
+                      isBroken={isInputHandleBroken(propKey)}
                     />
                   ) : (
                     propKey !== "credentials" &&
@@ -674,7 +857,7 @@ export const CustomNode = React.memo(
     })();
 
     const hasAdvancedFields =
-      data.inputSchema &&
+      data.inputSchema?.properties &&
       Object.entries(data.inputSchema.properties).some(([key, value]) => {
         return (
           value.advanced === true && !data.inputSchema.required?.includes(key)
@@ -873,6 +1056,22 @@ export const CustomNode = React.memo(
           <ContextMenuContent />
         </div>
 
+        {/* Sub-agent Update Bar - shown below header */}
+        {isAgentBlock && (subAgentUpdate.hasUpdate || isInResolutionMode) && (
+          <SubAgentUpdateBar
+            currentVersion={subAgentUpdate.currentVersion}
+            latestVersion={subAgentUpdate.latestVersion}
+            isCompatible={subAgentUpdate.isCompatible}
+            incompatibilities={
+              isInResolutionMode
+                ? resolutionMode.incompatibilities
+                : subAgentUpdate.incompatibilities
+            }
+            onUpdate={handleUpdateClick}
+            isInResolutionMode={isInResolutionMode}
+          />
+        )}
+
         {/* Body */}
         <div className="mx-5 my-6 rounded-b-xl">
           {/* Input Handles */}
@@ -1044,9 +1243,24 @@ export const CustomNode = React.memo(
     );
 
     return (
-      <ContextMenu.Root>
-        <ContextMenu.Trigger>{nodeContent()}</ContextMenu.Trigger>
-      </ContextMenu.Root>
+      <>
+        <ContextMenu.Root>
+          <ContextMenu.Trigger>{nodeContent()}</ContextMenu.Trigger>
+        </ContextMenu.Root>
+
+        {/* Incompatibility Dialog for sub-agent updates */}
+        {isAgentBlock && subAgentUpdate.incompatibilities && (
+          <IncompatibilityDialog
+            isOpen={showIncompatibilityDialog}
+            onClose={() => setShowIncompatibilityDialog(false)}
+            onConfirm={handleConfirmIncompatibleUpdate}
+            currentVersion={subAgentUpdate.currentVersion}
+            latestVersion={subAgentUpdate.latestVersion}
+            agentName={data.blockType || "Agent"}
+            incompatibilities={subAgentUpdate.incompatibilities}
+          />
+        )}
+      </>
     );
   },
   (prevProps, nextProps) => {
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/CustomNode/IncompatibilityDialog.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/CustomNode/IncompatibilityDialog.tsx
new file mode 100644
index 0000000000..951fe2eab5
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/CustomNode/IncompatibilityDialog.tsx
@@ -0,0 +1,244 @@
+import React from "react";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/__legacy__/ui/dialog";
+import { Button } from "@/components/__legacy__/ui/button";
+import { AlertTriangle, XCircle, PlusCircle } from "lucide-react";
+import { IncompatibilityInfo } from "../../../hooks/useSubAgentUpdate/types";
+import { beautifyString } from "@/lib/utils";
+import { Alert, AlertDescription } from "@/components/molecules/Alert/Alert";
+
+interface IncompatibilityDialogProps {
+  isOpen: boolean;
+  onClose: () => void;
+  onConfirm: () => void;
+  currentVersion: number;
+  latestVersion: number;
+  agentName: string;
+  incompatibilities: IncompatibilityInfo;
+}
+
+export const IncompatibilityDialog: React.FC<IncompatibilityDialogProps> = ({
+  isOpen,
+  onClose,
+  onConfirm,
+  currentVersion,
+  latestVersion,
+  agentName,
+  incompatibilities,
+}) => {
+  const hasMissingInputs = incompatibilities.missingInputs.length > 0;
+  const hasMissingOutputs = incompatibilities.missingOutputs.length > 0;
+  const hasNewInputs = incompatibilities.newInputs.length > 0;
+  const hasNewOutputs = incompatibilities.newOutputs.length > 0;
+  const hasNewRequired = incompatibilities.newRequiredInputs.length > 0;
+  const hasTypeMismatches = incompatibilities.inputTypeMismatches.length > 0;
+
+  const hasInputChanges = hasMissingInputs || hasNewInputs;
+  const hasOutputChanges = hasMissingOutputs || hasNewOutputs;
+
+  return (
+    <Dialog open={isOpen} onOpenChange={(open) => !open && onClose()}>
+      <DialogContent className="max-w-lg">
+        <DialogHeader>
+          <DialogTitle className="flex items-center gap-2">
+            <AlertTriangle className="h-5 w-5 text-amber-500" />
+            Incompatible Update
+          </DialogTitle>
+          <DialogDescription>
+            Updating <strong>{beautifyString(agentName)}</strong> from v
+            {currentVersion} to v{latestVersion} will break some connections.
+          </DialogDescription>
+        </DialogHeader>
+
+        <div className="space-y-4 py-2">
+          {/* Input changes - two column layout */}
+          {hasInputChanges && (
+            <TwoColumnSection
+              title="Input Changes"
+              leftIcon={<XCircle className="h-4 w-4 text-red-500" />}
+              leftTitle="Removed"
+              leftItems={incompatibilities.missingInputs}
+              rightIcon={<PlusCircle className="h-4 w-4 text-green-500" />}
+              rightTitle="Added"
+              rightItems={incompatibilities.newInputs}
+            />
+          )}
+
+          {/* Output changes - two column layout */}
+          {hasOutputChanges && (
+            <TwoColumnSection
+              title="Output Changes"
+              leftIcon={<XCircle className="h-4 w-4 text-red-500" />}
+              leftTitle="Removed"
+              leftItems={incompatibilities.missingOutputs}
+              rightIcon={<PlusCircle className="h-4 w-4 text-green-500" />}
+              rightTitle="Added"
+              rightItems={incompatibilities.newOutputs}
+            />
+          )}
+
+          {hasTypeMismatches && (
+            <SingleColumnSection
+              icon={<XCircle className="h-4 w-4 text-red-500" />}
+              title="Type Changed"
+              description="These connected inputs have a different type:"
+              items={incompatibilities.inputTypeMismatches.map(
+                (m) => `${m.name} (${m.oldType} → ${m.newType})`,
+              )}
+            />
+          )}
+
+          {hasNewRequired && (
+            <SingleColumnSection
+              icon={<PlusCircle className="h-4 w-4 text-amber-500" />}
+              title="New Required Inputs"
+              description="These inputs are now required:"
+              items={incompatibilities.newRequiredInputs}
+            />
+          )}
+        </div>
+
+        <Alert variant="warning">
+          <AlertDescription>
+            If you proceed, you&apos;ll need to remove the broken connections
+            before you can save or run your agent.
+          </AlertDescription>
+        </Alert>
+
+        <DialogFooter className="gap-2 sm:gap-0">
+          <Button variant="outline" onClick={onClose}>
+            Cancel
+          </Button>
+          <Button
+            variant="destructive"
+            onClick={onConfirm}
+            className="bg-amber-600 hover:bg-amber-700"
+          >
+            Update Anyway
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+};
+
+interface TwoColumnSectionProps {
+  title: string;
+  leftIcon: React.ReactNode;
+  leftTitle: string;
+  leftItems: string[];
+  rightIcon: React.ReactNode;
+  rightTitle: string;
+  rightItems: string[];
+}
+
+const TwoColumnSection: React.FC<TwoColumnSectionProps> = ({
+  title,
+  leftIcon,
+  leftTitle,
+  leftItems,
+  rightIcon,
+  rightTitle,
+  rightItems,
+}) => (
+  <div className="rounded-md border border-gray-200 p-3 dark:border-gray-700">
+    <span className="font-medium">{title}</span>
+    <div className="mt-2 grid grid-cols-2 items-start gap-4">
+      {/* Left column - Breaking changes */}
+      <div className="min-w-0">
+        <div className="flex items-center gap-1.5 text-sm text-gray-500 dark:text-gray-400">
+          {leftIcon}
+          <span>{leftTitle}</span>
+        </div>
+        <ul className="mt-1.5 space-y-1">
+          {leftItems.length > 0 ? (
+            leftItems.map((item) => (
+              <li
+                key={item}
+                className="text-sm text-gray-700 dark:text-gray-300"
+              >
+                <code className="rounded bg-red-50 px-1 py-0.5 font-mono text-xs text-red-700 dark:bg-red-900/30 dark:text-red-300">
+                  {item}
+                </code>
+              </li>
+            ))
+          ) : (
+            <li className="text-sm italic text-gray-400 dark:text-gray-500">
+              None
+            </li>
+          )}
+        </ul>
+      </div>
+
+      {/* Right column - Possible solutions */}
+      <div className="min-w-0">
+        <div className="flex items-center gap-1.5 text-sm text-gray-500 dark:text-gray-400">
+          {rightIcon}
+          <span>{rightTitle}</span>
+        </div>
+        <ul className="mt-1.5 space-y-1">
+          {rightItems.length > 0 ? (
+            rightItems.map((item) => (
+              <li
+                key={item}
+                className="text-sm text-gray-700 dark:text-gray-300"
+              >
+                <code className="rounded bg-green-50 px-1 py-0.5 font-mono text-xs text-green-700 dark:bg-green-900/30 dark:text-green-300">
+                  {item}
+                </code>
+              </li>
+            ))
+          ) : (
+            <li className="text-sm italic text-gray-400 dark:text-gray-500">
+              None
+            </li>
+          )}
+        </ul>
+      </div>
+    </div>
+  </div>
+);
+
+interface SingleColumnSectionProps {
+  icon: React.ReactNode;
+  title: string;
+  description: string;
+  items: string[];
+}
+
+const SingleColumnSection: React.FC<SingleColumnSectionProps> = ({
+  icon,
+  title,
+  description,
+  items,
+}) => (
+  <div className="rounded-md border border-gray-200 p-3 dark:border-gray-700">
+    <div className="flex items-center gap-2">
+      {icon}
+      <span className="font-medium">{title}</span>
+    </div>
+    <p className="mt-1 text-sm text-gray-500 dark:text-gray-400">
+      {description}
+    </p>
+    <ul className="mt-2 space-y-1">
+      {items.map((item) => (
+        <li
+          key={item}
+          className="ml-4 list-disc text-sm text-gray-700 dark:text-gray-300"
+        >
+          <code className="rounded bg-gray-100 px-1 py-0.5 font-mono text-xs dark:bg-gray-800">
+            {item}
+          </code>
+        </li>
+      ))}
+    </ul>
+  </div>
+);
+
+export default IncompatibilityDialog;
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/CustomNode/SubAgentUpdateBar.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/CustomNode/SubAgentUpdateBar.tsx
new file mode 100644
index 0000000000..5f421d90d8
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/CustomNode/SubAgentUpdateBar.tsx
@@ -0,0 +1,130 @@
+import React from "react";
+import { Button } from "@/components/__legacy__/ui/button";
+import { ArrowUp, AlertTriangle, Info } from "lucide-react";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "@/components/atoms/Tooltip/BaseTooltip";
+import { IncompatibilityInfo } from "../../../hooks/useSubAgentUpdate/types";
+import { cn } from "@/lib/utils";
+
+interface SubAgentUpdateBarProps {
+  currentVersion: number;
+  latestVersion: number;
+  isCompatible: boolean;
+  incompatibilities: IncompatibilityInfo | null;
+  onUpdate: () => void;
+  isInResolutionMode?: boolean;
+}
+
+export const SubAgentUpdateBar: React.FC<SubAgentUpdateBarProps> = ({
+  currentVersion,
+  latestVersion,
+  isCompatible,
+  incompatibilities,
+  onUpdate,
+  isInResolutionMode = false,
+}) => {
+  if (isInResolutionMode) {
+    return <ResolutionModeBar incompatibilities={incompatibilities} />;
+  }
+
+  return (
+    <div className="flex items-center justify-between gap-2 rounded-t-lg bg-blue-50 px-3 py-2 dark:bg-blue-900/30">
+      <div className="flex items-center gap-2">
+        <ArrowUp className="h-4 w-4 text-blue-600 dark:text-blue-400" />
+        <span className="text-sm text-blue-700 dark:text-blue-300">
+          Update available (v{currentVersion} → v{latestVersion})
+        </span>
+        {!isCompatible && (
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <AlertTriangle className="h-4 w-4 text-amber-500" />
+            </TooltipTrigger>
+            <TooltipContent className="max-w-xs">
+              <p className="font-medium">Incompatible changes detected</p>
+              <p className="text-xs text-gray-400">
+                Click Update to see details
+              </p>
+            </TooltipContent>
+          </Tooltip>
+        )}
+      </div>
+      <Button
+        size="sm"
+        variant={isCompatible ? "default" : "outline"}
+        onClick={onUpdate}
+        className={cn(
+          "h-7 text-xs",
+          !isCompatible && "border-amber-500 text-amber-600 hover:bg-amber-50",
+        )}
+      >
+        Update
+      </Button>
+    </div>
+  );
+};
+
+interface ResolutionModeBarProps {
+  incompatibilities: IncompatibilityInfo | null;
+}
+
+const ResolutionModeBar: React.FC<ResolutionModeBarProps> = ({
+  incompatibilities,
+}) => {
+  const formatIncompatibilities = () => {
+    if (!incompatibilities) return "No incompatibilities";
+
+    const items: string[] = [];
+
+    if (incompatibilities.missingInputs.length > 0) {
+      items.push(
+        `Missing inputs: ${incompatibilities.missingInputs.join(", ")}`,
+      );
+    }
+    if (incompatibilities.missingOutputs.length > 0) {
+      items.push(
+        `Missing outputs: ${incompatibilities.missingOutputs.join(", ")}`,
+      );
+    }
+    if (incompatibilities.newRequiredInputs.length > 0) {
+      items.push(
+        `New required inputs: ${incompatibilities.newRequiredInputs.join(", ")}`,
+      );
+    }
+    if (incompatibilities.inputTypeMismatches.length > 0) {
+      const mismatches = incompatibilities.inputTypeMismatches
+        .map((m) => `${m.name} (${m.oldType} → ${m.newType})`)
+        .join(", ");
+      items.push(`Type changed: ${mismatches}`);
+    }
+
+    return items.join("\n");
+  };
+
+  return (
+    <div className="flex items-center justify-between gap-2 rounded-t-lg bg-amber-50 px-3 py-2 dark:bg-amber-900/30">
+      <div className="flex items-center gap-2">
+        <AlertTriangle className="h-4 w-4 text-amber-600 dark:text-amber-400" />
+        <span className="text-sm text-amber-700 dark:text-amber-300">
+          Remove incompatible connections
+        </span>
+        <Tooltip>
+          <TooltipTrigger asChild>
+            <Info className="h-4 w-4 cursor-help text-amber-500" />
+          </TooltipTrigger>
+          <TooltipContent className="max-w-sm whitespace-pre-line">
+            <p className="font-medium">Incompatible changes:</p>
+            <p className="mt-1 text-xs">{formatIncompatibilities()}</p>
+            <p className="mt-2 text-xs text-gray-400">
+              Delete the red connections to continue
+            </p>
+          </TooltipContent>
+        </Tooltip>
+      </div>
+    </div>
+  );
+};
+
+export default SubAgentUpdateBar;
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/ExpandableOutputDialog.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/ExpandableOutputDialog.tsx
index 98edbca2fb..1ccb3d1261 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/ExpandableOutputDialog.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/ExpandableOutputDialog.tsx
@@ -1,9 +1,9 @@
-import type { OutputMetadata } from "@/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/OutputRenderers";
+import type { OutputMetadata } from "@/components/contextual/OutputRenderers";
 import {
   globalRegistry,
   OutputActions,
   OutputItem,
-} from "@/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/OutputRenderers";
+} from "@/components/contextual/OutputRenderers";
 import { Dialog } from "@/components/molecules/Dialog/Dialog";
 import { beautifyString } from "@/lib/utils";
 import { Flag, useGetFlag } from "@/services/feature-flags/use-get-flag";
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/Flow/Flow.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/Flow/Flow.tsx
index 80a6fb022d..a54a9ef386 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/Flow/Flow.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/Flow/Flow.tsx
@@ -26,15 +26,17 @@ import {
   applyNodeChanges,
 } from "@xyflow/react";
 import "@xyflow/react/dist/style.css";
-import { CustomNode } from "../CustomNode/CustomNode";
+import { ConnectedEdge, CustomNode } from "../CustomNode/CustomNode";
 import "./flow.css";
 import {
   BlockUIType,
   formatEdgeID,
   GraphExecutionID,
   GraphID,
+  GraphMeta,
   LibraryAgent,
 } from "@/lib/autogpt-server-api";
+import { IncompatibilityInfo } from "../../../hooks/useSubAgentUpdate/types";
 import { Key, storage } from "@/services/storage/local-storage";
 import { findNewlyAddedBlockCoordinates, getTypeColor } from "@/lib/utils";
 import { history } from "../history";
@@ -72,12 +74,30 @@ import { FloatingSafeModeToggle } from "../../FloatingSafeModeToogle";
 // It helps to prevent spamming the history with small movements especially when pressing on a input in a block
 const MINIMUM_MOVE_BEFORE_LOG = 50;
 
+export type ResolutionModeState = {
+  active: boolean;
+  nodeId: string | null;
+  incompatibilities: IncompatibilityInfo | null;
+  brokenEdgeIds: string[];
+  pendingUpdate: Record<string, unknown> | null; // The hardcoded values to apply after resolution
+};
+
 type BuilderContextType = {
   libraryAgent: LibraryAgent | null;
   visualizeBeads: "no" | "static" | "animate";
   setIsAnyModalOpen: (isOpen: boolean) => void;
   getNextNodeId: () => string;
   getNodeTitle: (nodeID: string) => string | null;
+  availableFlows: GraphMeta[];
+  resolutionMode: ResolutionModeState;
+  enterResolutionMode: (
+    nodeId: string,
+    incompatibilities: IncompatibilityInfo,
+    brokenEdgeIds: string[],
+    pendingUpdate: Record<string, unknown>,
+  ) => void;
+  exitResolutionMode: () => void;
+  applyPendingUpdate: () => void;
 };
 
 export type NodeDimension = {
@@ -172,6 +192,92 @@ const FlowEditor: React.FC<{
   // It stores the dimension of all nodes with position as well
   const [nodeDimensions, setNodeDimensions] = useState<NodeDimension>({});
 
+  // Resolution mode state for sub-agent incompatible updates
+  const [resolutionMode, setResolutionMode] = useState<ResolutionModeState>({
+    active: false,
+    nodeId: null,
+    incompatibilities: null,
+    brokenEdgeIds: [],
+    pendingUpdate: null,
+  });
+
+  const enterResolutionMode = useCallback(
+    (
+      nodeId: string,
+      incompatibilities: IncompatibilityInfo,
+      brokenEdgeIds: string[],
+      pendingUpdate: Record<string, unknown>,
+    ) => {
+      setResolutionMode({
+        active: true,
+        nodeId,
+        incompatibilities,
+        brokenEdgeIds,
+        pendingUpdate,
+      });
+    },
+    [],
+  );
+
+  const exitResolutionMode = useCallback(() => {
+    setResolutionMode({
+      active: false,
+      nodeId: null,
+      incompatibilities: null,
+      brokenEdgeIds: [],
+      pendingUpdate: null,
+    });
+  }, []);
+
+  // Apply pending update after resolution mode completes
+  const applyPendingUpdate = useCallback(() => {
+    if (!resolutionMode.nodeId || !resolutionMode.pendingUpdate) return;
+
+    const node = nodes.find((n) => n.id === resolutionMode.nodeId);
+    if (node) {
+      const pendingUpdate = resolutionMode.pendingUpdate as {
+        [key: string]: any;
+      };
+      setNodes((nds) =>
+        nds.map((n) =>
+          n.id === resolutionMode.nodeId
+            ? { ...n, data: { ...n.data, hardcodedValues: pendingUpdate } }
+            : n,
+        ),
+      );
+    }
+    exitResolutionMode();
+    toast({
+      title: "Update complete",
+      description: "Agent has been updated to the new version.",
+    });
+  }, [resolutionMode, nodes, setNodes, exitResolutionMode, toast]);
+
+  // Check if all broken edges have been removed and auto-apply pending update
+  useEffect(() => {
+    if (!resolutionMode.active || resolutionMode.brokenEdgeIds.length === 0) {
+      return;
+    }
+
+    const currentEdgeIds = new Set(edges.map((e) => e.id));
+    const remainingBrokenEdges = resolutionMode.brokenEdgeIds.filter((id) =>
+      currentEdgeIds.has(id),
+    );
+
+    if (remainingBrokenEdges.length === 0) {
+      // All broken edges have been removed, apply pending update
+      applyPendingUpdate();
+    } else if (
+      remainingBrokenEdges.length !== resolutionMode.brokenEdgeIds.length
+    ) {
+      // Update the list of broken edges
+      setResolutionMode((prev) => ({
+        ...prev,
+        brokenEdgeIds: remainingBrokenEdges,
+      }));
+    }
+  }, [edges, resolutionMode, applyPendingUpdate]);
+
   // Set page title with or without graph name
   useEffect(() => {
     document.title = savedAgent
@@ -431,17 +537,19 @@ const FlowEditor: React.FC<{
                 ...node.data.connections.filter(
                   (conn) =>
                     !removedEdges.some(
-                      (removedEdge) => removedEdge.id === conn.edge_id,
+                      (removedEdge) => removedEdge.id === conn.id,
                     ),
                 ),
                 // Add node connections for added edges
-                ...addedEdges.map((addedEdge) => ({
-                  edge_id: addedEdge.item.id,
-                  source: addedEdge.item.source,
-                  target: addedEdge.item.target,
-                  sourceHandle: addedEdge.item.sourceHandle!,
-                  targetHandle: addedEdge.item.targetHandle!,
-                })),
+                ...addedEdges.map(
+                  (addedEdge): ConnectedEdge => ({
+                    id: addedEdge.item.id,
+                    source: addedEdge.item.source,
+                    target: addedEdge.item.target,
+                    sourceHandle: addedEdge.item.sourceHandle!,
+                    targetHandle: addedEdge.item.targetHandle!,
+                  }),
+                ),
               ],
             },
           }));
@@ -467,13 +575,15 @@ const FlowEditor: React.FC<{
             data: {
               ...node.data,
               connections: [
-                ...replaceEdges.map((replaceEdge) => ({
-                  edge_id: replaceEdge.item.id,
-                  source: replaceEdge.item.source,
-                  target: replaceEdge.item.target,
-                  sourceHandle: replaceEdge.item.sourceHandle!,
-                  targetHandle: replaceEdge.item.targetHandle!,
-                })),
+                ...replaceEdges.map(
+                  (replaceEdge): ConnectedEdge => ({
+                    id: replaceEdge.item.id,
+                    source: replaceEdge.item.source,
+                    target: replaceEdge.item.target,
+                    sourceHandle: replaceEdge.item.sourceHandle!,
+                    targetHandle: replaceEdge.item.targetHandle!,
+                  }),
+                ),
               ],
             },
           })),
@@ -890,8 +1000,23 @@ const FlowEditor: React.FC<{
       setIsAnyModalOpen,
       getNextNodeId,
       getNodeTitle,
+      availableFlows,
+      resolutionMode,
+      enterResolutionMode,
+      exitResolutionMode,
+      applyPendingUpdate,
     }),
-    [libraryAgent, visualizeBeads, getNextNodeId, getNodeTitle],
+    [
+      libraryAgent,
+      visualizeBeads,
+      getNextNodeId,
+      getNodeTitle,
+      availableFlows,
+      resolutionMode,
+      enterResolutionMode,
+      applyPendingUpdate,
+      exitResolutionMode,
+    ],
   );
 
   return (
@@ -991,6 +1116,7 @@ const FlowEditor: React.FC<{
               onClickScheduleButton={handleScheduleButton}
               isDisabled={!savedAgent}
               isRunning={isRunning}
+              resolutionModeActive={resolutionMode.active}
             />
           ) : (
             <Alert className="absolute bottom-4 left-1/2 z-20 w-auto -translate-x-1/2 select-none">
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/NodeHandle.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/NodeHandle.tsx
index 1377df62a0..932e50c499 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/NodeHandle.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/NodeHandle.tsx
@@ -1,6 +1,11 @@
 import { BlockIOSubSchema } from "@/lib/autogpt-server-api/types";
-import { cn } from "@/lib/utils";
-import { beautifyString, getTypeBgColor, getTypeTextColor } from "@/lib/utils";
+import {
+  cn,
+  beautifyString,
+  getTypeBgColor,
+  getTypeTextColor,
+  getEffectiveType,
+} from "@/lib/utils";
 import { FC, memo, useCallback } from "react";
 import { Handle, Position } from "@xyflow/react";
 import { InformationTooltip } from "@/components/molecules/InformationTooltip/InformationTooltip";
@@ -13,6 +18,7 @@ type HandleProps = {
   side: "left" | "right";
   title?: string;
   className?: string;
+  isBroken?: boolean;
 };
 
 // Move the constant out of the component to avoid re-creation on every render.
@@ -27,18 +33,23 @@ const TYPE_NAME: Record<string, string> = {
 };
 
 // Extract and memoize the Dot component so that it doesn't re-render unnecessarily.
-const Dot: FC<{ isConnected: boolean; type?: string }> = memo(
-  ({ isConnected, type }) => {
-    const color = isConnected
-      ? getTypeBgColor(type || "any")
-      : "border-gray-300 dark:border-gray-600";
+const Dot: FC<{ isConnected: boolean; type?: string; isBroken?: boolean }> =
+  memo(({ isConnected, type, isBroken }) => {
+    const color = isBroken
+      ? "border-red-500 bg-red-100 dark:bg-red-900/30"
+      : isConnected
+        ? getTypeBgColor(type || "any")
+        : "border-gray-300 dark:border-gray-600";
     return (
       <div
-        className={`${color} m-1 h-4 w-4 rounded-full border-2 bg-white transition-colors duration-100 group-hover:bg-gray-300 dark:bg-slate-800 dark:group-hover:bg-gray-700`}
+        className={cn(
+          "m-1 h-4 w-4 rounded-full border-2 bg-white transition-colors duration-100 group-hover:bg-gray-300 dark:bg-slate-800 dark:group-hover:bg-gray-700",
+          color,
+          isBroken && "opacity-50",
+        )}
       />
     );
-  },
-);
+  });
 Dot.displayName = "Dot";
 
 const NodeHandle: FC<HandleProps> = ({
@@ -49,24 +60,34 @@ const NodeHandle: FC<HandleProps> = ({
   side,
   title,
   className,
+  isBroken = false,
 }) => {
-  const typeClass = `text-sm ${getTypeTextColor(schema.type || "any")} ${
+  // Extract effective type from schema (handles anyOf/oneOf/allOf wrappers)
+  const effectiveType = getEffectiveType(schema);
+
+  const typeClass = `text-sm ${getTypeTextColor(effectiveType || "any")} ${
     side === "left" ? "text-left" : "text-right"
   }`;
 
   const label = (
-    <div className="flex flex-grow flex-row">
+    <div className={cn("flex flex-grow flex-row", isBroken && "opacity-50")}>
       <span
         className={cn(
           "data-sentry-unmask text-m green flex items-end pr-2 text-gray-900 dark:text-gray-100",
           className,
+          isBroken && "text-red-500 line-through",
         )}
       >
         {title || schema.title || beautifyString(keyName.toLowerCase())}
         {isRequired ? "*" : ""}
       </span>
-      <span className={`${typeClass} data-sentry-unmask flex items-end`}>
-        ({TYPE_NAME[schema.type as keyof typeof TYPE_NAME] || "any"})
+      <span
+        className={cn(
+          `${typeClass} data-sentry-unmask flex items-end`,
+          isBroken && "text-red-400",
+        )}
+      >
+        ({TYPE_NAME[effectiveType as keyof typeof TYPE_NAME] || "any"})
       </span>
     </div>
   );
@@ -84,7 +105,7 @@ const NodeHandle: FC<HandleProps> = ({
     return (
       <div
         key={keyName}
-        className="handle-container"
+        className={cn("handle-container", isBroken && "pointer-events-none")}
         onContextMenu={handleContextMenu}
       >
         <Handle
@@ -92,10 +113,15 @@ const NodeHandle: FC<HandleProps> = ({
           data-testid={`input-handle-${keyName}`}
           position={Position.Left}
           id={keyName}
-          className="group -ml-[38px]"
+          className={cn("group -ml-[38px]", isBroken && "cursor-not-allowed")}
+          isConnectable={!isBroken}
         >
           <div className="pointer-events-none flex items-center">
-            <Dot isConnected={isConnected} type={schema.type} />
+            <Dot
+              isConnected={isConnected}
+              type={effectiveType}
+              isBroken={isBroken}
+            />
             {label}
           </div>
         </Handle>
@@ -106,7 +132,10 @@ const NodeHandle: FC<HandleProps> = ({
     return (
       <div
         key={keyName}
-        className="handle-container justify-end"
+        className={cn(
+          "handle-container justify-end",
+          isBroken && "pointer-events-none",
+        )}
         onContextMenu={handleContextMenu}
       >
         <Handle
@@ -114,11 +143,16 @@ const NodeHandle: FC<HandleProps> = ({
           data-testid={`output-handle-${keyName}`}
           position={Position.Right}
           id={keyName}
-          className="group -mr-[38px]"
+          className={cn("group -mr-[38px]", isBroken && "cursor-not-allowed")}
+          isConnectable={!isBroken}
         >
           <div className="pointer-events-none flex items-center">
             {label}
-            <Dot isConnected={isConnected} type={schema.type} />
+            <Dot
+              isConnected={isConnected}
+              type={effectiveType}
+              isBroken={isBroken}
+            />
           </div>
         </Handle>
       </div>
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/NodeInputs.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/NodeInputs.tsx
index e9d077bde1..51fed5bef1 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/NodeInputs.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/NodeInputs.tsx
@@ -1,9 +1,8 @@
 import {
-  ConnectionData,
+  ConnectedEdge,
   CustomNodeData,
 } from "@/app/(platform)/build/components/legacy-builder/CustomNode/CustomNode";
 import { NodeTableInput } from "@/app/(platform)/build/components/legacy-builder/NodeTableInput";
-import { CredentialsInput } from "@/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/CredentialsInputs";
 import { Button } from "@/components/__legacy__/ui/button";
 import { Calendar } from "@/components/__legacy__/ui/calendar";
 import { LocalValuedInput } from "@/components/__legacy__/ui/input";
@@ -28,6 +27,7 @@ import {
   SelectValue,
 } from "@/components/__legacy__/ui/select";
 import { Switch } from "@/components/atoms/Switch/Switch";
+import { CredentialsInput } from "@/components/contextual/CredentialsInput/CredentialsInput";
 import { GoogleDrivePickerInput } from "@/components/contextual/GoogleDrivePicker/GoogleDrivePickerInput";
 import {
   BlockIOArraySubSchema,
@@ -65,7 +65,7 @@ type NodeObjectInputTreeProps = {
   selfKey?: string;
   schema: BlockIORootSchema | BlockIOObjectSubSchema;
   object?: { [key: string]: any };
-  connections: ConnectionData;
+  connections: ConnectedEdge[];
   handleInputClick: (key: string) => void;
   handleInputChange: (key: string, value: any) => void;
   errors: { [key: string]: string | undefined };
@@ -585,7 +585,7 @@ const NodeOneOfDiscriminatorField: FC<{
   currentValue?: any;
   defaultValue?: any;
   errors: { [key: string]: string | undefined };
-  connections: ConnectionData;
+  connections: ConnectedEdge[];
   handleInputChange: (key: string, value: any) => void;
   handleInputClick: (key: string) => void;
   className?: string;
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/NodeTableInput.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/NodeTableInput.tsx
index 0e27d98ba2..07a5b38520 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/NodeTableInput.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/NodeTableInput.tsx
@@ -1,15 +1,16 @@
 import { FC, useCallback, useEffect, useState } from "react";
 
 import NodeHandle from "@/app/(platform)/build/components/legacy-builder/NodeHandle";
-import {
+import type {
   BlockIOTableSubSchema,
   TableCellValue,
   TableRow,
 } from "@/lib/autogpt-server-api/types";
+import type { ConnectedEdge } from "./CustomNode/CustomNode";
 import { cn } from "@/lib/utils";
 import { PlusIcon, XIcon } from "@phosphor-icons/react";
-import { Button } from "../../../../../components/atoms/Button/Button";
-import { Input } from "../../../../../components/atoms/Input/Input";
+import { Button } from "@/components/atoms/Button/Button";
+import { Input } from "@/components/atoms/Input/Input";
 
 interface NodeTableInputProps {
   /** Unique identifier for the node in the builder graph */
@@ -25,13 +26,7 @@ interface NodeTableInputProps {
   /** Validation errors mapped by field key */
   errors: { [key: string]: string | undefined };
   /** Graph connections between nodes in the builder */
-  connections: {
-    edge_id: string;
-    source: string;
-    sourceHandle: string;
-    target: string;
-    targetHandle: string;
-  }[];
+  connections: ConnectedEdge[];
   /** Callback when table data changes */
   handleInputChange: (key: string, value: TableRow[]) => void;
   /** Callback when input field is clicked (for builder selection) */
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/tutorial.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/tutorial.ts
index 7adcfd9c1e..418d18782a 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/tutorial.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/tutorial.ts
@@ -328,16 +328,16 @@ export const startTutorial = (
     title: "Press Run",
     text: "Start your first flow by pressing the Run button!",
     attachTo: {
-      element: '[data-testid="primary-action-run-agent"]',
+      element: '[data-tutorial-id="primary-action-run-agent"]',
       on: "top",
     },
     advanceOn: {
-      selector: '[data-testid="primary-action-run-agent"]',
+      selector: '[data-tutorial-id="primary-action-run-agent"]',
       event: "click",
     },
     buttons: [],
     beforeShowPromise: () =>
-      waitForElement('[data-testid="primary-action-run-agent"]'),
+      waitForElement('[data-tutorial-id="primary-action-run-agent"]'),
     when: {
       hide: () => {
         setTimeout(() => {
@@ -508,16 +508,16 @@ export const startTutorial = (
     title: "Press Run Again",
     text: "Now, press the Run button again to execute the flow with the new Calculator Block added!",
     attachTo: {
-      element: '[data-testid="primary-action-run-agent"]',
+      element: '[data-tutorial-id="primary-action-run-agent"]',
       on: "top",
     },
     advanceOn: {
-      selector: '[data-testid="primary-action-run-agent"]',
+      selector: '[data-tutorial-id="primary-action-run-agent"]',
       event: "click",
     },
     buttons: [],
     beforeShowPromise: () =>
-      waitForElement('[data-testid="primary-action-run-agent"]'),
+      waitForElement('[data-tutorial-id="primary-action-run-agent"]'),
     when: {
       hide: () => {
         setTimeout(() => {
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/useCopyPaste.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/useCopyPaste.ts
index a4f604506f..13628441fa 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/useCopyPaste.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/legacy-builder/useCopyPaste.ts
@@ -1,6 +1,7 @@
 import { useCallback } from "react";
 import { Node, Edge, useReactFlow } from "@xyflow/react";
 import { Key, storage } from "@/services/storage/local-storage";
+import { ConnectedEdge } from "./CustomNode/CustomNode";
 
 interface CopyableData {
   nodes: Node[];
@@ -111,13 +112,15 @@ export function useCopyPaste(getNextNodeId: () => string) {
                     (edge: Edge) =>
                       edge.source === node.id || edge.target === node.id,
                   )
-                  .map((edge: Edge) => ({
-                    edge_id: edge.id,
-                    source: edge.source,
-                    target: edge.target,
-                    sourceHandle: edge.sourceHandle,
-                    targetHandle: edge.targetHandle,
-                  }));
+                  .map(
+                    (edge: Edge): ConnectedEdge => ({
+                      id: edge.id,
+                      source: edge.source,
+                      target: edge.target,
+                      sourceHandle: edge.sourceHandle!,
+                      targetHandle: edge.targetHandle!,
+                    }),
+                  );
 
                 return {
                   ...node,
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/hooks/useSubAgentUpdate/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/build/hooks/useSubAgentUpdate/helpers.ts
new file mode 100644
index 0000000000..aece7e9811
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/hooks/useSubAgentUpdate/helpers.ts
@@ -0,0 +1,104 @@
+import { GraphInputSchema } from "@/lib/autogpt-server-api";
+import { GraphMetaLike, IncompatibilityInfo } from "./types";
+
+// Helper type for schema properties - the generated types are too loose
+type SchemaProperties = Record<string, GraphInputSchema["properties"][string]>;
+type SchemaRequired = string[];
+
+// Helper to safely extract schema properties
+export function getSchemaProperties(schema: unknown): SchemaProperties {
+  if (
+    schema &&
+    typeof schema === "object" &&
+    "properties" in schema &&
+    typeof schema.properties === "object" &&
+    schema.properties !== null
+  ) {
+    return schema.properties as SchemaProperties;
+  }
+  return {};
+}
+
+export function getSchemaRequired(schema: unknown): SchemaRequired {
+  if (
+    schema &&
+    typeof schema === "object" &&
+    "required" in schema &&
+    Array.isArray(schema.required)
+  ) {
+    return schema.required as SchemaRequired;
+  }
+  return [];
+}
+
+/**
+ * Creates the updated agent node inputs for a sub-agent node
+ */
+export function createUpdatedAgentNodeInputs(
+  currentInputs: Record<string, unknown>,
+  latestSubGraphVersion: GraphMetaLike,
+): Record<string, unknown> {
+  return {
+    ...currentInputs,
+    graph_version: latestSubGraphVersion.version,
+    input_schema: latestSubGraphVersion.input_schema,
+    output_schema: latestSubGraphVersion.output_schema,
+  };
+}
+
+/** Generic edge type that works with both builders:
+ *  - New builder uses CustomEdge with (formally) optional handles
+ *  - Legacy builder uses ConnectedEdge type with required handles */
+export type EdgeLike = {
+  id: string;
+  source: string;
+  target: string;
+  sourceHandle?: string | null;
+  targetHandle?: string | null;
+};
+
+/**
+ * Determines which edges are broken after an incompatible update.
+ * Works with both legacy ConnectedEdge and new CustomEdge.
+ */
+export function getBrokenEdgeIDs(
+  connections: EdgeLike[],
+  incompatibilities: IncompatibilityInfo,
+  nodeID: string,
+): string[] {
+  const brokenEdgeIDs: string[] = [];
+  const typeMismatchInputNames = new Set(
+    incompatibilities.inputTypeMismatches.map((m) => m.name),
+  );
+
+  connections.forEach((conn) => {
+    // Check if this connection uses a missing input (node is target)
+    if (
+      conn.target === nodeID &&
+      conn.targetHandle &&
+      incompatibilities.missingInputs.includes(conn.targetHandle)
+    ) {
+      brokenEdgeIDs.push(conn.id);
+    }
+
+    // Check if this connection uses an input with a type mismatch (node is target)
+    if (
+      conn.target === nodeID &&
+      conn.targetHandle &&
+      typeMismatchInputNames.has(conn.targetHandle)
+    ) {
+      brokenEdgeIDs.push(conn.id);
+    }
+
+    // Check if this connection uses a missing output (node is source)
+    if (
+      conn.source === nodeID &&
+      conn.sourceHandle &&
+      incompatibilities.missingOutputs.includes(conn.sourceHandle)
+    ) {
+      brokenEdgeIDs.push(conn.id);
+    }
+  });
+
+  return brokenEdgeIDs;
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/hooks/useSubAgentUpdate/index.ts b/autogpt_platform/frontend/src/app/(platform)/build/hooks/useSubAgentUpdate/index.ts
new file mode 100644
index 0000000000..7dd1ffa3b0
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/hooks/useSubAgentUpdate/index.ts
@@ -0,0 +1,2 @@
+export { useSubAgentUpdate } from "./useSubAgentUpdate";
+export { createUpdatedAgentNodeInputs, getBrokenEdgeIDs } from "./helpers";
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/hooks/useSubAgentUpdate/types.ts b/autogpt_platform/frontend/src/app/(platform)/build/hooks/useSubAgentUpdate/types.ts
new file mode 100644
index 0000000000..83f83155db
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/hooks/useSubAgentUpdate/types.ts
@@ -0,0 +1,27 @@
+import type { GraphMeta as LegacyGraphMeta } from "@/lib/autogpt-server-api";
+import type { GraphMeta as GeneratedGraphMeta } from "@/app/api/__generated__/models/graphMeta";
+
+export type SubAgentUpdateInfo<T extends GraphMetaLike = GraphMetaLike> = {
+  hasUpdate: boolean;
+  currentVersion: number;
+  latestVersion: number;
+  latestGraph: T | null;
+  isCompatible: boolean;
+  incompatibilities: IncompatibilityInfo | null;
+};
+
+// Union type for GraphMeta that works with both legacy and new builder
+export type GraphMetaLike = LegacyGraphMeta | GeneratedGraphMeta;
+
+export type IncompatibilityInfo = {
+  missingInputs: string[]; // Connected inputs that no longer exist
+  missingOutputs: string[]; // Connected outputs that no longer exist
+  newInputs: string[]; // Inputs that exist in new version but not in current
+  newOutputs: string[]; // Outputs that exist in new version but not in current
+  newRequiredInputs: string[]; // New required inputs not in current version or not required
+  inputTypeMismatches: Array<{
+    name: string;
+    oldType: string;
+    newType: string;
+  }>; // Connected inputs where the type has changed
+};
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/hooks/useSubAgentUpdate/useSubAgentUpdate.ts b/autogpt_platform/frontend/src/app/(platform)/build/hooks/useSubAgentUpdate/useSubAgentUpdate.ts
new file mode 100644
index 0000000000..315e337cd6
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/hooks/useSubAgentUpdate/useSubAgentUpdate.ts
@@ -0,0 +1,160 @@
+import { useMemo } from "react";
+import { GraphInputSchema, GraphOutputSchema } from "@/lib/autogpt-server-api";
+import { getEffectiveType } from "@/lib/utils";
+import { EdgeLike, getSchemaProperties, getSchemaRequired } from "./helpers";
+import {
+  GraphMetaLike,
+  IncompatibilityInfo,
+  SubAgentUpdateInfo,
+} from "./types";
+
+/**
+ * Checks if a newer version of a sub-agent is available and determines compatibility
+ */
+export function useSubAgentUpdate<T extends GraphMetaLike>(
+  nodeID: string,
+  graphID: string | undefined,
+  graphVersion: number | undefined,
+  currentInputSchema: GraphInputSchema | undefined,
+  currentOutputSchema: GraphOutputSchema | undefined,
+  connections: EdgeLike[],
+  availableGraphs: T[],
+): SubAgentUpdateInfo<T> {
+  // Find the latest version of the same graph
+  const latestGraph = useMemo(() => {
+    if (!graphID) return null;
+    return availableGraphs.find((graph) => graph.id === graphID) || null;
+  }, [graphID, availableGraphs]);
+
+  // Check if there's an update available
+  const hasUpdate = useMemo(() => {
+    if (!latestGraph || graphVersion === undefined) return false;
+    return latestGraph.version! > graphVersion;
+  }, [latestGraph, graphVersion]);
+
+  // Get connected input and output handles for this specific node
+  const connectedHandles = useMemo(() => {
+    const inputHandles = new Set<string>();
+    const outputHandles = new Set<string>();
+
+    connections.forEach((conn) => {
+      // If this node is the target, the targetHandle is an input on this node
+      if (conn.target === nodeID && conn.targetHandle) {
+        inputHandles.add(conn.targetHandle);
+      }
+      // If this node is the source, the sourceHandle is an output on this node
+      if (conn.source === nodeID && conn.sourceHandle) {
+        outputHandles.add(conn.sourceHandle);
+      }
+    });
+
+    return { inputHandles, outputHandles };
+  }, [connections, nodeID]);
+
+  // Check schema compatibility
+  const compatibilityResult = useMemo((): {
+    isCompatible: boolean;
+    incompatibilities: IncompatibilityInfo | null;
+  } => {
+    if (!hasUpdate || !latestGraph) {
+      return { isCompatible: true, incompatibilities: null };
+    }
+
+    const newInputProps = getSchemaProperties(latestGraph.input_schema);
+    const newOutputProps = getSchemaProperties(latestGraph.output_schema);
+    const newRequiredInputs = getSchemaRequired(latestGraph.input_schema);
+
+    const currentInputProps = getSchemaProperties(currentInputSchema);
+    const currentOutputProps = getSchemaProperties(currentOutputSchema);
+    const currentRequiredInputs = getSchemaRequired(currentInputSchema);
+
+    const incompatibilities: IncompatibilityInfo = {
+      missingInputs: [],
+      missingOutputs: [],
+      newInputs: [],
+      newOutputs: [],
+      newRequiredInputs: [],
+      inputTypeMismatches: [],
+    };
+
+    // Check for missing connected inputs and type mismatches
+    connectedHandles.inputHandles.forEach((inputHandle) => {
+      if (!(inputHandle in newInputProps)) {
+        incompatibilities.missingInputs.push(inputHandle);
+      } else {
+        // Check for type mismatch on connected inputs
+        const currentProp = currentInputProps[inputHandle];
+        const newProp = newInputProps[inputHandle];
+        const currentType = getEffectiveType(currentProp);
+        const newType = getEffectiveType(newProp);
+
+        if (currentType && newType && currentType !== newType) {
+          incompatibilities.inputTypeMismatches.push({
+            name: inputHandle,
+            oldType: currentType,
+            newType: newType,
+          });
+        }
+      }
+    });
+
+    // Check for missing connected outputs
+    connectedHandles.outputHandles.forEach((outputHandle) => {
+      if (!(outputHandle in newOutputProps)) {
+        incompatibilities.missingOutputs.push(outputHandle);
+      }
+    });
+
+    // Check for new required inputs that didn't exist or weren't required before
+    newRequiredInputs.forEach((requiredInput) => {
+      const existedBefore = requiredInput in currentInputProps;
+      const wasRequiredBefore = currentRequiredInputs.includes(
+        requiredInput as string,
+      );
+
+      if (!existedBefore || !wasRequiredBefore) {
+        incompatibilities.newRequiredInputs.push(requiredInput as string);
+      }
+    });
+
+    // Check for new inputs that don't exist in the current version
+    Object.keys(newInputProps).forEach((inputName) => {
+      if (!(inputName in currentInputProps)) {
+        incompatibilities.newInputs.push(inputName);
+      }
+    });
+
+    // Check for new outputs that don't exist in the current version
+    Object.keys(newOutputProps).forEach((outputName) => {
+      if (!(outputName in currentOutputProps)) {
+        incompatibilities.newOutputs.push(outputName);
+      }
+    });
+
+    const hasIncompatibilities =
+      incompatibilities.missingInputs.length > 0 ||
+      incompatibilities.missingOutputs.length > 0 ||
+      incompatibilities.newRequiredInputs.length > 0 ||
+      incompatibilities.inputTypeMismatches.length > 0;
+
+    return {
+      isCompatible: !hasIncompatibilities,
+      incompatibilities: hasIncompatibilities ? incompatibilities : null,
+    };
+  }, [
+    hasUpdate,
+    latestGraph,
+    currentInputSchema,
+    currentOutputSchema,
+    connectedHandles,
+  ]);
+
+  return {
+    hasUpdate,
+    currentVersion: graphVersion || 0,
+    latestVersion: latestGraph?.version || 0,
+    latestGraph,
+    isCompatible: compatibilityResult.isCompatible,
+    incompatibilities: compatibilityResult.incompatibilities,
+  };
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/stores/blockMenuStore.ts b/autogpt_platform/frontend/src/app/(platform)/build/stores/blockMenuStore.ts
index ea50a03979..31b9eda338 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/stores/blockMenuStore.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/build/stores/blockMenuStore.ts
@@ -1,12 +1,30 @@
 import { create } from "zustand";
 import { DefaultStateType } from "../components/NewControlPanel/NewBlockMenu/types";
+import { SearchResponseItemsItem } from "@/app/api/__generated__/models/searchResponseItemsItem";
+import { getSearchItemType } from "../components/NewControlPanel/NewBlockMenu/BlockMenuSearchContent/helper";
+import { StoreAgent } from "@/app/api/__generated__/models/storeAgent";
+import { GetV2BuilderSearchFilterAnyOfItem } from "@/app/api/__generated__/models/getV2BuilderSearchFilterAnyOfItem";
 
 type BlockMenuStore = {
   searchQuery: string;
   searchId: string | undefined;
   defaultState: DefaultStateType;
   integration: string | undefined;
+  filters: GetV2BuilderSearchFilterAnyOfItem[];
+  creators: string[];
+  creators_list: string[];
+  categoryCounts: Record<GetV2BuilderSearchFilterAnyOfItem, number>;
 
+  setCategoryCounts: (
+    counts: Record<GetV2BuilderSearchFilterAnyOfItem, number>,
+  ) => void;
+  setCreatorsList: (searchData: SearchResponseItemsItem[]) => void;
+  addCreator: (creator: string) => void;
+  setCreators: (creators: string[]) => void;
+  removeCreator: (creator: string) => void;
+  addFilter: (filter: GetV2BuilderSearchFilterAnyOfItem) => void;
+  setFilters: (filters: GetV2BuilderSearchFilterAnyOfItem[]) => void;
+  removeFilter: (filter: GetV2BuilderSearchFilterAnyOfItem) => void;
   setSearchQuery: (query: string) => void;
   setSearchId: (id: string | undefined) => void;
   setDefaultState: (state: DefaultStateType) => void;
@@ -19,11 +37,44 @@ export const useBlockMenuStore = create<BlockMenuStore>((set) => ({
   searchId: undefined,
   defaultState: DefaultStateType.SUGGESTION,
   integration: undefined,
+  filters: [],
+  creators: [], // creator filters that are applied to the search results
+  creators_list: [], // all creators that are available to filter by
+  categoryCounts: {
+    blocks: 0,
+    integrations: 0,
+    marketplace_agents: 0,
+    my_agents: 0,
+  },
 
+  setCategoryCounts: (counts) => set({ categoryCounts: counts }),
+  setCreatorsList: (searchData) => {
+    const marketplaceAgents = searchData.filter((item) => {
+      return getSearchItemType(item).type === "store_agent";
+    }) as StoreAgent[];
+
+    const newCreators = marketplaceAgents.map((agent) => agent.creator);
+
+    set((state) => ({
+      creators_list: Array.from(
+        new Set([...state.creators_list, ...newCreators]),
+      ),
+    }));
+  },
+  setCreators: (creators) => set({ creators }),
+  setFilters: (filters) => set({ filters }),
   setSearchQuery: (query) => set({ searchQuery: query }),
   setSearchId: (id) => set({ searchId: id }),
   setDefaultState: (state) => set({ defaultState: state }),
   setIntegration: (integration) => set({ integration }),
+  addFilter: (filter) =>
+    set((state) => ({ filters: [...state.filters, filter] })),
+  removeFilter: (filter) =>
+    set((state) => ({ filters: state.filters.filter((f) => f !== filter) })),
+  addCreator: (creator) =>
+    set((state) => ({ creators: [...state.creators, creator] })),
+  removeCreator: (creator) =>
+    set((state) => ({ creators: state.creators.filter((c) => c !== creator) })),
   reset: () =>
     set({
       searchQuery: "",
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/stores/controlPanelStore.ts b/autogpt_platform/frontend/src/app/(platform)/build/stores/controlPanelStore.ts
index 6847d769bd..5dcb11c121 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/stores/controlPanelStore.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/build/stores/controlPanelStore.ts
@@ -3,20 +3,32 @@ import { create } from "zustand";
 type ControlPanelStore = {
   blockMenuOpen: boolean;
   saveControlOpen: boolean;
+  forceOpenBlockMenu: boolean;
+  forceOpenSave: boolean;
+
   setBlockMenuOpen: (open: boolean) => void;
   setSaveControlOpen: (open: boolean) => void;
+  setForceOpenBlockMenu: (force: boolean) => void;
+  setForceOpenSave: (force: boolean) => void;
+
   reset: () => void;
 };
 
 export const useControlPanelStore = create<ControlPanelStore>((set) => ({
   blockMenuOpen: false,
   saveControlOpen: false,
+  forceOpenBlockMenu: false,
+  forceOpenSave: false,
 
+  setForceOpenBlockMenu: (force) => set({ forceOpenBlockMenu: force }),
+  setForceOpenSave: (force) => set({ forceOpenSave: force }),
   setBlockMenuOpen: (open) => set({ blockMenuOpen: open }),
   setSaveControlOpen: (open) => set({ saveControlOpen: open }),
   reset: () =>
     set({
       blockMenuOpen: false,
       saveControlOpen: false,
+      forceOpenBlockMenu: false,
+      forceOpenSave: false,
     }),
 }));
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/stores/edgeStore.ts b/autogpt_platform/frontend/src/app/(platform)/build/stores/edgeStore.ts
index 7b17eecfb3..6a45b9e1e2 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/stores/edgeStore.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/build/stores/edgeStore.ts
@@ -5,6 +5,8 @@ import { customEdgeToLink, linkToCustomEdge } from "../components/helper";
 import { MarkerType } from "@xyflow/react";
 import { NodeExecutionResult } from "@/app/api/__generated__/models/nodeExecutionResult";
 import { cleanUpHandleId } from "@/components/renderers/InputRenderer/helpers";
+import { useHistoryStore } from "./historyStore";
+import { useNodeStore } from "./nodeStore";
 
 type EdgeStore = {
   edges: CustomEdge[];
@@ -53,25 +55,36 @@ export const useEdgeStore = create<EdgeStore>((set, get) => ({
       id,
     };
 
-    set((state) => {
-      const exists = state.edges.some(
-        (e) =>
-          e.source === newEdge.source &&
-          e.target === newEdge.target &&
-          e.sourceHandle === newEdge.sourceHandle &&
-          e.targetHandle === newEdge.targetHandle,
-      );
-      if (exists) return state;
-      return { edges: [...state.edges, newEdge] };
-    });
+    const exists = get().edges.some(
+      (e) =>
+        e.source === newEdge.source &&
+        e.target === newEdge.target &&
+        e.sourceHandle === newEdge.sourceHandle &&
+        e.targetHandle === newEdge.targetHandle,
+    );
+    if (exists) return newEdge;
+    const prevState = {
+      nodes: useNodeStore.getState().nodes,
+      edges: get().edges,
+    };
+
+    set((state) => ({ edges: [...state.edges, newEdge] }));
+    useHistoryStore.getState().pushState(prevState);
 
     return newEdge;
   },
 
-  removeEdge: (edgeId) =>
+  removeEdge: (edgeId) => {
+    const prevState = {
+      nodes: useNodeStore.getState().nodes,
+      edges: get().edges,
+    };
+
     set((state) => ({
       edges: state.edges.filter((e) => e.id !== edgeId),
-    })),
+    }));
+    useHistoryStore.getState().pushState(prevState);
+  },
 
   upsertMany: (edges) =>
     set((state) => {
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/stores/graphStore.ts b/autogpt_platform/frontend/src/app/(platform)/build/stores/graphStore.ts
index 44142881a8..6961884732 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/stores/graphStore.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/build/stores/graphStore.ts
@@ -1,5 +1,6 @@
 import { create } from "zustand";
 import { AgentExecutionStatus } from "@/app/api/__generated__/models/agentExecutionStatus";
+import { GraphMeta } from "@/app/api/__generated__/models/graphMeta";
 
 interface GraphStore {
   graphExecutionStatus: AgentExecutionStatus | undefined;
@@ -17,6 +18,10 @@ interface GraphStore {
     outputSchema: Record<string, any> | null,
   ) => void;
 
+  // Available graphs; used for sub-graph updates
+  availableSubGraphs: GraphMeta[];
+  setAvailableSubGraphs: (graphs: GraphMeta[]) => void;
+
   hasInputs: () => boolean;
   hasCredentials: () => boolean;
   hasOutputs: () => boolean;
@@ -29,6 +34,7 @@ export const useGraphStore = create<GraphStore>((set, get) => ({
   inputSchema: null,
   credentialsInputSchema: null,
   outputSchema: null,
+  availableSubGraphs: [],
 
   setGraphExecutionStatus: (status: AgentExecutionStatus | undefined) => {
     set({
@@ -46,6 +52,8 @@ export const useGraphStore = create<GraphStore>((set, get) => ({
   setGraphSchemas: (inputSchema, credentialsInputSchema, outputSchema) =>
     set({ inputSchema, credentialsInputSchema, outputSchema }),
 
+  setAvailableSubGraphs: (graphs) => set({ availableSubGraphs: graphs }),
+
   hasOutputs: () => {
     const { outputSchema } = get();
     return Object.keys(outputSchema?.properties ?? {}).length > 0;
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/stores/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/build/stores/helpers.ts
new file mode 100644
index 0000000000..bcdfd4c313
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/stores/helpers.ts
@@ -0,0 +1,16 @@
+export const accumulateExecutionData = (
+  accumulated: Record<string, unknown[]>,
+  data: Record<string, unknown> | undefined,
+) => {
+  if (!data) return { ...accumulated };
+  const next = { ...accumulated };
+  Object.entries(data).forEach(([key, values]) => {
+    const nextValues = Array.isArray(values) ? values : [values];
+    if (next[key]) {
+      next[key] = [...next[key], ...nextValues];
+    } else {
+      next[key] = [...nextValues];
+    }
+  });
+  return next;
+};
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/stores/historyStore.ts b/autogpt_platform/frontend/src/app/(platform)/build/stores/historyStore.ts
index 4eea5741a4..3a67bb8dcd 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/stores/historyStore.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/build/stores/historyStore.ts
@@ -37,6 +37,15 @@ export const useHistoryStore = create<HistoryStore>((set, get) => ({
       return;
     }
 
+    const actualCurrentState = {
+      nodes: useNodeStore.getState().nodes,
+      edges: useEdgeStore.getState().edges,
+    };
+
+    if (isEqual(state, actualCurrentState)) {
+      return;
+    }
+
     set((prev) => ({
       past: [...prev.past.slice(-MAX_HISTORY + 1), state],
       future: [],
@@ -55,18 +64,25 @@ export const useHistoryStore = create<HistoryStore>((set, get) => ({
 
   undo: () => {
     const { past, future } = get();
-    if (past.length <= 1) return;
+    if (past.length === 0) return;
 
-    const currentState = past[past.length - 1];
+    const actualCurrentState = {
+      nodes: useNodeStore.getState().nodes,
+      edges: useEdgeStore.getState().edges,
+    };
 
-    const previousState = past[past.length - 2];
+    const previousState = past[past.length - 1];
+
+    if (isEqual(actualCurrentState, previousState)) {
+      return;
+    }
 
     useNodeStore.getState().setNodes(previousState.nodes);
     useEdgeStore.getState().setEdges(previousState.edges);
 
     set({
-      past: past.slice(0, -1),
-      future: [currentState, ...future],
+      past: past.length > 1 ? past.slice(0, -1) : past,
+      future: [actualCurrentState, ...future],
     });
   },
 
@@ -74,18 +90,36 @@ export const useHistoryStore = create<HistoryStore>((set, get) => ({
     const { past, future } = get();
     if (future.length === 0) return;
 
+    const actualCurrentState = {
+      nodes: useNodeStore.getState().nodes,
+      edges: useEdgeStore.getState().edges,
+    };
+
     const nextState = future[0];
 
     useNodeStore.getState().setNodes(nextState.nodes);
     useEdgeStore.getState().setEdges(nextState.edges);
 
+    const lastPast = past[past.length - 1];
+    const shouldPushToPast =
+      !lastPast || !isEqual(actualCurrentState, lastPast);
+
     set({
-      past: [...past, nextState],
+      past: shouldPushToPast ? [...past, actualCurrentState] : past,
       future: future.slice(1),
     });
   },
 
-  canUndo: () => get().past.length > 1,
+  canUndo: () => {
+    const { past } = get();
+    if (past.length === 0) return false;
+
+    const actualCurrentState = {
+      nodes: useNodeStore.getState().nodes,
+      edges: useEdgeStore.getState().edges,
+    };
+    return !isEqual(actualCurrentState, past[past.length - 1]);
+  },
   canRedo: () => get().future.length > 0,
 
   clear: () => set({ past: [{ nodes: [], edges: [] }], future: [] }),
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/stores/nodeStore.ts b/autogpt_platform/frontend/src/app/(platform)/build/stores/nodeStore.ts
index 96478c5b6f..f7a52636f3 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/stores/nodeStore.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/build/stores/nodeStore.ts
@@ -1,6 +1,7 @@
 import { create } from "zustand";
 import { NodeChange, XYPosition, applyNodeChanges } from "@xyflow/react";
 import { CustomNode } from "../components/FlowEditor/nodes/CustomNode/CustomNode";
+import { CustomEdge } from "../components/FlowEditor/edges/CustomEdge";
 import { BlockInfo } from "@/app/api/__generated__/models/blockInfo";
 import {
   convertBlockInfoIntoCustomNodeData,
@@ -9,6 +10,8 @@ import {
 import { Node } from "@/app/api/__generated__/models/node";
 import { AgentExecutionStatus } from "@/app/api/__generated__/models/agentExecutionStatus";
 import { NodeExecutionResult } from "@/app/api/__generated__/models/nodeExecutionResult";
+import { NodeExecutionResultInputData } from "@/app/api/__generated__/models/nodeExecutionResultInputData";
+import { NodeExecutionResultOutputData } from "@/app/api/__generated__/models/nodeExecutionResultOutputData";
 import { useHistoryStore } from "./historyStore";
 import { useEdgeStore } from "./edgeStore";
 import { BlockUIType } from "../components/types";
@@ -17,18 +20,28 @@ import {
   ensurePathExists,
   parseHandleIdToPath,
 } from "@/components/renderers/InputRenderer/helpers";
+import { accumulateExecutionData } from "./helpers";
+import { NodeResolutionData } from "./types";
 
-// Minimum movement (in pixels) required before logging position change to history
-// Prevents spamming history with small movements when clicking on inputs inside blocks
 const MINIMUM_MOVE_BEFORE_LOG = 50;
-
-// Track initial positions when drag starts (outside store to avoid re-renders)
 const dragStartPositions: Record<string, XYPosition> = {};
 
+let dragStartState: { nodes: CustomNode[]; edges: CustomEdge[] } | null = null;
+
 type NodeStore = {
   nodes: CustomNode[];
   nodeCounter: number;
+  setNodeCounter: (nodeCounter: number) => void;
   nodeAdvancedStates: Record<string, boolean>;
+
+  latestNodeInputData: Record<string, NodeExecutionResultInputData | undefined>;
+  latestNodeOutputData: Record<
+    string,
+    NodeExecutionResultOutputData | undefined
+  >;
+  accumulatedNodeInputData: Record<string, Record<string, unknown[]>>;
+  accumulatedNodeOutputData: Record<string, Record<string, unknown[]>>;
+
   setNodes: (nodes: CustomNode[]) => void;
   onNodesChange: (changes: NodeChange<CustomNode>[]) => void;
   addNode: (node: CustomNode) => void;
@@ -49,12 +62,26 @@ type NodeStore = {
 
   updateNodeStatus: (nodeId: string, status: AgentExecutionStatus) => void;
   getNodeStatus: (nodeId: string) => AgentExecutionStatus | undefined;
+  cleanNodesStatuses: () => void;
 
   updateNodeExecutionResult: (
     nodeId: string,
     result: NodeExecutionResult,
   ) => void;
-  getNodeExecutionResult: (nodeId: string) => NodeExecutionResult | undefined;
+  getNodeExecutionResults: (nodeId: string) => NodeExecutionResult[];
+  getLatestNodeInputData: (
+    nodeId: string,
+  ) => NodeExecutionResultInputData | undefined;
+  getLatestNodeOutputData: (
+    nodeId: string,
+  ) => NodeExecutionResultOutputData | undefined;
+  getAccumulatedNodeInputData: (nodeId: string) => Record<string, unknown[]>;
+  getAccumulatedNodeOutputData: (nodeId: string) => Record<string, unknown[]>;
+  getLatestNodeExecutionResult: (
+    nodeId: string,
+  ) => NodeExecutionResult | undefined;
+  clearAllNodeExecutionResults: () => void;
+
   getNodeBlockUIType: (nodeId: string) => BlockUIType;
   hasWebhookNodes: () => boolean;
 
@@ -65,29 +92,63 @@ type NodeStore = {
     backendId: string,
     errors: { [key: string]: string },
   ) => void;
-  clearAllNodeErrors: () => void; // Add this
 
   syncHardcodedValuesWithHandleIds: (nodeId: string) => void;
+
+  setCredentialsOptional: (nodeId: string, optional: boolean) => void;
+  clearAllNodeErrors: () => void;
+
+  nodesInResolutionMode: Set<string>;
+  brokenEdgeIDs: Map<string, Set<string>>;
+  nodeResolutionData: Map<string, NodeResolutionData>;
+  setNodeResolutionMode: (
+    nodeID: string,
+    inResolution: boolean,
+    resolutionData?: NodeResolutionData,
+  ) => void;
+  isNodeInResolutionMode: (nodeID: string) => boolean;
+  getNodeResolutionData: (nodeID: string) => NodeResolutionData | undefined;
+  setBrokenEdgeIDs: (nodeID: string, edgeIDs: string[]) => void;
+  removeBrokenEdgeID: (nodeID: string, edgeID: string) => void;
+  isEdgeBroken: (edgeID: string) => boolean;
+  clearResolutionState: () => void;
+
+  isInputBroken: (nodeID: string, handleID: string) => boolean;
+  getInputTypeMismatch: (
+    nodeID: string,
+    handleID: string,
+  ) => string | undefined;
 };
 
 export const useNodeStore = create<NodeStore>((set, get) => ({
   nodes: [],
   setNodes: (nodes) => set({ nodes }),
   nodeCounter: 0,
+  setNodeCounter: (nodeCounter) => set({ nodeCounter }),
   nodeAdvancedStates: {},
+  latestNodeInputData: {},
+  latestNodeOutputData: {},
+  accumulatedNodeInputData: {},
+  accumulatedNodeOutputData: {},
   incrementNodeCounter: () =>
     set((state) => ({
       nodeCounter: state.nodeCounter + 1,
     })),
   onNodesChange: (changes) => {
-    const prevState = {
-      nodes: get().nodes,
-      edges: useEdgeStore.getState().edges,
-    };
-
-    // Track initial positions when drag starts
     changes.forEach((change) => {
       if (change.type === "position" && change.dragging === true) {
+        if (!dragStartState) {
+          const currentNodes = get().nodes;
+          const currentEdges = useEdgeStore.getState().edges;
+          dragStartState = {
+            nodes: currentNodes.map((n) => ({
+              ...n,
+              position: { ...n.position },
+              data: { ...n.data },
+            })),
+            edges: currentEdges.map((e) => ({ ...e })),
+          };
+        }
         if (!dragStartPositions[change.id]) {
           const node = get().nodes.find((n) => n.id === change.id);
           if (node) {
@@ -97,12 +158,17 @@ export const useNodeStore = create<NodeStore>((set, get) => ({
       }
     });
 
-    // Check if we should track this change in history
-    let shouldTrack = changes.some(
-      (change) => change.type === "remove" || change.type === "add",
-    );
+    let shouldTrack = changes.some((change) => change.type === "remove");
+    let stateToTrack: { nodes: CustomNode[]; edges: CustomEdge[] } | null =
+      null;
+
+    if (shouldTrack) {
+      stateToTrack = {
+        nodes: get().nodes,
+        edges: useEdgeStore.getState().edges,
+      };
+    }
 
-    // For position changes, only track if movement exceeds threshold
     if (!shouldTrack) {
       changes.forEach((change) => {
         if (change.type === "position" && change.dragging === false) {
@@ -114,20 +180,23 @@ export const useNodeStore = create<NodeStore>((set, get) => ({
             );
             if (distanceMoved > MINIMUM_MOVE_BEFORE_LOG) {
               shouldTrack = true;
+              stateToTrack = dragStartState;
             }
           }
-          // Clean up tracked position after drag ends
           delete dragStartPositions[change.id];
         }
       });
+      if (Object.keys(dragStartPositions).length === 0) {
+        dragStartState = null;
+      }
     }
 
     set((state) => ({
       nodes: applyNodeChanges(changes, state.nodes),
     }));
 
-    if (shouldTrack) {
-      useHistoryStore.getState().pushState(prevState);
+    if (shouldTrack && stateToTrack) {
+      useHistoryStore.getState().pushState(stateToTrack);
     }
   },
 
@@ -141,6 +210,11 @@ export const useNodeStore = create<NodeStore>((set, get) => ({
     hardcodedValues?: Record<string, any>,
     position?: XYPosition,
   ) => {
+    const prevState = {
+      nodes: get().nodes,
+      edges: useEdgeStore.getState().edges,
+    };
+
     const customNodeData = convertBlockInfoIntoCustomNodeData(
       block,
       hardcodedValues,
@@ -174,21 +248,24 @@ export const useNodeStore = create<NodeStore>((set, get) => ({
     set((state) => ({
       nodes: [...state.nodes, customNode],
     }));
+
+    useHistoryStore.getState().pushState(prevState);
+
     return customNode;
   },
   updateNodeData: (nodeId, data) => {
+    const prevState = {
+      nodes: get().nodes,
+      edges: useEdgeStore.getState().edges,
+    };
+
     set((state) => ({
       nodes: state.nodes.map((n) =>
         n.id === nodeId ? { ...n, data: { ...n.data, ...data } } : n,
       ),
     }));
 
-    const newState = {
-      nodes: get().nodes,
-      edges: useEdgeStore.getState().edges,
-    };
-
-    useHistoryStore.getState().pushState(newState);
+    useHistoryStore.getState().pushState(prevState);
   },
   toggleAdvanced: (nodeId: string) =>
     set((state) => ({
@@ -226,6 +303,9 @@ export const useNodeStore = create<NodeStore>((set, get) => ({
         ...(node.data.metadata?.customized_name !== undefined && {
           customized_name: node.data.metadata.customized_name,
         }),
+        ...(node.data.metadata?.credentials_optional !== undefined && {
+          credentials_optional: node.data.metadata.credentials_optional,
+        }),
       },
     };
   },
@@ -245,17 +325,162 @@ export const useNodeStore = create<NodeStore>((set, get) => ({
     return get().nodes.find((n) => n.id === nodeId)?.data?.status;
   },
 
-  updateNodeExecutionResult: (nodeId: string, result: NodeExecutionResult) => {
+  cleanNodesStatuses: () => {
     set((state) => ({
-      nodes: state.nodes.map((n) =>
-        n.id === nodeId
-          ? { ...n, data: { ...n.data, nodeExecutionResult: result } }
-          : n,
-      ),
+      nodes: state.nodes.map((n) => ({
+        ...n,
+        data: { ...n.data, status: undefined },
+      })),
     }));
   },
-  getNodeExecutionResult: (nodeId: string) => {
-    return get().nodes.find((n) => n.id === nodeId)?.data?.nodeExecutionResult;
+
+  updateNodeExecutionResult: (nodeId: string, result: NodeExecutionResult) => {
+    set((state) => {
+      let latestNodeInputData = state.latestNodeInputData;
+      let latestNodeOutputData = state.latestNodeOutputData;
+      let accumulatedNodeInputData = state.accumulatedNodeInputData;
+      let accumulatedNodeOutputData = state.accumulatedNodeOutputData;
+
+      const nodes = state.nodes.map((n) => {
+        if (n.id !== nodeId) return n;
+
+        const existingResults = n.data.nodeExecutionResults || [];
+        const duplicateIndex = existingResults.findIndex(
+          (r) => r.node_exec_id === result.node_exec_id,
+        );
+
+        if (duplicateIndex !== -1) {
+          const oldResult = existingResults[duplicateIndex];
+          const inputDataChanged =
+            JSON.stringify(oldResult.input_data) !==
+            JSON.stringify(result.input_data);
+          const outputDataChanged =
+            JSON.stringify(oldResult.output_data) !==
+            JSON.stringify(result.output_data);
+
+          if (!inputDataChanged && !outputDataChanged) {
+            return n;
+          }
+
+          const updatedResults = [...existingResults];
+          updatedResults[duplicateIndex] = result;
+
+          const recomputedAccumulatedInput = updatedResults.reduce(
+            (acc, r) => accumulateExecutionData(acc, r.input_data),
+            {} as Record<string, unknown[]>,
+          );
+          const recomputedAccumulatedOutput = updatedResults.reduce(
+            (acc, r) => accumulateExecutionData(acc, r.output_data),
+            {} as Record<string, unknown[]>,
+          );
+
+          const mostRecentResult = updatedResults[updatedResults.length - 1];
+          latestNodeInputData = {
+            ...latestNodeInputData,
+            [nodeId]: mostRecentResult.input_data,
+          };
+          latestNodeOutputData = {
+            ...latestNodeOutputData,
+            [nodeId]: mostRecentResult.output_data,
+          };
+
+          accumulatedNodeInputData = {
+            ...accumulatedNodeInputData,
+            [nodeId]: recomputedAccumulatedInput,
+          };
+          accumulatedNodeOutputData = {
+            ...accumulatedNodeOutputData,
+            [nodeId]: recomputedAccumulatedOutput,
+          };
+
+          return {
+            ...n,
+            data: {
+              ...n.data,
+              nodeExecutionResults: updatedResults,
+            },
+          };
+        }
+
+        accumulatedNodeInputData = {
+          ...accumulatedNodeInputData,
+          [nodeId]: accumulateExecutionData(
+            accumulatedNodeInputData[nodeId] || {},
+            result.input_data,
+          ),
+        };
+        accumulatedNodeOutputData = {
+          ...accumulatedNodeOutputData,
+          [nodeId]: accumulateExecutionData(
+            accumulatedNodeOutputData[nodeId] || {},
+            result.output_data,
+          ),
+        };
+
+        latestNodeInputData = {
+          ...latestNodeInputData,
+          [nodeId]: result.input_data,
+        };
+        latestNodeOutputData = {
+          ...latestNodeOutputData,
+          [nodeId]: result.output_data,
+        };
+
+        return {
+          ...n,
+          data: {
+            ...n.data,
+            nodeExecutionResults: [...existingResults, result],
+          },
+        };
+      });
+
+      return {
+        nodes,
+        latestNodeInputData,
+        latestNodeOutputData,
+        accumulatedNodeInputData,
+        accumulatedNodeOutputData,
+      };
+    });
+  },
+  getNodeExecutionResults: (nodeId: string) => {
+    return (
+      get().nodes.find((n) => n.id === nodeId)?.data?.nodeExecutionResults || []
+    );
+  },
+  getLatestNodeInputData: (nodeId: string) => {
+    return get().latestNodeInputData[nodeId];
+  },
+  getLatestNodeOutputData: (nodeId: string) => {
+    return get().latestNodeOutputData[nodeId];
+  },
+  getAccumulatedNodeInputData: (nodeId: string) => {
+    return get().accumulatedNodeInputData[nodeId] || {};
+  },
+  getAccumulatedNodeOutputData: (nodeId: string) => {
+    return get().accumulatedNodeOutputData[nodeId] || {};
+  },
+  getLatestNodeExecutionResult: (nodeId: string) => {
+    const results =
+      get().nodes.find((n) => n.id === nodeId)?.data?.nodeExecutionResults ||
+      [];
+    return results.length > 0 ? results[results.length - 1] : undefined;
+  },
+  clearAllNodeExecutionResults: () => {
+    set((state) => ({
+      nodes: state.nodes.map((n) => ({
+        ...n,
+        data: {
+          ...n.data,
+          nodeExecutionResults: [],
+        },
+      })),
+      latestNodeInputData: {},
+      latestNodeOutputData: {},
+      accumulatedNodeInputData: {},
+      accumulatedNodeOutputData: {},
+    }));
   },
   getNodeBlockUIType: (nodeId: string) => {
     return (
@@ -342,4 +567,125 @@ export const useNodeStore = create<NodeStore>((set, get) => ({
       }));
     }
   },
+
+  setCredentialsOptional: (nodeId: string, optional: boolean) => {
+    const prevState = {
+      nodes: get().nodes,
+      edges: useEdgeStore.getState().edges,
+    };
+
+    set((state) => ({
+      nodes: state.nodes.map((n) =>
+        n.id === nodeId
+          ? {
+              ...n,
+              data: {
+                ...n.data,
+                metadata: {
+                  ...n.data.metadata,
+                  credentials_optional: optional,
+                },
+              },
+            }
+          : n,
+      ),
+    }));
+
+    useHistoryStore.getState().pushState(prevState);
+  },
+
+  // Sub-agent resolution mode state
+  nodesInResolutionMode: new Set<string>(),
+  brokenEdgeIDs: new Map<string, Set<string>>(),
+  nodeResolutionData: new Map<string, NodeResolutionData>(),
+
+  setNodeResolutionMode: (
+    nodeID: string,
+    inResolution: boolean,
+    resolutionData?: NodeResolutionData,
+  ) => {
+    set((state) => {
+      const newNodesSet = new Set(state.nodesInResolutionMode);
+      const newResolutionDataMap = new Map(state.nodeResolutionData);
+      const newBrokenEdgeIDs = new Map(state.brokenEdgeIDs);
+
+      if (inResolution) {
+        newNodesSet.add(nodeID);
+        if (resolutionData) {
+          newResolutionDataMap.set(nodeID, resolutionData);
+        }
+      } else {
+        newNodesSet.delete(nodeID);
+        newResolutionDataMap.delete(nodeID);
+        newBrokenEdgeIDs.delete(nodeID); // Clean up broken edges when exiting resolution mode
+      }
+
+      return {
+        nodesInResolutionMode: newNodesSet,
+        nodeResolutionData: newResolutionDataMap,
+        brokenEdgeIDs: newBrokenEdgeIDs,
+      };
+    });
+  },
+
+  isNodeInResolutionMode: (nodeID: string) => {
+    return get().nodesInResolutionMode.has(nodeID);
+  },
+
+  getNodeResolutionData: (nodeID: string) => {
+    return get().nodeResolutionData.get(nodeID);
+  },
+
+  setBrokenEdgeIDs: (nodeID: string, edgeIDs: string[]) => {
+    set((state) => {
+      const newMap = new Map(state.brokenEdgeIDs);
+      newMap.set(nodeID, new Set(edgeIDs));
+      return { brokenEdgeIDs: newMap };
+    });
+  },
+
+  removeBrokenEdgeID: (nodeID: string, edgeID: string) => {
+    set((state) => {
+      const newMap = new Map(state.brokenEdgeIDs);
+      const nodeSet = new Set(newMap.get(nodeID) || []);
+      nodeSet.delete(edgeID);
+      newMap.set(nodeID, nodeSet);
+      return { brokenEdgeIDs: newMap };
+    });
+  },
+
+  isEdgeBroken: (edgeID: string) => {
+    // Check across all nodes
+    const brokenEdgeIDs = get().brokenEdgeIDs;
+    for (const edgeSet of brokenEdgeIDs.values()) {
+      if (edgeSet.has(edgeID)) {
+        return true;
+      }
+    }
+    return false;
+  },
+
+  clearResolutionState: () => {
+    set({
+      nodesInResolutionMode: new Set<string>(),
+      brokenEdgeIDs: new Map<string, Set<string>>(),
+      nodeResolutionData: new Map<string, NodeResolutionData>(),
+    });
+  },
+
+  // Helper functions for input renderers
+  isInputBroken: (nodeID: string, handleID: string) => {
+    const resolutionData = get().nodeResolutionData.get(nodeID);
+    if (!resolutionData) return false;
+    return resolutionData.incompatibilities.missingInputs.includes(handleID);
+  },
+
+  getInputTypeMismatch: (nodeID: string, handleID: string) => {
+    const resolutionData = get().nodeResolutionData.get(nodeID);
+    if (!resolutionData) return undefined;
+    const mismatch = resolutionData.incompatibilities.inputTypeMismatches.find(
+      (m) => m.name === handleID,
+    );
+    return mismatch?.newType;
+  },
 }));
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/stores/tutorialStore.ts b/autogpt_platform/frontend/src/app/(platform)/build/stores/tutorialStore.ts
new file mode 100644
index 0000000000..581dda44c9
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/stores/tutorialStore.ts
@@ -0,0 +1,32 @@
+import { create } from "zustand";
+
+type TutorialStore = {
+  isTutorialRunning: boolean;
+  setIsTutorialRunning: (isTutorialRunning: boolean) => void;
+
+  currentStep: number;
+  setCurrentStep: (currentStep: number) => void;
+
+  // Force open the run input dialog from the tutorial
+  forceOpenRunInputDialog: boolean;
+  setForceOpenRunInputDialog: (forceOpen: boolean) => void;
+
+  // Track input values filled in the dialog
+  tutorialInputValues: Record<string, any>;
+  setTutorialInputValues: (values: Record<string, any>) => void;
+};
+
+export const useTutorialStore = create<TutorialStore>((set) => ({
+  isTutorialRunning: false,
+  setIsTutorialRunning: (isTutorialRunning) => set({ isTutorialRunning }),
+
+  currentStep: 0,
+  setCurrentStep: (currentStep) => set({ currentStep }),
+
+  forceOpenRunInputDialog: false,
+  setForceOpenRunInputDialog: (forceOpen) =>
+    set({ forceOpenRunInputDialog: forceOpen }),
+
+  tutorialInputValues: {},
+  setTutorialInputValues: (values) => set({ tutorialInputValues: values }),
+}));
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/stores/types.ts b/autogpt_platform/frontend/src/app/(platform)/build/stores/types.ts
new file mode 100644
index 0000000000..f0ec7e6c1c
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/build/stores/types.ts
@@ -0,0 +1,14 @@
+import { IncompatibilityInfo } from "../hooks/useSubAgentUpdate/types";
+
+export type NodeResolutionData = {
+  incompatibilities: IncompatibilityInfo;
+  pendingUpdate: {
+    input_schema: Record<string, unknown>;
+    output_schema: Record<string, unknown>;
+  };
+  currentSchema: {
+    input_schema: Record<string, unknown>;
+    output_schema: Record<string, unknown>;
+  };
+  pendingHardcodedValues: Record<string, unknown>;
+};
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatContainer/ChatContainer.tsx b/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatContainer/ChatContainer.tsx
deleted file mode 100644
index 32f9d6c6eb..0000000000
--- a/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatContainer/ChatContainer.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import { cn } from "@/lib/utils";
-import { ChatInput } from "@/app/(platform)/chat/components/ChatInput/ChatInput";
-import { MessageList } from "@/app/(platform)/chat/components/MessageList/MessageList";
-import { QuickActionsWelcome } from "@/app/(platform)/chat/components/QuickActionsWelcome/QuickActionsWelcome";
-import { useChatContainer } from "./useChatContainer";
-import type { SessionDetailResponse } from "@/app/api/__generated__/models/sessionDetailResponse";
-
-export interface ChatContainerProps {
-  sessionId: string | null;
-  initialMessages: SessionDetailResponse["messages"];
-  onRefreshSession: () => Promise<void>;
-  className?: string;
-}
-
-export function ChatContainer({
-  sessionId,
-  initialMessages,
-  onRefreshSession,
-  className,
-}: ChatContainerProps) {
-  const { messages, streamingChunks, isStreaming, sendMessage } =
-    useChatContainer({
-      sessionId,
-      initialMessages,
-      onRefreshSession,
-    });
-
-  const quickActions = [
-    "Find agents for social media management",
-    "Show me agents for content creation",
-    "Help me automate my business",
-    "What can you help me with?",
-  ];
-
-  return (
-    <div className={cn("flex h-full flex-col", className)}>
-      {/* Messages or Welcome Screen */}
-      {messages.length === 0 ? (
-        <QuickActionsWelcome
-          title="Welcome to AutoGPT Chat"
-          description="Start a conversation to discover and run AI agents."
-          actions={quickActions}
-          onActionClick={sendMessage}
-          disabled={isStreaming || !sessionId}
-        />
-      ) : (
-        <MessageList
-          messages={messages}
-          streamingChunks={streamingChunks}
-          isStreaming={isStreaming}
-          onSendMessage={sendMessage}
-          className="flex-1"
-        />
-      )}
-
-      {/* Input - Always visible */}
-      <div className="border-t border-zinc-200 p-4 dark:border-zinc-800">
-        <ChatInput
-          onSend={sendMessage}
-          disabled={isStreaming || !sessionId}
-          placeholder={
-            sessionId ? "Type your message..." : "Creating session..."
-          }
-        />
-      </div>
-    </div>
-  );
-}
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatContainer/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatContainer/helpers.ts
deleted file mode 100644
index 3a94dab1ea..0000000000
--- a/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatContainer/helpers.ts
+++ /dev/null
@@ -1,279 +0,0 @@
-import type { ChatMessageData } from "@/app/(platform)/chat/components/ChatMessage/useChatMessage";
-import type { ToolResult } from "@/types/chat";
-
-export function createUserMessage(content: string): ChatMessageData {
-  return {
-    type: "message",
-    role: "user",
-    content,
-    timestamp: new Date(),
-  };
-}
-
-export function filterAuthMessages(
-  messages: ChatMessageData[],
-): ChatMessageData[] {
-  return messages.filter(
-    (msg) => msg.type !== "credentials_needed" && msg.type !== "login_needed",
-  );
-}
-
-export function isValidMessage(msg: unknown): msg is Record<string, unknown> {
-  if (typeof msg !== "object" || msg === null) {
-    return false;
-  }
-  const m = msg as Record<string, unknown>;
-  if (typeof m.role !== "string") {
-    return false;
-  }
-  if (m.content !== undefined && typeof m.content !== "string") {
-    return false;
-  }
-  return true;
-}
-
-export function isToolCallArray(value: unknown): value is Array<{
-  id: string;
-  type: string;
-  function: { name: string; arguments: string };
-}> {
-  if (!Array.isArray(value)) {
-    return false;
-  }
-  return value.every(
-    (item) =>
-      typeof item === "object" &&
-      item !== null &&
-      "id" in item &&
-      typeof item.id === "string" &&
-      "type" in item &&
-      typeof item.type === "string" &&
-      "function" in item &&
-      typeof item.function === "object" &&
-      item.function !== null &&
-      "name" in item.function &&
-      typeof item.function.name === "string" &&
-      "arguments" in item.function &&
-      typeof item.function.arguments === "string",
-  );
-}
-
-export function isAgentArray(value: unknown): value is Array<{
-  id: string;
-  name: string;
-  description: string;
-  version?: number;
-}> {
-  if (!Array.isArray(value)) {
-    return false;
-  }
-  return value.every(
-    (item) =>
-      typeof item === "object" &&
-      item !== null &&
-      "id" in item &&
-      typeof item.id === "string" &&
-      "name" in item &&
-      typeof item.name === "string" &&
-      "description" in item &&
-      typeof item.description === "string" &&
-      (!("version" in item) || typeof item.version === "number"),
-  );
-}
-
-export function extractJsonFromErrorMessage(
-  message: string,
-): Record<string, unknown> | null {
-  try {
-    const start = message.indexOf("{");
-    if (start === -1) {
-      return null;
-    }
-    let depth = 0;
-    let end = -1;
-    for (let i = start; i < message.length; i++) {
-      const ch = message[i];
-      if (ch === "{") {
-        depth++;
-      } else if (ch === "}") {
-        depth--;
-        if (depth === 0) {
-          end = i;
-          break;
-        }
-      }
-    }
-    if (end === -1) {
-      return null;
-    }
-    const jsonStr = message.slice(start, end + 1);
-    return JSON.parse(jsonStr) as Record<string, unknown>;
-  } catch {
-    return null;
-  }
-}
-
-export function parseToolResponse(
-  result: ToolResult,
-  toolId: string,
-  toolName: string,
-  timestamp?: Date,
-): ChatMessageData | null {
-  let parsedResult: Record<string, unknown> | null = null;
-  try {
-    parsedResult =
-      typeof result === "string"
-        ? JSON.parse(result)
-        : (result as Record<string, unknown>);
-  } catch {
-    parsedResult = null;
-  }
-  if (parsedResult && typeof parsedResult === "object") {
-    const responseType = parsedResult.type as string | undefined;
-    if (responseType === "no_results") {
-      return {
-        type: "tool_response",
-        toolId,
-        toolName,
-        result: (parsedResult.message as string) || "No results found",
-        success: true,
-        timestamp: timestamp || new Date(),
-      };
-    }
-    if (responseType === "agent_carousel") {
-      const agentsData = parsedResult.agents;
-      if (isAgentArray(agentsData)) {
-        return {
-          type: "agent_carousel",
-          toolName: "agent_carousel",
-          agents: agentsData,
-          totalCount: parsedResult.total_count as number | undefined,
-          timestamp: timestamp || new Date(),
-        };
-      } else {
-        console.warn("Invalid agents array in agent_carousel response");
-      }
-    }
-    if (responseType === "execution_started") {
-      return {
-        type: "execution_started",
-        toolName: "execution_started",
-        executionId: (parsedResult.execution_id as string) || "",
-        agentName: (parsedResult.graph_name as string) || undefined,
-        message: parsedResult.message as string | undefined,
-        libraryAgentLink: parsedResult.library_agent_link as string | undefined,
-        timestamp: timestamp || new Date(),
-      };
-    }
-    if (responseType === "need_login") {
-      return {
-        type: "login_needed",
-        toolName: "login_needed",
-        message:
-          (parsedResult.message as string) ||
-          "Please sign in to use chat and agent features",
-        sessionId: (parsedResult.session_id as string) || "",
-        agentInfo: parsedResult.agent_info as
-          | {
-              graph_id: string;
-              name: string;
-              trigger_type: string;
-            }
-          | undefined,
-        timestamp: timestamp || new Date(),
-      };
-    }
-    if (responseType === "setup_requirements") {
-      return null;
-    }
-  }
-  return {
-    type: "tool_response",
-    toolId,
-    toolName,
-    result,
-    success: true,
-    timestamp: timestamp || new Date(),
-  };
-}
-
-export function isUserReadiness(
-  value: unknown,
-): value is { missing_credentials?: Record<string, unknown> } {
-  return (
-    typeof value === "object" &&
-    value !== null &&
-    (!("missing_credentials" in value) ||
-      typeof (value as any).missing_credentials === "object")
-  );
-}
-
-export function isMissingCredentials(
-  value: unknown,
-): value is Record<string, Record<string, unknown>> {
-  if (typeof value !== "object" || value === null) {
-    return false;
-  }
-  return Object.values(value).every((v) => typeof v === "object" && v !== null);
-}
-
-export function isSetupInfo(value: unknown): value is {
-  user_readiness?: Record<string, unknown>;
-  agent_name?: string;
-} {
-  return (
-    typeof value === "object" &&
-    value !== null &&
-    (!("user_readiness" in value) ||
-      typeof (value as any).user_readiness === "object") &&
-    (!("agent_name" in value) || typeof (value as any).agent_name === "string")
-  );
-}
-
-export function extractCredentialsNeeded(
-  parsedResult: Record<string, unknown>,
-): ChatMessageData | null {
-  try {
-    const setupInfo = parsedResult?.setup_info as
-      | Record<string, unknown>
-      | undefined;
-    const userReadiness = setupInfo?.user_readiness as
-      | Record<string, unknown>
-      | undefined;
-    const missingCreds = userReadiness?.missing_credentials as
-      | Record<string, Record<string, unknown>>
-      | undefined;
-    if (missingCreds && Object.keys(missingCreds).length > 0) {
-      const agentName = (setupInfo?.agent_name as string) || "this agent";
-      const credentials = Object.values(missingCreds).map((credInfo) => ({
-        provider: (credInfo.provider as string) || "unknown",
-        providerName:
-          (credInfo.provider_name as string) ||
-          (credInfo.provider as string) ||
-          "Unknown Provider",
-        credentialType:
-          (credInfo.type as
-            | "api_key"
-            | "oauth2"
-            | "user_password"
-            | "host_scoped") || "api_key",
-        title:
-          (credInfo.title as string) ||
-          `${(credInfo.provider_name as string) || (credInfo.provider as string)} credentials`,
-        scopes: credInfo.scopes as string[] | undefined,
-      }));
-      return {
-        type: "credentials_needed",
-        toolName: "run_agent",
-        credentials,
-        message: `To run ${agentName}, you need to add ${credentials.length === 1 ? "credentials" : `${credentials.length} credentials`}.`,
-        agentName,
-        timestamp: new Date(),
-      };
-    }
-    return null;
-  } catch (err) {
-    console.error("Failed to extract credentials from setup info:", err);
-    return null;
-  }
-}
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatContainer/useChatContainer.handlers.ts b/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatContainer/useChatContainer.handlers.ts
deleted file mode 100644
index fdbecb5d61..0000000000
--- a/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatContainer/useChatContainer.handlers.ts
+++ /dev/null
@@ -1,206 +0,0 @@
-import type { Dispatch, SetStateAction, MutableRefObject } from "react";
-import type { StreamChunk } from "@/app/(platform)/chat/useChatStream";
-import type { ChatMessageData } from "@/app/(platform)/chat/components/ChatMessage/useChatMessage";
-import { parseToolResponse, extractCredentialsNeeded } from "./helpers";
-
-export interface HandlerDependencies {
-  setHasTextChunks: Dispatch<SetStateAction<boolean>>;
-  setStreamingChunks: Dispatch<SetStateAction<string[]>>;
-  streamingChunksRef: MutableRefObject<string[]>;
-  setMessages: Dispatch<SetStateAction<ChatMessageData[]>>;
-  sessionId: string;
-}
-
-export function handleTextChunk(chunk: StreamChunk, deps: HandlerDependencies) {
-  if (!chunk.content) return;
-  deps.setHasTextChunks(true);
-  deps.setStreamingChunks((prev) => {
-    const updated = [...prev, chunk.content!];
-    deps.streamingChunksRef.current = updated;
-    return updated;
-  });
-}
-
-export function handleTextEnded(
-  _chunk: StreamChunk,
-  deps: HandlerDependencies,
-) {
-  console.log("[Text Ended] Saving streamed text as assistant message");
-  const completedText = deps.streamingChunksRef.current.join("");
-  if (completedText.trim()) {
-    const assistantMessage: ChatMessageData = {
-      type: "message",
-      role: "assistant",
-      content: completedText,
-      timestamp: new Date(),
-    };
-    deps.setMessages((prev) => [...prev, assistantMessage]);
-  }
-  deps.setStreamingChunks([]);
-  deps.streamingChunksRef.current = [];
-  deps.setHasTextChunks(false);
-}
-
-export function handleToolCallStart(
-  chunk: StreamChunk,
-  deps: HandlerDependencies,
-) {
-  const toolCallMessage: ChatMessageData = {
-    type: "tool_call",
-    toolId: chunk.tool_id || `tool-${Date.now()}-${chunk.idx || 0}`,
-    toolName: chunk.tool_name || "Executing...",
-    arguments: chunk.arguments || {},
-    timestamp: new Date(),
-  };
-  deps.setMessages((prev) => [...prev, toolCallMessage]);
-  console.log("[Tool Call Start]", {
-    toolId: toolCallMessage.toolId,
-    toolName: toolCallMessage.toolName,
-    timestamp: new Date().toISOString(),
-  });
-}
-
-export function handleToolResponse(
-  chunk: StreamChunk,
-  deps: HandlerDependencies,
-) {
-  console.log("[Tool Response] Received:", {
-    toolId: chunk.tool_id,
-    toolName: chunk.tool_name,
-    timestamp: new Date().toISOString(),
-  });
-  let toolName = chunk.tool_name || "unknown";
-  if (!chunk.tool_name || chunk.tool_name === "unknown") {
-    deps.setMessages((prev) => {
-      const matchingToolCall = [...prev]
-        .reverse()
-        .find(
-          (msg) => msg.type === "tool_call" && msg.toolId === chunk.tool_id,
-        );
-      if (matchingToolCall && matchingToolCall.type === "tool_call") {
-        toolName = matchingToolCall.toolName;
-      }
-      return prev;
-    });
-  }
-  const responseMessage = parseToolResponse(
-    chunk.result!,
-    chunk.tool_id!,
-    toolName,
-    new Date(),
-  );
-  if (!responseMessage) {
-    let parsedResult: Record<string, unknown> | null = null;
-    try {
-      parsedResult =
-        typeof chunk.result === "string"
-          ? JSON.parse(chunk.result)
-          : (chunk.result as Record<string, unknown>);
-    } catch {
-      parsedResult = null;
-    }
-    if (
-      chunk.tool_name === "run_agent" &&
-      chunk.success &&
-      parsedResult?.type === "setup_requirements"
-    ) {
-      const credentialsMessage = extractCredentialsNeeded(parsedResult);
-      if (credentialsMessage) {
-        deps.setMessages((prev) => [...prev, credentialsMessage]);
-      }
-    }
-    return;
-  }
-  deps.setMessages((prev) => {
-    const toolCallIndex = prev.findIndex(
-      (msg) => msg.type === "tool_call" && msg.toolId === chunk.tool_id,
-    );
-    if (toolCallIndex !== -1) {
-      const newMessages = [...prev];
-      newMessages[toolCallIndex] = responseMessage;
-      console.log(
-        "[Tool Response] Replaced tool_call with matching tool_id:",
-        chunk.tool_id,
-        "at index:",
-        toolCallIndex,
-      );
-      return newMessages;
-    }
-    console.warn(
-      "[Tool Response] No tool_call found with tool_id:",
-      chunk.tool_id,
-      "appending instead",
-    );
-    return [...prev, responseMessage];
-  });
-}
-
-export function handleLoginNeeded(
-  chunk: StreamChunk,
-  deps: HandlerDependencies,
-) {
-  const loginNeededMessage: ChatMessageData = {
-    type: "login_needed",
-    toolName: "login_needed",
-    message: chunk.message || "Please sign in to use chat and agent features",
-    sessionId: chunk.session_id || deps.sessionId,
-    agentInfo: chunk.agent_info,
-    timestamp: new Date(),
-  };
-  deps.setMessages((prev) => [...prev, loginNeededMessage]);
-}
-
-export function handleStreamEnd(
-  _chunk: StreamChunk,
-  deps: HandlerDependencies,
-) {
-  const completedContent = deps.streamingChunksRef.current.join("");
-  // Only save message if there are uncommitted chunks
-  // (text_ended already saved if there were tool calls)
-  if (completedContent.trim()) {
-    console.log(
-      "[Stream End] Saving remaining streamed text as assistant message",
-    );
-    const assistantMessage: ChatMessageData = {
-      type: "message",
-      role: "assistant",
-      content: completedContent,
-      timestamp: new Date(),
-    };
-    deps.setMessages((prev) => {
-      const updated = [...prev, assistantMessage];
-      console.log("[Stream End] Final state:", {
-        localMessages: updated.map((m) => ({
-          type: m.type,
-          ...(m.type === "message" && {
-            role: m.role,
-            contentLength: m.content.length,
-          }),
-          ...(m.type === "tool_call" && {
-            toolId: m.toolId,
-            toolName: m.toolName,
-          }),
-          ...(m.type === "tool_response" && {
-            toolId: m.toolId,
-            toolName: m.toolName,
-            success: m.success,
-          }),
-        })),
-        streamingChunks: deps.streamingChunksRef.current,
-        timestamp: new Date().toISOString(),
-      });
-      return updated;
-    });
-  } else {
-    console.log("[Stream End] No uncommitted chunks, message already saved");
-  }
-  deps.setStreamingChunks([]);
-  deps.streamingChunksRef.current = [];
-  deps.setHasTextChunks(false);
-  console.log("[Stream End] Stream complete, messages in local state");
-}
-
-export function handleError(chunk: StreamChunk, _deps: HandlerDependencies) {
-  const errorMessage = chunk.message || chunk.content || "An error occurred";
-  console.error("Stream error:", errorMessage);
-}
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatContainer/useChatContainer.ts b/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatContainer/useChatContainer.ts
deleted file mode 100644
index c75ad587a5..0000000000
--- a/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatContainer/useChatContainer.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-import { useState, useCallback, useRef, useMemo } from "react";
-import { toast } from "sonner";
-import { useChatStream } from "@/app/(platform)/chat/useChatStream";
-import type { SessionDetailResponse } from "@/app/api/__generated__/models/sessionDetailResponse";
-import type { ChatMessageData } from "@/app/(platform)/chat/components/ChatMessage/useChatMessage";
-import {
-  parseToolResponse,
-  isValidMessage,
-  isToolCallArray,
-  createUserMessage,
-  filterAuthMessages,
-} from "./helpers";
-import { createStreamEventDispatcher } from "./createStreamEventDispatcher";
-
-interface UseChatContainerArgs {
-  sessionId: string | null;
-  initialMessages: SessionDetailResponse["messages"];
-  onRefreshSession: () => Promise<void>;
-}
-
-export function useChatContainer({
-  sessionId,
-  initialMessages,
-}: UseChatContainerArgs) {
-  const [messages, setMessages] = useState<ChatMessageData[]>([]);
-  const [streamingChunks, setStreamingChunks] = useState<string[]>([]);
-  const [hasTextChunks, setHasTextChunks] = useState(false);
-  const streamingChunksRef = useRef<string[]>([]);
-  const { error, sendMessage: sendStreamMessage } = useChatStream();
-  const isStreaming = hasTextChunks;
-
-  const allMessages = useMemo(() => {
-    const processedInitialMessages = initialMessages
-      .filter((msg: Record<string, unknown>) => {
-        if (!isValidMessage(msg)) {
-          console.warn("Invalid message structure from backend:", msg);
-          return false;
-        }
-        const content = String(msg.content || "").trim();
-        const toolCalls = msg.tool_calls;
-        return (
-          content.length > 0 ||
-          (toolCalls && Array.isArray(toolCalls) && toolCalls.length > 0)
-        );
-      })
-      .map((msg: Record<string, unknown>) => {
-        const content = String(msg.content || "");
-        const role = String(msg.role || "assistant").toLowerCase();
-        const toolCalls = msg.tool_calls;
-        if (
-          role === "assistant" &&
-          toolCalls &&
-          isToolCallArray(toolCalls) &&
-          toolCalls.length > 0
-        ) {
-          return null;
-        }
-        if (role === "tool") {
-          const timestamp = msg.timestamp
-            ? new Date(msg.timestamp as string)
-            : undefined;
-          const toolResponse = parseToolResponse(
-            content,
-            (msg.tool_call_id as string) || "",
-            "unknown",
-            timestamp,
-          );
-          if (!toolResponse) {
-            return null;
-          }
-          return toolResponse;
-        }
-        return {
-          type: "message",
-          role: role as "user" | "assistant" | "system",
-          content,
-          timestamp: msg.timestamp
-            ? new Date(msg.timestamp as string)
-            : undefined,
-        };
-      })
-      .filter((msg): msg is ChatMessageData => msg !== null);
-
-    return [...processedInitialMessages, ...messages];
-  }, [initialMessages, messages]);
-
-  const sendMessage = useCallback(
-    async function sendMessage(content: string, isUserMessage: boolean = true) {
-      if (!sessionId) {
-        console.error("Cannot send message: no session ID");
-        return;
-      }
-      if (isUserMessage) {
-        const userMessage = createUserMessage(content);
-        setMessages((prev) => [...filterAuthMessages(prev), userMessage]);
-      } else {
-        setMessages((prev) => filterAuthMessages(prev));
-      }
-      setStreamingChunks([]);
-      streamingChunksRef.current = [];
-      setHasTextChunks(false);
-      const dispatcher = createStreamEventDispatcher({
-        setHasTextChunks,
-        setStreamingChunks,
-        streamingChunksRef,
-        setMessages,
-        sessionId,
-      });
-      try {
-        await sendStreamMessage(sessionId, content, dispatcher, isUserMessage);
-      } catch (err) {
-        console.error("Failed to send message:", err);
-        const errorMessage =
-          err instanceof Error ? err.message : "Failed to send message";
-        toast.error("Failed to send message", {
-          description: errorMessage,
-        });
-      }
-    },
-    [sessionId, sendStreamMessage],
-  );
-
-  return {
-    messages: allMessages,
-    streamingChunks,
-    isStreaming,
-    error,
-    sendMessage,
-  };
-}
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatCredentialsSetup/ChatCredentialsSetup.tsx b/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatCredentialsSetup/ChatCredentialsSetup.tsx
deleted file mode 100644
index 1f70f7740f..0000000000
--- a/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatCredentialsSetup/ChatCredentialsSetup.tsx
+++ /dev/null
@@ -1,153 +0,0 @@
-import { CredentialsInput } from "@/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/CredentialsInputs";
-import { Card } from "@/components/atoms/Card/Card";
-import { Text } from "@/components/atoms/Text/Text";
-import type { BlockIOCredentialsSubSchema } from "@/lib/autogpt-server-api";
-import { cn } from "@/lib/utils";
-import { CheckIcon, KeyIcon, WarningIcon } from "@phosphor-icons/react";
-import { useEffect, useRef } from "react";
-import { useChatCredentialsSetup } from "./useChatCredentialsSetup";
-
-export interface CredentialInfo {
-  provider: string;
-  providerName: string;
-  credentialType: "api_key" | "oauth2" | "user_password" | "host_scoped";
-  title: string;
-  scopes?: string[];
-}
-
-interface Props {
-  credentials: CredentialInfo[];
-  agentName?: string;
-  message: string;
-  onAllCredentialsComplete: () => void;
-  onCancel: () => void;
-  className?: string;
-}
-
-function createSchemaFromCredentialInfo(
-  credential: CredentialInfo,
-): BlockIOCredentialsSubSchema {
-  return {
-    type: "object",
-    properties: {},
-    credentials_provider: [credential.provider],
-    credentials_types: [credential.credentialType],
-    credentials_scopes: credential.scopes,
-    discriminator: undefined,
-    discriminator_mapping: undefined,
-    discriminator_values: undefined,
-  };
-}
-
-export function ChatCredentialsSetup({
-  credentials,
-  agentName: _agentName,
-  message,
-  onAllCredentialsComplete,
-  onCancel: _onCancel,
-  className,
-}: Props) {
-  const { selectedCredentials, isAllComplete, handleCredentialSelect } =
-    useChatCredentialsSetup(credentials);
-
-  // Track if we've already called completion to prevent double calls
-  const hasCalledCompleteRef = useRef(false);
-
-  // Reset the completion flag when credentials change (new credential setup flow)
-  useEffect(
-    function resetCompletionFlag() {
-      hasCalledCompleteRef.current = false;
-    },
-    [credentials],
-  );
-
-  // Auto-call completion when all credentials are configured
-  useEffect(
-    function autoCompleteWhenReady() {
-      if (isAllComplete && !hasCalledCompleteRef.current) {
-        hasCalledCompleteRef.current = true;
-        onAllCredentialsComplete();
-      }
-    },
-    [isAllComplete, onAllCredentialsComplete],
-  );
-
-  return (
-    <Card
-      className={cn(
-        "mx-4 my-2 overflow-hidden border-orange-200 bg-orange-50 dark:border-orange-900 dark:bg-orange-950",
-        className,
-      )}
-    >
-      <div className="flex items-start gap-4 p-6">
-        <div className="flex h-12 w-12 flex-shrink-0 items-center justify-center rounded-full bg-orange-500">
-          <KeyIcon size={24} weight="bold" className="text-white" />
-        </div>
-        <div className="flex-1">
-          <Text
-            variant="h3"
-            className="mb-2 text-orange-900 dark:text-orange-100"
-          >
-            Credentials Required
-          </Text>
-          <Text
-            variant="body"
-            className="mb-4 text-orange-700 dark:text-orange-300"
-          >
-            {message}
-          </Text>
-
-          <div className="space-y-3">
-            {credentials.map((cred, index) => {
-              const schema = createSchemaFromCredentialInfo(cred);
-              const isSelected = !!selectedCredentials[cred.provider];
-
-              return (
-                <div
-                  key={`${cred.provider}-${index}`}
-                  className={cn(
-                    "relative rounded-lg border border-orange-200 bg-white p-4 dark:border-orange-800 dark:bg-orange-900/20",
-                    isSelected &&
-                      "border-green-500 bg-green-50 dark:border-green-700 dark:bg-green-950/30",
-                  )}
-                >
-                  <div className="mb-2 flex items-center justify-between">
-                    <div className="flex items-center gap-2">
-                      {isSelected ? (
-                        <CheckIcon
-                          size={20}
-                          className="text-green-500"
-                          weight="bold"
-                        />
-                      ) : (
-                        <WarningIcon
-                          size={20}
-                          className="text-orange-500"
-                          weight="bold"
-                        />
-                      )}
-                      <Text
-                        variant="body"
-                        className="font-semibold text-orange-900 dark:text-orange-100"
-                      >
-                        {cred.providerName}
-                      </Text>
-                    </div>
-                  </div>
-
-                  <CredentialsInput
-                    schema={schema}
-                    selectedCredentials={selectedCredentials[cred.provider]}
-                    onSelectCredentials={(credMeta) =>
-                      handleCredentialSelect(cred.provider, credMeta)
-                    }
-                  />
-                </div>
-              );
-            })}
-          </div>
-        </div>
-      </div>
-    </Card>
-  );
-}
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatInput/ChatInput.tsx b/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatInput/ChatInput.tsx
deleted file mode 100644
index f1caceef70..0000000000
--- a/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatInput/ChatInput.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import { cn } from "@/lib/utils";
-import { PaperPlaneRightIcon } from "@phosphor-icons/react";
-import { Button } from "@/components/atoms/Button/Button";
-import { useChatInput } from "./useChatInput";
-
-export interface ChatInputProps {
-  onSend: (message: string) => void;
-  disabled?: boolean;
-  placeholder?: string;
-  className?: string;
-}
-
-export function ChatInput({
-  onSend,
-  disabled = false,
-  placeholder = "Type your message...",
-  className,
-}: ChatInputProps) {
-  const { value, setValue, handleKeyDown, handleSend, textareaRef } =
-    useChatInput({
-      onSend,
-      disabled,
-      maxRows: 5,
-    });
-
-  return (
-    <div className={cn("flex gap-2", className)}>
-      <textarea
-        ref={textareaRef}
-        value={value}
-        onChange={(e) => setValue(e.target.value)}
-        onKeyDown={handleKeyDown}
-        placeholder={placeholder}
-        disabled={disabled}
-        rows={1}
-        autoComplete="off"
-        aria-label="Chat message input"
-        aria-describedby="chat-input-hint"
-        className={cn(
-          "flex-1 resize-none rounded-lg border border-neutral-200 bg-white px-4 py-2 text-sm",
-          "placeholder:text-neutral-400",
-          "focus:border-violet-600 focus:outline-none focus:ring-2 focus:ring-violet-600/20",
-          "dark:border-neutral-800 dark:bg-neutral-900 dark:text-neutral-100 dark:placeholder:text-neutral-500",
-          "disabled:cursor-not-allowed disabled:opacity-50",
-        )}
-      />
-      <span id="chat-input-hint" className="sr-only">
-        Press Enter to send, Shift+Enter for new line
-      </span>
-
-      <Button
-        variant="primary"
-        size="small"
-        onClick={handleSend}
-        disabled={disabled || !value.trim()}
-        className="self-end"
-        aria-label="Send message"
-      >
-        <PaperPlaneRightIcon className="h-4 w-4" weight="fill" />
-      </Button>
-    </div>
-  );
-}
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatInput/useChatInput.ts b/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatInput/useChatInput.ts
deleted file mode 100644
index 2efae95483..0000000000
--- a/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatInput/useChatInput.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { KeyboardEvent, useCallback, useState, useRef, useEffect } from "react";
-
-interface UseChatInputArgs {
-  onSend: (message: string) => void;
-  disabled?: boolean;
-  maxRows?: number;
-}
-
-export function useChatInput({
-  onSend,
-  disabled = false,
-  maxRows = 5,
-}: UseChatInputArgs) {
-  const [value, setValue] = useState("");
-  const textareaRef = useRef<HTMLTextAreaElement>(null);
-
-  useEffect(() => {
-    const textarea = textareaRef.current;
-    if (!textarea) return;
-    textarea.style.height = "auto";
-    const lineHeight = parseInt(
-      window.getComputedStyle(textarea).lineHeight,
-      10,
-    );
-    const maxHeight = lineHeight * maxRows;
-    const newHeight = Math.min(textarea.scrollHeight, maxHeight);
-    textarea.style.height = `${newHeight}px`;
-    textarea.style.overflowY =
-      textarea.scrollHeight > maxHeight ? "auto" : "hidden";
-  }, [value, maxRows]);
-
-  const handleSend = useCallback(() => {
-    if (disabled || !value.trim()) return;
-    onSend(value.trim());
-    setValue("");
-    if (textareaRef.current) {
-      textareaRef.current.style.height = "auto";
-    }
-  }, [value, onSend, disabled]);
-
-  const handleKeyDown = useCallback(
-    (event: KeyboardEvent<HTMLTextAreaElement>) => {
-      if (event.key === "Enter" && !event.shiftKey) {
-        event.preventDefault();
-        handleSend();
-      }
-    },
-    [handleSend],
-  );
-
-  return {
-    value,
-    setValue,
-    handleKeyDown,
-    handleSend,
-    textareaRef,
-  };
-}
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatLoadingState/ChatLoadingState.tsx b/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatLoadingState/ChatLoadingState.tsx
deleted file mode 100644
index 20f2a980f0..0000000000
--- a/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatLoadingState/ChatLoadingState.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import React from "react";
-import { Text } from "@/components/atoms/Text/Text";
-import { ArrowClockwiseIcon } from "@phosphor-icons/react";
-import { cn } from "@/lib/utils";
-
-export interface ChatLoadingStateProps {
-  message?: string;
-  className?: string;
-}
-
-export function ChatLoadingState({
-  message = "Loading...",
-  className,
-}: ChatLoadingStateProps) {
-  return (
-    <div
-      className={cn("flex flex-1 items-center justify-center p-6", className)}
-    >
-      <div className="flex flex-col items-center gap-4 text-center">
-        <ArrowClockwiseIcon
-          size={32}
-          weight="bold"
-          className="animate-spin text-purple-500"
-        />
-        <Text variant="body" className="text-zinc-600 dark:text-zinc-400">
-          {message}
-        </Text>
-      </div>
-    </div>
-  );
-}
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatMessage/ChatMessage.tsx b/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatMessage/ChatMessage.tsx
deleted file mode 100644
index 6d8fdacb9a..0000000000
--- a/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatMessage/ChatMessage.tsx
+++ /dev/null
@@ -1,194 +0,0 @@
-"use client";
-
-import { cn } from "@/lib/utils";
-import { RobotIcon, UserIcon, CheckCircleIcon } from "@phosphor-icons/react";
-import { useCallback } from "react";
-import { MessageBubble } from "@/app/(platform)/chat/components/MessageBubble/MessageBubble";
-import { MarkdownContent } from "@/app/(platform)/chat/components/MarkdownContent/MarkdownContent";
-import { ToolCallMessage } from "@/app/(platform)/chat/components/ToolCallMessage/ToolCallMessage";
-import { ToolResponseMessage } from "@/app/(platform)/chat/components/ToolResponseMessage/ToolResponseMessage";
-import { AuthPromptWidget } from "@/app/(platform)/chat/components/AuthPromptWidget/AuthPromptWidget";
-import { ChatCredentialsSetup } from "@/app/(platform)/chat/components/ChatCredentialsSetup/ChatCredentialsSetup";
-import { useSupabase } from "@/lib/supabase/hooks/useSupabase";
-import { useChatMessage, type ChatMessageData } from "./useChatMessage";
-import { getToolActionPhrase } from "@/app/(platform)/chat/helpers";
-export interface ChatMessageProps {
-  message: ChatMessageData;
-  className?: string;
-  onDismissLogin?: () => void;
-  onDismissCredentials?: () => void;
-  onSendMessage?: (content: string, isUserMessage?: boolean) => void;
-}
-
-export function ChatMessage({
-  message,
-  className,
-  onDismissCredentials,
-  onSendMessage,
-}: ChatMessageProps) {
-  const { user } = useSupabase();
-  const {
-    formattedTimestamp,
-    isUser,
-    isAssistant,
-    isToolCall,
-    isToolResponse,
-    isLoginNeeded,
-    isCredentialsNeeded,
-  } = useChatMessage(message);
-
-  const handleAllCredentialsComplete = useCallback(
-    function handleAllCredentialsComplete() {
-      // Send a user message that explicitly asks to retry the setup
-      // This ensures the LLM calls get_required_setup_info again and proceeds with execution
-      if (onSendMessage) {
-        onSendMessage(
-          "I've configured the required credentials. Please check if everything is ready and proceed with setting up the agent.",
-        );
-      }
-      // Optionally dismiss the credentials prompt
-      if (onDismissCredentials) {
-        onDismissCredentials();
-      }
-    },
-    [onSendMessage, onDismissCredentials],
-  );
-
-  function handleCancelCredentials() {
-    // Dismiss the credentials prompt
-    if (onDismissCredentials) {
-      onDismissCredentials();
-    }
-  }
-
-  // Render credentials needed messages
-  if (isCredentialsNeeded && message.type === "credentials_needed") {
-    return (
-      <ChatCredentialsSetup
-        credentials={message.credentials}
-        agentName={message.agentName}
-        message={message.message}
-        onAllCredentialsComplete={handleAllCredentialsComplete}
-        onCancel={handleCancelCredentials}
-        className={className}
-      />
-    );
-  }
-
-  // Render login needed messages
-  if (isLoginNeeded && message.type === "login_needed") {
-    // If user is already logged in, show success message instead of auth prompt
-    if (user) {
-      return (
-        <div className={cn("px-4 py-2", className)}>
-          <div className="my-4 overflow-hidden rounded-lg border border-green-200 bg-gradient-to-br from-green-50 to-emerald-50 dark:border-green-800 dark:from-green-950/30 dark:to-emerald-950/30">
-            <div className="px-6 py-4">
-              <div className="flex items-center gap-3">
-                <div className="flex h-10 w-10 items-center justify-center rounded-full bg-green-600">
-                  <CheckCircleIcon
-                    size={20}
-                    weight="fill"
-                    className="text-white"
-                  />
-                </div>
-                <div>
-                  <h3 className="text-lg font-semibold text-neutral-900 dark:text-neutral-100">
-                    Successfully Authenticated
-                  </h3>
-                  <p className="text-sm text-neutral-600 dark:text-neutral-400">
-                    You&apos;re now signed in and ready to continue
-                  </p>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      );
-    }
-
-    // Show auth prompt if not logged in
-    return (
-      <div className={cn("px-4 py-2", className)}>
-        <AuthPromptWidget
-          message={message.message}
-          sessionId={message.sessionId}
-          agentInfo={message.agentInfo}
-          returnUrl="/chat"
-        />
-      </div>
-    );
-  }
-
-  // Render tool call messages
-  if (isToolCall && message.type === "tool_call") {
-    return (
-      <div className={cn("px-4 py-2", className)}>
-        <ToolCallMessage toolName={message.toolName} />
-      </div>
-    );
-  }
-
-  // Render tool response messages
-  if (
-    (isToolResponse && message.type === "tool_response") ||
-    message.type === "no_results" ||
-    message.type === "agent_carousel" ||
-    message.type === "execution_started"
-  ) {
-    return (
-      <div className={cn("px-4 py-2", className)}>
-        <ToolResponseMessage toolName={getToolActionPhrase(message.toolName)} />
-      </div>
-    );
-  }
-
-  // Render regular chat messages
-  if (message.type === "message") {
-    return (
-      <div
-        className={cn(
-          "flex gap-3 px-4 py-4",
-          isUser && "flex-row-reverse",
-          className,
-        )}
-      >
-        {/* Avatar */}
-        <div className="flex-shrink-0">
-          <div
-            className={cn(
-              "flex h-8 w-8 items-center justify-center rounded-full",
-              isUser && "bg-zinc-200 dark:bg-zinc-700",
-              isAssistant && "bg-purple-600 dark:bg-purple-500",
-            )}
-          >
-            {isUser ? (
-              <UserIcon className="h-5 w-5 text-zinc-700 dark:text-zinc-200" />
-            ) : (
-              <RobotIcon className="h-5 w-5 text-white" />
-            )}
-          </div>
-        </div>
-
-        {/* Message Content */}
-        <div className={cn("flex max-w-[70%] flex-col", isUser && "items-end")}>
-          <MessageBubble variant={isUser ? "user" : "assistant"}>
-            <MarkdownContent content={message.content} />
-          </MessageBubble>
-
-          {/* Timestamp */}
-          <span
-            className={cn(
-              "mt-1 text-xs text-zinc-500 dark:text-zinc-400",
-              isUser && "text-right",
-            )}
-          >
-            {formattedTimestamp}
-          </span>
-        </div>
-      </div>
-    );
-  }
-
-  // Fallback for unknown message types
-  return null;
-}
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/components/MessageBubble/MessageBubble.tsx b/autogpt_platform/frontend/src/app/(platform)/chat/components/MessageBubble/MessageBubble.tsx
deleted file mode 100644
index 96798493a1..0000000000
--- a/autogpt_platform/frontend/src/app/(platform)/chat/components/MessageBubble/MessageBubble.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { cn } from "@/lib/utils";
-import { ReactNode } from "react";
-
-export interface MessageBubbleProps {
-  children: ReactNode;
-  variant: "user" | "assistant";
-  className?: string;
-}
-
-export function MessageBubble({
-  children,
-  variant,
-  className,
-}: MessageBubbleProps) {
-  return (
-    <div
-      className={cn(
-        "rounded-lg px-4 py-3 text-sm",
-        variant === "user" && "bg-violet-600 text-white dark:bg-violet-500",
-        variant === "assistant" &&
-          "border border-neutral-200 bg-white dark:border-neutral-700 dark:bg-neutral-900 dark:text-neutral-100",
-        className,
-      )}
-    >
-      {children}
-    </div>
-  );
-}
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/components/MessageList/MessageList.tsx b/autogpt_platform/frontend/src/app/(platform)/chat/components/MessageList/MessageList.tsx
deleted file mode 100644
index aa8c4d9772..0000000000
--- a/autogpt_platform/frontend/src/app/(platform)/chat/components/MessageList/MessageList.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import { cn } from "@/lib/utils";
-import { ChatMessage } from "../ChatMessage/ChatMessage";
-import type { ChatMessageData } from "../ChatMessage/useChatMessage";
-import { StreamingMessage } from "../StreamingMessage/StreamingMessage";
-import { useMessageList } from "./useMessageList";
-
-export interface MessageListProps {
-  messages: ChatMessageData[];
-  streamingChunks?: string[];
-  isStreaming?: boolean;
-  className?: string;
-  onStreamComplete?: () => void;
-  onSendMessage?: (content: string) => void;
-}
-
-export function MessageList({
-  messages,
-  streamingChunks = [],
-  isStreaming = false,
-  className,
-  onStreamComplete,
-  onSendMessage,
-}: MessageListProps) {
-  const { messagesEndRef, messagesContainerRef } = useMessageList({
-    messageCount: messages.length,
-    isStreaming,
-  });
-
-  return (
-    <div
-      ref={messagesContainerRef}
-      className={cn(
-        "flex-1 overflow-y-auto",
-        "scrollbar-thin scrollbar-track-transparent scrollbar-thumb-zinc-300 dark:scrollbar-thumb-zinc-700",
-        className,
-      )}
-    >
-      <div className="space-y-0">
-        {/* Render all persisted messages */}
-        {messages.map((message, index) => (
-          <ChatMessage
-            key={index}
-            message={message}
-            onSendMessage={onSendMessage}
-          />
-        ))}
-
-        {/* Render streaming message if active */}
-        {isStreaming && streamingChunks.length > 0 && (
-          <StreamingMessage
-            chunks={streamingChunks}
-            onComplete={onStreamComplete}
-          />
-        )}
-
-        {/* Invisible div to scroll to */}
-        <div ref={messagesEndRef} />
-      </div>
-    </div>
-  );
-}
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/components/QuickActionsWelcome/QuickActionsWelcome.tsx b/autogpt_platform/frontend/src/app/(platform)/chat/components/QuickActionsWelcome/QuickActionsWelcome.tsx
deleted file mode 100644
index 0cf637542a..0000000000
--- a/autogpt_platform/frontend/src/app/(platform)/chat/components/QuickActionsWelcome/QuickActionsWelcome.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import React from "react";
-import { Text } from "@/components/atoms/Text/Text";
-import { cn } from "@/lib/utils";
-
-export interface QuickActionsWelcomeProps {
-  title: string;
-  description: string;
-  actions: string[];
-  onActionClick: (action: string) => void;
-  disabled?: boolean;
-  className?: string;
-}
-
-export function QuickActionsWelcome({
-  title,
-  description,
-  actions,
-  onActionClick,
-  disabled = false,
-  className,
-}: QuickActionsWelcomeProps) {
-  return (
-    <div
-      className={cn("flex flex-1 items-center justify-center p-4", className)}
-    >
-      <div className="max-w-2xl text-center">
-        <Text
-          variant="h2"
-          className="mb-4 text-3xl font-bold text-zinc-900 dark:text-zinc-100"
-        >
-          {title}
-        </Text>
-        <Text variant="body" className="mb-8 text-zinc-600 dark:text-zinc-400">
-          {description}
-        </Text>
-        <div className="grid gap-2 sm:grid-cols-2">
-          {actions.map((action) => (
-            <button
-              key={action}
-              onClick={() => onActionClick(action)}
-              disabled={disabled}
-              className="rounded-lg border border-zinc-200 bg-white p-4 text-left text-sm hover:bg-zinc-50 disabled:cursor-not-allowed disabled:opacity-50 dark:border-zinc-800 dark:bg-zinc-900 dark:hover:bg-zinc-800"
-            >
-              {action}
-            </button>
-          ))}
-        </div>
-      </div>
-    </div>
-  );
-}
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/components/StreamingMessage/StreamingMessage.tsx b/autogpt_platform/frontend/src/app/(platform)/chat/components/StreamingMessage/StreamingMessage.tsx
deleted file mode 100644
index 73b0419740..0000000000
--- a/autogpt_platform/frontend/src/app/(platform)/chat/components/StreamingMessage/StreamingMessage.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { cn } from "@/lib/utils";
-import { Robot } from "@phosphor-icons/react";
-import { MessageBubble } from "@/app/(platform)/chat/components/MessageBubble/MessageBubble";
-import { MarkdownContent } from "@/app/(platform)/chat/components/MarkdownContent/MarkdownContent";
-import { useStreamingMessage } from "./useStreamingMessage";
-
-export interface StreamingMessageProps {
-  chunks: string[];
-  className?: string;
-  onComplete?: () => void;
-}
-
-export function StreamingMessage({
-  chunks,
-  className,
-  onComplete,
-}: StreamingMessageProps) {
-  const { displayText } = useStreamingMessage({ chunks, onComplete });
-
-  return (
-    <div className={cn("flex gap-3 px-4 py-4", className)}>
-      {/* Avatar */}
-      <div className="flex-shrink-0">
-        <div className="flex h-8 w-8 items-center justify-center rounded-full bg-purple-600 dark:bg-purple-500">
-          <Robot className="h-5 w-5 text-white" />
-        </div>
-      </div>
-
-      {/* Message Content */}
-      <div className="flex max-w-[70%] flex-col">
-        <MessageBubble variant="assistant">
-          <MarkdownContent content={displayText} />
-        </MessageBubble>
-
-        {/* Timestamp */}
-        <span className="mt-1 text-xs text-neutral-500 dark:text-neutral-400">
-          Typing...
-        </span>
-      </div>
-    </div>
-  );
-}
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/components/ToolCallMessage/ToolCallMessage.tsx b/autogpt_platform/frontend/src/app/(platform)/chat/components/ToolCallMessage/ToolCallMessage.tsx
deleted file mode 100644
index c1babc587c..0000000000
--- a/autogpt_platform/frontend/src/app/(platform)/chat/components/ToolCallMessage/ToolCallMessage.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import React from "react";
-import { WrenchIcon } from "@phosphor-icons/react";
-import { cn } from "@/lib/utils";
-import { getToolActionPhrase } from "@/app/(platform)/chat/helpers";
-
-export interface ToolCallMessageProps {
-  toolName: string;
-  className?: string;
-}
-
-export function ToolCallMessage({ toolName, className }: ToolCallMessageProps) {
-  return (
-    <div
-      className={cn(
-        "mx-10 max-w-[70%] overflow-hidden rounded-lg border transition-all duration-200",
-        "border-neutral-200 dark:border-neutral-700",
-        "bg-white dark:bg-neutral-900",
-        "animate-in fade-in-50 slide-in-from-top-1",
-        className,
-      )}
-    >
-      {/* Header */}
-      <div
-        className={cn(
-          "flex items-center justify-between px-3 py-2",
-          "bg-gradient-to-r from-neutral-50 to-neutral-100 dark:from-neutral-800/20 dark:to-neutral-700/20",
-        )}
-      >
-        <div className="flex items-center gap-2 overflow-hidden">
-          <WrenchIcon
-            size={16}
-            weight="bold"
-            className="flex-shrink-0 text-neutral-500 dark:text-neutral-400"
-          />
-          <span className="relative inline-block overflow-hidden text-sm font-medium text-neutral-700 dark:text-neutral-300">
-            {getToolActionPhrase(toolName)}...
-            <span
-              className={cn(
-                "absolute inset-0 bg-gradient-to-r from-transparent via-white/50 to-transparent",
-                "dark:via-white/20",
-                "animate-shimmer",
-              )}
-            />
-          </span>
-        </div>
-      </div>
-    </div>
-  );
-}
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/components/ToolResponseMessage/ToolResponseMessage.tsx b/autogpt_platform/frontend/src/app/(platform)/chat/components/ToolResponseMessage/ToolResponseMessage.tsx
deleted file mode 100644
index fe5d858461..0000000000
--- a/autogpt_platform/frontend/src/app/(platform)/chat/components/ToolResponseMessage/ToolResponseMessage.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import React from "react";
-import { WrenchIcon } from "@phosphor-icons/react";
-import { cn } from "@/lib/utils";
-import { getToolActionPhrase } from "@/app/(platform)/chat/helpers";
-
-export interface ToolResponseMessageProps {
-  toolName: string;
-  success?: boolean;
-  className?: string;
-}
-
-export function ToolResponseMessage({
-  toolName,
-  success = true,
-  className,
-}: ToolResponseMessageProps) {
-  return (
-    <div
-      className={cn(
-        "mx-10 max-w-[70%] overflow-hidden rounded-lg border transition-all duration-200",
-        success
-          ? "border-neutral-200 dark:border-neutral-700"
-          : "border-red-200 dark:border-red-800",
-        "bg-white dark:bg-neutral-900",
-        "animate-in fade-in-50 slide-in-from-top-1",
-        className,
-      )}
-    >
-      {/* Header */}
-      <div
-        className={cn(
-          "flex items-center justify-between px-3 py-2",
-          "bg-gradient-to-r",
-          success
-            ? "from-neutral-50 to-neutral-100 dark:from-neutral-800/20 dark:to-neutral-700/20"
-            : "from-red-50 to-red-100 dark:from-red-900/20 dark:to-red-800/20",
-        )}
-      >
-        <div className="flex items-center gap-2">
-          <WrenchIcon
-            size={16}
-            weight="bold"
-            className="text-neutral-500 dark:text-neutral-400"
-          />
-          <span className="text-sm font-medium text-neutral-700 dark:text-neutral-300">
-            {getToolActionPhrase(toolName)}...
-          </span>
-        </div>
-      </div>
-    </div>
-  );
-}
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/chat/helpers.ts
deleted file mode 100644
index 5a1e5eb93f..0000000000
--- a/autogpt_platform/frontend/src/app/(platform)/chat/helpers.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * Maps internal tool names to user-friendly display names with emojis.
- * @deprecated Use getToolActionPhrase or getToolCompletionPhrase for status messages
- *
- * @param toolName - The internal tool name from the backend
- * @returns A user-friendly display name with an emoji prefix
- */
-export function getToolDisplayName(toolName: string): string {
-  const toolDisplayNames: Record<string, string> = {
-    find_agent: "🔍 Search Marketplace",
-    get_agent_details: "📋 Get Agent Details",
-    check_credentials: "🔑 Check Credentials",
-    setup_agent: "⚙️ Setup Agent",
-    run_agent: "▶️ Run Agent",
-    get_required_setup_info: "📝 Get Setup Requirements",
-  };
-  return toolDisplayNames[toolName] || toolName;
-}
-
-/**
- * Maps internal tool names to human-friendly action phrases (present continuous).
- * Used for tool call messages to indicate what action is currently happening.
- *
- * @param toolName - The internal tool name from the backend
- * @returns A human-friendly action phrase in present continuous tense
- */
-export function getToolActionPhrase(toolName: string): string {
-  const toolActionPhrases: Record<string, string> = {
-    find_agent: "Looking for agents in the marketplace",
-    agent_carousel: "Looking for agents in the marketplace",
-    get_agent_details: "Learning about the agent",
-    check_credentials: "Checking your credentials",
-    setup_agent: "Setting up the agent",
-    execution_started: "Running the agent",
-    run_agent: "Running the agent",
-    get_required_setup_info: "Getting setup requirements",
-    schedule_agent: "Scheduling the agent to run",
-  };
-
-  // Return mapped phrase or generate human-friendly fallback
-  return toolActionPhrases[toolName] || toolName;
-}
-
-/**
- * Maps internal tool names to human-friendly completion phrases (past tense).
- * Used for tool response messages to indicate what action was completed.
- *
- * @param toolName - The internal tool name from the backend
- * @returns A human-friendly completion phrase in past tense
- */
-export function getToolCompletionPhrase(toolName: string): string {
-  const toolCompletionPhrases: Record<string, string> = {
-    find_agent: "Finished searching the marketplace",
-    get_agent_details: "Got agent details",
-    check_credentials: "Checked credentials",
-    setup_agent: "Agent setup complete",
-    run_agent: "Agent execution started",
-    get_required_setup_info: "Got setup requirements",
-  };
-
-  // Return mapped phrase or generate human-friendly fallback
-  return (
-    toolCompletionPhrases[toolName] ||
-    `Finished ${toolName.replace(/_/g, " ").replace("...", "")}`
-  );
-}
-
-/** Validate UUID v4 format */
-export function isValidUUID(value: string): boolean {
-  const uuidRegex =
-    /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-  return uuidRegex.test(value);
-}
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/page.tsx b/autogpt_platform/frontend/src/app/(platform)/chat/page.tsx
deleted file mode 100644
index 09e530c296..0000000000
--- a/autogpt_platform/frontend/src/app/(platform)/chat/page.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-"use client";
-
-import { useChatPage } from "./useChatPage";
-import { ChatContainer } from "./components/ChatContainer/ChatContainer";
-import { ChatErrorState } from "./components/ChatErrorState/ChatErrorState";
-import { ChatLoadingState } from "./components/ChatLoadingState/ChatLoadingState";
-import { useGetFlag, Flag } from "@/services/feature-flags/use-get-flag";
-import { useRouter } from "next/navigation";
-import { useEffect } from "react";
-
-export default function ChatPage() {
-  const isChatEnabled = useGetFlag(Flag.CHAT);
-  const router = useRouter();
-  const {
-    messages,
-    isLoading,
-    isCreating,
-    error,
-    sessionId,
-    createSession,
-    clearSession,
-    refreshSession,
-  } = useChatPage();
-
-  useEffect(() => {
-    if (isChatEnabled === false) {
-      router.push("/404");
-    }
-  }, [isChatEnabled, router]);
-
-  if (isChatEnabled === null || isChatEnabled === false) {
-    return null;
-  }
-
-  return (
-    <div className="flex h-full flex-col">
-      {/* Header */}
-      <header className="border-b border-zinc-200 bg-white p-4 dark:border-zinc-800 dark:bg-zinc-900">
-        <div className="container mx-auto flex items-center justify-between">
-          <h1 className="text-xl font-semibold">Chat</h1>
-          {sessionId && (
-            <div className="flex items-center gap-4">
-              <span className="text-sm text-zinc-600 dark:text-zinc-400">
-                Session: {sessionId.slice(0, 8)}...
-              </span>
-              <button
-                onClick={clearSession}
-                className="text-sm text-zinc-600 hover:text-zinc-900 dark:text-zinc-400 dark:hover:text-zinc-100"
-              >
-                New Chat
-              </button>
-            </div>
-          )}
-        </div>
-      </header>
-
-      {/* Main Content */}
-      <main className="container mx-auto flex flex-1 flex-col overflow-hidden">
-        {/* Loading State - show when explicitly loading/creating OR when we don't have a session yet and no error */}
-        {(isLoading || isCreating || (!sessionId && !error)) && (
-          <ChatLoadingState
-            message={isCreating ? "Creating session..." : "Loading..."}
-          />
-        )}
-
-        {/* Error State */}
-        {error && !isLoading && (
-          <ChatErrorState error={error} onRetry={createSession} />
-        )}
-
-        {/* Session Content */}
-        {sessionId && !isLoading && !error && (
-          <ChatContainer
-            sessionId={sessionId}
-            initialMessages={messages}
-            onRefreshSession={refreshSession}
-            className="flex-1"
-          />
-        )}
-      </main>
-    </div>
-  );
-}
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/useChatPage.ts b/autogpt_platform/frontend/src/app/(platform)/chat/useChatPage.ts
deleted file mode 100644
index 4f1db5471a..0000000000
--- a/autogpt_platform/frontend/src/app/(platform)/chat/useChatPage.ts
+++ /dev/null
@@ -1,128 +0,0 @@
-"use client";
-
-import { useEffect, useRef } from "react";
-import { useRouter, useSearchParams } from "next/navigation";
-import { toast } from "sonner";
-import { useChatSession } from "@/app/(platform)/chat/useChatSession";
-import { useSupabase } from "@/lib/supabase/hooks/useSupabase";
-import { useChatStream } from "@/app/(platform)/chat/useChatStream";
-
-export function useChatPage() {
-  const router = useRouter();
-  const searchParams = useSearchParams();
-  const urlSessionId =
-    searchParams.get("session_id") || searchParams.get("session");
-  const hasCreatedSessionRef = useRef(false);
-  const hasClaimedSessionRef = useRef(false);
-  const { user } = useSupabase();
-  const { sendMessage: sendStreamMessage } = useChatStream();
-
-  const {
-    session,
-    sessionId: sessionIdFromHook,
-    messages,
-    isLoading,
-    isCreating,
-    error,
-    createSession,
-    refreshSession,
-    claimSession,
-    clearSession: clearSessionBase,
-  } = useChatSession({
-    urlSessionId,
-    autoCreate: false,
-  });
-
-  useEffect(
-    function autoCreateSession() {
-      if (
-        !urlSessionId &&
-        !hasCreatedSessionRef.current &&
-        !isCreating &&
-        !sessionIdFromHook
-      ) {
-        hasCreatedSessionRef.current = true;
-        createSession().catch((_err) => {
-          hasCreatedSessionRef.current = false;
-        });
-      }
-    },
-    [urlSessionId, isCreating, sessionIdFromHook, createSession],
-  );
-
-  useEffect(
-    function autoClaimSession() {
-      if (
-        session &&
-        !session.user_id &&
-        user &&
-        !hasClaimedSessionRef.current &&
-        !isLoading &&
-        sessionIdFromHook
-      ) {
-        hasClaimedSessionRef.current = true;
-        claimSession(sessionIdFromHook)
-          .then(() => {
-            sendStreamMessage(
-              sessionIdFromHook,
-              "User has successfully logged in.",
-              () => {},
-              false,
-            ).catch(() => {});
-          })
-          .catch(() => {
-            hasClaimedSessionRef.current = false;
-          });
-      }
-    },
-    [
-      session,
-      user,
-      isLoading,
-      sessionIdFromHook,
-      claimSession,
-      sendStreamMessage,
-    ],
-  );
-
-  useEffect(function monitorNetworkStatus() {
-    function handleOnline() {
-      toast.success("Connection restored", {
-        description: "You're back online",
-      });
-    }
-
-    function handleOffline() {
-      toast.error("You're offline", {
-        description: "Check your internet connection",
-      });
-    }
-
-    window.addEventListener("online", handleOnline);
-    window.addEventListener("offline", handleOffline);
-
-    return () => {
-      window.removeEventListener("online", handleOnline);
-      window.removeEventListener("offline", handleOffline);
-    };
-  }, []);
-
-  function clearSession() {
-    clearSessionBase();
-    hasCreatedSessionRef.current = false;
-    hasClaimedSessionRef.current = false;
-    router.push("/chat");
-  }
-
-  return {
-    session,
-    messages,
-    isLoading,
-    isCreating,
-    error,
-    createSession,
-    refreshSession,
-    clearSession,
-    sessionId: sessionIdFromHook,
-  };
-}
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/useChatSession.ts b/autogpt_platform/frontend/src/app/(platform)/chat/useChatSession.ts
deleted file mode 100644
index 99f4efc093..0000000000
--- a/autogpt_platform/frontend/src/app/(platform)/chat/useChatSession.ts
+++ /dev/null
@@ -1,258 +0,0 @@
-import { useCallback, useEffect, useState, useRef, useMemo } from "react";
-import { useQueryClient } from "@tanstack/react-query";
-import { toast } from "sonner";
-import {
-  usePostV2CreateSession,
-  postV2CreateSession,
-  useGetV2GetSession,
-  usePatchV2SessionAssignUser,
-  getGetV2GetSessionQueryKey,
-} from "@/app/api/__generated__/endpoints/chat/chat";
-import type { SessionDetailResponse } from "@/app/api/__generated__/models/sessionDetailResponse";
-import { storage, Key } from "@/services/storage/local-storage";
-import { isValidUUID } from "@/app/(platform)/chat/helpers";
-import { okData } from "@/app/api/helpers";
-
-interface UseChatSessionArgs {
-  urlSessionId?: string | null;
-  autoCreate?: boolean;
-}
-
-export function useChatSession({
-  urlSessionId,
-  autoCreate = false,
-}: UseChatSessionArgs = {}) {
-  const queryClient = useQueryClient();
-  const [sessionId, setSessionId] = useState<string | null>(null);
-  const [error, setError] = useState<Error | null>(null);
-  const justCreatedSessionIdRef = useRef<string | null>(null);
-
-  useEffect(() => {
-    if (urlSessionId) {
-      if (!isValidUUID(urlSessionId)) {
-        console.error("Invalid session ID format:", urlSessionId);
-        toast.error("Invalid session ID", {
-          description:
-            "The session ID in the URL is not valid. Starting a new session...",
-        });
-        setSessionId(null);
-        storage.clean(Key.CHAT_SESSION_ID);
-        return;
-      }
-      setSessionId(urlSessionId);
-      storage.set(Key.CHAT_SESSION_ID, urlSessionId);
-    } else {
-      const storedSessionId = storage.get(Key.CHAT_SESSION_ID);
-      if (storedSessionId) {
-        if (!isValidUUID(storedSessionId)) {
-          console.error("Invalid stored session ID:", storedSessionId);
-          storage.clean(Key.CHAT_SESSION_ID);
-          setSessionId(null);
-        } else {
-          setSessionId(storedSessionId);
-        }
-      } else if (autoCreate) {
-        setSessionId(null);
-      }
-    }
-  }, [urlSessionId, autoCreate]);
-
-  const {
-    mutateAsync: createSessionMutation,
-    isPending: isCreating,
-    error: createError,
-  } = usePostV2CreateSession();
-
-  const {
-    data: sessionData,
-    isLoading: isLoadingSession,
-    error: loadError,
-    refetch,
-  } = useGetV2GetSession(sessionId || "", {
-    query: {
-      enabled: !!sessionId,
-      select: okData,
-      staleTime: Infinity, // Never mark as stale
-      refetchOnMount: false, // Don't refetch on component mount
-      refetchOnWindowFocus: false, // Don't refetch when window regains focus
-      refetchOnReconnect: false, // Don't refetch when network reconnects
-      retry: 1,
-    },
-  });
-
-  const { mutateAsync: claimSessionMutation } = usePatchV2SessionAssignUser();
-
-  const session = useMemo(() => {
-    if (sessionData) return sessionData;
-
-    if (sessionId && justCreatedSessionIdRef.current === sessionId) {
-      return {
-        id: sessionId,
-        user_id: null,
-        messages: [],
-        created_at: new Date().toISOString(),
-        updated_at: new Date().toISOString(),
-      } as SessionDetailResponse;
-    }
-    return null;
-  }, [sessionData, sessionId]);
-
-  const messages = session?.messages || [];
-  const isLoading = isCreating || isLoadingSession;
-
-  useEffect(() => {
-    if (createError) {
-      setError(
-        createError instanceof Error
-          ? createError
-          : new Error("Failed to create session"),
-      );
-    } else if (loadError) {
-      setError(
-        loadError instanceof Error
-          ? loadError
-          : new Error("Failed to load session"),
-      );
-    } else {
-      setError(null);
-    }
-  }, [createError, loadError]);
-
-  const createSession = useCallback(
-    async function createSession() {
-      try {
-        setError(null);
-        const response = await postV2CreateSession({
-          body: JSON.stringify({}),
-        });
-        if (response.status !== 200) {
-          throw new Error("Failed to create session");
-        }
-        const newSessionId = response.data.id;
-        setSessionId(newSessionId);
-        storage.set(Key.CHAT_SESSION_ID, newSessionId);
-        justCreatedSessionIdRef.current = newSessionId;
-        setTimeout(() => {
-          if (justCreatedSessionIdRef.current === newSessionId) {
-            justCreatedSessionIdRef.current = null;
-          }
-        }, 10000);
-        return newSessionId;
-      } catch (err) {
-        const error =
-          err instanceof Error ? err : new Error("Failed to create session");
-        setError(error);
-        toast.error("Failed to create chat session", {
-          description: error.message,
-        });
-        throw error;
-      }
-    },
-    [createSessionMutation],
-  );
-
-  const loadSession = useCallback(
-    async function loadSession(id: string) {
-      try {
-        setError(null);
-        setSessionId(id);
-        storage.set(Key.CHAT_SESSION_ID, id);
-        const result = await refetch();
-        if (!result.data || result.isError) {
-          console.warn("Session not found on server, clearing local state");
-          storage.clean(Key.CHAT_SESSION_ID);
-          setSessionId(null);
-          throw new Error("Session not found");
-        }
-      } catch (err) {
-        const error =
-          err instanceof Error ? err : new Error("Failed to load session");
-        setError(error);
-        throw error;
-      }
-    },
-    [refetch],
-  );
-
-  const refreshSession = useCallback(
-    async function refreshSession() {
-      if (!sessionId) {
-        console.log("[refreshSession] Skipping - no session ID");
-        return;
-      }
-      try {
-        setError(null);
-        await refetch();
-      } catch (err) {
-        const error =
-          err instanceof Error ? err : new Error("Failed to refresh session");
-        setError(error);
-        throw error;
-      }
-    },
-    [sessionId, refetch],
-  );
-
-  const claimSession = useCallback(
-    async function claimSession(id: string) {
-      try {
-        setError(null);
-        await claimSessionMutation({ sessionId: id });
-        if (justCreatedSessionIdRef.current === id) {
-          justCreatedSessionIdRef.current = null;
-        }
-        await queryClient.invalidateQueries({
-          queryKey: getGetV2GetSessionQueryKey(id),
-        });
-        await refetch();
-        toast.success("Session claimed successfully", {
-          description: "Your chat history has been saved to your account",
-        });
-      } catch (err: unknown) {
-        const error =
-          err instanceof Error ? err : new Error("Failed to claim session");
-        const is404 =
-          (typeof err === "object" &&
-            err !== null &&
-            "status" in err &&
-            err.status === 404) ||
-          (typeof err === "object" &&
-            err !== null &&
-            "response" in err &&
-            typeof err.response === "object" &&
-            err.response !== null &&
-            "status" in err.response &&
-            err.response.status === 404);
-        if (!is404) {
-          setError(error);
-          toast.error("Failed to claim session", {
-            description: error.message || "Unable to claim session",
-          });
-        }
-        throw error;
-      }
-    },
-    [claimSessionMutation, queryClient, refetch],
-  );
-
-  const clearSession = useCallback(function clearSession() {
-    setSessionId(null);
-    setError(null);
-    storage.clean(Key.CHAT_SESSION_ID);
-    justCreatedSessionIdRef.current = null;
-  }, []);
-
-  return {
-    session,
-    sessionId,
-    messages,
-    isLoading,
-    isCreating,
-    error,
-    createSession,
-    loadSession,
-    refreshSession,
-    claimSession,
-    clearSession,
-  };
-}
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/useChatStream.ts b/autogpt_platform/frontend/src/app/(platform)/chat/useChatStream.ts
deleted file mode 100644
index 40455e9979..0000000000
--- a/autogpt_platform/frontend/src/app/(platform)/chat/useChatStream.ts
+++ /dev/null
@@ -1,204 +0,0 @@
-import { useState, useCallback, useRef, useEffect } from "react";
-import { toast } from "sonner";
-import type { ToolArguments, ToolResult } from "@/types/chat";
-
-const MAX_RETRIES = 3;
-const INITIAL_RETRY_DELAY = 1000;
-
-export interface StreamChunk {
-  type:
-    | "text_chunk"
-    | "text_ended"
-    | "tool_call"
-    | "tool_call_start"
-    | "tool_response"
-    | "login_needed"
-    | "need_login"
-    | "credentials_needed"
-    | "error"
-    | "usage"
-    | "stream_end";
-  timestamp?: string;
-  content?: string;
-  message?: string;
-  tool_id?: string;
-  tool_name?: string;
-  arguments?: ToolArguments;
-  result?: ToolResult;
-  success?: boolean;
-  idx?: number;
-  session_id?: string;
-  agent_info?: {
-    graph_id: string;
-    name: string;
-    trigger_type: string;
-  };
-  provider?: string;
-  provider_name?: string;
-  credential_type?: string;
-  scopes?: string[];
-  title?: string;
-  [key: string]: unknown;
-}
-
-export function useChatStream() {
-  const [isStreaming, setIsStreaming] = useState(false);
-  const [error, setError] = useState<Error | null>(null);
-  const eventSourceRef = useRef<EventSource | null>(null);
-  const retryCountRef = useRef<number>(0);
-  const retryTimeoutRef = useRef<NodeJS.Timeout | null>(null);
-  const abortControllerRef = useRef<AbortController | null>(null);
-
-  const stopStreaming = useCallback(() => {
-    if (abortControllerRef.current) {
-      abortControllerRef.current.abort();
-      abortControllerRef.current = null;
-    }
-    if (eventSourceRef.current) {
-      eventSourceRef.current.close();
-      eventSourceRef.current = null;
-    }
-    if (retryTimeoutRef.current) {
-      clearTimeout(retryTimeoutRef.current);
-      retryTimeoutRef.current = null;
-    }
-    retryCountRef.current = 0;
-    setIsStreaming(false);
-  }, []);
-
-  useEffect(() => {
-    return () => {
-      stopStreaming();
-    };
-  }, [stopStreaming]);
-
-  const sendMessage = useCallback(
-    async (
-      sessionId: string,
-      message: string,
-      onChunk: (chunk: StreamChunk) => void,
-      isUserMessage: boolean = true,
-    ) => {
-      stopStreaming();
-
-      const abortController = new AbortController();
-      abortControllerRef.current = abortController;
-
-      if (abortController.signal.aborted) {
-        return Promise.reject(new Error("Request aborted"));
-      }
-
-      retryCountRef.current = 0;
-      setIsStreaming(true);
-      setError(null);
-
-      try {
-        const url = `/api/chat/sessions/${sessionId}/stream?message=${encodeURIComponent(
-          message,
-        )}&is_user_message=${isUserMessage}`;
-
-        const eventSource = new EventSource(url);
-        eventSourceRef.current = eventSource;
-
-        abortController.signal.addEventListener("abort", () => {
-          eventSource.close();
-          eventSourceRef.current = null;
-        });
-
-        return new Promise<void>((resolve, reject) => {
-          const cleanup = () => {
-            eventSource.removeEventListener("message", messageHandler);
-            eventSource.removeEventListener("error", errorHandler);
-          };
-
-          const messageHandler = (event: MessageEvent) => {
-            try {
-              const chunk = JSON.parse(event.data) as StreamChunk;
-
-              if (retryCountRef.current > 0) {
-                retryCountRef.current = 0;
-              }
-
-              // Call the chunk handler
-              onChunk(chunk);
-
-              // Handle stream lifecycle
-              if (chunk.type === "stream_end") {
-                cleanup();
-                stopStreaming();
-                resolve();
-              } else if (chunk.type === "error") {
-                cleanup();
-                reject(
-                  new Error(chunk.message || chunk.content || "Stream error"),
-                );
-              }
-            } catch (err) {
-              const parseError =
-                err instanceof Error
-                  ? err
-                  : new Error("Failed to parse stream chunk");
-              setError(parseError);
-              cleanup();
-              reject(parseError);
-            }
-          };
-
-          const errorHandler = () => {
-            if (eventSourceRef.current) {
-              eventSourceRef.current.close();
-              eventSourceRef.current = null;
-            }
-
-            if (retryCountRef.current < MAX_RETRIES) {
-              retryCountRef.current += 1;
-              const retryDelay =
-                INITIAL_RETRY_DELAY * Math.pow(2, retryCountRef.current - 1);
-
-              toast.info("Connection interrupted", {
-                description: `Retrying in ${retryDelay / 1000} seconds...`,
-              });
-
-              retryTimeoutRef.current = setTimeout(() => {
-                sendMessage(sessionId, message, onChunk, isUserMessage).catch(
-                  (_err) => {
-                    // Retry failed
-                  },
-                );
-              }, retryDelay);
-            } else {
-              const streamError = new Error(
-                "Stream connection failed after multiple retries",
-              );
-              setError(streamError);
-              toast.error("Connection Failed", {
-                description:
-                  "Unable to connect to chat service. Please try again.",
-              });
-              cleanup();
-              stopStreaming();
-              reject(streamError);
-            }
-          };
-
-          eventSource.addEventListener("message", messageHandler);
-          eventSource.addEventListener("error", errorHandler);
-        });
-      } catch (err) {
-        const streamError =
-          err instanceof Error ? err : new Error("Failed to start stream");
-        setError(streamError);
-        setIsStreaming(false);
-        throw streamError;
-      }
-    },
-    [stopStreaming],
-  );
-
-  return {
-    isStreaming,
-    error,
-    sendMessage,
-    stopStreaming,
-  };
-}
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/CopilotShell.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/CopilotShell.tsx
new file mode 100644
index 0000000000..3f695da5ed
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/CopilotShell.tsx
@@ -0,0 +1,99 @@
+"use client";
+
+import { ChatLoader } from "@/components/contextual/Chat/components/ChatLoader/ChatLoader";
+import { Text } from "@/components/atoms/Text/Text";
+import { NAVBAR_HEIGHT_PX } from "@/lib/constants";
+import type { ReactNode } from "react";
+import { DesktopSidebar } from "./components/DesktopSidebar/DesktopSidebar";
+import { MobileDrawer } from "./components/MobileDrawer/MobileDrawer";
+import { MobileHeader } from "./components/MobileHeader/MobileHeader";
+import { useCopilotShell } from "./useCopilotShell";
+
+interface Props {
+  children: ReactNode;
+}
+
+export function CopilotShell({ children }: Props) {
+  const {
+    isMobile,
+    isDrawerOpen,
+    isLoading,
+    isCreatingSession,
+    isLoggedIn,
+    hasActiveSession,
+    sessions,
+    currentSessionId,
+    handleOpenDrawer,
+    handleCloseDrawer,
+    handleDrawerOpenChange,
+    handleNewChatClick,
+    handleSessionClick,
+    hasNextPage,
+    isFetchingNextPage,
+    fetchNextPage,
+  } = useCopilotShell();
+
+  if (!isLoggedIn) {
+    return (
+      <div className="flex h-full items-center justify-center">
+        <ChatLoader />
+      </div>
+    );
+  }
+
+  return (
+    <div
+      className="flex overflow-hidden bg-[#EFEFF0]"
+      style={{ height: `calc(100vh - ${NAVBAR_HEIGHT_PX}px)` }}
+    >
+      {!isMobile && (
+        <DesktopSidebar
+          sessions={sessions}
+          currentSessionId={currentSessionId}
+          isLoading={isLoading}
+          hasNextPage={hasNextPage}
+          isFetchingNextPage={isFetchingNextPage}
+          onSelectSession={handleSessionClick}
+          onFetchNextPage={fetchNextPage}
+          onNewChat={handleNewChatClick}
+          hasActiveSession={Boolean(hasActiveSession)}
+        />
+      )}
+
+      <div className="relative flex min-h-0 flex-1 flex-col">
+        {isMobile && <MobileHeader onOpenDrawer={handleOpenDrawer} />}
+        <div className="flex min-h-0 flex-1 flex-col">
+          {isCreatingSession ? (
+            <div className="flex h-full flex-1 flex-col items-center justify-center bg-[#f8f8f9]">
+              <div className="flex flex-col items-center gap-4">
+                <ChatLoader />
+                <Text variant="body" className="text-zinc-500">
+                  Creating your chat...
+                </Text>
+              </div>
+            </div>
+          ) : (
+            children
+          )}
+        </div>
+      </div>
+
+      {isMobile && (
+        <MobileDrawer
+          isOpen={isDrawerOpen}
+          sessions={sessions}
+          currentSessionId={currentSessionId}
+          isLoading={isLoading}
+          hasNextPage={hasNextPage}
+          isFetchingNextPage={isFetchingNextPage}
+          onSelectSession={handleSessionClick}
+          onFetchNextPage={fetchNextPage}
+          onNewChat={handleNewChatClick}
+          onClose={handleCloseDrawer}
+          onOpenChange={handleDrawerOpenChange}
+          hasActiveSession={Boolean(hasActiveSession)}
+        />
+      )}
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/components/DesktopSidebar/DesktopSidebar.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/components/DesktopSidebar/DesktopSidebar.tsx
new file mode 100644
index 0000000000..122a09a02f
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/components/DesktopSidebar/DesktopSidebar.tsx
@@ -0,0 +1,70 @@
+import type { SessionSummaryResponse } from "@/app/api/__generated__/models/sessionSummaryResponse";
+import { Button } from "@/components/atoms/Button/Button";
+import { Text } from "@/components/atoms/Text/Text";
+import { scrollbarStyles } from "@/components/styles/scrollbars";
+import { cn } from "@/lib/utils";
+import { Plus } from "@phosphor-icons/react";
+import { SessionsList } from "../SessionsList/SessionsList";
+
+interface Props {
+  sessions: SessionSummaryResponse[];
+  currentSessionId: string | null;
+  isLoading: boolean;
+  hasNextPage: boolean;
+  isFetchingNextPage: boolean;
+  onSelectSession: (sessionId: string) => void;
+  onFetchNextPage: () => void;
+  onNewChat: () => void;
+  hasActiveSession: boolean;
+}
+
+export function DesktopSidebar({
+  sessions,
+  currentSessionId,
+  isLoading,
+  hasNextPage,
+  isFetchingNextPage,
+  onSelectSession,
+  onFetchNextPage,
+  onNewChat,
+  hasActiveSession,
+}: Props) {
+  return (
+    <aside className="flex h-full w-80 flex-col border-r border-zinc-100 bg-zinc-50">
+      <div className="shrink-0 px-6 py-4">
+        <Text variant="h3" size="body-medium">
+          Your chats
+        </Text>
+      </div>
+      <div
+        className={cn(
+          "flex min-h-0 flex-1 flex-col overflow-y-auto px-3 py-3",
+          scrollbarStyles,
+        )}
+      >
+        <SessionsList
+          sessions={sessions}
+          currentSessionId={currentSessionId}
+          isLoading={isLoading}
+          hasNextPage={hasNextPage}
+          isFetchingNextPage={isFetchingNextPage}
+          onSelectSession={onSelectSession}
+          onFetchNextPage={onFetchNextPage}
+        />
+      </div>
+      {hasActiveSession && (
+        <div className="shrink-0 bg-zinc-50 p-3 shadow-[0_-4px_6px_-1px_rgba(0,0,0,0.05)]">
+          <Button
+            variant="primary"
+            size="small"
+            onClick={onNewChat}
+            className="w-full"
+            leftIcon={<Plus width="1rem" height="1rem" />}
+          >
+            New Chat
+          </Button>
+        </div>
+      )}
+    </aside>
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/components/MobileDrawer/MobileDrawer.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/components/MobileDrawer/MobileDrawer.tsx
new file mode 100644
index 0000000000..ea3b39f829
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/components/MobileDrawer/MobileDrawer.tsx
@@ -0,0 +1,91 @@
+import type { SessionSummaryResponse } from "@/app/api/__generated__/models/sessionSummaryResponse";
+import { Button } from "@/components/atoms/Button/Button";
+import { scrollbarStyles } from "@/components/styles/scrollbars";
+import { cn } from "@/lib/utils";
+import { PlusIcon, X } from "@phosphor-icons/react";
+import { Drawer } from "vaul";
+import { SessionsList } from "../SessionsList/SessionsList";
+
+interface Props {
+  isOpen: boolean;
+  sessions: SessionSummaryResponse[];
+  currentSessionId: string | null;
+  isLoading: boolean;
+  hasNextPage: boolean;
+  isFetchingNextPage: boolean;
+  onSelectSession: (sessionId: string) => void;
+  onFetchNextPage: () => void;
+  onNewChat: () => void;
+  onClose: () => void;
+  onOpenChange: (open: boolean) => void;
+  hasActiveSession: boolean;
+}
+
+export function MobileDrawer({
+  isOpen,
+  sessions,
+  currentSessionId,
+  isLoading,
+  hasNextPage,
+  isFetchingNextPage,
+  onSelectSession,
+  onFetchNextPage,
+  onNewChat,
+  onClose,
+  onOpenChange,
+  hasActiveSession,
+}: Props) {
+  return (
+    <Drawer.Root open={isOpen} onOpenChange={onOpenChange} direction="left">
+      <Drawer.Portal>
+        <Drawer.Overlay className="fixed inset-0 z-[60] bg-black/10 backdrop-blur-sm" />
+        <Drawer.Content className="fixed left-0 top-0 z-[70] flex h-full w-80 flex-col border-r border-zinc-200 bg-zinc-50">
+          <div className="shrink-0 border-b border-zinc-200 p-4">
+            <div className="flex items-center justify-between">
+              <Drawer.Title className="text-lg font-semibold text-zinc-800">
+                Your chats
+              </Drawer.Title>
+              <Button
+                variant="icon"
+                size="icon"
+                aria-label="Close sessions"
+                onClick={onClose}
+              >
+                <X width="1.25rem" height="1.25rem" />
+              </Button>
+            </div>
+          </div>
+          <div
+            className={cn(
+              "flex min-h-0 flex-1 flex-col overflow-y-auto px-3 py-3",
+              scrollbarStyles,
+            )}
+          >
+            <SessionsList
+              sessions={sessions}
+              currentSessionId={currentSessionId}
+              isLoading={isLoading}
+              hasNextPage={hasNextPage}
+              isFetchingNextPage={isFetchingNextPage}
+              onSelectSession={onSelectSession}
+              onFetchNextPage={onFetchNextPage}
+            />
+          </div>
+          {hasActiveSession && (
+            <div className="shrink-0 bg-white p-3 shadow-[0_-4px_6px_-1px_rgba(0,0,0,0.05)]">
+              <Button
+                variant="primary"
+                size="small"
+                onClick={onNewChat}
+                className="w-full"
+                leftIcon={<PlusIcon width="1rem" height="1rem" />}
+              >
+                New Chat
+              </Button>
+            </div>
+          )}
+        </Drawer.Content>
+      </Drawer.Portal>
+    </Drawer.Root>
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/components/MobileDrawer/useMobileDrawer.ts b/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/components/MobileDrawer/useMobileDrawer.ts
new file mode 100644
index 0000000000..2ef63a4422
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/components/MobileDrawer/useMobileDrawer.ts
@@ -0,0 +1,24 @@
+import { useState } from "react";
+
+export function useMobileDrawer() {
+  const [isDrawerOpen, setIsDrawerOpen] = useState(false);
+
+  const handleOpenDrawer = () => {
+    setIsDrawerOpen(true);
+  };
+
+  const handleCloseDrawer = () => {
+    setIsDrawerOpen(false);
+  };
+
+  const handleDrawerOpenChange = (open: boolean) => {
+    setIsDrawerOpen(open);
+  };
+
+  return {
+    isDrawerOpen,
+    handleOpenDrawer,
+    handleCloseDrawer,
+    handleDrawerOpenChange,
+  };
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/components/MobileHeader/MobileHeader.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/components/MobileHeader/MobileHeader.tsx
new file mode 100644
index 0000000000..e0d6161744
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/components/MobileHeader/MobileHeader.tsx
@@ -0,0 +1,22 @@
+import { Button } from "@/components/atoms/Button/Button";
+import { NAVBAR_HEIGHT_PX } from "@/lib/constants";
+import { ListIcon } from "@phosphor-icons/react";
+
+interface Props {
+  onOpenDrawer: () => void;
+}
+
+export function MobileHeader({ onOpenDrawer }: Props) {
+  return (
+    <Button
+      variant="icon"
+      size="icon"
+      aria-label="Open sessions"
+      onClick={onOpenDrawer}
+      className="fixed z-50 bg-white shadow-md"
+      style={{ left: "1rem", top: `${NAVBAR_HEIGHT_PX + 20}px` }}
+    >
+      <ListIcon width="1.25rem" height="1.25rem" />
+    </Button>
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/components/SessionsList/SessionsList.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/components/SessionsList/SessionsList.tsx
new file mode 100644
index 0000000000..ef63e1aff4
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/components/SessionsList/SessionsList.tsx
@@ -0,0 +1,80 @@
+import type { SessionSummaryResponse } from "@/app/api/__generated__/models/sessionSummaryResponse";
+import { Skeleton } from "@/components/__legacy__/ui/skeleton";
+import { Text } from "@/components/atoms/Text/Text";
+import { InfiniteList } from "@/components/molecules/InfiniteList/InfiniteList";
+import { cn } from "@/lib/utils";
+import { getSessionTitle } from "../../helpers";
+
+interface Props {
+  sessions: SessionSummaryResponse[];
+  currentSessionId: string | null;
+  isLoading: boolean;
+  hasNextPage: boolean;
+  isFetchingNextPage: boolean;
+  onSelectSession: (sessionId: string) => void;
+  onFetchNextPage: () => void;
+}
+
+export function SessionsList({
+  sessions,
+  currentSessionId,
+  isLoading,
+  hasNextPage,
+  isFetchingNextPage,
+  onSelectSession,
+  onFetchNextPage,
+}: Props) {
+  if (isLoading) {
+    return (
+      <div className="space-y-1">
+        {Array.from({ length: 5 }).map((_, i) => (
+          <div key={i} className="rounded-lg px-3 py-2.5">
+            <Skeleton className="h-5 w-full" />
+          </div>
+        ))}
+      </div>
+    );
+  }
+
+  if (sessions.length === 0) {
+    return (
+      <div className="flex h-full items-center justify-center">
+        <Text variant="body" className="text-zinc-500">
+          You don&apos;t have previous chats
+        </Text>
+      </div>
+    );
+  }
+
+  return (
+    <InfiniteList
+      items={sessions}
+      hasMore={hasNextPage}
+      isFetchingMore={isFetchingNextPage}
+      onEndReached={onFetchNextPage}
+      className="space-y-1"
+      renderItem={(session) => {
+        const isActive = session.id === currentSessionId;
+        return (
+          <button
+            onClick={() => onSelectSession(session.id)}
+            className={cn(
+              "w-full rounded-lg px-3 py-2.5 text-left transition-colors",
+              isActive ? "bg-zinc-100" : "hover:bg-zinc-50",
+            )}
+          >
+            <Text
+              variant="body"
+              className={cn(
+                "font-normal",
+                isActive ? "text-zinc-600" : "text-zinc-800",
+              )}
+            >
+              {getSessionTitle(session)}
+            </Text>
+          </button>
+        );
+      }}
+    />
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/components/SessionsList/useSessionsPagination.ts b/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/components/SessionsList/useSessionsPagination.ts
new file mode 100644
index 0000000000..61e3e6f37f
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/components/SessionsList/useSessionsPagination.ts
@@ -0,0 +1,91 @@
+import { useGetV2ListSessions } from "@/app/api/__generated__/endpoints/chat/chat";
+import type { SessionSummaryResponse } from "@/app/api/__generated__/models/sessionSummaryResponse";
+import { okData } from "@/app/api/helpers";
+import { useEffect, useState } from "react";
+
+const PAGE_SIZE = 50;
+
+export interface UseSessionsPaginationArgs {
+  enabled: boolean;
+}
+
+export function useSessionsPagination({ enabled }: UseSessionsPaginationArgs) {
+  const [offset, setOffset] = useState(0);
+
+  const [accumulatedSessions, setAccumulatedSessions] = useState<
+    SessionSummaryResponse[]
+  >([]);
+
+  const [totalCount, setTotalCount] = useState<number | null>(null);
+
+  const { data, isLoading, isFetching, isError } = useGetV2ListSessions(
+    { limit: PAGE_SIZE, offset },
+    {
+      query: {
+        enabled: enabled && offset >= 0,
+      },
+    },
+  );
+
+  useEffect(() => {
+    const responseData = okData(data);
+    if (responseData) {
+      const newSessions = responseData.sessions;
+      const total = responseData.total;
+      setTotalCount(total);
+
+      if (offset === 0) {
+        setAccumulatedSessions(newSessions);
+      } else {
+        setAccumulatedSessions((prev) => [...prev, ...newSessions]);
+      }
+    } else if (!enabled) {
+      setAccumulatedSessions([]);
+      setTotalCount(null);
+    }
+  }, [data, offset, enabled]);
+
+  const hasNextPage =
+    totalCount !== null && accumulatedSessions.length < totalCount;
+
+  const areAllSessionsLoaded =
+    totalCount !== null &&
+    accumulatedSessions.length >= totalCount &&
+    !isFetching &&
+    !isLoading;
+
+  useEffect(() => {
+    if (
+      hasNextPage &&
+      !isFetching &&
+      !isLoading &&
+      !isError &&
+      totalCount !== null
+    ) {
+      setOffset((prev) => prev + PAGE_SIZE);
+    }
+  }, [hasNextPage, isFetching, isLoading, isError, totalCount]);
+
+  const fetchNextPage = () => {
+    if (hasNextPage && !isFetching) {
+      setOffset((prev) => prev + PAGE_SIZE);
+    }
+  };
+
+  const reset = () => {
+    // Only reset the offset - keep existing sessions visible during refetch
+    // The effect will replace sessions when new data arrives at offset 0
+    setOffset(0);
+  };
+
+  return {
+    sessions: accumulatedSessions,
+    isLoading,
+    isFetching,
+    hasNextPage,
+    areAllSessionsLoaded,
+    totalCount,
+    fetchNextPage,
+    reset,
+  };
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/helpers.ts
new file mode 100644
index 0000000000..ef0d414edf
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/helpers.ts
@@ -0,0 +1,106 @@
+import type { SessionDetailResponse } from "@/app/api/__generated__/models/sessionDetailResponse";
+import type { SessionSummaryResponse } from "@/app/api/__generated__/models/sessionSummaryResponse";
+import { format, formatDistanceToNow, isToday } from "date-fns";
+
+export function convertSessionDetailToSummary(session: SessionDetailResponse) {
+  return {
+    id: session.id,
+    created_at: session.created_at,
+    updated_at: session.updated_at,
+    title: undefined,
+  };
+}
+
+export function filterVisibleSessions(sessions: SessionSummaryResponse[]) {
+  const fiveMinutesAgo = Date.now() - 5 * 60 * 1000;
+  return sessions.filter((session) => {
+    const hasBeenUpdated = session.updated_at !== session.created_at;
+
+    if (hasBeenUpdated) return true;
+
+    const isRecentlyCreated =
+      new Date(session.created_at).getTime() > fiveMinutesAgo;
+
+    return isRecentlyCreated;
+  });
+}
+
+export function getSessionTitle(session: SessionSummaryResponse) {
+  if (session.title) return session.title;
+
+  const isNewSession = session.updated_at === session.created_at;
+
+  if (isNewSession) {
+    const createdDate = new Date(session.created_at);
+    if (isToday(createdDate)) {
+      return "Today";
+    }
+    return format(createdDate, "MMM d, yyyy");
+  }
+
+  return "Untitled Chat";
+}
+
+export function getSessionUpdatedLabel(session: SessionSummaryResponse) {
+  if (!session.updated_at) return "";
+  return formatDistanceToNow(new Date(session.updated_at), { addSuffix: true });
+}
+
+export function mergeCurrentSessionIntoList(
+  accumulatedSessions: SessionSummaryResponse[],
+  currentSessionId: string | null,
+  currentSessionData: SessionDetailResponse | null | undefined,
+  recentlyCreatedSessions?: Map<string, SessionSummaryResponse>,
+) {
+  const filteredSessions: SessionSummaryResponse[] = [];
+  const addedIds = new Set<string>();
+
+  if (accumulatedSessions.length > 0) {
+    const visibleSessions = filterVisibleSessions(accumulatedSessions);
+
+    if (currentSessionId) {
+      const currentInAll = accumulatedSessions.find(
+        (s) => s.id === currentSessionId,
+      );
+      if (currentInAll) {
+        const isInVisible = visibleSessions.some(
+          (s) => s.id === currentSessionId,
+        );
+        if (!isInVisible) {
+          filteredSessions.push(currentInAll);
+          addedIds.add(currentInAll.id);
+        }
+      }
+    }
+
+    for (const session of visibleSessions) {
+      if (!addedIds.has(session.id)) {
+        filteredSessions.push(session);
+        addedIds.add(session.id);
+      }
+    }
+  }
+
+  if (currentSessionId && currentSessionData) {
+    if (!addedIds.has(currentSessionId)) {
+      const summarySession = convertSessionDetailToSummary(currentSessionData);
+      filteredSessions.unshift(summarySession);
+      addedIds.add(currentSessionId);
+    }
+  }
+
+  if (recentlyCreatedSessions) {
+    for (const [sessionId, sessionData] of recentlyCreatedSessions) {
+      if (!addedIds.has(sessionId)) {
+        filteredSessions.unshift(sessionData);
+        addedIds.add(sessionId);
+      }
+    }
+  }
+
+  return filteredSessions;
+}
+
+export function getCurrentSessionId(searchParams: URLSearchParams) {
+  return searchParams.get("sessionId");
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/useCopilotShell.ts b/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/useCopilotShell.ts
new file mode 100644
index 0000000000..913c4d7ded
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/useCopilotShell.ts
@@ -0,0 +1,124 @@
+"use client";
+
+import {
+  getGetV2GetSessionQueryKey,
+  getGetV2ListSessionsQueryKey,
+  useGetV2GetSession,
+} from "@/app/api/__generated__/endpoints/chat/chat";
+import { okData } from "@/app/api/helpers";
+import { useChatStore } from "@/components/contextual/Chat/chat-store";
+import { useBreakpoint } from "@/lib/hooks/useBreakpoint";
+import { useSupabase } from "@/lib/supabase/hooks/useSupabase";
+import { useQueryClient } from "@tanstack/react-query";
+import { usePathname, useSearchParams } from "next/navigation";
+import { useCopilotStore } from "../../copilot-page-store";
+import { useCopilotSessionId } from "../../useCopilotSessionId";
+import { useMobileDrawer } from "./components/MobileDrawer/useMobileDrawer";
+import { getCurrentSessionId } from "./helpers";
+import { useShellSessionList } from "./useShellSessionList";
+
+export function useCopilotShell() {
+  const pathname = usePathname();
+  const searchParams = useSearchParams();
+  const queryClient = useQueryClient();
+  const breakpoint = useBreakpoint();
+  const { isLoggedIn } = useSupabase();
+  const isMobile =
+    breakpoint === "base" || breakpoint === "sm" || breakpoint === "md";
+
+  const { urlSessionId, setUrlSessionId } = useCopilotSessionId();
+
+  const isOnHomepage = pathname === "/copilot";
+  const paramSessionId = searchParams.get("sessionId");
+
+  const {
+    isDrawerOpen,
+    handleOpenDrawer,
+    handleCloseDrawer,
+    handleDrawerOpenChange,
+  } = useMobileDrawer();
+
+  const paginationEnabled = !isMobile || isDrawerOpen || !!paramSessionId;
+
+  const currentSessionId = getCurrentSessionId(searchParams);
+
+  const { data: currentSessionData } = useGetV2GetSession(
+    currentSessionId || "",
+    {
+      query: {
+        enabled: !!currentSessionId,
+        select: okData,
+      },
+    },
+  );
+
+  const {
+    sessions,
+    isLoading,
+    isSessionsFetching,
+    hasNextPage,
+    fetchNextPage,
+    resetPagination,
+    recentlyCreatedSessionsRef,
+  } = useShellSessionList({
+    paginationEnabled,
+    currentSessionId,
+    currentSessionData,
+    isOnHomepage,
+    paramSessionId,
+  });
+
+  const stopStream = useChatStore((s) => s.stopStream);
+  const isCreatingSession = useCopilotStore((s) => s.isCreatingSession);
+
+  function handleSessionClick(sessionId: string) {
+    if (sessionId === currentSessionId) return;
+
+    // Stop current stream - SSE reconnection allows resuming later
+    if (currentSessionId) {
+      stopStream(currentSessionId);
+    }
+
+    if (recentlyCreatedSessionsRef.current.has(sessionId)) {
+      queryClient.invalidateQueries({
+        queryKey: getGetV2GetSessionQueryKey(sessionId),
+      });
+    }
+    setUrlSessionId(sessionId, { shallow: false });
+    if (isMobile) handleCloseDrawer();
+  }
+
+  function handleNewChatClick() {
+    // Stop current stream - SSE reconnection allows resuming later
+    if (currentSessionId) {
+      stopStream(currentSessionId);
+    }
+
+    resetPagination();
+    queryClient.invalidateQueries({
+      queryKey: getGetV2ListSessionsQueryKey(),
+    });
+    setUrlSessionId(null, { shallow: false });
+    if (isMobile) handleCloseDrawer();
+  }
+
+  return {
+    isMobile,
+    isDrawerOpen,
+    isLoggedIn,
+    hasActiveSession:
+      Boolean(currentSessionId) && (!isOnHomepage || Boolean(paramSessionId)),
+    isLoading: isLoading || isCreatingSession,
+    isCreatingSession,
+    sessions,
+    currentSessionId: urlSessionId,
+    handleOpenDrawer,
+    handleCloseDrawer,
+    handleDrawerOpenChange,
+    handleNewChatClick,
+    handleSessionClick,
+    hasNextPage,
+    isFetchingNextPage: isSessionsFetching,
+    fetchNextPage,
+  };
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/useShellSessionList.ts b/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/useShellSessionList.ts
new file mode 100644
index 0000000000..fb39a11096
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/CopilotShell/useShellSessionList.ts
@@ -0,0 +1,113 @@
+import { getGetV2ListSessionsQueryKey } from "@/app/api/__generated__/endpoints/chat/chat";
+import type { SessionDetailResponse } from "@/app/api/__generated__/models/sessionDetailResponse";
+import type { SessionSummaryResponse } from "@/app/api/__generated__/models/sessionSummaryResponse";
+import { useChatStore } from "@/components/contextual/Chat/chat-store";
+import { useQueryClient } from "@tanstack/react-query";
+import { useEffect, useMemo, useRef } from "react";
+import { useSessionsPagination } from "./components/SessionsList/useSessionsPagination";
+import {
+  convertSessionDetailToSummary,
+  filterVisibleSessions,
+  mergeCurrentSessionIntoList,
+} from "./helpers";
+
+interface UseShellSessionListArgs {
+  paginationEnabled: boolean;
+  currentSessionId: string | null;
+  currentSessionData: SessionDetailResponse | null | undefined;
+  isOnHomepage: boolean;
+  paramSessionId: string | null;
+}
+
+export function useShellSessionList({
+  paginationEnabled,
+  currentSessionId,
+  currentSessionData,
+  isOnHomepage,
+  paramSessionId,
+}: UseShellSessionListArgs) {
+  const queryClient = useQueryClient();
+  const onStreamComplete = useChatStore((s) => s.onStreamComplete);
+
+  const {
+    sessions: accumulatedSessions,
+    isLoading: isSessionsLoading,
+    isFetching: isSessionsFetching,
+    hasNextPage,
+    fetchNextPage,
+    reset: resetPagination,
+  } = useSessionsPagination({
+    enabled: paginationEnabled,
+  });
+
+  const recentlyCreatedSessionsRef = useRef<
+    Map<string, SessionSummaryResponse>
+  >(new Map());
+
+  useEffect(() => {
+    if (isOnHomepage && !paramSessionId) {
+      queryClient.invalidateQueries({
+        queryKey: getGetV2ListSessionsQueryKey(),
+      });
+    }
+  }, [isOnHomepage, paramSessionId, queryClient]);
+
+  useEffect(() => {
+    if (currentSessionId && currentSessionData) {
+      const isNewSession =
+        currentSessionData.updated_at === currentSessionData.created_at;
+      const isNotInAccumulated = !accumulatedSessions.some(
+        (s) => s.id === currentSessionId,
+      );
+      if (isNewSession || isNotInAccumulated) {
+        const summary = convertSessionDetailToSummary(currentSessionData);
+        recentlyCreatedSessionsRef.current.set(currentSessionId, summary);
+      }
+    }
+  }, [currentSessionId, currentSessionData, accumulatedSessions]);
+
+  useEffect(() => {
+    for (const sessionId of recentlyCreatedSessionsRef.current.keys()) {
+      if (accumulatedSessions.some((s) => s.id === sessionId)) {
+        recentlyCreatedSessionsRef.current.delete(sessionId);
+      }
+    }
+  }, [accumulatedSessions]);
+
+  useEffect(() => {
+    const unsubscribe = onStreamComplete(() => {
+      queryClient.invalidateQueries({
+        queryKey: getGetV2ListSessionsQueryKey(),
+      });
+    });
+    return unsubscribe;
+  }, [onStreamComplete, queryClient]);
+
+  const sessions = useMemo(
+    () =>
+      mergeCurrentSessionIntoList(
+        accumulatedSessions,
+        currentSessionId,
+        currentSessionData,
+        recentlyCreatedSessionsRef.current,
+      ),
+    [accumulatedSessions, currentSessionId, currentSessionData],
+  );
+
+  const visibleSessions = useMemo(
+    () => filterVisibleSessions(sessions),
+    [sessions],
+  );
+
+  const isLoading = isSessionsLoading && accumulatedSessions.length === 0;
+
+  return {
+    sessions: visibleSessions,
+    isLoading,
+    isSessionsFetching,
+    hasNextPage,
+    fetchNextPage,
+    resetPagination,
+    recentlyCreatedSessionsRef,
+  };
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/copilot-page-store.ts b/autogpt_platform/frontend/src/app/(platform)/copilot/copilot-page-store.ts
new file mode 100644
index 0000000000..9fc97a14e3
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/copilot-page-store.ts
@@ -0,0 +1,56 @@
+"use client";
+
+import { create } from "zustand";
+
+interface CopilotStoreState {
+  isStreaming: boolean;
+  isSwitchingSession: boolean;
+  isCreatingSession: boolean;
+  isInterruptModalOpen: boolean;
+  pendingAction: (() => void) | null;
+}
+
+interface CopilotStoreActions {
+  setIsStreaming: (isStreaming: boolean) => void;
+  setIsSwitchingSession: (isSwitchingSession: boolean) => void;
+  setIsCreatingSession: (isCreating: boolean) => void;
+  openInterruptModal: (onConfirm: () => void) => void;
+  confirmInterrupt: () => void;
+  cancelInterrupt: () => void;
+}
+
+type CopilotStore = CopilotStoreState & CopilotStoreActions;
+
+export const useCopilotStore = create<CopilotStore>((set, get) => ({
+  isStreaming: false,
+  isSwitchingSession: false,
+  isCreatingSession: false,
+  isInterruptModalOpen: false,
+  pendingAction: null,
+
+  setIsStreaming(isStreaming) {
+    set({ isStreaming });
+  },
+
+  setIsSwitchingSession(isSwitchingSession) {
+    set({ isSwitchingSession });
+  },
+
+  setIsCreatingSession(isCreatingSession) {
+    set({ isCreatingSession });
+  },
+
+  openInterruptModal(onConfirm) {
+    set({ isInterruptModalOpen: true, pendingAction: onConfirm });
+  },
+
+  confirmInterrupt() {
+    const { pendingAction } = get();
+    set({ isInterruptModalOpen: false, pendingAction: null });
+    if (pendingAction) pendingAction();
+  },
+
+  cancelInterrupt() {
+    set({ isInterruptModalOpen: false, pendingAction: null });
+  },
+}));
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/copilot/helpers.ts
new file mode 100644
index 0000000000..c6e479f896
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/helpers.ts
@@ -0,0 +1,45 @@
+import type { User } from "@supabase/supabase-js";
+
+export function getGreetingName(user?: User | null): string {
+  if (!user) return "there";
+  const metadata = user.user_metadata as Record<string, unknown> | undefined;
+  const fullName = metadata?.full_name;
+  const name = metadata?.name;
+  if (typeof fullName === "string" && fullName.trim()) {
+    return fullName.split(" ")[0];
+  }
+  if (typeof name === "string" && name.trim()) {
+    return name.split(" ")[0];
+  }
+  if (user.email) {
+    return user.email.split("@")[0];
+  }
+  return "there";
+}
+
+export function buildCopilotChatUrl(prompt: string): string {
+  const trimmed = prompt.trim();
+  if (!trimmed) return "/copilot/chat";
+  const encoded = encodeURIComponent(trimmed);
+  return `/copilot/chat?prompt=${encoded}`;
+}
+
+export function getQuickActions(): string[] {
+  return [
+    "I don't know where to start, just ask me stuff",
+    "I do the same thing every week and it's killing me",
+    "Help me find where I'm wasting my time",
+  ];
+}
+
+export function getInputPlaceholder(width?: number) {
+  if (!width) return "What's your role and what eats up most of your day?";
+
+  if (width < 500) {
+    return "I'm a chef and I hate...";
+  }
+  if (width <= 1080) {
+    return "What's your role and what eats up most of your day?";
+  }
+  return "What's your role and what eats up most of your day? e.g. 'I'm a recruiter and I hate...'";
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/layout.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/layout.tsx
new file mode 100644
index 0000000000..876e5accfb
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/layout.tsx
@@ -0,0 +1,13 @@
+"use client";
+import { FeatureFlagPage } from "@/services/feature-flags/FeatureFlagPage";
+import { Flag } from "@/services/feature-flags/use-get-flag";
+import { type ReactNode } from "react";
+import { CopilotShell } from "./components/CopilotShell/CopilotShell";
+
+export default function CopilotLayout({ children }: { children: ReactNode }) {
+  return (
+    <FeatureFlagPage flag={Flag.CHAT} whenDisabled="/library">
+      <CopilotShell>{children}</CopilotShell>
+    </FeatureFlagPage>
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/page.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/page.tsx
new file mode 100644
index 0000000000..542173a99c
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/page.tsx
@@ -0,0 +1,149 @@
+"use client";
+
+import { Button } from "@/components/atoms/Button/Button";
+import { Skeleton } from "@/components/atoms/Skeleton/Skeleton";
+import { Text } from "@/components/atoms/Text/Text";
+import { Chat } from "@/components/contextual/Chat/Chat";
+import { ChatInput } from "@/components/contextual/Chat/components/ChatInput/ChatInput";
+import { Dialog } from "@/components/molecules/Dialog/Dialog";
+import { useEffect, useState } from "react";
+import { useCopilotStore } from "./copilot-page-store";
+import { getInputPlaceholder } from "./helpers";
+import { useCopilotPage } from "./useCopilotPage";
+
+export default function CopilotPage() {
+  const { state, handlers } = useCopilotPage();
+  const isInterruptModalOpen = useCopilotStore((s) => s.isInterruptModalOpen);
+  const confirmInterrupt = useCopilotStore((s) => s.confirmInterrupt);
+  const cancelInterrupt = useCopilotStore((s) => s.cancelInterrupt);
+
+  const [inputPlaceholder, setInputPlaceholder] = useState(
+    getInputPlaceholder(),
+  );
+
+  useEffect(() => {
+    const handleResize = () => {
+      setInputPlaceholder(getInputPlaceholder(window.innerWidth));
+    };
+
+    handleResize();
+
+    window.addEventListener("resize", handleResize);
+    return () => window.removeEventListener("resize", handleResize);
+  }, []);
+
+  const { greetingName, quickActions, isLoading, hasSession, initialPrompt } =
+    state;
+
+  const {
+    handleQuickAction,
+    startChatWithPrompt,
+    handleSessionNotFound,
+    handleStreamingChange,
+  } = handlers;
+
+  if (hasSession) {
+    return (
+      <div className="flex h-full flex-col">
+        <Chat
+          className="flex-1"
+          initialPrompt={initialPrompt}
+          onSessionNotFound={handleSessionNotFound}
+          onStreamingChange={handleStreamingChange}
+        />
+        <Dialog
+          title="Interrupt current chat?"
+          styling={{ maxWidth: 300, width: "100%" }}
+          controlled={{
+            isOpen: isInterruptModalOpen,
+            set: (open) => {
+              if (!open) cancelInterrupt();
+            },
+          }}
+          onClose={cancelInterrupt}
+        >
+          <Dialog.Content>
+            <div className="flex flex-col gap-4">
+              <Text variant="body">
+                The current chat response will be interrupted. Are you sure you
+                want to continue?
+              </Text>
+              <Dialog.Footer>
+                <Button
+                  type="button"
+                  variant="outline"
+                  onClick={cancelInterrupt}
+                >
+                  Cancel
+                </Button>
+                <Button
+                  type="button"
+                  variant="primary"
+                  onClick={confirmInterrupt}
+                >
+                  Continue
+                </Button>
+              </Dialog.Footer>
+            </div>
+          </Dialog.Content>
+        </Dialog>
+      </div>
+    );
+  }
+
+  return (
+    <div className="flex h-full flex-1 items-center justify-center overflow-y-auto bg-[#f8f8f9] px-3 py-5 md:px-6 md:py-10">
+      <div className="w-full text-center">
+        {isLoading ? (
+          <div className="mx-auto max-w-2xl">
+            <Skeleton className="mx-auto mb-3 h-8 w-64" />
+            <Skeleton className="mx-auto mb-8 h-6 w-80" />
+            <div className="mb-8">
+              <Skeleton className="mx-auto h-14 w-full rounded-lg" />
+            </div>
+            <div className="flex flex-wrap items-center justify-center gap-3">
+              {Array.from({ length: 4 }).map((_, i) => (
+                <Skeleton key={i} className="h-9 w-48 rounded-md" />
+              ))}
+            </div>
+          </div>
+        ) : (
+          <>
+            <div className="mx-auto max-w-3xl">
+              <Text
+                variant="h3"
+                className="mb-1 !text-[1.375rem] text-zinc-700"
+              >
+                Hey, <span className="text-violet-600">{greetingName}</span>
+              </Text>
+              <Text variant="h3" className="mb-8 !font-normal">
+                Tell me about your work — I&apos;ll find what to automate.
+              </Text>
+
+              <div className="mb-6">
+                <ChatInput
+                  onSend={startChatWithPrompt}
+                  placeholder={inputPlaceholder}
+                />
+              </div>
+            </div>
+            <div className="flex flex-wrap items-center justify-center gap-3 overflow-x-auto [-ms-overflow-style:none] [scrollbar-width:none] [&::-webkit-scrollbar]:hidden">
+              {quickActions.map((action) => (
+                <Button
+                  key={action}
+                  type="button"
+                  variant="outline"
+                  size="small"
+                  onClick={() => handleQuickAction(action)}
+                  className="h-auto shrink-0 border-zinc-300 px-3 py-2 text-[.9rem] text-zinc-600"
+                >
+                  {action}
+                </Button>
+              ))}
+            </div>
+          </>
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/useCopilotPage.ts b/autogpt_platform/frontend/src/app/(platform)/copilot/useCopilotPage.ts
new file mode 100644
index 0000000000..9d99f8e7bd
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/useCopilotPage.ts
@@ -0,0 +1,127 @@
+import {
+  getGetV2ListSessionsQueryKey,
+  postV2CreateSession,
+} from "@/app/api/__generated__/endpoints/chat/chat";
+import { useToast } from "@/components/molecules/Toast/use-toast";
+import { useSupabase } from "@/lib/supabase/hooks/useSupabase";
+import { useOnboarding } from "@/providers/onboarding/onboarding-provider";
+import { SessionKey, sessionStorage } from "@/services/storage/session-storage";
+import * as Sentry from "@sentry/nextjs";
+import { useQueryClient } from "@tanstack/react-query";
+import { useRouter } from "next/navigation";
+import { useEffect } from "react";
+import { useCopilotStore } from "./copilot-page-store";
+import { getGreetingName, getQuickActions } from "./helpers";
+import { useCopilotSessionId } from "./useCopilotSessionId";
+
+export function useCopilotPage() {
+  const router = useRouter();
+  const queryClient = useQueryClient();
+  const { user, isLoggedIn, isUserLoading } = useSupabase();
+  const { toast } = useToast();
+  const { completeStep } = useOnboarding();
+
+  const { urlSessionId, setUrlSessionId } = useCopilotSessionId();
+  const setIsStreaming = useCopilotStore((s) => s.setIsStreaming);
+  const isCreating = useCopilotStore((s) => s.isCreatingSession);
+  const setIsCreating = useCopilotStore((s) => s.setIsCreatingSession);
+
+  const greetingName = getGreetingName(user);
+  const quickActions = getQuickActions();
+
+  const hasSession = Boolean(urlSessionId);
+  const initialPrompt = urlSessionId
+    ? getInitialPrompt(urlSessionId)
+    : undefined;
+
+  useEffect(() => {
+    if (isLoggedIn) completeStep("VISIT_COPILOT");
+  }, [completeStep, isLoggedIn]);
+
+  async function startChatWithPrompt(prompt: string) {
+    if (!prompt?.trim()) return;
+    if (isCreating) return;
+
+    const trimmedPrompt = prompt.trim();
+    setIsCreating(true);
+
+    try {
+      const sessionResponse = await postV2CreateSession({
+        body: JSON.stringify({}),
+      });
+
+      if (sessionResponse.status !== 200 || !sessionResponse.data?.id) {
+        throw new Error("Failed to create session");
+      }
+
+      const sessionId = sessionResponse.data.id;
+      setInitialPrompt(sessionId, trimmedPrompt);
+
+      await queryClient.invalidateQueries({
+        queryKey: getGetV2ListSessionsQueryKey(),
+      });
+
+      await setUrlSessionId(sessionId, { shallow: true });
+    } catch (error) {
+      console.error("[CopilotPage] Failed to start chat:", error);
+      toast({ title: "Failed to start chat", variant: "destructive" });
+      Sentry.captureException(error);
+    } finally {
+      setIsCreating(false);
+    }
+  }
+
+  function handleQuickAction(action: string) {
+    startChatWithPrompt(action);
+  }
+
+  function handleSessionNotFound() {
+    router.replace("/copilot");
+  }
+
+  function handleStreamingChange(isStreamingValue: boolean) {
+    setIsStreaming(isStreamingValue);
+  }
+
+  return {
+    state: {
+      greetingName,
+      quickActions,
+      isLoading: isUserLoading,
+      hasSession,
+      initialPrompt,
+    },
+    handlers: {
+      handleQuickAction,
+      startChatWithPrompt,
+      handleSessionNotFound,
+      handleStreamingChange,
+    },
+  };
+}
+
+function getInitialPrompt(sessionId: string): string | undefined {
+  try {
+    const prompts = JSON.parse(
+      sessionStorage.get(SessionKey.CHAT_INITIAL_PROMPTS) || "{}",
+    );
+    return prompts[sessionId];
+  } catch {
+    return undefined;
+  }
+}
+
+function setInitialPrompt(sessionId: string, prompt: string): void {
+  try {
+    const prompts = JSON.parse(
+      sessionStorage.get(SessionKey.CHAT_INITIAL_PROMPTS) || "{}",
+    );
+    prompts[sessionId] = prompt;
+    sessionStorage.set(
+      SessionKey.CHAT_INITIAL_PROMPTS,
+      JSON.stringify(prompts),
+    );
+  } catch {
+    // Ignore storage errors
+  }
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/useCopilotSessionId.ts b/autogpt_platform/frontend/src/app/(platform)/copilot/useCopilotSessionId.ts
new file mode 100644
index 0000000000..87f9b7d3ae
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/useCopilotSessionId.ts
@@ -0,0 +1,10 @@
+import { parseAsString, useQueryState } from "nuqs";
+
+export function useCopilotSessionId() {
+  const [urlSessionId, setUrlSessionId] = useQueryState(
+    "sessionId",
+    parseAsString,
+  );
+
+  return { urlSessionId, setUrlSessionId };
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/error.tsx b/autogpt_platform/frontend/src/app/(platform)/error.tsx
index 12ff33f838..6bf7572069 100644
--- a/autogpt_platform/frontend/src/app/(platform)/error.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/error.tsx
@@ -18,7 +18,7 @@ function ErrorPageContent() {
     ) {
       window.location.href = "/login";
     } else {
-      window.location.href = "/marketplace";
+      window.document.location.reload();
     }
   }
 
diff --git a/autogpt_platform/frontend/src/app/(platform)/error/page.tsx b/autogpt_platform/frontend/src/app/(platform)/error/page.tsx
index b7858787cf..3cf68178ad 100644
--- a/autogpt_platform/frontend/src/app/(platform)/error/page.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/error/page.tsx
@@ -25,8 +25,8 @@ function ErrorPageContent() {
         window.location.reload();
       }, 2000);
     } else {
-      // For server/network errors, go to marketplace
-      window.location.href = "/marketplace";
+      // For server/network errors, go to home
+      window.location.href = "/";
     }
   }
 
diff --git a/autogpt_platform/frontend/src/app/(platform)/layout.tsx b/autogpt_platform/frontend/src/app/(platform)/layout.tsx
index 2975e7d097..048110f8b2 100644
--- a/autogpt_platform/frontend/src/app/(platform)/layout.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/layout.tsx
@@ -1,10 +1,12 @@
 import { Navbar } from "@/components/layout/Navbar/Navbar";
-import { AdminImpersonationBanner } from "./admin/components/AdminImpersonationBanner";
+import { NetworkStatusMonitor } from "@/services/network-status/NetworkStatusMonitor";
 import { ReactNode } from "react";
+import { AdminImpersonationBanner } from "./admin/components/AdminImpersonationBanner";
 
 export default function PlatformLayout({ children }: { children: ReactNode }) {
   return (
     <main className="flex h-screen w-full flex-col">
+      <NetworkStatusMonitor />
       <Navbar />
       <AdminImpersonationBanner />
       <section className="flex-1">{children}</section>
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/NewAgentLibraryView.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/NewAgentLibraryView.tsx
index 3768a0d150..b9091584bf 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/NewAgentLibraryView.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/NewAgentLibraryView.tsx
@@ -1,32 +1,31 @@
 "use client";
 
 import { Button } from "@/components/atoms/Button/Button";
+import { PublishAgentModal } from "@/components/contextual/PublishAgentModal/PublishAgentModal";
 import { Breadcrumbs } from "@/components/molecules/Breadcrumbs/Breadcrumbs";
 import { ErrorCard } from "@/components/molecules/ErrorCard/ErrorCard";
 import { cn } from "@/lib/utils";
 import { PlusIcon } from "@phosphor-icons/react";
 import { useEffect, useState } from "react";
-import { RunAgentModal } from "./components/modals/RunAgentModal/RunAgentModal";
-import { useMarketplaceUpdate } from "./hooks/useMarketplaceUpdate";
 import { AgentVersionChangelog } from "./components/AgentVersionChangelog";
-import { MarketplaceBanners } from "@/components/contextual/MarketplaceBanners/MarketplaceBanners";
-import { PublishAgentModal } from "@/components/contextual/PublishAgentModal/PublishAgentModal";
-import { AgentSettingsButton } from "./components/other/AgentSettingsButton";
+import { AgentSettingsModal } from "./components/modals/AgentSettingsModal/AgentSettingsModal";
+import { RunAgentModal } from "./components/modals/RunAgentModal/RunAgentModal";
 import { AgentRunsLoading } from "./components/other/AgentRunsLoading";
 import { EmptySchedules } from "./components/other/EmptySchedules";
 import { EmptyTasks } from "./components/other/EmptyTasks";
 import { EmptyTemplates } from "./components/other/EmptyTemplates";
 import { EmptyTriggers } from "./components/other/EmptyTriggers";
+import { MarketplaceBanners } from "./components/other/MarketplaceBanners";
 import { SectionWrap } from "./components/other/SectionWrap";
 import { LoadingSelectedContent } from "./components/selected-views/LoadingSelectedContent";
 import { SelectedRunView } from "./components/selected-views/SelectedRunView/SelectedRunView";
 import { SelectedScheduleView } from "./components/selected-views/SelectedScheduleView/SelectedScheduleView";
-import { SelectedSettingsView } from "./components/selected-views/SelectedSettingsView/SelectedSettingsView";
 import { SelectedTemplateView } from "./components/selected-views/SelectedTemplateView/SelectedTemplateView";
 import { SelectedTriggerView } from "./components/selected-views/SelectedTriggerView/SelectedTriggerView";
 import { SelectedViewLayout } from "./components/selected-views/SelectedViewLayout";
 import { SidebarRunsList } from "./components/sidebar/SidebarRunsList/SidebarRunsList";
 import { AGENT_LIBRARY_SECTION_PADDING_X } from "./helpers";
+import { useMarketplaceUpdate } from "./hooks/useMarketplaceUpdate";
 import { useNewAgentLibraryView } from "./useNewAgentLibraryView";
 
 export function NewAgentLibraryView() {
@@ -45,7 +44,6 @@ export function NewAgentLibraryView() {
     handleSelectRun,
     handleCountsChange,
     handleClearSelectedRun,
-    handleSelectSettings,
     onRunInitiated,
     onTriggerSetup,
     onScheduleCreated,
@@ -137,13 +135,16 @@ export function NewAgentLibraryView() {
     return (
       <>
         <div className="flex h-full flex-col">
-          <div className="mx-6 pt-4">
-            <Breadcrumbs
-              items={[
-                { name: "My Library", link: "/library" },
-                { name: agent.name, link: `/library/agents/${agentId}` },
-              ]}
-            />
+          <div className="mx-6 flex flex-col gap-4 pt-4">
+            <div className="flex items-center justify-between">
+              <Breadcrumbs
+                items={[
+                  { name: "My Library", link: "/library" },
+                  { name: agent.name, link: `/library/agents/${agentId}` },
+                ]}
+              />
+              <AgentSettingsModal agent={agent} />
+            </div>
           </div>
           <div className="flex min-h-0 flex-1">
             <EmptyTasks
@@ -162,7 +163,7 @@ export function NewAgentLibraryView() {
 
   return (
     <>
-      <div className="mx-4 grid h-full grid-cols-1 gap-0 pt-3 md:ml-4 md:mr-0 md:gap-4 lg:grid-cols-[25%_70%]">
+      <div className="mx-4 grid h-full w-full grid-cols-1 gap-0 pt-3 md:ml-4 md:mr-0 md:gap-4 lg:grid-cols-[25%_70%]">
         <SectionWrap className="mb-3 block">
           <div
             className={cn(
@@ -170,31 +171,24 @@ export function NewAgentLibraryView() {
               AGENT_LIBRARY_SECTION_PADDING_X,
             )}
           >
-            <div className="flex items-center gap-2">
-              <RunAgentModal
-                triggerSlot={
-                  <Button
-                    variant="primary"
-                    size="large"
-                    className="flex-1"
-                    disabled={isTemplateLoading && activeTab === "templates"}
-                  >
-                    <PlusIcon size={20} /> New task
-                  </Button>
-                }
-                agent={agent}
-                onRunCreated={onRunInitiated}
-                onScheduleCreated={onScheduleCreated}
-                onTriggerSetup={onTriggerSetup}
-                initialInputValues={activeTemplate?.inputs}
-                initialInputCredentials={activeTemplate?.credentials}
-              />
-              <AgentSettingsButton
-                agent={agent}
-                onSelectSettings={handleSelectSettings}
-                selected={activeItem === "settings"}
-              />
-            </div>
+            <RunAgentModal
+              triggerSlot={
+                <Button
+                  variant="primary"
+                  size="large"
+                  className="w-full"
+                  disabled={isTemplateLoading && activeTab === "templates"}
+                >
+                  <PlusIcon size={20} /> New task
+                </Button>
+              }
+              agent={agent}
+              onRunCreated={onRunInitiated}
+              onScheduleCreated={onScheduleCreated}
+              onTriggerSetup={onTriggerSetup}
+              initialInputValues={activeTemplate?.inputs}
+              initialInputCredentials={activeTemplate?.credentials}
+            />
           </div>
 
           <SidebarRunsList
@@ -208,12 +202,7 @@ export function NewAgentLibraryView() {
         </SectionWrap>
 
         {activeItem ? (
-          activeItem === "settings" ? (
-            <SelectedSettingsView
-              agent={agent}
-              onClearSelectedRun={handleClearSelectedRun}
-            />
-          ) : activeTab === "scheduled" ? (
+          activeTab === "scheduled" ? (
             <SelectedScheduleView
               agent={agent}
               scheduleId={activeItem}
@@ -246,8 +235,6 @@ export function NewAgentLibraryView() {
               onSelectRun={handleSelectRun}
               onClearSelectedRun={handleClearSelectedRun}
               banner={renderMarketplaceUpdateBanner()}
-              onSelectSettings={handleSelectSettings}
-              selectedSettings={activeItem === "settings"}
             />
           )
         ) : sidebarLoading ? (
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/AgentInputsReadOnly/AgentInputsReadOnly.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/AgentInputsReadOnly/AgentInputsReadOnly.tsx
index bc9918c2bb..88a2be9b34 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/AgentInputsReadOnly/AgentInputsReadOnly.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/AgentInputsReadOnly/AgentInputsReadOnly.tsx
@@ -2,8 +2,9 @@
 
 import type { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";
 import { Text } from "@/components/atoms/Text/Text";
+import { CredentialsInput } from "@/components/contextual/CredentialsInput/CredentialsInput";
+import { isSystemCredential } from "@/components/contextual/CredentialsInput/helpers";
 import type { CredentialsMetaInput } from "@/lib/autogpt-server-api/types";
-import { CredentialsInput } from "../CredentialsInputs/CredentialsInputs";
 import { RunAgentInputs } from "../RunAgentInputs/RunAgentInputs";
 import { getAgentCredentialsFields, getAgentInputFields } from "./helpers";
 
@@ -71,6 +72,7 @@ export function AgentInputsReadOnly({
           {credentialFieldEntries.map(([key, inputSubSchema]) => {
             const credential = credentialInputs![key];
             if (!credential) return null;
+            if (isSystemCredential(credential)) return null;
 
             return (
               <CredentialsInput
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/AgentSettingsModal/AgentSettingsModal.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/AgentSettingsModal/AgentSettingsModal.tsx
new file mode 100644
index 0000000000..de912c5fc3
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/AgentSettingsModal/AgentSettingsModal.tsx
@@ -0,0 +1,114 @@
+"use client";
+
+import { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";
+import { Button } from "@/components/atoms/Button/Button";
+import { Switch } from "@/components/atoms/Switch/Switch";
+import { Text } from "@/components/atoms/Text/Text";
+import { Dialog } from "@/components/molecules/Dialog/Dialog";
+import { useAgentSafeMode } from "@/hooks/useAgentSafeMode";
+import { GearIcon } from "@phosphor-icons/react";
+import { useState } from "react";
+
+interface Props {
+  agent: LibraryAgent;
+  controlledOpen?: boolean;
+  onOpenChange?: (open: boolean) => void;
+}
+
+export function AgentSettingsModal({
+  agent,
+  controlledOpen,
+  onOpenChange,
+}: Props) {
+  const [internalIsOpen, setInternalIsOpen] = useState(false);
+  const isOpen = controlledOpen !== undefined ? controlledOpen : internalIsOpen;
+
+  function setIsOpen(open: boolean) {
+    if (onOpenChange) {
+      onOpenChange(open);
+    } else {
+      setInternalIsOpen(open);
+    }
+  }
+
+  const {
+    currentHITLSafeMode,
+    showHITLToggle,
+    handleHITLToggle,
+    currentSensitiveActionSafeMode,
+    showSensitiveActionToggle,
+    handleSensitiveActionToggle,
+    isPending,
+    shouldShowToggle,
+  } = useAgentSafeMode(agent);
+
+  if (!shouldShowToggle) return null;
+
+  return (
+    <Dialog
+      controlled={{ isOpen, set: setIsOpen }}
+      styling={{ maxWidth: "600px", maxHeight: "90vh" }}
+      title="Agent Settings"
+    >
+      {controlledOpen === undefined && (
+        <Dialog.Trigger>
+          <Button
+            variant="ghost"
+            size="small"
+            className="m-0 min-w-0 rounded-full p-0 px-1"
+            aria-label="Agent Settings"
+          >
+            <GearIcon size={18} className="text-zinc-600" />
+            <Text variant="small">Agent Settings</Text>
+          </Button>
+        </Dialog.Trigger>
+      )}
+      <Dialog.Content>
+        <div className="space-y-6">
+          {showHITLToggle && (
+            <div className="flex w-full flex-col items-start gap-4 rounded-xl border border-zinc-100 bg-white p-6">
+              <div className="flex w-full items-start justify-between gap-4">
+                <div className="flex-1">
+                  <Text variant="large-semibold">
+                    Human-in-the-loop approval
+                  </Text>
+                  <Text variant="large" className="mt-1 text-zinc-900">
+                    The agent will pause at human-in-the-loop blocks and wait
+                    for your review before continuing
+                  </Text>
+                </div>
+                <Switch
+                  checked={currentHITLSafeMode || false}
+                  onCheckedChange={handleHITLToggle}
+                  disabled={isPending}
+                  className="mt-1"
+                />
+              </div>
+            </div>
+          )}
+          {showSensitiveActionToggle && (
+            <div className="flex w-full flex-col items-start gap-4 rounded-xl border border-zinc-100 bg-white p-6">
+              <div className="flex w-full items-start justify-between gap-4">
+                <div className="flex-1">
+                  <Text variant="large-semibold">
+                    Sensitive action approval
+                  </Text>
+                  <Text variant="large" className="mt-1 text-zinc-900">
+                    The agent will pause at sensitive action blocks and wait for
+                    your review before continuing
+                  </Text>
+                </div>
+                <Switch
+                  checked={currentSensitiveActionSafeMode}
+                  onCheckedChange={handleSensitiveActionToggle}
+                  disabled={isPending}
+                  className="mt-1"
+                />
+              </div>
+            </div>
+          )}
+        </div>
+      </Dialog.Content>
+    </Dialog>
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/CredentialsSelect/CredentialsSelect.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/CredentialsSelect/CredentialsSelect.tsx
deleted file mode 100644
index 7adfa5772b..0000000000
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/CredentialsSelect/CredentialsSelect.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@/components/__legacy__/ui/select";
-import { Text } from "@/components/atoms/Text/Text";
-import { CredentialsMetaInput } from "@/lib/autogpt-server-api/types";
-import { useEffect } from "react";
-import { getCredentialDisplayName } from "../../helpers";
-import { CredentialRow } from "../CredentialRow/CredentialRow";
-
-interface Props {
-  credentials: Array<{
-    id: string;
-    title?: string;
-    username?: string;
-    type: string;
-    provider: string;
-  }>;
-  provider: string;
-  displayName: string;
-  selectedCredentials?: CredentialsMetaInput;
-  onSelectCredential: (credentialId: string) => void;
-  readOnly?: boolean;
-}
-
-export function CredentialsSelect({
-  credentials,
-  provider,
-  displayName,
-  selectedCredentials,
-  onSelectCredential,
-  readOnly = false,
-}: Props) {
-  // Auto-select first credential if none is selected
-  useEffect(() => {
-    if (!selectedCredentials && credentials.length > 0) {
-      onSelectCredential(credentials[0].id);
-    }
-  }, [selectedCredentials, credentials, onSelectCredential]);
-
-  return (
-    <div className="mb-4 w-full">
-      <Select
-        value={selectedCredentials?.id || ""}
-        onValueChange={(value) => onSelectCredential(value)}
-      >
-        <SelectTrigger className="h-auto min-h-12 w-full rounded-medium border-zinc-200 p-0 pr-4 shadow-none">
-          {selectedCredentials ? (
-            <SelectValue key={selectedCredentials.id} asChild>
-              <CredentialRow
-                credential={{
-                  id: selectedCredentials.id,
-                  title: selectedCredentials.title || undefined,
-                  type: selectedCredentials.type,
-                  provider: selectedCredentials.provider,
-                }}
-                provider={provider}
-                displayName={displayName}
-                onSelect={() => {}}
-                onDelete={() => {}}
-                readOnly={readOnly}
-                asSelectTrigger={true}
-              />
-            </SelectValue>
-          ) : (
-            <SelectValue key="placeholder" placeholder="Select credential" />
-          )}
-        </SelectTrigger>
-        <SelectContent>
-          {credentials.map((credential) => (
-            <SelectItem key={credential.id} value={credential.id}>
-              <div className="flex items-center gap-2">
-                <Text variant="body" className="tracking-tight">
-                  {getCredentialDisplayName(credential, displayName)}
-                </Text>
-              </div>
-            </SelectItem>
-          ))}
-        </SelectContent>
-      </Select>
-    </div>
-  );
-}
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentInputs/RunAgentInputs.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentInputs/RunAgentInputs.tsx
index d3e6fd9669..72d04d634b 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentInputs/RunAgentInputs.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentInputs/RunAgentInputs.tsx
@@ -68,9 +68,15 @@ export function RunAgentInputs({
           type="number"
           value={value ?? ""}
           placeholder={placeholder || "Enter number"}
-          onChange={(e) =>
-            onChange(Number((e.target as HTMLInputElement).value))
-          }
+          onChange={(e) => {
+            const v = (e.target as HTMLInputElement).value;
+            if (!v || v.trim() === "") {
+              onChange(undefined);
+            } else {
+              const numValue = Number(v);
+              onChange(isNaN(numValue) ? undefined : numValue);
+            }
+          }}
           {...props}
         />
       );
@@ -125,14 +131,32 @@ export function RunAgentInputs({
       );
       break;
 
-    case DataType.DATE:
+    case DataType.DATE: {
+      function normalizeDateValue(val: any): Date | null {
+        if (!val) return null;
+        if (val instanceof Date) {
+          return isNaN(val.getTime()) ? null : val;
+        }
+        if (typeof val === "string") {
+          if (/^\d{4}-\d{2}-\d{2}$/.test(val)) {
+            const [y, m, d] = val.split("-").map(Number);
+            const date = new Date(y, m - 1, d);
+            return isNaN(date.getTime()) ? null : date;
+          }
+          const date = new Date(val);
+          return isNaN(date.getTime()) ? null : date;
+        }
+        return null;
+      }
+
+      const dateValue = normalizeDateValue(value);
       innerInputElement = (
         <DSInput
           id={`${baseId}-date`}
           label={schema.title ?? placeholder ?? "Date"}
           hideLabel
           type="date"
-          value={value ? format(value as Date, "yyyy-MM-dd") : ""}
+          value={dateValue ? format(dateValue, "yyyy-MM-dd") : ""}
           onChange={(e) => {
             const v = (e.target as HTMLInputElement).value;
             if (!v) onChange(undefined);
@@ -146,6 +170,7 @@ export function RunAgentInputs({
         />
       );
       break;
+    }
 
     case DataType.TIME:
       innerInputElement = (
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/RunAgentModal.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/RunAgentModal.tsx
index e53f31a349..aff06d79c5 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/RunAgentModal.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/RunAgentModal.tsx
@@ -12,8 +12,12 @@ import {
   TooltipTrigger,
 } from "@/components/atoms/Tooltip/BaseTooltip";
 import { Dialog } from "@/components/molecules/Dialog/Dialog";
-import { useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { ScheduleAgentModal } from "../ScheduleAgentModal/ScheduleAgentModal";
+import {
+  AIAgentSafetyPopup,
+  useAIAgentSafetyPopup,
+} from "./components/AIAgentSafetyPopup/AIAgentSafetyPopup";
 import { ModalHeader } from "./components/ModalHeader/ModalHeader";
 import { ModalRunSection } from "./components/ModalRunSection/ModalRunSection";
 import { RunActions } from "./components/RunActions/RunActions";
@@ -82,6 +86,18 @@ export function RunAgentModal({
   });
 
   const [isScheduleModalOpen, setIsScheduleModalOpen] = useState(false);
+  const [hasOverflow, setHasOverflow] = useState(false);
+  const [isSafetyPopupOpen, setIsSafetyPopupOpen] = useState(false);
+  const [pendingRunAction, setPendingRunAction] = useState<(() => void) | null>(
+    null,
+  );
+  const contentRef = useRef<HTMLDivElement>(null);
+
+  const { shouldShowPopup, dismissPopup } = useAIAgentSafetyPopup(
+    agent.id,
+    agent.has_sensitive_action,
+    agent.has_human_in_the_loop,
+  );
 
   const hasAnySetupFields =
     Object.keys(agentInputFields || {}).length > 0 ||
@@ -89,6 +105,43 @@ export function RunAgentModal({
 
   const isTriggerRunType = defaultRunType.includes("trigger");
 
+  useEffect(() => {
+    if (!isOpen) return;
+
+    function checkOverflow() {
+      if (!contentRef.current) return;
+      const scrollableParent = contentRef.current
+        .closest("[data-dialog-content]")
+        ?.querySelector('[class*="overflow-y-auto"]');
+      if (scrollableParent) {
+        setHasOverflow(
+          scrollableParent.scrollHeight > scrollableParent.clientHeight,
+        );
+      }
+    }
+
+    const timeoutId = setTimeout(checkOverflow, 100);
+    const resizeObserver = new ResizeObserver(checkOverflow);
+    if (contentRef.current) {
+      const scrollableParent = contentRef.current
+        .closest("[data-dialog-content]")
+        ?.querySelector('[class*="overflow-y-auto"]');
+      if (scrollableParent) {
+        resizeObserver.observe(scrollableParent);
+      }
+    }
+
+    return () => {
+      clearTimeout(timeoutId);
+      resizeObserver.disconnect();
+    };
+  }, [
+    isOpen,
+    hasAnySetupFields,
+    agentInputFields,
+    agentCredentialsInputFields,
+  ]);
+
   function handleInputChange(key: string, value: string) {
     setInputValues((prev) => ({
       ...prev,
@@ -126,6 +179,24 @@ export function RunAgentModal({
     onScheduleCreated?.(schedule);
   }
 
+  function handleRunWithSafetyCheck() {
+    if (shouldShowPopup) {
+      setPendingRunAction(() => handleRun);
+      setIsSafetyPopupOpen(true);
+    } else {
+      handleRun();
+    }
+  }
+
+  function handleSafetyPopupAcknowledge() {
+    setIsSafetyPopupOpen(false);
+    dismissPopup();
+    if (pendingRunAction) {
+      pendingRunAction();
+      setPendingRunAction(null);
+    }
+  }
+
   return (
     <>
       <Dialog
@@ -134,93 +205,105 @@ export function RunAgentModal({
       >
         <Dialog.Trigger>{triggerSlot}</Dialog.Trigger>
         <Dialog.Content>
-          {/* Header */}
-          <ModalHeader agent={agent} />
+          <div ref={contentRef} className="flex min-h-full flex-col">
+            <div className="flex-1">
+              {/* Header */}
+              <ModalHeader agent={agent} />
 
-          {/* Content */}
-          {hasAnySetupFields ? (
-            <div className="mt-10">
-              <RunAgentModalContextProvider
-                value={{
-                  agent,
-                  defaultRunType,
-                  presetName,
-                  setPresetName,
-                  presetDescription,
-                  setPresetDescription,
-                  inputValues,
-                  setInputValue: handleInputChange,
-                  agentInputFields,
-                  inputCredentials,
-                  setInputCredentialsValue: handleCredentialsChange,
-                  agentCredentialsInputFields,
-                }}
-              >
-                <ModalRunSection />
-              </RunAgentModalContextProvider>
+              {/* Content */}
+              {hasAnySetupFields ? (
+                <div className="mt-4 pb-10">
+                  <RunAgentModalContextProvider
+                    value={{
+                      agent,
+                      defaultRunType,
+                      presetName,
+                      setPresetName,
+                      presetDescription,
+                      setPresetDescription,
+                      inputValues,
+                      setInputValue: handleInputChange,
+                      agentInputFields,
+                      inputCredentials,
+                      setInputCredentialsValue: handleCredentialsChange,
+                      agentCredentialsInputFields,
+                    }}
+                  >
+                    <ModalRunSection />
+                  </RunAgentModalContextProvider>
+                </div>
+              ) : null}
             </div>
-          ) : null}
 
-          <Dialog.Footer className="mt-6 bg-white pt-4">
-            <div className="flex items-center justify-end gap-3">
-              {isTriggerRunType ? null : !allRequiredInputsAreSet ? (
-                <TooltipProvider>
-                  <Tooltip>
-                    <TooltipTrigger asChild>
-                      <span>
-                        <Button
-                          variant="secondary"
-                          onClick={handleOpenScheduleModal}
-                          disabled={
-                            isExecuting ||
-                            isSettingUpTrigger ||
-                            !allRequiredInputsAreSet
-                          }
-                        >
-                          Schedule Task
-                        </Button>
-                      </span>
-                    </TooltipTrigger>
-                    <TooltipContent>
-                      <p>
-                        Please set up all required inputs and credentials before
-                        scheduling
-                      </p>
-                    </TooltipContent>
-                  </Tooltip>
-                </TooltipProvider>
-              ) : (
-                <Button
-                  variant="secondary"
-                  onClick={handleOpenScheduleModal}
-                  disabled={
-                    isExecuting ||
-                    isSettingUpTrigger ||
-                    !allRequiredInputsAreSet
-                  }
-                >
-                  Schedule Task
-                </Button>
-              )}
-              <RunActions
-                defaultRunType={defaultRunType}
-                onRun={handleRun}
-                isExecuting={isExecuting}
-                isSettingUpTrigger={isSettingUpTrigger}
-                isRunReady={allRequiredInputsAreSet}
+            <Dialog.Footer
+              className={`sticky bottom-0 z-10 bg-white pt-4 ${
+                hasOverflow
+                  ? "border-t border-neutral-100 shadow-[0_-2px_8px_rgba(0,0,0,0.04)]"
+                  : ""
+              }`}
+            >
+              <div className="flex items-center justify-end gap-3">
+                {isTriggerRunType ? null : !allRequiredInputsAreSet ? (
+                  <TooltipProvider>
+                    <Tooltip>
+                      <TooltipTrigger asChild>
+                        <span>
+                          <Button
+                            variant="secondary"
+                            onClick={handleOpenScheduleModal}
+                            disabled={
+                              isExecuting ||
+                              isSettingUpTrigger ||
+                              !allRequiredInputsAreSet
+                            }
+                          >
+                            Schedule Task
+                          </Button>
+                        </span>
+                      </TooltipTrigger>
+                      <TooltipContent>
+                        <p>
+                          Please set up all required inputs and credentials
+                          before scheduling
+                        </p>
+                      </TooltipContent>
+                    </Tooltip>
+                  </TooltipProvider>
+                ) : (
+                  <Button
+                    variant="secondary"
+                    onClick={handleOpenScheduleModal}
+                    disabled={isExecuting || isSettingUpTrigger}
+                  >
+                    Schedule Task
+                  </Button>
+                )}
+                <RunActions
+                  defaultRunType={defaultRunType}
+                  onRun={handleRunWithSafetyCheck}
+                  isExecuting={isExecuting}
+                  isSettingUpTrigger={isSettingUpTrigger}
+                  isRunReady={allRequiredInputsAreSet}
+                />
+              </div>
+              <ScheduleAgentModal
+                isOpen={isScheduleModalOpen}
+                onClose={handleCloseScheduleModal}
+                agent={agent}
+                inputValues={inputValues}
+                inputCredentials={inputCredentials}
+                onScheduleCreated={handleScheduleCreated}
               />
-            </div>
-            <ScheduleAgentModal
-              isOpen={isScheduleModalOpen}
-              onClose={handleCloseScheduleModal}
-              agent={agent}
-              inputValues={inputValues}
-              inputCredentials={inputCredentials}
-              onScheduleCreated={handleScheduleCreated}
-            />
-          </Dialog.Footer>
+            </Dialog.Footer>
+          </div>
         </Dialog.Content>
       </Dialog>
+
+      <AIAgentSafetyPopup
+        agentId={agent.id}
+        isOpen={isSafetyPopupOpen}
+        onAcknowledge={handleSafetyPopupAcknowledge}
+      />
     </>
   );
 }
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/AIAgentSafetyPopup/AIAgentSafetyPopup.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/AIAgentSafetyPopup/AIAgentSafetyPopup.tsx
new file mode 100644
index 0000000000..f2d178b33d
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/AIAgentSafetyPopup/AIAgentSafetyPopup.tsx
@@ -0,0 +1,108 @@
+"use client";
+
+import { Button } from "@/components/atoms/Button/Button";
+import { Text } from "@/components/atoms/Text/Text";
+import { Dialog } from "@/components/molecules/Dialog/Dialog";
+import { Key, storage } from "@/services/storage/local-storage";
+import { ShieldCheckIcon } from "@phosphor-icons/react";
+import { useCallback, useEffect, useState } from "react";
+
+interface Props {
+  agentId: string;
+  onAcknowledge: () => void;
+  isOpen: boolean;
+}
+
+export function AIAgentSafetyPopup({ agentId, onAcknowledge, isOpen }: Props) {
+  function handleAcknowledge() {
+    // Add this agent to the list of agents for which popup has been shown
+    const seenAgentsJson = storage.get(Key.AI_AGENT_SAFETY_POPUP_SHOWN);
+    const seenAgents: string[] = seenAgentsJson
+      ? JSON.parse(seenAgentsJson)
+      : [];
+
+    if (!seenAgents.includes(agentId)) {
+      seenAgents.push(agentId);
+      storage.set(Key.AI_AGENT_SAFETY_POPUP_SHOWN, JSON.stringify(seenAgents));
+    }
+
+    onAcknowledge();
+  }
+
+  if (!isOpen) return null;
+
+  return (
+    <Dialog
+      controlled={{ isOpen, set: () => {} }}
+      styling={{ maxWidth: "480px" }}
+    >
+      <Dialog.Content>
+        <div className="flex flex-col items-center p-6 text-center">
+          <div className="mb-6 flex h-16 w-16 items-center justify-center rounded-full bg-blue-50">
+            <ShieldCheckIcon
+              weight="fill"
+              size={32}
+              className="text-blue-600"
+            />
+          </div>
+
+          <Text variant="h3" className="mb-4">
+            Safety Checks Enabled
+          </Text>
+
+          <Text variant="body" className="mb-2 text-zinc-700">
+            AI-generated agents may take actions that affect your data or
+            external systems.
+          </Text>
+
+          <Text variant="body" className="mb-8 text-zinc-700">
+            AutoGPT includes safety checks so you&apos;ll always have the
+            opportunity to review and approve sensitive actions before they
+            happen.
+          </Text>
+
+          <Button
+            variant="primary"
+            size="large"
+            className="w-full"
+            onClick={handleAcknowledge}
+          >
+            Got it
+          </Button>
+        </div>
+      </Dialog.Content>
+    </Dialog>
+  );
+}
+
+export function useAIAgentSafetyPopup(
+  agentId: string,
+  hasSensitiveAction: boolean,
+  hasHumanInTheLoop: boolean,
+) {
+  const [shouldShowPopup, setShouldShowPopup] = useState(false);
+  const [hasChecked, setHasChecked] = useState(false);
+
+  useEffect(() => {
+    if (hasChecked) return;
+
+    const seenAgentsJson = storage.get(Key.AI_AGENT_SAFETY_POPUP_SHOWN);
+    const seenAgents: string[] = seenAgentsJson
+      ? JSON.parse(seenAgentsJson)
+      : [];
+    const hasSeenPopupForThisAgent = seenAgents.includes(agentId);
+    const isRelevantAgent = hasSensitiveAction || hasHumanInTheLoop;
+
+    setShouldShowPopup(!hasSeenPopupForThisAgent && isRelevantAgent);
+    setHasChecked(true);
+  }, [agentId, hasSensitiveAction, hasHumanInTheLoop, hasChecked]);
+
+  const dismissPopup = useCallback(() => {
+    setShouldShowPopup(false);
+  }, []);
+
+  return {
+    shouldShowPopup,
+    dismissPopup,
+  };
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/ModalHeader/ModalHeader.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/ModalHeader/ModalHeader.tsx
index 2a31f62f82..b35ab87198 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/ModalHeader/ModalHeader.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/ModalHeader/ModalHeader.tsx
@@ -29,7 +29,7 @@ export function ModalHeader({ agent }: ModalHeaderProps) {
           <ShowMoreText
             previewLimit={400}
             variant="small"
-            className="mt-4 !text-zinc-700"
+            className="mb-2 mt-4 !text-zinc-700"
           >
             {agent.description}
           </ShowMoreText>
@@ -40,6 +40,8 @@ export function ModalHeader({ agent }: ModalHeaderProps) {
             <Text variant="lead-semibold" className="text-blue-600">
               Tip
             </Text>
+            <div className="h-px w-full bg-blue-100" />
+
             <Text variant="body">
               For best results, run this agent{" "}
               {humanizeCronExpression(
@@ -50,7 +52,7 @@ export function ModalHeader({ agent }: ModalHeaderProps) {
         ) : null}
 
         {agent.instructions ? (
-          <div className="flex flex-col gap-4 rounded-medium border border-purple-100 bg-[#F1EBFE/5] p-4">
+          <div className="mt-4 flex flex-col gap-4 rounded-medium border border-purple-100 bg-[#f1ebfe80] p-4">
             <Text variant="lead-semibold" className="text-purple-600">
               Instructions
             </Text>
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/ModalRunSection/ModalRunSection.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/ModalRunSection/ModalRunSection.tsx
index f3b02bfbc9..b3e0c17d74 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/ModalRunSection/ModalRunSection.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/ModalRunSection/ModalRunSection.tsx
@@ -1,6 +1,7 @@
-import { CredentialsInput } from "@/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/CredentialsInputs";
 import { Input } from "@/components/atoms/Input/Input";
+import { CredentialsGroupedView } from "@/components/contextual/CredentialsInput/components/CredentialsGroupedView/CredentialsGroupedView";
 import { InformationTooltip } from "@/components/molecules/InformationTooltip/InformationTooltip";
+import { useMemo } from "react";
 import { RunAgentInputs } from "../../../RunAgentInputs/RunAgentInputs";
 import { useRunAgentModalContext } from "../../context";
 import { ModalSection } from "../ModalSection/ModalSection";
@@ -8,6 +9,7 @@ import { WebhookTriggerBanner } from "../WebhookTriggerBanner/WebhookTriggerBann
 
 export function ModalRunSection() {
   const {
+    agent,
     defaultRunType,
     presetName,
     setPresetName,
@@ -16,13 +18,21 @@ export function ModalRunSection() {
     inputValues,
     setInputValue,
     agentInputFields,
+    agentCredentialsInputFields,
     inputCredentials,
     setInputCredentialsValue,
-    agentCredentialsInputFields,
   } = useRunAgentModalContext();
 
   const inputFields = Object.entries(agentInputFields || {});
-  const credentialFields = Object.entries(agentCredentialsInputFields || {});
+
+  const credentialFields = useMemo(() => {
+    if (!agentCredentialsInputFields) return [];
+    return Object.entries(agentCredentialsInputFields);
+  }, [agentCredentialsInputFields]);
+
+  const requiredCredentials = new Set(
+    (agent.credentials_input_schema?.required as string[]) || [],
+  );
 
   return (
     <div className="flex flex-col gap-4">
@@ -91,26 +101,13 @@ export function ModalRunSection() {
           title="Task Credentials"
           subtitle="These are the credentials the agent will use to perform this task"
         >
-          <div className="space-y-6">
-            {Object.entries(agentCredentialsInputFields || {}).map(
-              ([key, inputSubSchema]) => (
-                <CredentialsInput
-                  key={key}
-                  schema={
-                    { ...inputSubSchema, discriminator: undefined } as any
-                  }
-                  selectedCredentials={
-                    (inputCredentials && inputCredentials[key]) ??
-                    inputSubSchema.default
-                  }
-                  onSelectCredentials={(value) =>
-                    setInputCredentialsValue(key, value)
-                  }
-                  siblingInputs={inputValues}
-                />
-              ),
-            )}
-          </div>
+          <CredentialsGroupedView
+            credentialFields={credentialFields}
+            requiredCredentials={requiredCredentials}
+            inputCredentials={inputCredentials}
+            inputValues={inputValues}
+            onCredentialChange={setInputCredentialsValue}
+          />
         </ModalSection>
       ) : null}
     </div>
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/useAgentRunModal.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/useAgentRunModal.tsx
index b997a33fcf..c867b11098 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/useAgentRunModal.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/useAgentRunModal.tsx
@@ -11,9 +11,18 @@ import { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";
 import { LibraryAgentPreset } from "@/app/api/__generated__/models/libraryAgentPreset";
 import { useToast } from "@/components/molecules/Toast/use-toast";
 import { isEmpty } from "@/lib/utils";
+import { CredentialsProvidersContext } from "@/providers/agent-credentials/credentials-provider";
 import { analytics } from "@/services/analytics";
 import { useQueryClient } from "@tanstack/react-query";
-import { useCallback, useEffect, useMemo, useState } from "react";
+import {
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+import { getSystemCredentials } from "../../../../../../../../../../components/contextual/CredentialsInput/helpers";
 import { showExecutionErrorToast } from "./errorHelpers";
 
 export type RunVariant =
@@ -42,8 +51,10 @@ export function useAgentRunModal(
   const [inputCredentials, setInputCredentials] = useState<Record<string, any>>(
     callbacks?.initialInputCredentials || {},
   );
+
   const [presetName, setPresetName] = useState<string>("");
   const [presetDescription, setPresetDescription] = useState<string>("");
+  const hasInitializedSystemCreds = useRef(false);
 
   // Determine the default run type based on agent capabilities
   const defaultRunType: RunVariant = agent.trigger_setup_info
@@ -58,6 +69,91 @@ export function useAgentRunModal(
     setInputCredentials(callbacks?.initialInputCredentials || {});
   }, [callbacks?.initialInputValues, callbacks?.initialInputCredentials]);
 
+  const allProviders = useContext(CredentialsProvidersContext);
+
+  // Initialize credentials with default system credentials
+  useEffect(() => {
+    if (!allProviders || !agent.credentials_input_schema?.properties) return;
+    if (callbacks?.initialInputCredentials) {
+      hasInitializedSystemCreds.current = true;
+      return;
+    }
+    if (hasInitializedSystemCreds.current) return;
+
+    const properties = agent.credentials_input_schema.properties as Record<
+      string,
+      any
+    >;
+
+    setInputCredentials((currentCreds) => {
+      const credsToAdd: Record<string, any> = {};
+
+      for (const [key, schema] of Object.entries(properties)) {
+        if (currentCreds[key]) continue;
+
+        const providerNames = schema.credentials_provider || [];
+        const supportedTypes = schema.credentials_types || [];
+        const requiredScopes = schema.credentials_scopes;
+
+        for (const providerName of providerNames) {
+          const providerData = allProviders[providerName];
+          if (!providerData) continue;
+
+          const systemCreds = getSystemCredentials(
+            providerData.savedCredentials ?? [],
+          );
+          const matchingSystemCreds = systemCreds.filter((cred) => {
+            if (!supportedTypes.includes(cred.type)) return false;
+
+            if (
+              cred.type === "oauth2" &&
+              requiredScopes &&
+              requiredScopes.length > 0
+            ) {
+              const grantedScopes = new Set(cred.scopes || []);
+              const hasAllRequiredScopes = requiredScopes.every(
+                (scope: string) => grantedScopes.has(scope),
+              );
+              if (!hasAllRequiredScopes) return false;
+            }
+
+            return true;
+          });
+
+          if (matchingSystemCreds.length === 1) {
+            const systemCred = matchingSystemCreds[0];
+            credsToAdd[key] = {
+              id: systemCred.id,
+              type: systemCred.type,
+              provider: providerName,
+              title: systemCred.title,
+            };
+            break;
+          }
+        }
+      }
+
+      if (Object.keys(credsToAdd).length > 0) {
+        hasInitializedSystemCreds.current = true;
+        return {
+          ...currentCreds,
+          ...credsToAdd,
+        };
+      }
+
+      return currentCreds;
+    });
+  }, [
+    allProviders,
+    agent.credentials_input_schema,
+    callbacks?.initialInputCredentials,
+  ]);
+
+  // Reset initialization flag when modal closes/opens or agent changes
+  useEffect(() => {
+    hasInitializedSystemCreds.current = false;
+  }, [isOpen, agent.graph_id]);
+
   // API mutations
   const executeGraphMutation = usePostV1ExecuteGraphAgent({
     mutation: {
@@ -66,7 +162,6 @@ export function useAgentRunModal(
           toast({
             title: "Agent execution started",
           });
-          // Invalidate runs list for this graph
           queryClient.invalidateQueries({
             queryKey: getGetV1ListGraphExecutionsQueryKey(agent.graph_id),
           });
@@ -163,22 +258,23 @@ export function useAgentRunModal(
   }, [agentInputSchema.required, inputValues]);
 
   const [allCredentialsAreSet, missingCredentials] = useMemo(() => {
-    const availableCredentials = new Set(Object.keys(inputCredentials));
-    const allCredentials = new Set(
-      Object.keys(agentCredentialsInputFields || {}) ?? [],
-    );
-    const missing = [...allCredentials].filter(
-      (key) => !availableCredentials.has(key),
+    const requiredCredentials = new Set(
+      (agent.credentials_input_schema?.required as string[]) || [],
     );
+
+    const missing = [...requiredCredentials].filter((key) => {
+      const cred = inputCredentials[key];
+      return !cred || !cred.id;
+    });
+
     return [missing.length === 0, missing];
-  }, [agentCredentialsInputFields, inputCredentials]);
+  }, [agent.credentials_input_schema, inputCredentials]);
 
   const credentialsRequired = useMemo(
     () => Object.keys(agentCredentialsInputFields || {}).length > 0,
     [agentCredentialsInputFields],
   );
 
-  // Final readiness flag combining inputs + credentials when credentials are shown
   const allRequiredInputsAreSet = useMemo(
     () =>
       allRequiredInputsAreSetRaw &&
@@ -217,7 +313,6 @@ export function useAgentRunModal(
       defaultRunType === "automatic-trigger" ||
       defaultRunType === "manual-trigger"
     ) {
-      // Setup trigger
       if (!presetName.trim()) {
         toast({
           title: "⚠️ Trigger name required",
@@ -238,13 +333,16 @@ export function useAgentRunModal(
         },
       });
     } else {
-      // Manual execution
+      const validCredentials = Object.fromEntries(
+        Object.entries(inputCredentials).filter(([_, cred]) => cred && cred.id),
+      );
+
       executeGraphMutation.mutate({
         graphId: agent.graph_id,
         graphVersion: agent.graph_version,
         data: {
           inputs: inputValues,
-          credentials_inputs: inputCredentials,
+          credentials_inputs: validCredentials,
           source: "library",
         },
       });
@@ -268,41 +366,24 @@ export function useAgentRunModal(
   }, [agentInputFields]);
 
   return {
-    // UI state
     isOpen,
     setIsOpen,
-
-    // Run mode
     defaultRunType: defaultRunType as RunVariant,
-
-    // Form: regular inputs
     inputValues,
     setInputValues,
-
-    // Form: credentials
     inputCredentials,
     setInputCredentials,
-
-    // Preset/trigger labels
     presetName,
     presetDescription,
     setPresetName,
     setPresetDescription,
-
-    // Validation/readiness
     allRequiredInputsAreSet,
     missingInputs,
-
-    // Schemas for rendering
     agentInputFields,
     agentCredentialsInputFields,
     hasInputFields,
-
-    // Async states
     isExecuting: executeGraphMutation.isPending,
     isSettingUpTrigger: setupTriggerMutation.isPending,
-
-    // Actions
     handleRun,
   };
 }
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/AgentSettingsButton.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/AgentSettingsButton.tsx
index 11dcbd943f..95fdf826a2 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/AgentSettingsButton.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/AgentSettingsButton.tsx
@@ -1,37 +1,17 @@
 import { Button } from "@/components/atoms/Button/Button";
+import { Text } from "@/components/atoms/Text/Text";
 import { GearIcon } from "@phosphor-icons/react";
-import { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";
-import { useAgentSafeMode } from "@/hooks/useAgentSafeMode";
-
-interface Props {
-  agent: LibraryAgent;
-  onSelectSettings: () => void;
-  selected?: boolean;
-}
-
-export function AgentSettingsButton({
-  agent,
-  onSelectSettings,
-  selected,
-}: Props) {
-  const { hasHITLBlocks } = useAgentSafeMode(agent);
-
-  if (!hasHITLBlocks) {
-    return null;
-  }
 
+export function AgentSettingsButton() {
   return (
     <Button
-      variant={selected ? "secondary" : "ghost"}
+      variant="ghost"
       size="small"
       className="m-0 min-w-0 rounded-full p-0 px-1"
-      onClick={onSelectSettings}
       aria-label="Agent Settings"
     >
-      <GearIcon
-        size={18}
-        className={selected ? "text-zinc-900" : "text-zinc-600"}
-      />
+      <GearIcon size={18} className="text-zinc-600" />
+      <Text variant="small">Agent Settings</Text>
     </Button>
   );
 }
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/EmptySchedules.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/EmptySchedules.tsx
index 97492d8a59..4c781b2896 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/EmptySchedules.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/EmptySchedules.tsx
@@ -1,3 +1,5 @@
+"use client";
+
 import { Text } from "@/components/atoms/Text/Text";
 
 export function EmptySchedules() {
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/EmptyTasks.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/EmptyTasks.tsx
index 3446611827..5ac3745bd4 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/EmptyTasks.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/EmptyTasks.tsx
@@ -1,17 +1,25 @@
 "use client";
 
 import { getV1GetGraphVersion } from "@/app/api/__generated__/endpoints/graphs/graphs";
+import {
+  getGetV2ListLibraryAgentsQueryKey,
+  useDeleteV2DeleteLibraryAgent,
+} from "@/app/api/__generated__/endpoints/library/library";
 import { GraphExecutionJobInfo } from "@/app/api/__generated__/models/graphExecutionJobInfo";
 import { GraphExecutionMeta } from "@/app/api/__generated__/models/graphExecutionMeta";
 import { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";
 import { LibraryAgentPreset } from "@/app/api/__generated__/models/libraryAgentPreset";
 import { Button } from "@/components/atoms/Button/Button";
 import { Text } from "@/components/atoms/Text/Text";
+import { Dialog } from "@/components/molecules/Dialog/Dialog";
 import { ShowMoreText } from "@/components/molecules/ShowMoreText/ShowMoreText";
 import { useToast } from "@/components/molecules/Toast/use-toast";
 import { exportAsJSONFile } from "@/lib/utils";
 import { formatDate } from "@/lib/utils/time";
+import { useQueryClient } from "@tanstack/react-query";
 import Link from "next/link";
+import { useRouter } from "next/navigation";
+import { useState } from "react";
 import { RunAgentModal } from "../modals/RunAgentModal/RunAgentModal";
 import { RunDetailCard } from "../selected-views/RunDetailCard/RunDetailCard";
 import { EmptyTasksIllustration } from "./EmptyTasksIllustration";
@@ -30,6 +38,41 @@ export function EmptyTasks({
   onScheduleCreated,
 }: Props) {
   const { toast } = useToast();
+  const queryClient = useQueryClient();
+  const router = useRouter();
+  const [showDeleteDialog, setShowDeleteDialog] = useState(false);
+  const [isDeletingAgent, setIsDeletingAgent] = useState(false);
+
+  const { mutateAsync: deleteAgent } = useDeleteV2DeleteLibraryAgent();
+
+  async function handleDeleteAgent() {
+    if (!agent.id) return;
+
+    setIsDeletingAgent(true);
+
+    try {
+      await deleteAgent({ libraryAgentId: agent.id });
+
+      await queryClient.refetchQueries({
+        queryKey: getGetV2ListLibraryAgentsQueryKey(),
+      });
+
+      toast({ title: "Agent deleted" });
+      setShowDeleteDialog(false);
+      router.push("/library");
+    } catch (error: unknown) {
+      toast({
+        title: "Failed to delete agent",
+        description:
+          error instanceof Error
+            ? error.message
+            : "An unexpected error occurred.",
+        variant: "destructive",
+      });
+    } finally {
+      setIsDeletingAgent(false);
+    }
+  }
 
   async function handleExport() {
     try {
@@ -147,9 +190,50 @@ export function EmptyTasks({
             <Button variant="secondary" size="small" onClick={handleExport}>
               Export agent to file
             </Button>
+            <Button
+              variant="secondary"
+              size="small"
+              onClick={() => setShowDeleteDialog(true)}
+            >
+              Delete agent
+            </Button>
           </div>
         </div>
       </div>
+
+      <Dialog
+        controlled={{
+          isOpen: showDeleteDialog,
+          set: setShowDeleteDialog,
+        }}
+        styling={{ maxWidth: "32rem" }}
+        title="Delete agent"
+      >
+        <Dialog.Content>
+          <div>
+            <Text variant="large">
+              Are you sure you want to delete this agent? This action cannot be
+              undone.
+            </Text>
+            <Dialog.Footer>
+              <Button
+                variant="secondary"
+                disabled={isDeletingAgent}
+                onClick={() => setShowDeleteDialog(false)}
+              >
+                Cancel
+              </Button>
+              <Button
+                variant="destructive"
+                onClick={handleDeleteAgent}
+                loading={isDeletingAgent}
+              >
+                Delete Agent
+              </Button>
+            </Dialog.Footer>
+          </div>
+        </Dialog.Content>
+      </Dialog>
     </div>
   );
 }
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/EmptyTemplates.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/EmptyTemplates.tsx
index c33abe69ad..364b762167 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/EmptyTemplates.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/EmptyTemplates.tsx
@@ -1,3 +1,5 @@
+"use client";
+
 import { Text } from "@/components/atoms/Text/Text";
 
 export function EmptyTemplates() {
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/EmptyTriggers.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/EmptyTriggers.tsx
index 0d9dc47fff..06d09ff9a0 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/EmptyTriggers.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/EmptyTriggers.tsx
@@ -1,3 +1,5 @@
+"use client";
+
 import { Text } from "@/components/atoms/Text/Text";
 
 export function EmptyTriggers() {
diff --git a/autogpt_platform/frontend/src/components/contextual/MarketplaceBanners/MarketplaceBanners.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/MarketplaceBanners.tsx
similarity index 97%
rename from autogpt_platform/frontend/src/components/contextual/MarketplaceBanners/MarketplaceBanners.tsx
rename to autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/MarketplaceBanners.tsx
index 4f826f6e85..00edcc721f 100644
--- a/autogpt_platform/frontend/src/components/contextual/MarketplaceBanners/MarketplaceBanners.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/MarketplaceBanners.tsx
@@ -3,7 +3,7 @@
 import { Button } from "@/components/atoms/Button/Button";
 import { Text } from "@/components/atoms/Text/Text";
 
-interface MarketplaceBannersProps {
+interface Props {
   hasUpdate?: boolean;
   latestVersion?: number;
   hasUnpublishedChanges?: boolean;
@@ -21,7 +21,7 @@ export function MarketplaceBanners({
   isUpdating,
   onUpdate,
   onPublish,
-}: MarketplaceBannersProps) {
+}: Props) {
   const renderUpdateBanner = () => {
     if (hasUpdate && latestVersion) {
       return (
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/SectionWrap.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/SectionWrap.tsx
index 75571dd856..f88d91bb0d 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/SectionWrap.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/SectionWrap.tsx
@@ -1,3 +1,5 @@
+"use client";
+
 import { cn } from "@/lib/utils";
 
 type Props = {
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/LoadingSelectedContent.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/LoadingSelectedContent.tsx
index dc2bb7cac2..bc5548afd0 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/LoadingSelectedContent.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/LoadingSelectedContent.tsx
@@ -1,22 +1,16 @@
+import { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";
 import { Skeleton } from "@/components/__legacy__/ui/skeleton";
 import { cn } from "@/lib/utils";
-import { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";
 import { AGENT_LIBRARY_SECTION_PADDING_X } from "../../helpers";
 import { SelectedViewLayout } from "./SelectedViewLayout";
 
 interface Props {
   agent: LibraryAgent;
-  onSelectSettings?: () => void;
-  selectedSettings?: boolean;
 }
 
 export function LoadingSelectedContent(props: Props) {
   return (
-    <SelectedViewLayout
-      agent={props.agent}
-      onSelectSettings={props.onSelectSettings}
-      selectedSettings={props.selectedSettings}
-    >
+    <SelectedViewLayout agent={props.agent}>
       <div
         className={cn("flex flex-col gap-4", AGENT_LIBRARY_SECTION_PADDING_X)}
       >
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/OutputRenderers/renderers/CodeRenderer.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/OutputRenderers/renderers/CodeRenderer.tsx
index 93df7d8ddd..a204890a3a 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/OutputRenderers/renderers/CodeRenderer.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/OutputRenderers/renderers/CodeRenderer.tsx
@@ -83,7 +83,9 @@ function renderCode(
         </div>
       )}
       <pre className="overflow-x-auto rounded-md bg-muted p-3">
-        <code className="font-mono text-sm">{codeValue}</code>
+        <code className="whitespace-pre-wrap break-words font-mono text-sm">
+          {codeValue}
+        </code>
       </pre>
     </div>
   );
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedRunView/SelectedRunView.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedRunView/SelectedRunView.tsx
index c66f0e9245..05da986583 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedRunView/SelectedRunView.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedRunView/SelectedRunView.tsx
@@ -33,8 +33,6 @@ interface Props {
   onSelectRun?: (id: string) => void;
   onClearSelectedRun?: () => void;
   banner?: React.ReactNode;
-  onSelectSettings?: () => void;
-  selectedSettings?: boolean;
 }
 
 export function SelectedRunView({
@@ -43,8 +41,6 @@ export function SelectedRunView({
   onSelectRun,
   onClearSelectedRun,
   banner,
-  onSelectSettings,
-  selectedSettings,
 }: Props) {
   const { run, preset, isLoading, responseError, httpError } =
     useSelectedRunView(agent.graph_id, runId);
@@ -84,12 +80,7 @@ export function SelectedRunView({
   return (
     <div className="flex h-full w-full gap-4">
       <div className="flex min-h-0 min-w-0 flex-1 flex-col">
-        <SelectedViewLayout
-          agent={agent}
-          banner={banner}
-          onSelectSettings={onSelectSettings}
-          selectedSettings={selectedSettings}
-        >
+        <SelectedViewLayout agent={agent} banner={banner}>
           <div className="flex flex-col gap-4">
             <RunDetailHeader agent={agent} run={run} />
 
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedRunView/components/RunOutputs.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedRunView/components/RunOutputs.tsx
index 20e218abb2..9824283c40 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedRunView/components/RunOutputs.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedRunView/components/RunOutputs.tsx
@@ -3,12 +3,12 @@
 import type {
   OutputMetadata,
   OutputRenderer,
-} from "@/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/OutputRenderers";
+} from "@/components/contextual/OutputRenderers";
 import {
   globalRegistry,
   OutputActions,
   OutputItem,
-} from "@/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/OutputRenderers";
+} from "@/components/contextual/OutputRenderers";
 import React, { useMemo } from "react";
 
 type OutputsRecord = Record<string, Array<unknown>>;
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedRunView/components/SafeModeToggle.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedRunView/components/SafeModeToggle.tsx
index 9ba37d8d17..0fafa67414 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedRunView/components/SafeModeToggle.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedRunView/components/SafeModeToggle.tsx
@@ -5,48 +5,104 @@ import { Graph } from "@/lib/autogpt-server-api/types";
 import { cn } from "@/lib/utils";
 import { ShieldCheckIcon, ShieldIcon } from "@phosphor-icons/react";
 import { useAgentSafeMode } from "@/hooks/useAgentSafeMode";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "@/components/atoms/Tooltip/BaseTooltip";
 
 interface Props {
   graph: GraphModel | LibraryAgent | Graph;
   className?: string;
-  fullWidth?: boolean;
 }
 
-export function SafeModeToggle({ graph }: Props) {
+interface SafeModeIconButtonProps {
+  isEnabled: boolean;
+  label: string;
+  tooltipEnabled: string;
+  tooltipDisabled: string;
+  onToggle: () => void;
+  isPending: boolean;
+}
+
+function SafeModeIconButton({
+  isEnabled,
+  label,
+  tooltipEnabled,
+  tooltipDisabled,
+  onToggle,
+  isPending,
+}: SafeModeIconButtonProps) {
+  return (
+    <Tooltip delayDuration={100}>
+      <TooltipTrigger asChild>
+        <Button
+          variant="icon"
+          size="icon"
+          aria-label={`${label}: ${isEnabled ? "ON" : "OFF"}. ${isEnabled ? tooltipEnabled : tooltipDisabled}`}
+          onClick={onToggle}
+          disabled={isPending}
+          className={cn(isPending ? "opacity-0" : "opacity-100")}
+        >
+          {isEnabled ? (
+            <ShieldCheckIcon weight="bold" size={16} />
+          ) : (
+            <ShieldIcon weight="bold" size={16} />
+          )}
+        </Button>
+      </TooltipTrigger>
+      <TooltipContent>
+        <div className="text-center">
+          <div className="font-medium">
+            {label}: {isEnabled ? "ON" : "OFF"}
+          </div>
+          <div className="mt-1 text-xs text-muted-foreground">
+            {isEnabled ? tooltipEnabled : tooltipDisabled}
+          </div>
+        </div>
+      </TooltipContent>
+    </Tooltip>
+  );
+}
+
+export function SafeModeToggle({ graph, className }: Props) {
   const {
-    currentSafeMode,
+    currentHITLSafeMode,
+    showHITLToggle,
+    handleHITLToggle,
+    currentSensitiveActionSafeMode,
+    showSensitiveActionToggle,
+    handleSensitiveActionToggle,
     isPending,
     shouldShowToggle,
-    isStateUndetermined,
-    handleToggle,
   } = useAgentSafeMode(graph);
 
-  if (!shouldShowToggle || isStateUndetermined) {
+  if (!shouldShowToggle) {
     return null;
   }
 
   return (
-    <Button
-      variant="icon"
-      key={graph.id}
-      size="icon"
-      aria-label={
-        currentSafeMode!
-          ? "Safe Mode: ON. Human in the loop blocks require manual review"
-          : "Safe Mode: OFF. Human in the loop blocks proceed automatically"
-      }
-      onClick={handleToggle}
-      className={cn(isPending ? "opacity-0" : "opacity-100")}
-    >
-      {currentSafeMode! ? (
-        <>
-          <ShieldCheckIcon weight="bold" size={16} />
-        </>
-      ) : (
-        <>
-          <ShieldIcon weight="bold" size={16} />
-        </>
+    <div className={cn("flex gap-1", className)}>
+      {showHITLToggle && (
+        <SafeModeIconButton
+          isEnabled={currentHITLSafeMode}
+          label="Human-in-the-loop"
+          tooltipEnabled="The agent will pause at human-in-the-loop blocks and wait for your approval"
+          tooltipDisabled="Human-in-the-loop blocks will proceed automatically"
+          onToggle={handleHITLToggle}
+          isPending={isPending}
+        />
       )}
-    </Button>
+      {showSensitiveActionToggle && (
+        <SafeModeIconButton
+          isEnabled={currentSensitiveActionSafeMode}
+          label="Sensitive actions"
+          tooltipEnabled="The agent will pause at sensitive action blocks and wait for your approval"
+          tooltipDisabled="Sensitive action blocks will proceed automatically"
+          onToggle={handleSensitiveActionToggle}
+          isPending={isPending}
+        />
+      )}
+    </div>
   );
 }
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedScheduleView/SelectedScheduleView.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedScheduleView/SelectedScheduleView.tsx
index 4cc6d8c5b0..e0a81dba5f 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedScheduleView/SelectedScheduleView.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedScheduleView/SelectedScheduleView.tsx
@@ -13,7 +13,7 @@ import { LoadingSelectedContent } from "../LoadingSelectedContent";
 import { RunDetailCard } from "../RunDetailCard/RunDetailCard";
 import { RunDetailHeader } from "../RunDetailHeader/RunDetailHeader";
 import { SelectedViewLayout } from "../SelectedViewLayout";
-import { SelectedScheduleActions } from "./components/SelectedScheduleActions";
+import { SelectedScheduleActions } from "./components/SelectedScheduleActions/SelectedScheduleActions";
 import { useSelectedScheduleView } from "./useSelectedScheduleView";
 
 interface Props {
@@ -21,8 +21,6 @@ interface Props {
   scheduleId: string;
   onClearSelectedRun?: () => void;
   banner?: React.ReactNode;
-  onSelectSettings?: () => void;
-  selectedSettings?: boolean;
 }
 
 export function SelectedScheduleView({
@@ -30,8 +28,6 @@ export function SelectedScheduleView({
   scheduleId,
   onClearSelectedRun,
   banner,
-  onSelectSettings,
-  selectedSettings,
 }: Props) {
   const { schedule, isLoading, error } = useSelectedScheduleView(
     agent.graph_id,
@@ -76,12 +72,7 @@ export function SelectedScheduleView({
   return (
     <div className="flex h-full w-full gap-4">
       <div className="flex min-h-0 min-w-0 flex-1 flex-col">
-        <SelectedViewLayout
-          agent={agent}
-          banner={banner}
-          onSelectSettings={onSelectSettings}
-          selectedSettings={selectedSettings}
-        >
+        <SelectedViewLayout agent={agent} banner={banner}>
           <div className="flex flex-col gap-4">
             <div className="flex w-full flex-col gap-0">
               <RunDetailHeader
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedScheduleView/components/SelectedScheduleActions.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedScheduleView/components/SelectedScheduleActions.tsx
deleted file mode 100644
index 0fd34851fd..0000000000
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedScheduleView/components/SelectedScheduleActions.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";
-import { Button } from "@/components/atoms/Button/Button";
-import { EyeIcon } from "@phosphor-icons/react";
-import { AgentActionsDropdown } from "../../AgentActionsDropdown";
-import { useScheduleDetailHeader } from "../../RunDetailHeader/useScheduleDetailHeader";
-import { SelectedActionsWrap } from "../../SelectedActionsWrap";
-
-type Props = {
-  agent: LibraryAgent;
-  scheduleId: string;
-  onDeleted?: () => void;
-};
-
-export function SelectedScheduleActions({ agent, scheduleId }: Props) {
-  const { openInBuilderHref } = useScheduleDetailHeader(
-    agent.graph_id,
-    scheduleId,
-    agent.graph_version,
-  );
-
-  return (
-    <>
-      <SelectedActionsWrap>
-        {openInBuilderHref && (
-          <Button
-            variant="icon"
-            size="icon"
-            as="NextLink"
-            href={openInBuilderHref}
-            target="_blank"
-            aria-label="View scheduled task details"
-          >
-            <EyeIcon weight="bold" size={18} className="text-zinc-700" />
-          </Button>
-        )}
-        <AgentActionsDropdown agent={agent} scheduleId={scheduleId} />
-      </SelectedActionsWrap>
-    </>
-  );
-}
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedScheduleView/components/SelectedScheduleActions/SelectedScheduleActions.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedScheduleView/components/SelectedScheduleActions/SelectedScheduleActions.tsx
new file mode 100644
index 0000000000..9088cb112b
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedScheduleView/components/SelectedScheduleActions/SelectedScheduleActions.tsx
@@ -0,0 +1,96 @@
+"use client";
+
+import { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";
+import { Button } from "@/components/atoms/Button/Button";
+import { LoadingSpinner } from "@/components/atoms/LoadingSpinner/LoadingSpinner";
+import { Text } from "@/components/atoms/Text/Text";
+import { Dialog } from "@/components/molecules/Dialog/Dialog";
+import { EyeIcon, TrashIcon } from "@phosphor-icons/react";
+import { AgentActionsDropdown } from "../../../AgentActionsDropdown";
+import { SelectedActionsWrap } from "../../../SelectedActionsWrap";
+import { useSelectedScheduleActions } from "./useSelectedScheduleActions";
+
+type Props = {
+  agent: LibraryAgent;
+  scheduleId: string;
+  onDeleted?: () => void;
+};
+
+export function SelectedScheduleActions({
+  agent,
+  scheduleId,
+  onDeleted,
+}: Props) {
+  const {
+    openInBuilderHref,
+    showDeleteDialog,
+    setShowDeleteDialog,
+    handleDelete,
+    isDeleting,
+  } = useSelectedScheduleActions({ agent, scheduleId, onDeleted });
+
+  return (
+    <>
+      <SelectedActionsWrap>
+        {openInBuilderHref && (
+          <Button
+            variant="icon"
+            size="icon"
+            as="NextLink"
+            href={openInBuilderHref}
+            target="_blank"
+            aria-label="View scheduled task details"
+          >
+            <EyeIcon weight="bold" size={18} className="text-zinc-700" />
+          </Button>
+        )}
+        <Button
+          variant="icon"
+          size="icon"
+          aria-label="Delete schedule"
+          onClick={() => setShowDeleteDialog(true)}
+          disabled={isDeleting}
+        >
+          {isDeleting ? (
+            <LoadingSpinner size="small" />
+          ) : (
+            <TrashIcon weight="bold" size={18} />
+          )}
+        </Button>
+        <AgentActionsDropdown agent={agent} scheduleId={scheduleId} />
+      </SelectedActionsWrap>
+
+      <Dialog
+        controlled={{
+          isOpen: showDeleteDialog,
+          set: setShowDeleteDialog,
+        }}
+        styling={{ maxWidth: "32rem" }}
+        title="Delete schedule"
+      >
+        <Dialog.Content>
+          <Text variant="large">
+            Are you sure you want to delete this schedule? This action cannot be
+            undone.
+          </Text>
+          <Dialog.Footer>
+            <Button
+              variant="secondary"
+              onClick={() => setShowDeleteDialog(false)}
+              disabled={isDeleting}
+            >
+              Cancel
+            </Button>
+            <Button
+              variant="destructive"
+              onClick={handleDelete}
+              loading={isDeleting}
+            >
+              Delete Schedule
+            </Button>
+          </Dialog.Footer>
+        </Dialog.Content>
+      </Dialog>
+    </>
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedScheduleView/components/SelectedScheduleActions/useSelectedScheduleActions.ts b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedScheduleView/components/SelectedScheduleActions/useSelectedScheduleActions.ts
new file mode 100644
index 0000000000..1e22b764eb
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedScheduleView/components/SelectedScheduleActions/useSelectedScheduleActions.ts
@@ -0,0 +1,65 @@
+"use client";
+
+import {
+  getGetV1ListExecutionSchedulesForAGraphQueryOptions,
+  useDeleteV1DeleteExecutionSchedule,
+} from "@/app/api/__generated__/endpoints/schedules/schedules";
+import { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";
+import { useToast } from "@/components/molecules/Toast/use-toast";
+import { useQueryClient } from "@tanstack/react-query";
+import { useState } from "react";
+
+interface UseSelectedScheduleActionsProps {
+  agent: LibraryAgent;
+  scheduleId: string;
+  onDeleted?: () => void;
+}
+
+export function useSelectedScheduleActions({
+  agent,
+  scheduleId,
+  onDeleted,
+}: UseSelectedScheduleActionsProps) {
+  const { toast } = useToast();
+  const queryClient = useQueryClient();
+  const [showDeleteDialog, setShowDeleteDialog] = useState(false);
+
+  const deleteMutation = useDeleteV1DeleteExecutionSchedule({
+    mutation: {
+      onSuccess: () => {
+        toast({ title: "Schedule deleted" });
+        queryClient.invalidateQueries({
+          queryKey: getGetV1ListExecutionSchedulesForAGraphQueryOptions(
+            agent.graph_id,
+          ).queryKey,
+        });
+        setShowDeleteDialog(false);
+        onDeleted?.();
+      },
+      onError: (error: unknown) =>
+        toast({
+          title: "Failed to delete schedule",
+          description:
+            error instanceof Error
+              ? error.message
+              : "An unexpected error occurred.",
+          variant: "destructive",
+        }),
+    },
+  });
+
+  function handleDelete() {
+    if (!scheduleId) return;
+    deleteMutation.mutate({ scheduleId });
+  }
+
+  const openInBuilderHref = `/build?flowID=${agent.graph_id}&flowVersion=${agent.graph_version}`;
+
+  return {
+    openInBuilderHref,
+    showDeleteDialog,
+    setShowDeleteDialog,
+    handleDelete,
+    isDeleting: deleteMutation.isPending,
+  };
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedSettingsView/SelectedSettingsView.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedSettingsView/SelectedSettingsView.tsx
index 68622458f6..530d24529f 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedSettingsView/SelectedSettingsView.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedSettingsView/SelectedSettingsView.tsx
@@ -1,11 +1,11 @@
 import { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";
-import { Text } from "@/components/atoms/Text/Text";
-import { Switch } from "@/components/atoms/Switch/Switch";
 import { Button } from "@/components/atoms/Button/Button";
-import { ArrowLeftIcon } from "@phosphor-icons/react";
+import { Switch } from "@/components/atoms/Switch/Switch";
+import { Text } from "@/components/atoms/Text/Text";
 import { useAgentSafeMode } from "@/hooks/useAgentSafeMode";
-import { SelectedViewLayout } from "../SelectedViewLayout";
+import { ArrowLeftIcon } from "@phosphor-icons/react";
 import { AGENT_LIBRARY_SECTION_PADDING_X } from "../../../helpers";
+import { SelectedViewLayout } from "../SelectedViewLayout";
 
 interface Props {
   agent: LibraryAgent;
@@ -13,11 +13,19 @@ interface Props {
 }
 
 export function SelectedSettingsView({ agent, onClearSelectedRun }: Props) {
-  const { currentSafeMode, isPending, hasHITLBlocks, handleToggle } =
-    useAgentSafeMode(agent);
+  const {
+    currentHITLSafeMode,
+    showHITLToggle,
+    handleHITLToggle,
+    currentSensitiveActionSafeMode,
+    showSensitiveActionToggle,
+    handleSensitiveActionToggle,
+    isPending,
+    shouldShowToggle,
+  } = useAgentSafeMode(agent);
 
   return (
-    <SelectedViewLayout agent={agent} onSelectSettings={() => {}}>
+    <SelectedViewLayout agent={agent}>
       <div className="flex flex-col gap-4">
         <div
           className={`${AGENT_LIBRARY_SECTION_PADDING_X} mb-8 flex items-center gap-3`}
@@ -33,32 +41,58 @@ export function SelectedSettingsView({ agent, onClearSelectedRun }: Props) {
           <Text variant="h2">Agent Settings</Text>
         </div>
 
-        <div className={AGENT_LIBRARY_SECTION_PADDING_X}>
-          {!hasHITLBlocks ? (
+        <div className={`${AGENT_LIBRARY_SECTION_PADDING_X} space-y-6`}>
+          {shouldShowToggle ? (
+            <>
+              {showHITLToggle && (
+                <div className="flex w-full max-w-2xl flex-col items-start gap-4 rounded-xl border border-zinc-100 bg-white p-6">
+                  <div className="flex w-full items-start justify-between gap-4">
+                    <div className="flex-1">
+                      <Text variant="large-semibold">
+                        Human-in-the-loop approval
+                      </Text>
+                      <Text variant="large" className="mt-1 text-zinc-900">
+                        The agent will pause at human-in-the-loop blocks and
+                        wait for your review before continuing
+                      </Text>
+                    </div>
+                    <Switch
+                      checked={currentHITLSafeMode || false}
+                      onCheckedChange={handleHITLToggle}
+                      disabled={isPending}
+                      className="mt-1"
+                    />
+                  </div>
+                </div>
+              )}
+              {showSensitiveActionToggle && (
+                <div className="flex w-full max-w-2xl flex-col items-start gap-4 rounded-xl border border-zinc-100 bg-white p-6">
+                  <div className="flex w-full items-start justify-between gap-4">
+                    <div className="flex-1">
+                      <Text variant="large-semibold">
+                        Sensitive action approval
+                      </Text>
+                      <Text variant="large" className="mt-1 text-zinc-900">
+                        The agent will pause at sensitive action blocks and wait
+                        for your review before continuing
+                      </Text>
+                    </div>
+                    <Switch
+                      checked={currentSensitiveActionSafeMode}
+                      onCheckedChange={handleSensitiveActionToggle}
+                      disabled={isPending}
+                      className="mt-1"
+                    />
+                  </div>
+                </div>
+              )}
+            </>
+          ) : (
             <div className="rounded-xl border border-zinc-100 bg-white p-6">
               <Text variant="body" className="text-muted-foreground">
-                This agent doesn&apos;t have any human-in-the-loop blocks, so
-                there are no settings to configure.
+                This agent doesn&apos;t have any configurable settings.
               </Text>
             </div>
-          ) : (
-            <div className="flex w-full max-w-2xl flex-col items-start gap-4 rounded-xl border border-zinc-100 bg-white p-6">
-              <div className="flex w-full items-start justify-between gap-4">
-                <div className="flex-1">
-                  <Text variant="large-semibold">Require human approval</Text>
-                  <Text variant="large" className="mt-1 text-zinc-900">
-                    The agent will pause and wait for your review before
-                    continuing
-                  </Text>
-                </div>
-                <Switch
-                  checked={currentSafeMode || false}
-                  onCheckedChange={handleToggle}
-                  disabled={isPending}
-                  className="mt-1"
-                />
-              </div>
-            </div>
           )}
         </div>
       </div>
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedTemplateView/SelectedTemplateView.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedTemplateView/SelectedTemplateView.tsx
index b5ecb7ae5c..bc411d37e6 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedTemplateView/SelectedTemplateView.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedTemplateView/SelectedTemplateView.tsx
@@ -4,11 +4,11 @@ import type { GraphExecutionMeta } from "@/app/api/__generated__/models/graphExe
 import type { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";
 import { Input } from "@/components/atoms/Input/Input";
 import { ErrorCard } from "@/components/molecules/ErrorCard/ErrorCard";
+import { CredentialsInput } from "../../../../../../../../../../components/contextual/CredentialsInput/CredentialsInput";
 import {
   getAgentCredentialsFields,
   getAgentInputFields,
 } from "../../modals/AgentInputsReadOnly/helpers";
-import { CredentialsInput } from "../../modals/CredentialsInputs/CredentialsInputs";
 import { RunAgentInputs } from "../../modals/RunAgentInputs/RunAgentInputs";
 import { LoadingSelectedContent } from "../LoadingSelectedContent";
 import { RunDetailCard } from "../RunDetailCard/RunDetailCard";
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedTriggerView/SelectedTriggerView.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedTriggerView/SelectedTriggerView.tsx
index f92c91112e..74dfbd12c2 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedTriggerView/SelectedTriggerView.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedTriggerView/SelectedTriggerView.tsx
@@ -2,12 +2,12 @@
 
 import type { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";
 import { Input } from "@/components/atoms/Input/Input";
+import { CredentialsInput } from "@/components/contextual/CredentialsInput/CredentialsInput";
 import { ErrorCard } from "@/components/molecules/ErrorCard/ErrorCard";
 import {
   getAgentCredentialsFields,
   getAgentInputFields,
 } from "../../modals/AgentInputsReadOnly/helpers";
-import { CredentialsInput } from "../../modals/CredentialsInputs/CredentialsInputs";
 import { RunAgentInputs } from "../../modals/RunAgentInputs/RunAgentInputs";
 import { LoadingSelectedContent } from "../LoadingSelectedContent";
 import { RunDetailCard } from "../RunDetailCard/RunDetailCard";
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedViewLayout.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedViewLayout.tsx
index 8a4e46a606..fe824604df 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedViewLayout.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedViewLayout.tsx
@@ -1,7 +1,7 @@
-import { Breadcrumbs } from "@/components/molecules/Breadcrumbs/Breadcrumbs";
-import { AgentSettingsButton } from "@/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/other/AgentSettingsButton";
 import { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";
+import { Breadcrumbs } from "@/components/molecules/Breadcrumbs/Breadcrumbs";
 import { AGENT_LIBRARY_SECTION_PADDING_X } from "../../helpers";
+import { AgentSettingsModal } from "../modals/AgentSettingsModal/AgentSettingsModal";
 import { SectionWrap } from "../other/SectionWrap";
 
 interface Props {
@@ -9,8 +9,6 @@ interface Props {
   children: React.ReactNode;
   banner?: React.ReactNode;
   additionalBreadcrumb?: { name: string; link?: string };
-  onSelectSettings?: () => void;
-  selectedSettings?: boolean;
 }
 
 export function SelectedViewLayout(props: Props) {
@@ -19,8 +17,8 @@ export function SelectedViewLayout(props: Props) {
       <div
         className={`${AGENT_LIBRARY_SECTION_PADDING_X} flex-shrink-0 border-b border-zinc-100 pb-0 lg:pb-4`}
       >
-        {props.banner && <div className="mb-4">{props.banner}</div>}
-        <div className="relative flex w-fit items-center gap-2">
+        {props.banner}
+        <div className="relative flex w-full items-center justify-between">
           <Breadcrumbs
             items={[
               { name: "My Library", link: "/library" },
@@ -33,15 +31,9 @@ export function SelectedViewLayout(props: Props) {
                 : []),
             ]}
           />
-          {props.agent && props.onSelectSettings && (
-            <div className="absolute -right-8">
-              <AgentSettingsButton
-                agent={props.agent}
-                onSelectSettings={props.onSelectSettings}
-                selected={props.selectedSettings}
-              />
-            </div>
-          )}
+          <div className="absolute right-0">
+            <AgentSettingsModal agent={props.agent} />
+          </div>
         </div>
       </div>
       <div className="flex min-h-0 flex-1 flex-col overflow-y-auto overflow-x-visible">
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/hooks/useMarketplaceUpdate.ts b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/hooks/useMarketplaceUpdate.ts
index 4ae146e514..158fd3f134 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/hooks/useMarketplaceUpdate.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/hooks/useMarketplaceUpdate.ts
@@ -40,15 +40,17 @@ export function useMarketplaceUpdate({ agent }: UseMarketplaceUpdateProps) {
     },
   );
 
-  // Get user's submissions to check for pending submissions
-  const { data: submissionsData } = useGetV2ListMySubmissions(
-    { page: 1, page_size: 50 }, // Get enough to cover recent submissions
-    {
-      query: {
-        enabled: !!user?.id, // Only fetch if user is authenticated
+  // Get user's submissions - only fetch if user is the creator
+  const { data: submissionsData, isLoading: isSubmissionsLoading } =
+    useGetV2ListMySubmissions(
+      { page: 1, page_size: 50 },
+      {
+        query: {
+          // Only fetch if user is the creator
+          enabled: !!(user?.id && agent?.owner_user_id === user.id),
+        },
       },
-    },
-  );
+    );
 
   const updateToLatestMutation = usePatchV2UpdateLibraryAgent({
     mutation: {
@@ -78,16 +80,45 @@ export function useMarketplaceUpdate({ agent }: UseMarketplaceUpdateProps) {
   // Check if marketplace has a newer version than user's current version
   const marketplaceUpdateInfo = React.useMemo(() => {
     const storeAgent = okData(storeAgentData) as any;
-    if (!agent || !storeAgent) {
+
+    if (!agent || isSubmissionsLoading) {
       return {
         hasUpdate: false,
         latestVersion: undefined,
         isUserCreator: false,
+        hasPublishUpdate: false,
+      };
+    }
+
+    const isUserCreator = agent?.owner_user_id === user?.id;
+
+    const submissionsResponse = okData(submissionsData) as any;
+    const agentSubmissions =
+      submissionsResponse?.submissions?.filter(
+        (submission: StoreSubmission) => submission.agent_id === agent.graph_id,
+      ) || [];
+
+    const highestSubmittedVersion =
+      agentSubmissions.length > 0
+        ? Math.max(
+            ...agentSubmissions.map(
+              (submission: StoreSubmission) => submission.agent_version,
+            ),
+          )
+        : 0;
+
+    const hasUnpublishedChanges =
+      isUserCreator && agent.graph_version > highestSubmittedVersion;
+
+    if (!storeAgent) {
+      return {
+        hasUpdate: false,
+        latestVersion: undefined,
+        isUserCreator,
+        hasPublishUpdate: agentSubmissions.length > 0 && hasUnpublishedChanges,
       };
     }
 
-    // Get the latest version from the marketplace
-    // agentGraphVersions array contains graph version numbers as strings, get the highest one
     const latestMarketplaceVersion =
       storeAgent.agentGraphVersions?.length > 0
         ? Math.max(
@@ -97,32 +128,11 @@ export function useMarketplaceUpdate({ agent }: UseMarketplaceUpdateProps) {
           )
         : undefined;
 
-    // Determine if the user is the creator of this agent
-    // Compare current user ID with the marketplace listing creator ID
-    const isUserCreator =
-      user?.id && agent.marketplace_listing?.creator.id === user.id;
-
-    // Check if there's a pending submission for this specific agent version
-    const submissionsResponse = okData(submissionsData) as any;
-    const hasPendingSubmissionForCurrentVersion =
-      isUserCreator &&
-      submissionsResponse?.submissions?.some(
-        (submission: StoreSubmission) =>
-          submission.agent_id === agent.graph_id &&
-          submission.agent_version === agent.graph_version &&
-          submission.status === "PENDING",
-      );
-
-    // If user is creator and their version is newer than marketplace, show publish update banner
-    // BUT only if there's no pending submission for this version
     const hasPublishUpdate =
       isUserCreator &&
-      !hasPendingSubmissionForCurrentVersion &&
-      latestMarketplaceVersion !== undefined &&
-      agent.graph_version > latestMarketplaceVersion;
+      agent.graph_version >
+        Math.max(latestMarketplaceVersion || 0, highestSubmittedVersion);
 
-    // If marketplace version is newer than user's version, show update banner
-    // This applies to both creators and non-creators
     const hasMarketplaceUpdate =
       latestMarketplaceVersion !== undefined &&
       latestMarketplaceVersion > agent.graph_version;
@@ -133,7 +143,7 @@ export function useMarketplaceUpdate({ agent }: UseMarketplaceUpdateProps) {
       isUserCreator,
       hasPublishUpdate,
     };
-  }, [agent, storeAgentData, user, submissionsData]);
+  }, [agent, storeAgentData, user, submissionsData, isSubmissionsLoading]);
 
   const handlePublishUpdate = () => {
     setModalOpen(true);
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/OldAgentLibraryView/OldAgentLibraryView.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/OldAgentLibraryView/OldAgentLibraryView.tsx
index dff1b5a7bb..54cc07878d 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/OldAgentLibraryView/OldAgentLibraryView.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/OldAgentLibraryView/OldAgentLibraryView.tsx
@@ -173,8 +173,9 @@ export function OldAgentLibraryView() {
     if (agentRuns.length > 0) {
       // select latest run
       const latestRun = agentRuns.reduce((latest, current) => {
-        if (latest.started_at && !current.started_at) return current;
-        else if (!latest.started_at) return latest;
+        if (!latest.started_at && !current.started_at) return latest;
+        if (!latest.started_at) return current;
+        if (!current.started_at) return latest;
         return latest.started_at > current.started_at ? latest : current;
       }, agentRuns[0]);
       selectRun(latestRun.id as GraphExecutionID);
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/OldAgentLibraryView/components/agent-run-draft-view.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/OldAgentLibraryView/components/agent-run-draft-view.tsx
index 5f57032618..0147c19a5c 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/OldAgentLibraryView/components/agent-run-draft-view.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/OldAgentLibraryView/components/agent-run-draft-view.tsx
@@ -1,8 +1,15 @@
 "use client";
-import React, { useCallback, useEffect, useMemo, useState } from "react";
+import React, {
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useState,
+} from "react";
 
 import {
   CredentialsMetaInput,
+  CredentialsType,
   GraphExecutionID,
   GraphMeta,
   LibraryAgentPreset,
@@ -12,7 +19,6 @@ import {
 } from "@/lib/autogpt-server-api";
 import { useBackendAPI } from "@/lib/autogpt-server-api/context";
 
-import { CredentialsInput } from "@/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/CredentialsInputs";
 import { RunAgentInputs } from "@/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentInputs/RunAgentInputs";
 import { ScheduleTaskDialog } from "@/app/(platform)/library/agents/[id]/components/OldAgentLibraryView/components/cron-scheduler-dialog";
 import ActionButtonGroup from "@/components/__legacy__/action-button-group";
@@ -30,6 +36,11 @@ import {
 } from "@/components/__legacy__/ui/icons";
 import { Input } from "@/components/__legacy__/ui/input";
 import { Button } from "@/components/atoms/Button/Button";
+import { CredentialsGroupedView } from "@/components/contextual/CredentialsInput/components/CredentialsGroupedView/CredentialsGroupedView";
+import {
+  findSavedCredentialByProviderAndType,
+  findSavedUserCredentialByProviderAndType,
+} from "@/components/contextual/CredentialsInput/components/CredentialsGroupedView/helpers";
 import { InformationTooltip } from "@/components/molecules/InformationTooltip/InformationTooltip";
 import {
   useToast,
@@ -37,6 +48,7 @@ import {
 } from "@/components/molecules/Toast/use-toast";
 import { humanizeCronExpression } from "@/lib/cron-expression-utils";
 import { cn, isEmpty } from "@/lib/utils";
+import { CredentialsProvidersContext } from "@/providers/agent-credentials/credentials-provider";
 import { ClockIcon, CopyIcon, InfoIcon } from "@phosphor-icons/react";
 import { CalendarClockIcon, Trash2Icon } from "lucide-react";
 
@@ -90,6 +102,7 @@ export function AgentRunDraftView({
   const api = useBackendAPI();
   const { toast } = useToast();
   const toastOnFail = useToastOnFail();
+  const allProviders = useContext(CredentialsProvidersContext);
 
   const [inputValues, setInputValues] = useState<Record<string, any>>({});
   const [inputCredentials, setInputCredentials] = useState<
@@ -128,6 +141,77 @@ export function AgentRunDraftView({
     () => graph.credentials_input_schema.properties,
     [graph],
   );
+  const credentialFields = useMemo(
+    function getCredentialFields() {
+      return Object.entries(agentCredentialsInputFields);
+    },
+    [agentCredentialsInputFields],
+  );
+  const requiredCredentials = useMemo(
+    function getRequiredCredentials() {
+      return new Set(
+        (graph.credentials_input_schema?.required as string[]) || [],
+      );
+    },
+    [graph.credentials_input_schema?.required],
+  );
+
+  useEffect(
+    function initializeDefaultCredentials() {
+      if (!allProviders) return;
+      if (!graph.credentials_input_schema?.properties) return;
+      if (requiredCredentials.size === 0) return;
+
+      setInputCredentials(function updateCredentials(currentCreds) {
+        const next = { ...currentCreds };
+        let didAdd = false;
+
+        for (const key of requiredCredentials) {
+          if (next[key]) continue;
+          const schema = graph.credentials_input_schema.properties[key];
+          if (!schema) continue;
+
+          const providerNames = schema.credentials_provider || [];
+          const credentialTypes = schema.credentials_types || [];
+          const requiredScopes = schema.credentials_scopes;
+
+          const userCredential = findSavedUserCredentialByProviderAndType(
+            providerNames,
+            credentialTypes,
+            requiredScopes,
+            allProviders,
+          );
+
+          const savedCredential =
+            userCredential ||
+            findSavedCredentialByProviderAndType(
+              providerNames,
+              credentialTypes,
+              requiredScopes,
+              allProviders,
+            );
+
+          if (!savedCredential) continue;
+
+          next[key] = {
+            id: savedCredential.id,
+            provider: savedCredential.provider,
+            type: savedCredential.type as CredentialsType,
+            title: savedCredential.title,
+          };
+          didAdd = true;
+        }
+
+        if (!didAdd) return currentCreds;
+        return next;
+      });
+    },
+    [
+      allProviders,
+      graph.credentials_input_schema?.properties,
+      requiredCredentials,
+    ],
+  );
 
   const [allRequiredInputsAreSet, missingInputs] = useMemo(() => {
     const nonEmptyInputs = new Set(
@@ -145,18 +229,35 @@ export function AgentRunDraftView({
     );
     return [isSuperset, difference];
   }, [agentInputSchema.required, inputValues]);
-  const [allCredentialsAreSet, missingCredentials] = useMemo(() => {
-    const availableCredentials = new Set(Object.keys(inputCredentials));
-    const allCredentials = new Set(Object.keys(agentCredentialsInputFields));
-    // Backwards-compatible implementation of isSupersetOf and difference
-    const isSuperset = Array.from(allCredentials).every((item) =>
-      availableCredentials.has(item),
-    );
-    const difference = Array.from(allCredentials).filter(
-      (item) => !availableCredentials.has(item),
-    );
-    return [isSuperset, difference];
-  }, [agentCredentialsInputFields, inputCredentials]);
+  const [allCredentialsAreSet, missingCredentials] = useMemo(
+    function getCredentialStatus() {
+      const missing = Array.from(requiredCredentials).filter((key) => {
+        const cred = inputCredentials[key];
+        return !cred || !cred.id;
+      });
+      return [missing.length === 0, missing];
+    },
+    [requiredCredentials, inputCredentials],
+  );
+  function addChangedCredentials(prev: Set<keyof LibraryAgentPresetUpdatable>) {
+    const next = new Set(prev);
+    next.add("credentials");
+    return next;
+  }
+
+  function handleCredentialChange(key: string, value?: CredentialsMetaInput) {
+    setInputCredentials(function updateInputCredentials(currentCreds) {
+      const next = { ...currentCreds };
+      if (value === undefined) {
+        delete next[key];
+        return next;
+      }
+      next[key] = value;
+      return next;
+    });
+    setChangedPresetAttributes(addChangedCredentials);
+  }
+
   const notifyMissingInputs = useCallback(
     (needPresetName: boolean = true) => {
       const allMissingFields = (
@@ -649,35 +750,6 @@ export function AgentRunDraftView({
               </>
             )}
 
-            {/* Credentials inputs */}
-            {Object.entries(agentCredentialsInputFields).map(
-              ([key, inputSubSchema]) => (
-                <CredentialsInput
-                  key={key}
-                  schema={{ ...inputSubSchema, discriminator: undefined }}
-                  selectedCredentials={
-                    inputCredentials[key] ?? inputSubSchema.default
-                  }
-                  onSelectCredentials={(value) => {
-                    setInputCredentials((obj) => {
-                      const newObj = { ...obj };
-                      if (value === undefined) {
-                        delete newObj[key];
-                        return newObj;
-                      }
-                      return {
-                        ...obj,
-                        [key]: value,
-                      };
-                    });
-                    setChangedPresetAttributes((prev) =>
-                      prev.add("credentials"),
-                    );
-                  }}
-                />
-              ),
-            )}
-
             {/* Regular inputs */}
             {Object.entries(agentInputFields).map(([key, inputSubSchema]) => (
               <RunAgentInputs
@@ -695,6 +767,17 @@ export function AgentRunDraftView({
                 data-testid={`agent-input-${key}`}
               />
             ))}
+
+            {/* Credentials inputs */}
+            {credentialFields.length > 0 && (
+              <CredentialsGroupedView
+                credentialFields={credentialFields}
+                requiredCredentials={requiredCredentials}
+                inputCredentials={inputCredentials}
+                inputValues={inputValues}
+                onCredentialChange={handleCredentialChange}
+              />
+            )}
           </CardContent>
         </Card>
       </div>
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/OldAgentLibraryView/components/agent-run-output-view.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/OldAgentLibraryView/components/agent-run-output-view.tsx
index e55914b4ea..668ac2e215 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/OldAgentLibraryView/components/agent-run-output-view.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/OldAgentLibraryView/components/agent-run-output-view.tsx
@@ -11,12 +11,12 @@ import {
 } from "@/components/__legacy__/ui/card";
 
 import LoadingBox from "@/components/__legacy__/ui/loading";
-import type { OutputMetadata } from "../../NewAgentLibraryView/components/selected-views/OutputRenderers";
+import type { OutputMetadata } from "../../../../../../../../components/contextual/OutputRenderers";
 import {
   globalRegistry,
   OutputActions,
   OutputItem,
-} from "../../NewAgentLibraryView/components/selected-views/OutputRenderers";
+} from "../../../../../../../../components/contextual/OutputRenderers";
 
 export function AgentRunOutputView({
   agentRunOutputs,
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/OldAgentLibraryView/components/agent-runs-selector-list.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/OldAgentLibraryView/components/agent-runs-selector-list.tsx
index 5931404846..49d93b4319 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/OldAgentLibraryView/components/agent-runs-selector-list.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/OldAgentLibraryView/components/agent-runs-selector-list.tsx
@@ -184,9 +184,11 @@ export function AgentRunsSelectorList({
                     ))}
                   {agentPresets.length > 0 && <Separator className="my-1" />}
                   {agentRuns
-                    .toSorted(
-                      (a, b) => b.started_at.getTime() - a.started_at.getTime(),
-                    )
+                    .toSorted((a, b) => {
+                      const aTime = a.started_at?.getTime() ?? 0;
+                      const bTime = b.started_at?.getTime() ?? 0;
+                      return bTime - aTime;
+                    })
                     .map((run) => (
                       <AgentRunSummaryCard
                         className={listItemClasses}
@@ -199,7 +201,7 @@ export function AgentRunsSelectorList({
                                 ?.name
                             : null) ?? agent.name
                         }
-                        timestamp={run.started_at}
+                        timestamp={run.started_at ?? undefined}
                         selected={selectedView.id === run.id}
                         onClick={() => onSelectRun(run.id)}
                         onDelete={() => doDeleteRun(run as GraphExecutionMeta)}
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/page.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/page.tsx
index 9ada590dd8..147c0aef45 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/page.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/page.tsx
@@ -1,14 +1,7 @@
 "use client";
 
-import { Flag, useGetFlag } from "@/services/feature-flags/use-get-flag";
 import { NewAgentLibraryView } from "./components/NewAgentLibraryView/NewAgentLibraryView";
-import { OldAgentLibraryView } from "./components/OldAgentLibraryView/OldAgentLibraryView";
 
 export default function AgentLibraryPage() {
-  const isNewLibraryPageEnabled = useGetFlag(Flag.NEW_AGENT_RUNS);
-  return isNewLibraryPageEnabled ? (
-    <NewAgentLibraryView />
-  ) : (
-    <OldAgentLibraryView />
-  );
+  return <NewAgentLibraryView />;
 }
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/components/FavoritesSection/FavoritesSection.tsx b/autogpt_platform/frontend/src/app/(platform)/library/components/FavoritesSection/FavoritesSection.tsx
index 7ed372f296..d1167cc747 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/components/FavoritesSection/FavoritesSection.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/components/FavoritesSection/FavoritesSection.tsx
@@ -1,16 +1,17 @@
 "use client";
 
-import React from "react";
-import { useFavoriteAgents } from "../../hooks/useFavoriteAgents";
-import LibraryAgentCard from "../LibraryAgentCard/LibraryAgentCard";
-import { useGetFlag, Flag } from "@/services/feature-flags/use-get-flag";
-import { Heart } from "lucide-react";
-import { Skeleton } from "@/components/__legacy__/ui/skeleton";
-import { InfiniteScroll } from "@/components/contextual/InfiniteScroll/InfiniteScroll";
 import { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";
+import { Text } from "@/components/atoms/Text/Text";
+import { InfiniteScroll } from "@/components/contextual/InfiniteScroll/InfiniteScroll";
+import { HeartIcon } from "@phosphor-icons/react";
+import { useFavoriteAgents } from "../../hooks/useFavoriteAgents";
+import { LibraryAgentCard } from "../LibraryAgentCard/LibraryAgentCard";
 
-export default function FavoritesSection() {
-  const isAgentFavoritingEnabled = useGetFlag(Flag.AGENT_FAVORITING);
+interface Props {
+  searchTerm: string;
+}
+
+export function FavoritesSection({ searchTerm }: Props) {
   const {
     allAgents: favoriteAgents,
     agentLoading: isLoading,
@@ -18,60 +19,50 @@ export default function FavoritesSection() {
     hasNextPage,
     fetchNextPage,
     isFetchingNextPage,
-  } = useFavoriteAgents();
+  } = useFavoriteAgents({ searchTerm });
 
-  // Only show this section if the feature flag is enabled
-  if (!isAgentFavoritingEnabled) {
-    return null;
-  }
-
-  // Don't show the section if there are no favorites
-  if (!isLoading && favoriteAgents.length === 0) {
+  if (isLoading || favoriteAgents.length === 0) {
     return null;
   }
 
   return (
-    <div className="mb-8">
-      <div className="flex items-center gap-[10px] p-2 pb-[10px]">
-        <Heart className="h-5 w-5 fill-red-500 text-red-500" />
-        <span className="font-poppin text-[18px] font-semibold leading-[28px] text-neutral-800">
-          Favorites
-        </span>
-        {!isLoading && (
-          <span className="font-sans text-[14px] font-normal leading-6">
-            {agentCount} {agentCount === 1 ? "agent" : "agents"}
-          </span>
-        )}
+    <div className="!mb-8">
+      <div className="mb-3 flex items-center gap-2 p-2">
+        <HeartIcon className="h-5 w-5" weight="fill" />
+        <div className="flex items-baseline gap-2">
+          <Text variant="h4">Favorites</Text>
+          {!isLoading && (
+            <Text
+              variant="body"
+              data-testid="agents-count"
+              className="relative bottom-px text-zinc-500"
+            >
+              {agentCount}
+            </Text>
+          )}
+        </div>
       </div>
 
       <div className="relative">
-        {isLoading ? (
+        <InfiniteScroll
+          isFetchingNextPage={isFetchingNextPage}
+          fetchNextPage={fetchNextPage}
+          hasNextPage={hasNextPage}
+          loader={
+            <div className="flex h-8 w-full items-center justify-center">
+              <div className="h-6 w-6 animate-spin rounded-full border-b-2 border-t-2 border-neutral-800" />
+            </div>
+          }
+        >
           <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4">
-            {[...Array(4)].map((_, i) => (
-              <Skeleton key={i} className="h-48 w-full rounded-lg" />
+            {favoriteAgents.map((agent: LibraryAgent) => (
+              <LibraryAgentCard key={agent.id} agent={agent} />
             ))}
           </div>
-        ) : (
-          <InfiniteScroll
-            isFetchingNextPage={isFetchingNextPage}
-            fetchNextPage={fetchNextPage}
-            hasNextPage={hasNextPage}
-            loader={
-              <div className="flex h-8 w-full items-center justify-center">
-                <div className="h-6 w-6 animate-spin rounded-full border-b-2 border-t-2 border-neutral-800" />
-              </div>
-            }
-          >
-            <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4">
-              {favoriteAgents.map((agent: LibraryAgent) => (
-                <LibraryAgentCard key={agent.id} agent={agent} />
-              ))}
-            </div>
-          </InfiniteScroll>
-        )}
+        </InfiniteScroll>
       </div>
 
-      {favoriteAgents.length > 0 && <div className="mt-6 border-t pt-6" />}
+      {favoriteAgents.length > 0 && <div className="!mt-10 border-t" />}
     </div>
   );
 }
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryActionHeader/LibraryActionHeader.tsx b/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryActionHeader/LibraryActionHeader.tsx
index 11011945fb..139f753563 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryActionHeader/LibraryActionHeader.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryActionHeader/LibraryActionHeader.tsx
@@ -1,34 +1,28 @@
-// import LibraryNotificationDropdown from "./library-notification-dropdown";
+import { LibrarySearchBar } from "../LibrarySearchBar/LibrarySearchBar";
 import LibraryUploadAgentDialog from "../LibraryUploadAgentDialog/LibraryUploadAgentDialog";
-import LibrarySearchBar from "../LibrarySearchBar/LibrarySearchBar";
 
-type LibraryActionHeaderProps = Record<string, never>;
+interface Props {
+  setSearchTerm: (value: string) => void;
+}
 
-/**
- * LibraryActionHeader component - Renders a header with search, notifications and filters
- */
-const LibraryActionHeader: React.FC<LibraryActionHeaderProps> = ({}) => {
+export function LibraryActionHeader({ setSearchTerm }: Props) {
   return (
     <>
-      <div className="mb-[32px] hidden items-start justify-between md:flex">
-        {/* <LibraryNotificationDropdown /> */}
-        <LibrarySearchBar />
+      <div className="mb-[32px] hidden items-center justify-center gap-4 md:flex">
+        <LibrarySearchBar setSearchTerm={setSearchTerm} />
         <LibraryUploadAgentDialog />
       </div>
 
       {/* Mobile and tablet */}
       <div className="flex flex-col gap-4 p-4 pt-[52px] md:hidden">
         <div className="flex w-full justify-between">
-          {/* <LibraryNotificationDropdown /> */}
           <LibraryUploadAgentDialog />
         </div>
 
         <div className="flex items-center justify-center">
-          <LibrarySearchBar />
+          <LibrarySearchBar setSearchTerm={setSearchTerm} />
         </div>
       </div>
     </>
   );
-};
-
-export default LibraryActionHeader;
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryActionSubHeader/LibraryActionSubHeader.tsx b/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryActionSubHeader/LibraryActionSubHeader.tsx
index be1ebe1aef..edefa52911 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryActionSubHeader/LibraryActionSubHeader.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryActionSubHeader/LibraryActionSubHeader.tsx
@@ -1,28 +1,28 @@
 "use client";
 
-import LibrarySortMenu from "../LibrarySortMenu/LibrarySortMenu";
+import { LibraryAgentSort } from "@/app/api/__generated__/models/libraryAgentSort";
+import { Text } from "@/components/atoms/Text/Text";
+import { LibrarySortMenu } from "../LibrarySortMenu/LibrarySortMenu";
 
-interface LibraryActionSubHeaderProps {
+interface Props {
   agentCount: number;
+  setLibrarySort: (value: LibraryAgentSort) => void;
 }
 
-export default function LibraryActionSubHeader({
-  agentCount,
-}: LibraryActionSubHeaderProps) {
+export function LibraryActionSubHeader({ agentCount, setLibrarySort }: Props) {
   return (
-    <div className="flex items-center justify-between pb-[10px]">
-      <div className="flex items-center gap-[10px] p-2">
-        <span className="font-poppin w-[96px] text-[18px] font-semibold leading-[28px] text-neutral-800">
-          My agents
-        </span>
-        <span
-          className="w-[70px] font-sans text-[14px] font-normal leading-6"
+    <div className="flex items-baseline justify-between">
+      <div className="flex items-baseline gap-4">
+        <Text variant="h4">My agents</Text>
+        <Text
+          variant="body"
           data-testid="agents-count"
+          className="text-zinc-500"
         >
-          {agentCount} agents
-        </span>
+          {agentCount}
+        </Text>
       </div>
-      <LibrarySortMenu />
+      <LibrarySortMenu setLibrarySort={setLibrarySort} />
     </div>
   );
 }
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryAgentCard/LibraryAgentCard.tsx b/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryAgentCard/LibraryAgentCard.tsx
index ef2662f735..1327de5347 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryAgentCard/LibraryAgentCard.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryAgentCard/LibraryAgentCard.tsx
@@ -1,332 +1,126 @@
 "use client";
 
-import Link from "next/link";
+import { Text } from "@/components/atoms/Text/Text";
+import { CaretCircleRightIcon } from "@phosphor-icons/react";
 import Image from "next/image";
-import { Heart } from "@phosphor-icons/react";
-import { useState, useEffect } from "react";
-import { getQueryClient } from "@/lib/react-query/queryClient";
-import { InfiniteData } from "@tanstack/react-query";
+import NextLink from "next/link";
 
 import { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";
-import {
-  getV2ListLibraryAgentsResponse,
-  getV2ListFavoriteLibraryAgentsResponse,
-} from "@/app/api/__generated__/endpoints/library/library";
-import BackendAPI, { LibraryAgentID } from "@/lib/autogpt-server-api";
-import { cn } from "@/lib/utils";
-import { useToast } from "@/components/molecules/Toast/use-toast";
-import { Flag, useGetFlag } from "@/services/feature-flags/use-get-flag";
 import Avatar, {
   AvatarFallback,
   AvatarImage,
 } from "@/components/atoms/Avatar/Avatar";
+import { Link } from "@/components/atoms/Link/Link";
+import { AgentCardMenu } from "./components/AgentCardMenu";
+import { FavoriteButton } from "./components/FavoriteButton";
+import { useLibraryAgentCard } from "./useLibraryAgentCard";
 
-interface LibraryAgentCardProps {
+interface Props {
   agent: LibraryAgent;
 }
 
-export default function LibraryAgentCard({
-  agent: {
-    id,
-    name,
-    description,
-    graph_id,
-    can_access_graph,
+export function LibraryAgentCard({ agent }: Props) {
+  const { id, name, graph_id, can_access_graph, image_url } = agent;
+
+  const {
+    isFromMarketplace,
+    isFavorite,
+    profile,
     creator_image_url,
-    image_url,
-    is_favorite,
-  },
-}: LibraryAgentCardProps) {
-  const isAgentFavoritingEnabled = useGetFlag(Flag.AGENT_FAVORITING);
-  const [isFavorite, setIsFavorite] = useState(is_favorite);
-  const [isUpdating, setIsUpdating] = useState(false);
-  const { toast } = useToast();
-  const api = new BackendAPI();
-  const queryClient = getQueryClient();
-
-  // Sync local state with prop when it changes (e.g., after query invalidation)
-  useEffect(() => {
-    setIsFavorite(is_favorite);
-  }, [is_favorite]);
-
-  const updateQueryData = (newIsFavorite: boolean) => {
-    // Update the agent in all library agent queries
-    queryClient.setQueriesData(
-      { queryKey: ["/api/library/agents"] },
-      (
-        oldData:
-          | InfiniteData<getV2ListLibraryAgentsResponse, number | undefined>
-          | undefined,
-      ) => {
-        if (!oldData?.pages) return oldData;
-
-        return {
-          ...oldData,
-          pages: oldData.pages.map((page) => {
-            if (page.status !== 200) return page;
-
-            return {
-              ...page,
-              data: {
-                ...page.data,
-                agents: page.data.agents.map((agent: LibraryAgent) =>
-                  agent.id === id
-                    ? { ...agent, is_favorite: newIsFavorite }
-                    : agent,
-                ),
-              },
-            };
-          }),
-        };
-      },
-    );
-
-    // Update or remove from favorites query based on new state
-    queryClient.setQueriesData(
-      { queryKey: ["/api/library/agents/favorites"] },
-      (
-        oldData:
-          | InfiniteData<
-              getV2ListFavoriteLibraryAgentsResponse,
-              number | undefined
-            >
-          | undefined,
-      ) => {
-        if (!oldData?.pages) return oldData;
-
-        if (newIsFavorite) {
-          // Add to favorites if not already there
-          const exists = oldData.pages.some(
-            (page) =>
-              page.status === 200 &&
-              page.data.agents.some((agent: LibraryAgent) => agent.id === id),
-          );
-
-          if (!exists) {
-            const firstPage = oldData.pages[0];
-            if (firstPage?.status === 200) {
-              const updatedAgent = {
-                id,
-                name,
-                description,
-                graph_id,
-                can_access_graph,
-                creator_image_url,
-                image_url,
-                is_favorite: true,
-              };
-
-              return {
-                ...oldData,
-                pages: [
-                  {
-                    ...firstPage,
-                    data: {
-                      ...firstPage.data,
-                      agents: [updatedAgent, ...firstPage.data.agents],
-                      pagination: {
-                        ...firstPage.data.pagination,
-                        total_items: firstPage.data.pagination.total_items + 1,
-                      },
-                    },
-                  },
-                  ...oldData.pages.slice(1).map((page) =>
-                    page.status === 200
-                      ? {
-                          ...page,
-                          data: {
-                            ...page.data,
-                            pagination: {
-                              ...page.data.pagination,
-                              total_items: page.data.pagination.total_items + 1,
-                            },
-                          },
-                        }
-                      : page,
-                  ),
-                ],
-              };
-            }
-          }
-        } else {
-          // Remove from favorites
-          let removedCount = 0;
-          return {
-            ...oldData,
-            pages: oldData.pages.map((page) => {
-              if (page.status !== 200) return page;
-
-              const filteredAgents = page.data.agents.filter(
-                (agent: LibraryAgent) => agent.id !== id,
-              );
-
-              if (filteredAgents.length < page.data.agents.length) {
-                removedCount = 1;
-              }
-
-              return {
-                ...page,
-                data: {
-                  ...page.data,
-                  agents: filteredAgents,
-                  pagination: {
-                    ...page.data.pagination,
-                    total_items:
-                      page.data.pagination.total_items - removedCount,
-                  },
-                },
-              };
-            }),
-          };
-        }
-
-        return oldData;
-      },
-    );
-  };
-
-  const handleToggleFavorite = async (e: React.MouseEvent) => {
-    e.preventDefault(); // Prevent navigation when clicking the heart
-    e.stopPropagation();
-
-    if (isUpdating || !isAgentFavoritingEnabled) return;
-
-    const newIsFavorite = !isFavorite;
-
-    // Optimistic update
-    setIsFavorite(newIsFavorite);
-    updateQueryData(newIsFavorite);
-
-    setIsUpdating(true);
-    try {
-      await api.updateLibraryAgent(id as LibraryAgentID, {
-        is_favorite: newIsFavorite,
-      });
-
-      toast({
-        title: newIsFavorite ? "Added to favorites" : "Removed from favorites",
-        description: `${name} has been ${newIsFavorite ? "added to" : "removed from"} your favorites.`,
-      });
-    } catch (error) {
-      // Revert on error
-      console.error("Failed to update favorite status:", error);
-      setIsFavorite(!newIsFavorite);
-      updateQueryData(!newIsFavorite);
-
-      toast({
-        title: "Error",
-        description: "Failed to update favorite status. Please try again.",
-        variant: "destructive",
-      });
-    } finally {
-      setIsUpdating(false);
-    }
-  };
+    handleToggleFavorite,
+  } = useLibraryAgentCard({ agent });
 
   return (
     <div
       data-testid="library-agent-card"
       data-agent-id={id}
-      className="group inline-flex w-full max-w-[434px] flex-col items-start justify-start gap-2.5 rounded-[26px] bg-white transition-all duration-300 hover:shadow-lg dark:bg-transparent dark:hover:shadow-gray-700"
+      className="group relative inline-flex h-[10.625rem] w-full max-w-[25rem] flex-col items-start justify-start gap-2.5 rounded-medium border border-zinc-100 bg-white transition-all duration-300 hover:shadow-md"
     >
-      <Link
-        href={`/library/agents/${id}`}
-        className="relative h-[200px] w-full overflow-hidden rounded-[20px]"
-      >
-        {!image_url ? (
-          <div
-            className={`h-full w-full ${
-              [
-                "bg-gradient-to-r from-green-200 to-blue-200",
-                "bg-gradient-to-r from-pink-200 to-purple-200",
-                "bg-gradient-to-r from-yellow-200 to-orange-200",
-                "bg-gradient-to-r from-blue-200 to-cyan-200",
-                "bg-gradient-to-r from-indigo-200 to-purple-200",
-              ][parseInt(id.slice(0, 8), 16) % 5]
-            }`}
-            style={{
-              backgroundSize: "200% 200%",
-              animation: "gradient 15s ease infinite",
-            }}
-          />
-        ) : (
-          <Image
-            src={image_url}
-            alt={`${name} preview image`}
-            fill
-            className="object-cover"
-          />
-        )}
-        {isAgentFavoritingEnabled && (
-          <button
-            onClick={handleToggleFavorite}
-            className={cn(
-              "absolute right-4 top-4 rounded-full bg-white/90 p-2 backdrop-blur-sm transition-all duration-200",
-              "hover:scale-110 hover:bg-white",
-              "focus:outline-none focus:ring-2 focus:ring-red-500 focus:ring-offset-2",
-              isUpdating && "cursor-not-allowed opacity-50",
-              !isFavorite && "opacity-0 group-hover:opacity-100",
-            )}
-            disabled={isUpdating}
-            aria-label={
-              isFavorite ? "Remove from favorites" : "Add to favorites"
-            }
-          >
-            <Heart
-              size={20}
-              weight={isFavorite ? "fill" : "regular"}
-              className={cn(
-                "transition-colors duration-200",
-                isFavorite
-                  ? "text-red-500"
-                  : "text-gray-600 hover:text-red-500",
-              )}
-            />
-          </button>
-        )}
-        <div className="absolute bottom-4 left-4">
-          <Avatar className="h-16 w-16">
+      <NextLink href={`/library/agents/${id}`} className="flex-shrink-0">
+        <div className="relative flex items-center gap-2 px-4 pt-3">
+          <Avatar className="h-4 w-4 rounded-full">
             <AvatarImage
               src={
-                creator_image_url
-                  ? creator_image_url
-                  : "/avatar-placeholder.png"
+                isFromMarketplace
+                  ? creator_image_url || "/avatar-placeholder.png"
+                  : profile?.avatar_url || "/avatar-placeholder.png"
               }
               alt={`${name} creator avatar`}
             />
-            <AvatarFallback size={64}>{name.charAt(0)}</AvatarFallback>
+            <AvatarFallback size={48}>{name.charAt(0)}</AvatarFallback>
           </Avatar>
+          <Text
+            variant="small-medium"
+            className="uppercase tracking-wide text-zinc-400"
+          >
+            {isFromMarketplace ? "FROM MARKETPLACE" : "Built by you"}
+          </Text>
         </div>
-      </Link>
+      </NextLink>
+      <FavoriteButton
+        isFavorite={isFavorite}
+        onClick={handleToggleFavorite}
+        className="absolute right-10 top-0"
+      />
+      <AgentCardMenu agent={agent} />
 
-      <div className="flex w-full flex-1 flex-col px-4 py-4">
-        <Link href={`/library/agents/${id}`}>
-          <h3 className="mb-2 line-clamp-2 font-poppins text-2xl font-semibold leading-tight text-[#272727] dark:text-neutral-100">
+      <div className="flex w-full flex-1 flex-col px-4 pb-2">
+        <Link
+          href={`/library/agents/${id}`}
+          className="flex w-full items-start justify-between gap-2 no-underline hover:no-underline"
+        >
+          <Text
+            variant="h5"
+            data-testid="library-agent-card-name"
+            className="line-clamp-3 hyphens-auto break-words no-underline hover:no-underline"
+          >
             {name}
-          </h3>
+          </Text>
 
-          <p className="line-clamp-3 flex-1 text-sm text-gray-600 dark:text-gray-400">
-            {description}
-          </p>
+          {!image_url ? (
+            <div
+              className={`h-[3.64rem] w-[6.70rem] flex-shrink-0 rounded-small ${
+                [
+                  "bg-gradient-to-r from-green-200 to-blue-200",
+                  "bg-gradient-to-r from-pink-200 to-purple-200",
+                  "bg-gradient-to-r from-yellow-200 to-orange-200",
+                  "bg-gradient-to-r from-blue-200 to-cyan-200",
+                  "bg-gradient-to-r from-indigo-200 to-purple-200",
+                ][parseInt(id.slice(0, 8), 16) % 5]
+              }`}
+              style={{
+                backgroundSize: "200% 200%",
+                animation: "gradient 15s ease infinite",
+              }}
+            />
+          ) : (
+            <Image
+              src={image_url}
+              alt={`${name} preview image`}
+              width={107}
+              height={58}
+              className="flex-shrink-0 rounded-small object-cover"
+            />
+          )}
         </Link>
 
-        <div className="flex-grow" />
-        {/* Spacer */}
-
-        <div className="items-between mt-4 flex w-full justify-between gap-3">
+        <div className="mt-auto flex w-full justify-start gap-6 border-t border-zinc-100 pb-1 pt-3">
           <Link
             href={`/library/agents/${id}`}
-            className="text-lg font-semibold text-neutral-800 hover:underline dark:text-neutral-200"
+            data-testid="library-agent-card-see-runs-link"
+            className="flex items-center gap-1 text-[13px]"
           >
-            See runs
+            See runs <CaretCircleRightIcon size={20} />
           </Link>
 
           {can_access_graph && (
             <Link
               href={`/build?flowID=${graph_id}`}
-              className="text-lg font-semibold text-neutral-800 hover:underline dark:text-neutral-200"
+              data-testid="library-agent-card-open-in-builder-link"
+              className="flex items-center gap-1 text-[13px]"
+              isExternal
             >
-              Open in builder
+              Open in builder <CaretCircleRightIcon size={20} />
             </Link>
           )}
         </div>
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryAgentCard/components/AgentCardMenu.tsx b/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryAgentCard/components/AgentCardMenu.tsx
new file mode 100644
index 0000000000..933cdd34fa
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryAgentCard/components/AgentCardMenu.tsx
@@ -0,0 +1,188 @@
+"use client";
+
+import {
+  getGetV2ListLibraryAgentsQueryKey,
+  useDeleteV2DeleteLibraryAgent,
+  usePostV2ForkLibraryAgent,
+} from "@/app/api/__generated__/endpoints/library/library";
+import { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";
+import { Button } from "@/components/atoms/Button/Button";
+import { Text } from "@/components/atoms/Text/Text";
+import { Dialog } from "@/components/molecules/Dialog/Dialog";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
+} from "@/components/molecules/DropdownMenu/DropdownMenu";
+import { useToast } from "@/components/molecules/Toast/use-toast";
+import { DotsThree } from "@phosphor-icons/react";
+import { useQueryClient } from "@tanstack/react-query";
+import Link from "next/link";
+import { useRouter } from "next/navigation";
+import { useState } from "react";
+
+interface AgentCardMenuProps {
+  agent: LibraryAgent;
+}
+
+export function AgentCardMenu({ agent }: AgentCardMenuProps) {
+  const { toast } = useToast();
+  const queryClient = useQueryClient();
+  const router = useRouter();
+  const [showDeleteDialog, setShowDeleteDialog] = useState(false);
+  const [isDeletingAgent, setIsDeletingAgent] = useState(false);
+  const [isDuplicatingAgent, setIsDuplicatingAgent] = useState(false);
+
+  const { mutateAsync: deleteAgent } = useDeleteV2DeleteLibraryAgent();
+  const { mutateAsync: forkAgent } = usePostV2ForkLibraryAgent();
+
+  async function handleDuplicateAgent() {
+    if (!agent.id) return;
+
+    setIsDuplicatingAgent(true);
+
+    try {
+      const result = await forkAgent({ libraryAgentId: agent.id });
+
+      if (result.status === 200) {
+        await queryClient.refetchQueries({
+          queryKey: getGetV2ListLibraryAgentsQueryKey(),
+        });
+
+        toast({
+          title: "Agent duplicated",
+          description: `${result.data.name} has been created.`,
+        });
+      }
+    } catch (error: unknown) {
+      toast({
+        title: "Failed to duplicate agent",
+        description:
+          error instanceof Error
+            ? error.message
+            : "An unexpected error occurred.",
+        variant: "destructive",
+      });
+    } finally {
+      setIsDuplicatingAgent(false);
+    }
+  }
+
+  async function handleDeleteAgent() {
+    if (!agent.id) return;
+
+    setIsDeletingAgent(true);
+
+    try {
+      await deleteAgent({ libraryAgentId: agent.id });
+
+      await queryClient.refetchQueries({
+        queryKey: getGetV2ListLibraryAgentsQueryKey(),
+      });
+
+      toast({ title: "Agent deleted" });
+      setShowDeleteDialog(false);
+      router.push("/library");
+    } catch (error: unknown) {
+      toast({
+        title: "Failed to delete agent",
+        description:
+          error instanceof Error
+            ? error.message
+            : "An unexpected error occurred.",
+        variant: "destructive",
+      });
+    } finally {
+      setIsDeletingAgent(false);
+    }
+  }
+
+  return (
+    <>
+      <DropdownMenu>
+        <DropdownMenuTrigger asChild>
+          <button
+            className="absolute right-2 top-1 rounded p-1.5 transition-opacity hover:bg-neutral-100"
+            onClick={(e) => e.stopPropagation()}
+            aria-label="More actions"
+          >
+            <DotsThree className="h-5 w-5 text-neutral-600" />
+          </button>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent align="end">
+          {agent.can_access_graph && (
+            <>
+              <DropdownMenuItem asChild>
+                <Link
+                  href={`/build?flowID=${agent.graph_id}&flowVersion=${agent.graph_version}`}
+                  target="_blank"
+                  className="flex items-center gap-2"
+                  onClick={(e) => e.stopPropagation()}
+                >
+                  Edit agent
+                </Link>
+              </DropdownMenuItem>
+              <DropdownMenuSeparator />
+            </>
+          )}
+          <DropdownMenuItem
+            onClick={(e) => {
+              e.stopPropagation();
+              handleDuplicateAgent();
+            }}
+            disabled={isDuplicatingAgent}
+            className="flex items-center gap-2"
+          >
+            Duplicate agent
+          </DropdownMenuItem>
+          <DropdownMenuSeparator />
+          <DropdownMenuItem
+            onClick={(e) => {
+              e.stopPropagation();
+              setShowDeleteDialog(true);
+            }}
+            className="flex items-center gap-2 text-red-600 focus:bg-red-50 focus:text-red-600"
+          >
+            Delete agent
+          </DropdownMenuItem>
+        </DropdownMenuContent>
+      </DropdownMenu>
+
+      <Dialog
+        controlled={{
+          isOpen: showDeleteDialog,
+          set: setShowDeleteDialog,
+        }}
+        styling={{ maxWidth: "32rem" }}
+        title="Delete agent"
+      >
+        <Dialog.Content>
+          <div>
+            <Text variant="large">
+              Are you sure you want to delete this agent? This action cannot be
+              undone.
+            </Text>
+            <Dialog.Footer>
+              <Button
+                variant="secondary"
+                disabled={isDeletingAgent}
+                onClick={() => setShowDeleteDialog(false)}
+              >
+                Cancel
+              </Button>
+              <Button
+                variant="destructive"
+                onClick={handleDeleteAgent}
+                loading={isDeletingAgent}
+              >
+                Delete Agent
+              </Button>
+            </Dialog.Footer>
+          </div>
+        </Dialog.Content>
+      </Dialog>
+    </>
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryAgentCard/components/FavoriteButton.tsx b/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryAgentCard/components/FavoriteButton.tsx
new file mode 100644
index 0000000000..df11553ec1
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryAgentCard/components/FavoriteButton.tsx
@@ -0,0 +1,39 @@
+"use client";
+
+import { cn } from "@/lib/utils";
+import { HeartIcon } from "@phosphor-icons/react";
+import type { MouseEvent } from "react";
+
+interface FavoriteButtonProps {
+  isFavorite: boolean;
+  onClick: (e: MouseEvent<HTMLButtonElement>) => void;
+  className?: string;
+}
+
+export function FavoriteButton({
+  isFavorite,
+  onClick,
+  className,
+}: FavoriteButtonProps) {
+  return (
+    <button
+      onClick={onClick}
+      className={cn(
+        "rounded-full p-2 transition-all duration-200",
+        "hover:scale-110",
+        !isFavorite && "opacity-0 group-hover:opacity-100",
+        className,
+      )}
+      aria-label={isFavorite ? "Remove from favorites" : "Add to favorites"}
+    >
+      <HeartIcon
+        size={20}
+        weight={isFavorite ? "fill" : "regular"}
+        className={cn(
+          "transition-colors duration-200",
+          isFavorite ? "text-red-500" : "text-gray-600 hover:text-red-500",
+        )}
+      />
+    </button>
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryAgentCard/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryAgentCard/helpers.ts
new file mode 100644
index 0000000000..40449e2344
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryAgentCard/helpers.ts
@@ -0,0 +1,150 @@
+import { InfiniteData, QueryClient } from "@tanstack/react-query";
+
+import {
+  getV2ListFavoriteLibraryAgentsResponse,
+  getV2ListLibraryAgentsResponse,
+} from "@/app/api/__generated__/endpoints/library/library";
+import { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";
+
+interface UpdateFavoriteInQueriesParams {
+  queryClient: QueryClient;
+  agentId: string;
+  agent: LibraryAgent;
+  newIsFavorite: boolean;
+}
+
+export function updateFavoriteInQueries({
+  queryClient,
+  agentId,
+  agent,
+  newIsFavorite,
+}: UpdateFavoriteInQueriesParams) {
+  queryClient.setQueriesData(
+    { queryKey: ["/api/library/agents"] },
+    (
+      oldData:
+        | InfiniteData<getV2ListLibraryAgentsResponse, number | undefined>
+        | undefined,
+    ) => {
+      if (!oldData?.pages) return oldData;
+
+      return {
+        ...oldData,
+        pages: oldData.pages.map((page) => {
+          if (page.status !== 200) return page;
+
+          return {
+            ...page,
+            data: {
+              ...page.data,
+              agents: page.data.agents.map((currentAgent: LibraryAgent) =>
+                currentAgent.id === agentId
+                  ? { ...currentAgent, is_favorite: newIsFavorite }
+                  : currentAgent,
+              ),
+            },
+          };
+        }),
+      };
+    },
+  );
+
+  queryClient.setQueriesData(
+    { queryKey: ["/api/library/agents/favorites"] },
+    (
+      oldData:
+        | InfiniteData<
+            getV2ListFavoriteLibraryAgentsResponse,
+            number | undefined
+          >
+        | undefined,
+    ) => {
+      if (!oldData?.pages) return oldData;
+
+      if (newIsFavorite) {
+        const exists = oldData.pages.some(
+          (page) =>
+            page.status === 200 &&
+            page.data.agents.some(
+              (currentAgent: LibraryAgent) => currentAgent.id === agentId,
+            ),
+        );
+
+        if (!exists) {
+          const firstPage = oldData.pages[0];
+          if (firstPage?.status === 200) {
+            const updatedAgent = {
+              id: agent.id,
+              name: agent.name,
+              description: agent.description,
+              graph_id: agent.graph_id,
+              can_access_graph: agent.can_access_graph,
+              creator_image_url: agent.creator_image_url,
+              image_url: agent.image_url,
+              is_favorite: true,
+            };
+
+            return {
+              ...oldData,
+              pages: [
+                {
+                  ...firstPage,
+                  data: {
+                    ...firstPage.data,
+                    agents: [updatedAgent, ...firstPage.data.agents],
+                    pagination: {
+                      ...firstPage.data.pagination,
+                      total_items: firstPage.data.pagination.total_items + 1,
+                    },
+                  },
+                },
+                ...oldData.pages.slice(1).map((page) =>
+                  page.status === 200
+                    ? {
+                        ...page,
+                        data: {
+                          ...page.data,
+                          pagination: {
+                            ...page.data.pagination,
+                            total_items: page.data.pagination.total_items + 1,
+                          },
+                        },
+                      }
+                    : page,
+                ),
+              ],
+            };
+          }
+        }
+      } else {
+        return {
+          ...oldData,
+          pages: oldData.pages.map((page) => {
+            if (page.status !== 200) return page;
+
+            const filteredAgents = page.data.agents.filter(
+              (currentAgent: LibraryAgent) => currentAgent.id !== agentId,
+            );
+
+            const removedCount =
+              filteredAgents.length < page.data.agents.length ? 1 : 0;
+
+            return {
+              ...page,
+              data: {
+                ...page.data,
+                agents: filteredAgents,
+                pagination: {
+                  ...page.data.pagination,
+                  total_items: page.data.pagination.total_items - removedCount,
+                },
+              },
+            };
+          }),
+        };
+      }
+
+      return oldData;
+    },
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryAgentCard/useLibraryAgentCard.ts b/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryAgentCard/useLibraryAgentCard.ts
new file mode 100644
index 0000000000..87e9e9e9bc
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryAgentCard/useLibraryAgentCard.ts
@@ -0,0 +1,90 @@
+"use client";
+
+import { getQueryClient } from "@/lib/react-query/queryClient";
+import { useEffect, useState } from "react";
+
+import { usePatchV2UpdateLibraryAgent } from "@/app/api/__generated__/endpoints/library/library";
+import { useGetV2GetUserProfile } from "@/app/api/__generated__/endpoints/store/store";
+import { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";
+import { okData } from "@/app/api/helpers";
+import { useToast } from "@/components/molecules/Toast/use-toast";
+import { isLogoutInProgress } from "@/lib/autogpt-server-api/helpers";
+import { useSupabase } from "@/lib/supabase/hooks/useSupabase";
+import { updateFavoriteInQueries } from "./helpers";
+
+interface Props {
+  agent: LibraryAgent;
+}
+
+export function useLibraryAgentCard({ agent }: Props) {
+  const { id, name, is_favorite, creator_image_url, marketplace_listing } =
+    agent;
+
+  const isFromMarketplace = Boolean(marketplace_listing);
+  const [isFavorite, setIsFavorite] = useState(is_favorite);
+  const { toast } = useToast();
+  const queryClient = getQueryClient();
+  const { mutateAsync: updateLibraryAgent } = usePatchV2UpdateLibraryAgent();
+  const { user, isLoggedIn } = useSupabase();
+  const logoutInProgress = isLogoutInProgress();
+
+  const { data: profile } = useGetV2GetUserProfile({
+    query: {
+      select: okData,
+      enabled: isLoggedIn && !!user && !logoutInProgress,
+      queryKey: ["/api/store/profile", user?.id],
+    },
+  });
+
+  useEffect(() => {
+    setIsFavorite(is_favorite);
+  }, [is_favorite]);
+
+  function updateQueryData(newIsFavorite: boolean) {
+    updateFavoriteInQueries({
+      queryClient,
+      agentId: id,
+      agent,
+      newIsFavorite,
+    });
+  }
+
+  async function handleToggleFavorite(e: React.MouseEvent) {
+    e.preventDefault();
+    e.stopPropagation();
+
+    const newIsFavorite = !isFavorite;
+
+    setIsFavorite(newIsFavorite);
+    updateQueryData(newIsFavorite);
+
+    try {
+      await updateLibraryAgent({
+        libraryAgentId: id,
+        data: { is_favorite: newIsFavorite },
+      });
+
+      toast({
+        title: newIsFavorite ? "Added to favorites" : "Removed from favorites",
+        description: `${name} has been ${newIsFavorite ? "added to" : "removed from"} your favorites.`,
+      });
+    } catch {
+      setIsFavorite(!newIsFavorite);
+      updateQueryData(!newIsFavorite);
+
+      toast({
+        title: "Error",
+        description: "Failed to update favorite status. Please try again.",
+        variant: "destructive",
+      });
+    }
+  }
+
+  return {
+    isFromMarketplace,
+    isFavorite,
+    profile,
+    creator_image_url,
+    handleToggleFavorite,
+  };
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryAgentList/LibraryAgentList.tsx b/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryAgentList/LibraryAgentList.tsx
index 1b3926a6e1..074cd8ae26 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryAgentList/LibraryAgentList.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryAgentList/LibraryAgentList.tsx
@@ -1,10 +1,22 @@
 "use client";
-import LibraryActionSubHeader from "../LibraryActionSubHeader/LibraryActionSubHeader";
-import LibraryAgentCard from "../LibraryAgentCard/LibraryAgentCard";
+import { LibraryAgentSort } from "@/app/api/__generated__/models/libraryAgentSort";
+import { LoadingSpinner } from "@/components/atoms/LoadingSpinner/LoadingSpinner";
 import { InfiniteScroll } from "@/components/contextual/InfiniteScroll/InfiniteScroll";
+import { LibraryActionSubHeader } from "../LibraryActionSubHeader/LibraryActionSubHeader";
+import { LibraryAgentCard } from "../LibraryAgentCard/LibraryAgentCard";
 import { useLibraryAgentList } from "./useLibraryAgentList";
 
-export default function LibraryAgentList() {
+interface Props {
+  searchTerm: string;
+  librarySort: LibraryAgentSort;
+  setLibrarySort: (value: LibraryAgentSort) => void;
+}
+
+export function LibraryAgentList({
+  searchTerm,
+  librarySort,
+  setLibrarySort,
+}: Props) {
   const {
     agentLoading,
     agentCount,
@@ -12,28 +24,27 @@ export default function LibraryAgentList() {
     hasNextPage,
     isFetchingNextPage,
     fetchNextPage,
-  } = useLibraryAgentList();
-
-  const LoadingSpinner = () => (
-    <div className="h-8 w-8 animate-spin rounded-full border-b-2 border-t-2 border-neutral-800" />
-  );
+  } = useLibraryAgentList({ searchTerm, librarySort });
 
   return (
     <>
-      <LibraryActionSubHeader agentCount={agentCount} />
+      <LibraryActionSubHeader
+        agentCount={agentCount}
+        setLibrarySort={setLibrarySort}
+      />
       <div className="px-2">
         {agentLoading ? (
           <div className="flex h-[200px] items-center justify-center">
-            <LoadingSpinner />
+            <LoadingSpinner size="large" />
           </div>
         ) : (
           <InfiniteScroll
             isFetchingNextPage={isFetchingNextPage}
             fetchNextPage={fetchNextPage}
             hasNextPage={hasNextPage}
-            loader={<LoadingSpinner />}
+            loader={<LoadingSpinner size="medium" />}
           >
-            <div className="grid grid-cols-1 gap-3 sm:grid-cols-2 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4">
+            <div className="grid grid-cols-1 gap-6 sm:grid-cols-2 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4">
               {agents.map((agent) => (
                 <LibraryAgentCard key={agent.id} agent={agent} />
               ))}
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryAgentList/useLibraryAgentList.ts b/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryAgentList/useLibraryAgentList.ts
index e9db9a02da..0b102ff545 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryAgentList/useLibraryAgentList.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryAgentList/useLibraryAgentList.ts
@@ -1,18 +1,23 @@
 "use client";
 
+import { useGetV2ListLibraryAgentsInfinite } from "@/app/api/__generated__/endpoints/library/library";
+import { LibraryAgentSort } from "@/app/api/__generated__/models/libraryAgentSort";
 import {
   getPaginatedTotalCount,
   getPaginationNextPageNumber,
   unpaginate,
 } from "@/app/api/helpers";
-import { useGetV2ListLibraryAgentsInfinite } from "@/app/api/__generated__/endpoints/library/library";
-import { useLibraryPageContext } from "../state-provider";
-import { useLibraryAgentsStore } from "@/hooks/useLibraryAgents/store";
-import { getInitialData } from "./helpers";
+import { getQueryClient } from "@/lib/react-query/queryClient";
+import { useEffect, useRef } from "react";
 
-export const useLibraryAgentList = () => {
-  const { searchTerm, librarySort } = useLibraryPageContext();
-  const { agents: cachedAgents } = useLibraryAgentsStore();
+interface Props {
+  searchTerm: string;
+  librarySort: LibraryAgentSort;
+}
+
+export function useLibraryAgentList({ searchTerm, librarySort }: Props) {
+  const queryClient = getQueryClient();
+  const prevSortRef = useRef<LibraryAgentSort | null>(null);
 
   const {
     data: agentsQueryData,
@@ -23,18 +28,28 @@ export const useLibraryAgentList = () => {
   } = useGetV2ListLibraryAgentsInfinite(
     {
       page: 1,
-      page_size: 8,
+      page_size: 20,
       search_term: searchTerm || undefined,
       sort_by: librarySort,
     },
     {
       query: {
-        initialData: getInitialData(cachedAgents, searchTerm, 8),
         getNextPageParam: getPaginationNextPageNumber,
       },
     },
   );
 
+  // Reset queries when sort changes to ensure fresh data with correct sorting
+  useEffect(() => {
+    if (prevSortRef.current !== null && prevSortRef.current !== librarySort) {
+      // Reset all library agent queries to ensure fresh fetch with new sort
+      queryClient.resetQueries({
+        queryKey: ["/api/library/agents"],
+      });
+    }
+    prevSortRef.current = librarySort;
+  }, [librarySort, queryClient]);
+
   const allAgents = agentsQueryData
     ? unpaginate(agentsQueryData, "agents")
     : [];
@@ -48,4 +63,4 @@ export const useLibraryAgentList = () => {
     isFetchingNextPage,
     fetchNextPage,
   };
-};
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryNotificationCard/LibraryNotificationCard.tsx b/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryNotificationCard/LibraryNotificationCard.tsx
deleted file mode 100644
index 51520e4445..0000000000
--- a/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryNotificationCard/LibraryNotificationCard.tsx
+++ /dev/null
@@ -1,175 +0,0 @@
-import Image from "next/image";
-import { Button } from "@/components/__legacy__/ui/button";
-import { Separator } from "@/components/__legacy__/ui/separator";
-import {
-  CirclePlayIcon,
-  ClipboardCopy,
-  ImageIcon,
-  PlayCircle,
-  Share2,
-  X,
-} from "lucide-react";
-
-export interface NotificationCardData {
-  type: "text" | "image" | "video" | "audio";
-  title: string;
-  id: string;
-  content?: string;
-  mediaUrl?: string;
-}
-
-interface NotificationCardProps {
-  notification: NotificationCardData;
-  onClose: () => void;
-}
-
-const NotificationCard = ({
-  notification: { type, title, content, mediaUrl },
-  onClose,
-}: NotificationCardProps) => {
-  const barHeights = Array.from({ length: 60 }, () =>
-    Math.floor(Math.random() * (34 - 20 + 1) + 20),
-  );
-
-  const handleClose = (e: React.MouseEvent<HTMLButtonElement>) => {
-    e.preventDefault();
-    onClose();
-  };
-
-  return (
-    <div className="w-[430px] space-y-[22px] rounded-[14px] border border-neutral-100 bg-neutral-50 p-[16px] pt-[12px]">
-      <div className="flex items-center justify-between">
-        {/* count */}
-        <div className="flex items-center gap-[10px]">
-          <p className="font-sans text-[12px] font-medium text-neutral-500">
-            1/4
-          </p>
-          <p className="h-[26px] rounded-[45px] bg-green-100 px-[9px] py-[3px] font-sans text-[12px] font-medium text-green-800">
-            Success
-          </p>
-        </div>
-
-        {/* cross icon */}
-        <Button
-          variant="ghost"
-          className="p-0 hover:bg-transparent"
-          onClick={handleClose}
-        >
-          <X
-            className="h-6 w-6 text-[#020617] hover:scale-105"
-            strokeWidth={1.25}
-          />
-        </Button>
-      </div>
-
-      <div className="space-y-[6px] p-0">
-        <p className="font-sans text-[14px] font-medium leading-[20px] text-neutral-500">
-          New Output Ready!
-        </p>
-        <h2 className="font-poppin text-[20px] font-medium leading-7 text-neutral-800">
-          {title}
-        </h2>
-        {type === "text" && <Separator />}
-      </div>
-
-      <div className="p-0">
-        {type === "text" && (
-          // Maybe in future we give markdown support
-          <div className="mt-[-8px] line-clamp-6 font-sans text-sm font-[400px] text-neutral-600">
-            {content}
-          </div>
-        )}
-
-        {type === "image" &&
-          (mediaUrl ? (
-            <div className="relative h-[200px] w-full">
-              <Image
-                src={mediaUrl}
-                alt={title}
-                fill
-                className="rounded-lg object-cover"
-              />
-            </div>
-          ) : (
-            <div className="flex h-[244px] w-full items-center justify-center rounded-lg bg-[#D9D9D9]">
-              <ImageIcon
-                className="h-[138px] w-[138px] text-neutral-400"
-                strokeWidth={1}
-              />
-            </div>
-          ))}
-
-        {type === "video" && (
-          <div className="space-y-4">
-            {mediaUrl ? (
-              <video src={mediaUrl} controls className="w-full rounded-lg" />
-            ) : (
-              <div className="flex h-[219px] w-[398px] items-center justify-center rounded-lg bg-[#D9D9D9]">
-                <PlayCircle
-                  className="h-16 w-16 text-neutral-500"
-                  strokeWidth={1}
-                />
-              </div>
-            )}
-          </div>
-        )}
-
-        {type === "audio" && (
-          <div className="flex gap-2">
-            <CirclePlayIcon
-              className="h-10 w-10 rounded-full bg-neutral-800 text-white"
-              strokeWidth={1}
-            />
-            <div className="flex flex-1 items-center justify-between">
-              {/* <audio src={mediaUrl} controls className="w-full" /> */}
-              {barHeights.map((h, i) => {
-                return (
-                  <div
-                    key={i}
-                    className={`rounded-[8px] bg-neutral-500`}
-                    style={{
-                      height: `${h}px`,
-                      width: "3px",
-                    }}
-                  />
-                );
-              })}
-            </div>
-          </div>
-        )}
-      </div>
-
-      <div className="flex justify-between gap-2 p-0">
-        <div className="space-x-3">
-          <Button
-            variant="outline"
-            onClick={() => {
-              navigator.share({
-                title,
-                text: content,
-                url: mediaUrl,
-              });
-            }}
-            className="h-10 w-10 rounded-full border-neutral-800 p-0"
-          >
-            <Share2 className="h-5 w-5" strokeWidth={1} />
-          </Button>
-          <Button
-            variant="outline"
-            onClick={() =>
-              navigator.clipboard.writeText(content || mediaUrl || "")
-            }
-            className="h-10 w-10 rounded-full border-neutral-800 p-0"
-          >
-            <ClipboardCopy className="h-5 w-5" strokeWidth={1} />
-          </Button>
-        </div>
-        <Button className="h-[40px] rounded-[52px] bg-neutral-800 px-4 py-2">
-          See run
-        </Button>
-      </div>
-    </div>
-  );
-};
-
-export default NotificationCard;
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryNotificationDropdown/LibraryNotificationDropdown.tsx b/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryNotificationDropdown/LibraryNotificationDropdown.tsx
deleted file mode 100644
index cd863a21af..0000000000
--- a/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryNotificationDropdown/LibraryNotificationDropdown.tsx
+++ /dev/null
@@ -1,132 +0,0 @@
-"use client";
-import React, { useState, useEffect, useMemo } from "react";
-
-import { motion, useAnimationControls } from "framer-motion";
-import { BellIcon, X } from "lucide-react";
-import { Button } from "@/components/__legacy__/Button";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuLabel,
-  DropdownMenuTrigger,
-} from "@/components/__legacy__/ui/dropdown-menu";
-import NotificationCard, {
-  NotificationCardData,
-} from "../LibraryNotificationCard/LibraryNotificationCard";
-
-export default function LibraryNotificationDropdown(): React.ReactNode {
-  const controls = useAnimationControls();
-  const [open, setOpen] = useState(false);
-  const [notifications, setNotifications] = useState<
-    NotificationCardData[] | null
-  >(null);
-
-  const initialNotificationData = useMemo(
-    () =>
-      [
-        {
-          type: "audio",
-          title: "Audio Processing Complete",
-          id: "4",
-        },
-        {
-          type: "text",
-          title: "LinkedIn Post Generator: YouTube to Professional Content",
-          id: "1",
-          content:
-            "As artificial intelligence (AI) continues to evolve, it's increasingly clear that AI isn't just a trend—it's reshaping the way we work, innovate, and solve complex problems. However, for many professionals, the question remains: How can I leverage AI to drive meaningful results in my own field? In this article, we'll explore how AI can empower businesses and individuals alike to be more efficient, make better decisions, and unlock new opportunities. Whether you're in tech, finance, healthcare, or any other industry, understanding the potential of AI can set you apart.",
-        },
-        {
-          type: "image",
-          title: "New Image Upload",
-          id: "2",
-        },
-        {
-          type: "video",
-          title: "Video Processing Complete",
-          id: "3",
-        },
-      ] as NotificationCardData[],
-    [],
-  );
-
-  useEffect(() => {
-    if (initialNotificationData) {
-      setNotifications(initialNotificationData);
-    }
-  }, [initialNotificationData]);
-
-  const handleHoverStart = () => {
-    controls.start({
-      rotate: [0, -10, 10, -10, 10, 0],
-      transition: { duration: 0.5 },
-    });
-  };
-
-  return (
-    <DropdownMenu open={open} onOpenChange={setOpen}>
-      <DropdownMenuTrigger className="sm:flex-1" asChild>
-        <Button
-          variant={open ? "primary" : "outline"}
-          onMouseEnter={handleHoverStart}
-          onMouseLeave={handleHoverStart}
-          className="w-fit max-w-[161px] transition-all duration-200 ease-in-out sm:w-[161px]"
-        >
-          <motion.div animate={controls}>
-            <BellIcon
-              className="h-5 w-5 transition-all duration-200 ease-in-out sm:mr-2"
-              strokeWidth={2}
-            />
-          </motion.div>
-          <motion.div
-            initial={{ opacity: 1 }}
-            animate={{ opacity: 1 }}
-            exit={{ opacity: 0 }}
-            className="hidden items-center transition-opacity duration-300 sm:inline-flex"
-          >
-            Your updates
-            <span className="ml-2 text-[14px]">
-              {notifications?.length || 0}
-            </span>
-          </motion.div>
-        </Button>
-      </DropdownMenuTrigger>
-      <DropdownMenuContent
-        sideOffset={22}
-        className="relative left-[16px] h-[80vh] w-fit overflow-y-auto rounded-[26px] bg-[#C5C5CA] p-5"
-      >
-        <DropdownMenuLabel className="z-10 mb-4 font-sans text-[18px] text-white">
-          Agent run updates
-        </DropdownMenuLabel>
-        <button
-          className="absolute right-[10px] top-[20px] h-fit w-fit"
-          onClick={() => setOpen(false)}
-        >
-          <X className="h-6 w-6 text-white hover:text-white/60" />
-        </button>
-        <div className="space-y-[12px]">
-          {notifications && notifications.length ? (
-            notifications.map((notification) => (
-              <DropdownMenuItem key={notification.id} className="p-0">
-                <NotificationCard
-                  notification={notification}
-                  onClose={() =>
-                    setNotifications((prev) => {
-                      if (!prev) return null;
-                      return prev.filter((n) => n.id !== notification.id);
-                    })
-                  }
-                />
-              </DropdownMenuItem>
-            ))
-          ) : (
-            <div className="w-[464px] py-4 text-center text-white">
-              No notifications present
-            </div>
-          )}
-        </div>
-      </DropdownMenuContent>
-    </DropdownMenu>
-  );
-}
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/components/LibrarySearchBar/LibrarySearchBar.tsx b/autogpt_platform/frontend/src/app/(platform)/library/components/LibrarySearchBar/LibrarySearchBar.tsx
index ee36347874..cf63c300d6 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/components/LibrarySearchBar/LibrarySearchBar.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/components/LibrarySearchBar/LibrarySearchBar.tsx
@@ -1,40 +1,37 @@
 "use client";
-import { Input } from "@/components/__legacy__/ui/input";
-import { Search, X } from "lucide-react";
+
+import { Input } from "@/components/atoms/Input/Input";
+import { MagnifyingGlassIcon } from "@phosphor-icons/react";
 import { useLibrarySearchbar } from "./useLibrarySearchbar";
 
-export default function LibrarySearchBar(): React.ReactNode {
-  const { handleSearchInput, handleClear, setIsFocused, isFocused, inputRef } =
-    useLibrarySearchbar();
+interface Props {
+  setSearchTerm: (value: string) => void;
+}
+
+export function LibrarySearchBar({ setSearchTerm }: Props) {
+  const { handleSearchInput } = useLibrarySearchbar({ setSearchTerm });
+
   return (
     <div
       data-testid="search-bar"
-      onClick={() => inputRef.current?.focus()}
-      className="relative z-[21] mx-auto flex h-[50px] w-full max-w-[500px] flex-1 cursor-pointer items-center rounded-[45px] bg-[#EDEDED] px-[24px] py-[10px]"
+      className="relative z-[21] -mb-6 flex w-full items-center md:w-auto"
     >
-      <Search
-        className="mr-2 h-[29px] w-[29px] text-neutral-900"
-        strokeWidth={1.25}
+      <MagnifyingGlassIcon
+        width={18}
+        height={18}
+        className="absolute left-4 top-[34%] z-20 -translate-y-1/2 text-zinc-800"
       />
 
       <Input
-        ref={inputRef}
-        onFocus={() => setIsFocused(true)}
-        onBlur={() => !inputRef.current?.value && setIsFocused(false)}
+        label="Search agents"
+        id="library-search-bar"
+        hideLabel
         onChange={handleSearchInput}
-        className="flex-1 border-none font-sans text-[16px] font-normal leading-7 shadow-none focus:shadow-none focus:ring-0"
+        className="min-w-[18rem] pl-12 lg:min-w-[30rem]"
         type="text"
         data-testid="library-textbox"
         placeholder="Search agents"
       />
-
-      {isFocused && inputRef.current?.value && (
-        <X
-          className="ml-2 h-[29px] w-[29px] cursor-pointer text-neutral-900"
-          strokeWidth={1.25}
-          onClick={handleClear}
-        />
-      )}
     </div>
   );
 }
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/components/LibrarySearchBar/useLibrarySearchbar.tsx b/autogpt_platform/frontend/src/app/(platform)/library/components/LibrarySearchBar/useLibrarySearchbar.tsx
index f6428c6c4e..74b8e9874c 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/components/LibrarySearchBar/useLibrarySearchbar.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/components/LibrarySearchBar/useLibrarySearchbar.tsx
@@ -1,36 +1,30 @@
-import { useRef, useState } from "react";
-import { useLibraryPageContext } from "../state-provider";
 import { debounce } from "lodash";
+import { useCallback, useEffect } from "react";
 
-export const useLibrarySearchbar = () => {
-  const inputRef = useRef<HTMLInputElement>(null);
-  const [isFocused, setIsFocused] = useState(false);
-  const { setSearchTerm } = useLibraryPageContext();
+interface Props {
+  setSearchTerm: (value: string) => void;
+}
 
-  const debouncedSearch = debounce((value: string) => {
-    setSearchTerm(value);
-  }, 300);
+export function useLibrarySearchbar({ setSearchTerm }: Props) {
+  const debouncedSearch = useCallback(
+    debounce((value: string) => {
+      setSearchTerm(value);
+    }, 300),
+    [setSearchTerm],
+  );
 
-  const handleSearchInput = (e: React.ChangeEvent<HTMLInputElement>) => {
+  useEffect(() => {
+    return () => {
+      debouncedSearch.cancel();
+    };
+  }, [debouncedSearch]);
+
+  function handleSearchInput(e: React.ChangeEvent<HTMLInputElement>) {
     const searchTerm = e.target.value;
     debouncedSearch(searchTerm);
-  };
-
-  const handleClear = (e: React.MouseEvent) => {
-    if (inputRef.current) {
-      inputRef.current.value = "";
-      inputRef.current.blur();
-      setSearchTerm("");
-      e.preventDefault();
-    }
-    setIsFocused(false);
-  };
+  }
 
   return {
-    handleClear,
     handleSearchInput,
-    isFocused,
-    inputRef,
-    setIsFocused,
   };
-};
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/components/LibrarySortMenu/LibrarySortMenu.tsx b/autogpt_platform/frontend/src/app/(platform)/library/components/LibrarySortMenu/LibrarySortMenu.tsx
index ac4ed060f2..de37af5fad 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/components/LibrarySortMenu/LibrarySortMenu.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/components/LibrarySortMenu/LibrarySortMenu.tsx
@@ -1,5 +1,5 @@
 "use client";
-import { ArrowDownNarrowWideIcon } from "lucide-react";
+import { LibraryAgentSort } from "@/app/api/__generated__/models/libraryAgentSort";
 import {
   Select,
   SelectContent,
@@ -8,11 +8,15 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/__legacy__/ui/select";
-import { LibraryAgentSort } from "@/app/api/__generated__/models/libraryAgentSort";
+import { ArrowDownNarrowWideIcon } from "lucide-react";
 import { useLibrarySortMenu } from "./useLibrarySortMenu";
 
-export default function LibrarySortMenu(): React.ReactNode {
-  const { handleSortChange } = useLibrarySortMenu();
+interface Props {
+  setLibrarySort: (value: LibraryAgentSort) => void;
+}
+
+export function LibrarySortMenu({ setLibrarySort }: Props) {
+  const { handleSortChange } = useLibrarySortMenu({ setLibrarySort });
   return (
     <div className="flex items-center" data-testid="sort-by-dropdown">
       <span className="hidden whitespace-nowrap sm:inline">sort by</span>
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/components/LibrarySortMenu/useLibrarySortMenu.ts b/autogpt_platform/frontend/src/app/(platform)/library/components/LibrarySortMenu/useLibrarySortMenu.ts
index d2575c8936..e6d6f2d127 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/components/LibrarySortMenu/useLibrarySortMenu.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/library/components/LibrarySortMenu/useLibrarySortMenu.ts
@@ -1,11 +1,11 @@
 import { LibraryAgentSort } from "@/app/api/__generated__/models/libraryAgentSort";
-import { useLibraryPageContext } from "../state-provider";
 
-export const useLibrarySortMenu = () => {
-  const { setLibrarySort } = useLibraryPageContext();
+interface Props {
+  setLibrarySort: (value: LibraryAgentSort) => void;
+}
 
+export function useLibrarySortMenu({ setLibrarySort }: Props) {
   const handleSortChange = (value: LibraryAgentSort) => {
-    // Simply updating the sort state - React Query will handle the rest
     setLibrarySort(value);
   };
 
@@ -24,4 +24,4 @@ export const useLibrarySortMenu = () => {
     handleSortChange,
     getSortLabel,
   };
-};
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryUploadAgentDialog/LibraryUploadAgentDialog.tsx b/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryUploadAgentDialog/LibraryUploadAgentDialog.tsx
index d92bbe86fe..436be6f15a 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryUploadAgentDialog/LibraryUploadAgentDialog.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryUploadAgentDialog/LibraryUploadAgentDialog.tsx
@@ -1,192 +1,135 @@
 "use client";
-import { Upload, X } from "lucide-react";
-import { Button } from "@/components/__legacy__/Button";
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from "@/components/__legacy__/ui/dialog";
-import { z } from "zod";
-import { FileUploader } from "react-drag-drop-files";
+import { Button } from "@/components/atoms/Button/Button";
+import { FileInput } from "@/components/atoms/FileInput/FileInput";
+import { Input } from "@/components/atoms/Input/Input";
+import { LoadingSpinner } from "@/components/atoms/LoadingSpinner/LoadingSpinner";
+import { Dialog } from "@/components/molecules/Dialog/Dialog";
 import {
   Form,
   FormControl,
   FormField,
   FormItem,
-  FormLabel,
   FormMessage,
-} from "@/components/__legacy__/ui/form";
-import { Input } from "@/components/__legacy__/ui/input";
-import { Textarea } from "@/components/__legacy__/ui/textarea";
+} from "@/components/molecules/Form/Form";
+import { UploadSimpleIcon } from "@phosphor-icons/react";
+import { z } from "zod";
 import { useLibraryUploadAgentDialog } from "./useLibraryUploadAgentDialog";
 
-const fileTypes = ["JSON"];
-
-const fileSchema = z.custom<File>((val) => val instanceof File, {
-  message: "Must be a File object",
-});
-
 export const uploadAgentFormSchema = z.object({
-  agentFile: fileSchema,
+  agentFile: z.string().min(1, "Agent file is required"),
   agentName: z.string().min(1, "Agent name is required"),
   agentDescription: z.string(),
 });
 
-export default function LibraryUploadAgentDialog(): React.ReactNode {
-  const {
-    onSubmit,
-    isUploading,
-    isOpen,
-    setIsOpen,
-    isDroped,
-    handleChange,
-    form,
-    setisDroped,
-    agentObject,
-    clearAgentFile,
-  } = useLibraryUploadAgentDialog();
+export default function LibraryUploadAgentDialog() {
+  const { onSubmit, isUploading, isOpen, setIsOpen, form, agentObject } =
+    useLibraryUploadAgentDialog();
+
   return (
-    <Dialog open={isOpen} onOpenChange={setIsOpen}>
-      <DialogTrigger asChild>
+    <Dialog
+      title="Upload Agent"
+      styling={{ maxWidth: "30rem" }}
+      controlled={{
+        isOpen,
+        set: setIsOpen,
+      }}
+      onClose={() => {
+        setIsOpen(false);
+      }}
+    >
+      <Dialog.Trigger>
         <Button
           data-testid="upload-agent-button"
           variant="primary"
-          className="w-fit sm:w-[177px]"
+          className="h-[2.78rem] w-full md:w-[12rem]"
+          size="small"
         >
-          <Upload className="h-5 w-5 sm:mr-2" />
-          <span className="hidden items-center sm:inline-flex">
-            Upload an agent
-          </span>
+          <UploadSimpleIcon width={18} height={18} />
+          <span className="">Upload agent</span>
         </Button>
-      </DialogTrigger>
-      <DialogContent>
-        <DialogHeader>
-          <DialogTitle className="mb-8 text-center">Upload Agent</DialogTitle>
-          <DialogDescription>
-            Upload your agent by providing a name, description, and JSON file.
-          </DialogDescription>
-        </DialogHeader>
+      </Dialog.Trigger>
+      <Dialog.Content>
+        <Form
+          form={form}
+          onSubmit={onSubmit}
+          className="flex flex-col justify-center gap-0 px-1"
+        >
+          <FormField
+            control={form.control}
+            name="agentName"
+            render={({ field }) => (
+              <FormItem>
+                <FormControl>
+                  <Input
+                    {...field}
+                    id={field.name}
+                    label="Agent name"
+                    className="w-full rounded-[10px]"
+                  />
+                </FormControl>
+                <FormMessage />
+              </FormItem>
+            )}
+          />
 
-        <Form {...form}>
-          <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-            <FormField
-              control={form.control}
-              name="agentName"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>Agent name</FormLabel>
-                  <FormControl>
-                    <Input {...field} className="w-full rounded-[10px]" />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
+          <FormField
+            control={form.control}
+            name="agentDescription"
+            render={({ field }) => (
+              <FormItem>
+                <FormControl>
+                  <Input
+                    {...field}
+                    id={field.name}
+                    label="Agent description"
+                    type="textarea"
+                    className="w-full rounded-[10px]"
+                  />
+                </FormControl>
+                <FormMessage />
+              </FormItem>
+            )}
+          />
 
-            <FormField
-              control={form.control}
-              name="agentDescription"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>Description</FormLabel>
-                  <FormControl>
-                    <Textarea {...field} className="w-full rounded-[10px]" />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
+          <FormField
+            control={form.control}
+            name="agentFile"
+            render={({ field }) => (
+              <FormItem>
+                <FormControl>
+                  <FileInput
+                    mode="base64"
+                    value={field.value}
+                    onChange={field.onChange}
+                    accept=".json,application/json"
+                    placeholder="Agent file"
+                    maxFileSize={10 * 1024 * 1024}
+                    showStorageNote={false}
+                    className="mb-8 mt-4"
+                  />
+                </FormControl>
+                <FormMessage />
+              </FormItem>
+            )}
+          />
 
-            <FormField
-              control={form.control}
-              name="agentFile"
-              render={({ field }) => (
-                <FormItem className="rounded-xl border-2 border-dashed border-neutral-300 hover:border-neutral-600">
-                  <FormControl>
-                    {field.value ? (
-                      <div className="relative flex rounded-[10px] border p-2 font-sans text-sm font-medium text-[#525252] outline-none">
-                        <span className="line-clamp-1">{field.value.name}</span>
-                        <Button
-                          onClick={clearAgentFile}
-                          className="absolute left-[-10px] top-[-16px] mt-2 h-fit border-none bg-red-200 p-1"
-                        >
-                          <X
-                            className="m-0 h-[12px] w-[12px] text-red-600"
-                            strokeWidth={3}
-                          />
-                        </Button>
-                      </div>
-                    ) : (
-                      <FileUploader
-                        handleChange={handleChange}
-                        name="file"
-                        types={fileTypes}
-                        label={"Upload your agent here..!!"}
-                        uploadedLabel={"Uploading Successful"}
-                        required={true}
-                        hoverTitle={"Drop your agent here...!!"}
-                        maxSize={10}
-                        classes={"drop-style"}
-                        onDrop={() => {
-                          setisDroped(true);
-                        }}
-                        onSelect={() => setisDroped(true)}
-                      >
-                        <div
-                          style={{
-                            minHeight: "150px",
-                            display: "flex",
-                            flexDirection: "column",
-                            justifyContent: "center",
-                            alignItems: "center",
-                            outline: "none",
-                            color: "#525252",
-                            fontSize: "14px",
-                            fontWeight: "500",
-                            borderWidth: "0px",
-                          }}
-                        >
-                          {isDroped ? (
-                            <div className="flex items-center justify-center py-4">
-                              <div className="h-8 w-8 animate-spin rounded-full border-b-2 border-t-2 border-neutral-800"></div>
-                            </div>
-                          ) : (
-                            <>
-                              <span>Drop your agent here</span>
-                              <span>or</span>
-                              <span>Click to upload</span>
-                            </>
-                          )}
-                        </div>
-                      </FileUploader>
-                    )}
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-
-            <Button
-              type="submit"
-              variant="primary"
-              className="mt-2 self-end"
-              disabled={!agentObject || isUploading}
-            >
-              {isUploading ? (
-                <div className="flex items-center gap-2">
-                  <div className="h-4 w-4 animate-spin rounded-full border-b-2 border-t-2 border-white"></div>
-                  <span>Uploading...</span>
-                </div>
-              ) : (
-                "Upload Agent"
-              )}
-            </Button>
-          </form>
+          <Button
+            type="submit"
+            variant="primary"
+            className="min-w-[18rem]"
+            disabled={!agentObject || isUploading}
+          >
+            {isUploading ? (
+              <div className="flex items-center gap-2">
+                <LoadingSpinner size="small" className="text-white" />
+                <span>Uploading...</span>
+              </div>
+            ) : (
+              "Upload"
+            )}
+          </Button>
         </Form>
-      </DialogContent>
+      </Dialog.Content>
     </Dialog>
   );
 }
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryUploadAgentDialog/useLibraryUploadAgentDialog.ts b/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryUploadAgentDialog/useLibraryUploadAgentDialog.ts
index 689753a340..e5e9c5d6df 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryUploadAgentDialog/useLibraryUploadAgentDialog.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/library/components/LibraryUploadAgentDialog/useLibraryUploadAgentDialog.ts
@@ -1,16 +1,15 @@
+import { usePostV1CreateNewGraph } from "@/app/api/__generated__/endpoints/graphs/graphs";
+import { Graph } from "@/app/api/__generated__/models/graph";
+import { GraphModel } from "@/app/api/__generated__/models/graphModel";
+import { useToast } from "@/components/molecules/Toast/use-toast";
+import { sanitizeImportedGraph } from "@/lib/autogpt-server-api";
 import { zodResolver } from "@hookform/resolvers/zod";
+import { useEffect, useRef, useState } from "react";
 import { useForm } from "react-hook-form";
 import { z } from "zod";
 import { uploadAgentFormSchema } from "./LibraryUploadAgentDialog";
-import { usePostV1CreateNewGraph } from "@/app/api/__generated__/endpoints/graphs/graphs";
-import { GraphModel } from "@/app/api/__generated__/models/graphModel";
-import { useToast } from "@/components/molecules/Toast/use-toast";
-import { useState } from "react";
-import { Graph } from "@/app/api/__generated__/models/graph";
-import { sanitizeImportedGraph } from "@/lib/autogpt-server-api";
 
-export const useLibraryUploadAgentDialog = () => {
-  const [isDroped, setisDroped] = useState(false);
+export function useLibraryUploadAgentDialog() {
   const [isOpen, setIsOpen] = useState(false);
   const { toast } = useToast();
   const [agentObject, setAgentObject] = useState<Graph | null>(null);
@@ -43,9 +42,78 @@ export const useLibraryUploadAgentDialog = () => {
     defaultValues: {
       agentName: "",
       agentDescription: "",
+      agentFile: "",
     },
   });
 
+  const agentFileValue = form.watch("agentFile");
+  const prevAgentObjectRef = useRef<Graph | null>(null);
+
+  useEffect(() => {
+    if (!agentFileValue) {
+      const prevAgent = prevAgentObjectRef.current;
+      if (prevAgent) {
+        const currentName = form.getValues("agentName");
+        const currentDescription = form.getValues("agentDescription");
+        if (currentName === prevAgent.name) {
+          form.setValue("agentName", "");
+        }
+        if (currentDescription === prevAgent.description) {
+          form.setValue("agentDescription", "");
+        }
+      }
+      setAgentObject(null);
+      prevAgentObjectRef.current = null;
+      return;
+    }
+
+    try {
+      const base64Match = agentFileValue.match(/^data:[^;]+;base64,(.+)$/);
+      if (!base64Match) {
+        throw new Error("Invalid base64 data URL format");
+      }
+
+      const base64String = base64Match[1];
+      const jsonString = atob(base64String);
+      const obj = JSON.parse(jsonString);
+
+      if (
+        !["name", "description", "nodes", "links"].every(
+          (key) => key in obj && obj[key] != null,
+        )
+      ) {
+        throw new Error(
+          "Invalid agent file. Please upload a valid agent.json file that has been previously exported from the AutoGPT platform. The file must contain the required fields: name, description, nodes, and links.",
+        );
+      }
+
+      const agent = obj as Graph;
+      sanitizeImportedGraph(agent);
+      setAgentObject(agent);
+      prevAgentObjectRef.current = agent;
+
+      if (!form.getValues("agentName")) {
+        form.setValue("agentName", agent.name);
+      }
+      if (!form.getValues("agentDescription")) {
+        form.setValue("agentDescription", agent.description);
+      }
+    } catch (error) {
+      console.error("Error loading agent file:", error);
+
+      toast({
+        title: "Invalid Agent File",
+        description:
+          "Please upload a valid agent.json file that has been previously exported from the AutoGPT platform. The file must contain the required fields: name, description, nodes, and links.",
+        duration: 5000,
+        variant: "destructive",
+      });
+
+      form.resetField("agentFile");
+      setAgentObject(null);
+    }
+  }, [agentFileValue, form, toast]);
+
   const onSubmit = async (values: z.infer<typeof uploadAgentFormSchema>) => {
     if (!agentObject) {
       form.setError("root", { message: "No Agent object to save" });
@@ -67,69 +135,6 @@ export const useLibraryUploadAgentDialog = () => {
     });
   };
 
-  const handleChange = (file: File) => {
-    setTimeout(() => {
-      setisDroped(false);
-    }, 2000);
-
-    form.setValue("agentFile", file);
-    const reader = new FileReader();
-    reader.onload = (event) => {
-      try {
-        const obj = JSON.parse(event.target?.result as string);
-        if (
-          !["name", "description", "nodes", "links"].every(
-            (key) => key in obj && obj[key] != null,
-          )
-        ) {
-          throw new Error(
-            "Invalid agent file. Please upload a valid agent.json file that has been previously exported from the AutoGPT platform. The file must contain the required fields: name, description, nodes, and links.",
-          );
-        }
-        const agent = obj as Graph;
-        sanitizeImportedGraph(agent);
-        setAgentObject(agent);
-        if (!form.getValues("agentName")) {
-          form.setValue("agentName", agent.name);
-        }
-        if (!form.getValues("agentDescription")) {
-          form.setValue("agentDescription", agent.description);
-        }
-      } catch (error) {
-        console.error("Error loading agent file:", error);
-
-        toast({
-          title: "Invalid Agent File",
-          description:
-            "Please upload a valid agent.json file that has been previously exported from the AutoGPT platform. The file must contain the required fields: name, description, nodes, and links.",
-          duration: 5000,
-          variant: "destructive",
-        });
-
-        form.resetField("agentFile");
-        setAgentObject(null);
-      }
-    };
-    reader.readAsText(file);
-    setisDroped(false);
-  };
-
-  const clearAgentFile = () => {
-    const currentName = form.getValues("agentName");
-    const currentDescription = form.getValues("agentDescription");
-    const prevAgent = agentObject;
-
-    form.setValue("agentFile", undefined as any);
-    if (prevAgent && currentName === prevAgent.name) {
-      form.setValue("agentName", "");
-    }
-    if (prevAgent && currentDescription === prevAgent.description) {
-      form.setValue("agentDescription", "");
-    }
-
-    setAgentObject(null);
-  };
-
   return {
     onSubmit,
     isUploading,
@@ -137,9 +142,5 @@ export const useLibraryUploadAgentDialog = () => {
     setIsOpen,
     form,
     agentObject,
-    isDroped,
-    handleChange,
-    setisDroped,
-    clearAgentFile,
   };
-};
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/components/state-provider.tsx b/autogpt_platform/frontend/src/app/(platform)/library/components/state-provider.tsx
deleted file mode 100644
index 20afbc9cd5..0000000000
--- a/autogpt_platform/frontend/src/app/(platform)/library/components/state-provider.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-"use client";
-
-import { LibraryAgentSort } from "@/app/api/__generated__/models/libraryAgentSort";
-import {
-  createContext,
-  useState,
-  ReactNode,
-  useContext,
-  Dispatch,
-  SetStateAction,
-} from "react";
-
-interface LibraryPageContextType {
-  searchTerm: string;
-  setSearchTerm: Dispatch<SetStateAction<string>>;
-  uploadedFile: File | null;
-  setUploadedFile: Dispatch<SetStateAction<File | null>>;
-  librarySort: LibraryAgentSort;
-  setLibrarySort: Dispatch<SetStateAction<LibraryAgentSort>>;
-}
-
-export const LibraryPageContext = createContext<LibraryPageContextType>(
-  {} as LibraryPageContextType,
-);
-
-export function LibraryPageStateProvider({
-  children,
-}: {
-  children: ReactNode;
-}) {
-  const [searchTerm, setSearchTerm] = useState<string>("");
-  const [uploadedFile, setUploadedFile] = useState<File | null>(null);
-  const [librarySort, setLibrarySort] = useState<LibraryAgentSort>(
-    LibraryAgentSort.updatedAt,
-  );
-
-  return (
-    <LibraryPageContext.Provider
-      value={{
-        searchTerm,
-        setSearchTerm,
-        uploadedFile,
-        setUploadedFile,
-        librarySort,
-        setLibrarySort,
-      }}
-    >
-      {children}
-    </LibraryPageContext.Provider>
-  );
-}
-
-export function useLibraryPageContext(): LibraryPageContextType {
-  const context = useContext(LibraryPageContext);
-  if (!context) {
-    throw new Error("Error in context of Library page");
-  }
-  return context;
-}
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/components/useLibraryListPage.ts b/autogpt_platform/frontend/src/app/(platform)/library/components/useLibraryListPage.ts
new file mode 100644
index 0000000000..94a8fe9fab
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/library/components/useLibraryListPage.ts
@@ -0,0 +1,41 @@
+"use client";
+
+import { LibraryAgentSort } from "@/app/api/__generated__/models/libraryAgentSort";
+import { parseAsStringEnum, useQueryState } from "nuqs";
+import { useCallback, useEffect, useMemo, useState } from "react";
+
+const sortParser = parseAsStringEnum(Object.values(LibraryAgentSort));
+
+export function useLibraryListPage() {
+  const [searchTerm, setSearchTerm] = useState<string>("");
+  const [uploadedFile, setUploadedFile] = useState<File | null>(null);
+  const [librarySortRaw, setLibrarySortRaw] = useQueryState("sort", sortParser);
+
+  // Ensure sort param is always present in URL (even if default)
+  useEffect(() => {
+    if (!librarySortRaw) {
+      setLibrarySortRaw(LibraryAgentSort.updatedAt, { shallow: false });
+    }
+  }, [librarySortRaw, setLibrarySortRaw]);
+
+  const librarySort = librarySortRaw || LibraryAgentSort.updatedAt;
+
+  const setLibrarySort = useCallback(
+    (value: LibraryAgentSort) => {
+      setLibrarySortRaw(value, { shallow: false });
+    },
+    [setLibrarySortRaw],
+  );
+
+  return useMemo(
+    () => ({
+      searchTerm,
+      setSearchTerm,
+      uploadedFile,
+      setUploadedFile,
+      librarySort,
+      setLibrarySort,
+    }),
+    [searchTerm, uploadedFile, librarySort, setLibrarySort],
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/hooks/useFavoriteAgents.ts b/autogpt_platform/frontend/src/app/(platform)/library/hooks/useFavoriteAgents.ts
index 933670ca80..d5f8cce057 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/hooks/useFavoriteAgents.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/library/hooks/useFavoriteAgents.ts
@@ -1,13 +1,15 @@
 "use client";
 
-import {
-  getPaginatedTotalCount,
-  getPaginationNextPageNumber,
-  unpaginate,
-} from "@/app/api/helpers";
 import { useGetV2ListFavoriteLibraryAgentsInfinite } from "@/app/api/__generated__/endpoints/library/library";
+import { getPaginationNextPageNumber, unpaginate } from "@/app/api/helpers";
+import { useMemo } from "react";
+import { filterAgents } from "../components/LibraryAgentList/helpers";
 
-export function useFavoriteAgents() {
+interface Props {
+  searchTerm: string;
+}
+
+export function useFavoriteAgents({ searchTerm }: Props) {
   const {
     data: agentsQueryData,
     fetchNextPage,
@@ -27,10 +29,16 @@ export function useFavoriteAgents() {
   const allAgents = agentsQueryData
     ? unpaginate(agentsQueryData, "agents")
     : [];
-  const agentCount = getPaginatedTotalCount(agentsQueryData);
+
+  const filteredAgents = useMemo(
+    () => filterAgents(allAgents, searchTerm),
+    [allAgents, searchTerm],
+  );
+
+  const agentCount = filteredAgents.length;
 
   return {
-    allAgents,
+    allAgents: filteredAgents,
     agentLoading,
     hasNextPage,
     agentCount,
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/page.tsx b/autogpt_platform/frontend/src/app/(platform)/library/page.tsx
index c4c3f5ab21..c619d480e0 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/page.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/page.tsx
@@ -1,23 +1,28 @@
 "use client";
 
 import { useEffect } from "react";
-import FavoritesSection from "./components/FavoritesSection/FavoritesSection";
-import LibraryActionHeader from "./components/LibraryActionHeader/LibraryActionHeader";
-import LibraryAgentList from "./components/LibraryAgentList/LibraryAgentList";
-import { LibraryPageStateProvider } from "./components/state-provider";
+import { FavoritesSection } from "./components/FavoritesSection/FavoritesSection";
+import { LibraryActionHeader } from "./components/LibraryActionHeader/LibraryActionHeader";
+import { LibraryAgentList } from "./components/LibraryAgentList/LibraryAgentList";
+import { useLibraryListPage } from "./components/useLibraryListPage";
 
 export default function LibraryPage() {
+  const { searchTerm, setSearchTerm, librarySort, setLibrarySort } =
+    useLibraryListPage();
+
   useEffect(() => {
     document.title = "Library – AutoGPT Platform";
   }, []);
 
   return (
     <main className="pt-160 container min-h-screen space-y-4 pb-20 pt-16 sm:px-8 md:px-12">
-      <LibraryPageStateProvider>
-        <LibraryActionHeader />
-        <FavoritesSection />
-        <LibraryAgentList />
-      </LibraryPageStateProvider>
+      <LibraryActionHeader setSearchTerm={setSearchTerm} />
+      <FavoritesSection searchTerm={searchTerm} />
+      <LibraryAgentList
+        searchTerm={searchTerm}
+        librarySort={librarySort}
+        setLibrarySort={setLibrarySort}
+      />
     </main>
   );
 }
diff --git a/autogpt_platform/frontend/src/app/(platform)/login/actions.ts b/autogpt_platform/frontend/src/app/(platform)/login/actions.ts
index 936c879d69..c4867dd123 100644
--- a/autogpt_platform/frontend/src/app/(platform)/login/actions.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/login/actions.ts
@@ -4,7 +4,7 @@ import BackendAPI from "@/lib/autogpt-server-api";
 import { getServerSupabase } from "@/lib/supabase/server/getServerSupabase";
 import { loginFormSchema } from "@/types/auth";
 import * as Sentry from "@sentry/nextjs";
-import { shouldShowOnboarding } from "../../api/helpers";
+import { getOnboardingStatus } from "../../api/helpers";
 
 export async function login(email: string, password: string) {
   try {
@@ -36,11 +36,13 @@ export async function login(email: string, password: string) {
     const api = new BackendAPI();
     await api.createUser();
 
-    const onboarding = await shouldShowOnboarding();
+    // Get onboarding status from backend (includes chat flag evaluated for this user)
+    const { shouldShowOnboarding } = await getOnboardingStatus();
+    const next = shouldShowOnboarding ? "/onboarding" : "/";
 
     return {
       success: true,
-      onboarding,
+      next,
     };
   } catch (err) {
     Sentry.captureException(err);
diff --git a/autogpt_platform/frontend/src/app/(platform)/login/useLoginPage.ts b/autogpt_platform/frontend/src/app/(platform)/login/useLoginPage.ts
index 656e1febc2..9b81965c31 100644
--- a/autogpt_platform/frontend/src/app/(platform)/login/useLoginPage.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/login/useLoginPage.ts
@@ -26,7 +26,7 @@ export function useLoginPage() {
 
   useEffect(() => {
     if (isLoggedIn && !isLoggingIn) {
-      router.push(nextUrl || "/marketplace");
+      router.push(nextUrl || "/");
     }
   }, [isLoggedIn, isLoggingIn, nextUrl, router]);
 
@@ -93,13 +93,8 @@ export function useLoginPage() {
         throw new Error(result.error || "Login failed");
       }
 
-      if (nextUrl) {
-        router.replace(nextUrl);
-      } else if (result.onboarding) {
-        router.replace("/onboarding");
-      } else {
-        router.replace("/marketplace");
-      }
+      // Prefer URL's next parameter, then use backend-determined route
+      router.replace(nextUrl || result.next || "/");
     } catch (error) {
       toast({
         title:
diff --git a/autogpt_platform/frontend/src/app/(platform)/marketplace/components/AgentInfo/AgentInfo.tsx b/autogpt_platform/frontend/src/app/(platform)/marketplace/components/AgentInfo/AgentInfo.tsx
index a7a690c67e..8098af7405 100644
--- a/autogpt_platform/frontend/src/app/(platform)/marketplace/components/AgentInfo/AgentInfo.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/marketplace/components/AgentInfo/AgentInfo.tsx
@@ -12,6 +12,7 @@ import type { GetV2GetSpecificAgentParams } from "@/app/api/__generated__/models
 import { useAgentInfo } from "./useAgentInfo";
 import { useGetV2GetSpecificAgent } from "@/app/api/__generated__/endpoints/store/store";
 import { Text } from "@/components/atoms/Text/Text";
+import { formatTimeAgo } from "@/lib/utils/time";
 import * as React from "react";
 
 interface AgentInfoProps {
@@ -258,23 +259,29 @@ export const AgentInfo = ({
           </div>
         </div>
 
-        {/* Changelog */}
+        {/* Version history */}
         <div className="flex w-full flex-col gap-1.5 sm:gap-2">
-          <div className="decoration-skip-ink-none mb-1.5 text-base font-medium leading-6 text-neutral-800 dark:text-neutral-200 sm:mb-2">
-            Changelog
+          <div className="decoration-skip-ink-none text-base font-medium leading-6 text-neutral-800 dark:text-neutral-200">
+            Version history
           </div>
-          <div className="decoration-skip-ink-none text-base font-normal leading-6 text-neutral-600 underline-offset-[from-font] dark:text-neutral-400">
-            Last updated {lastUpdated}
+          <div className="decoration-skip-ink-none text-sm font-normal leading-6 text-neutral-600 underline-offset-[from-font] dark:text-neutral-400">
+            Last updated {formatTimeAgo(lastUpdated)}
+          </div>
+          <div className="decoration-skip-ink-none text-xs text-neutral-600 dark:text-neutral-400 sm:text-sm">
+            Version {version}.0
           </div>
 
           {/* Version List */}
           {agentVersions.length > 0 ? (
-            <div className="mt-4">
+            <div className="mt-3">
+              <div className="decoration-skip-ink-none mb-1.5 text-base font-medium leading-6 text-neutral-900 dark:text-neutral-200 sm:mb-2">
+                Changelog
+              </div>
               {agentVersions.map(renderVersionItem)}
               {hasMoreVersions && (
                 <button
                   onClick={() => setVisibleVersionCount((prev) => prev + 3)}
-                  className="mt-2 flex items-center gap-1 text-sm font-medium text-neutral-900 hover:text-neutral-700 dark:text-neutral-100 dark:hover:text-neutral-300"
+                  className="mt-2 flex items-center gap-1 text-sm font-medium text-neutral-700 hover:text-neutral-700 dark:text-neutral-100 dark:hover:text-neutral-300"
                 >
                   <svg
                     width="16"
@@ -297,7 +304,7 @@ export const AgentInfo = ({
             </div>
           ) : (
             <div className="text-xs text-neutral-600 dark:text-neutral-400 sm:text-sm">
-              Version {version}
+              Version {version}.0
             </div>
           )}
         </div>
diff --git a/autogpt_platform/frontend/src/app/(platform)/marketplace/components/MainMarketplacePage/__tests__/main.test.tsx b/autogpt_platform/frontend/src/app/(platform)/marketplace/components/MainMarketplacePage/__tests__/main.test.tsx
new file mode 100644
index 0000000000..bee227a7af
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/marketplace/components/MainMarketplacePage/__tests__/main.test.tsx
@@ -0,0 +1,15 @@
+import { expect, test } from "vitest";
+import { render, screen } from "@/tests/integrations/test-utils";
+import { MainMarkeplacePage } from "../MainMarketplacePage";
+import { server } from "@/mocks/mock-server";
+import { getDeleteV2DeleteStoreSubmissionMockHandler422 } from "@/app/api/__generated__/endpoints/store/store.msw";
+
+// Only for CI testing purpose, will remove it in future PR
+test("MainMarketplacePage", async () => {
+  server.use(getDeleteV2DeleteStoreSubmissionMockHandler422());
+
+  render(<MainMarkeplacePage />);
+  expect(
+    await screen.findByText("Featured agents", { exact: false }),
+  ).toBeDefined();
+});
diff --git a/autogpt_platform/frontend/src/app/(platform)/monitoring/components/AgentFlowList.tsx b/autogpt_platform/frontend/src/app/(platform)/monitoring/components/AgentFlowList.tsx
index d4cb6fc649..badba61bf1 100644
--- a/autogpt_platform/frontend/src/app/(platform)/monitoring/components/AgentFlowList.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/monitoring/components/AgentFlowList.tsx
@@ -120,9 +120,11 @@ export const AgentFlowList = ({
                   lastRun =
                     runCount == 0
                       ? null
-                      : _flowRuns.reduce((a, c) =>
-                          a.started_at > c.started_at ? a : c,
-                        );
+                      : _flowRuns.reduce((a, c) => {
+                          const aTime = a.started_at?.getTime() ?? 0;
+                          const cTime = c.started_at?.getTime() ?? 0;
+                          return aTime > cTime ? a : c;
+                        });
                 }
                 return { flow, runCount, lastRun };
               })
@@ -130,10 +132,9 @@ export const AgentFlowList = ({
                 if (!a.lastRun && !b.lastRun) return 0;
                 if (!a.lastRun) return 1;
                 if (!b.lastRun) return -1;
-                return (
-                  b.lastRun.started_at.getTime() -
-                  a.lastRun.started_at.getTime()
-                );
+                const bTime = b.lastRun.started_at?.getTime() ?? 0;
+                const aTime = a.lastRun.started_at?.getTime() ?? 0;
+                return bTime - aTime;
               })
               .map(({ flow, runCount, lastRun }) => (
                 <TableRow
diff --git a/autogpt_platform/frontend/src/app/(platform)/monitoring/components/FlowRunsStatus.tsx b/autogpt_platform/frontend/src/app/(platform)/monitoring/components/FlowRunsStatus.tsx
index 603982cba5..c545ac2998 100644
--- a/autogpt_platform/frontend/src/app/(platform)/monitoring/components/FlowRunsStatus.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/monitoring/components/FlowRunsStatus.tsx
@@ -29,7 +29,10 @@ export const FlowRunsStatus: React.FC<{
         : statsSince;
   const filteredFlowRuns =
     statsSinceTimestamp != null
-      ? executions.filter((fr) => fr.started_at.getTime() > statsSinceTimestamp)
+      ? executions.filter(
+          (fr) =>
+            fr.started_at && fr.started_at.getTime() > statsSinceTimestamp,
+        )
       : executions;
 
   return (
diff --git a/autogpt_platform/frontend/src/app/(platform)/monitoring/components/FlowRunsTimeline.tsx b/autogpt_platform/frontend/src/app/(platform)/monitoring/components/FlowRunsTimeline.tsx
index 02050627f5..ee01d67234 100644
--- a/autogpt_platform/frontend/src/app/(platform)/monitoring/components/FlowRunsTimeline.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/monitoring/components/FlowRunsTimeline.tsx
@@ -98,40 +98,43 @@ export const FlowRunsTimeline = ({
         <Scatter
           key={flow.id}
           data={executions
-            .filter((e) => e.graph_id == flow.graph_id)
+            .filter((e) => e.graph_id == flow.graph_id && e.started_at)
             .map((e) => ({
               ...e,
               time:
-                e.started_at.getTime() + (e.stats?.node_exec_time ?? 0) * 1000,
+                (e.started_at?.getTime() ?? 0) +
+                (e.stats?.node_exec_time ?? 0) * 1000,
               _duration: e.stats?.node_exec_time ?? 0,
             }))}
           name={flow.name}
           fill={`hsl(${(hashString(flow.id) * 137.5) % 360}, 70%, 50%)`}
         />
       ))}
-      {executions.map((execution) => (
-        <Line
-          key={execution.id}
-          type="linear"
-          dataKey="_duration"
-          data={[
-            {
-              ...execution,
-              time: execution.started_at.getTime(),
-              _duration: 0,
-            },
-            {
-              ...execution,
-              time: execution.ended_at.getTime(),
-              _duration: execution.stats?.node_exec_time ?? 0,
-            },
-          ]}
-          stroke={`hsl(${(hashString(execution.graph_id) * 137.5) % 360}, 70%, 50%)`}
-          strokeWidth={2}
-          dot={false}
-          legendType="none"
-        />
-      ))}
+      {executions
+        .filter((e) => e.started_at && e.ended_at)
+        .map((execution) => (
+          <Line
+            key={execution.id}
+            type="linear"
+            dataKey="_duration"
+            data={[
+              {
+                ...execution,
+                time: execution.started_at!.getTime(),
+                _duration: 0,
+              },
+              {
+                ...execution,
+                time: execution.ended_at!.getTime(),
+                _duration: execution.stats?.node_exec_time ?? 0,
+              },
+            ]}
+            stroke={`hsl(${(hashString(execution.graph_id) * 137.5) % 360}, 70%, 50%)`}
+            strokeWidth={2}
+            dot={false}
+            legendType="none"
+          />
+        ))}
       <Legend
         content={<ScrollableLegend />}
         wrapperStyle={{
diff --git a/autogpt_platform/frontend/src/app/(platform)/monitoring/page.tsx b/autogpt_platform/frontend/src/app/(platform)/monitoring/page.tsx
index 3b5aa46839..4c356dabef 100644
--- a/autogpt_platform/frontend/src/app/(platform)/monitoring/page.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/monitoring/page.tsx
@@ -98,7 +98,11 @@ const Monitor = () => {
           ...(selectedFlow
             ? executions.filter((v) => v.graph_id == selectedFlow.graph_id)
             : executions),
-        ].sort((a, b) => b.started_at.getTime() - a.started_at.getTime())}
+        ].sort((a, b) => {
+          const aTime = a.started_at?.getTime() ?? 0;
+          const bTime = b.started_at?.getTime() ?? 0;
+          return bTime - aTime;
+        })}
         selectedRun={selectedRun}
         onSelectRun={(r) => setSelectedRun(r.id == selectedRun?.id ? null : r)}
       />
diff --git a/autogpt_platform/frontend/src/app/(platform)/profile/(user)/dashboard/components/AgentTableCard/AgentTableCard.tsx b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/dashboard/components/AgentTableCard/AgentTableCard.tsx
index a8d5d23912..0e1a6ac095 100644
--- a/autogpt_platform/frontend/src/app/(platform)/profile/(user)/dashboard/components/AgentTableCard/AgentTableCard.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/dashboard/components/AgentTableCard/AgentTableCard.tsx
@@ -18,6 +18,7 @@ export interface AgentTableCardProps {
   runs: number;
   rating: number;
   id: number;
+  listing_id?: string;
   onViewSubmission: (submission: StoreSubmission) => void;
 }
 
@@ -32,10 +33,12 @@ export const AgentTableCard = ({
   status,
   runs,
   rating,
+  listing_id,
   onViewSubmission,
 }: AgentTableCardProps) => {
   const onView = () => {
     onViewSubmission({
+      listing_id: listing_id || "",
       agent_id,
       agent_version,
       slug: "",
@@ -62,9 +65,14 @@ export const AgentTableCard = ({
           />
         </div>
         <div className="flex-1">
-          <h3 className="text-[15px] font-medium text-neutral-800 dark:text-neutral-200">
-            {agentName}
-          </h3>
+          <div className="flex items-center gap-2">
+            <h3 className="text-[15px] font-medium text-neutral-800 dark:text-neutral-200">
+              {agentName}
+            </h3>
+            <span className="text-[13px] text-neutral-500 dark:text-neutral-400">
+              v{agent_version}
+            </span>
+          </div>
           <p className="line-clamp-2 text-sm text-neutral-600 dark:text-neutral-400">
             {description}
           </p>
diff --git a/autogpt_platform/frontend/src/app/(platform)/profile/(user)/dashboard/components/AgentTableRow/AgentTableRow.tsx b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/dashboard/components/AgentTableRow/AgentTableRow.tsx
index 5b85ade1ae..917b872df1 100644
--- a/autogpt_platform/frontend/src/app/(platform)/profile/(user)/dashboard/components/AgentTableRow/AgentTableRow.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/dashboard/components/AgentTableRow/AgentTableRow.tsx
@@ -9,11 +9,11 @@ import { useAgentTableRow } from "./useAgentTableRow";
 import { StoreSubmission } from "@/app/api/__generated__/models/storeSubmission";
 import {
   DotsThreeVerticalIcon,
-  Eye,
+  EyeIcon,
   ImageBroken,
-  Star,
-  Trash,
-  PencilSimple,
+  StarIcon,
+  TrashIcon,
+  PencilIcon,
 } from "@phosphor-icons/react/dist/ssr";
 import { SubmissionStatus } from "@/app/api/__generated__/models/submissionStatus";
 import { StoreSubmissionEditRequest } from "@/app/api/__generated__/models/storeSubmissionEditRequest";
@@ -34,6 +34,7 @@ export interface AgentTableRowProps {
   categories?: string[];
   store_listing_version_id?: string;
   changes_summary?: string;
+  listing_id?: string;
   onViewSubmission: (submission: StoreSubmission) => void;
   onDeleteSubmission: (submission_id: string) => void;
   onEditSubmission: (
@@ -60,6 +61,7 @@ export const AgentTableRow = ({
   categories,
   store_listing_version_id,
   changes_summary,
+  listing_id,
   onViewSubmission,
   onDeleteSubmission,
   onEditSubmission,
@@ -83,11 +85,10 @@ export const AgentTableRow = ({
     categories,
     store_listing_version_id,
     changes_summary,
+    listing_id,
   });
 
-  // Determine if we should show Edit or View button
-  const canEdit =
-    status === SubmissionStatus.APPROVED || status === SubmissionStatus.PENDING;
+  const canModify = status === SubmissionStatus.PENDING;
 
   return (
     <div
@@ -114,13 +115,22 @@ export const AgentTableRow = ({
             </div>
           )}
           <div className="flex flex-col">
-            <Text
-              variant="h3"
-              className="line-clamp-1 text-ellipsis text-neutral-800 dark:text-neutral-200"
-              size="large-medium"
-            >
-              {agentName}
-            </Text>
+            <div className="flex items-center gap-2">
+              <Text
+                variant="h3"
+                className="line-clamp-1 text-ellipsis text-neutral-800 dark:text-neutral-200"
+                size="large-medium"
+              >
+                {agentName}
+              </Text>
+              <Text
+                variant="body"
+                size="small"
+                className="text-neutral-500 dark:text-neutral-400"
+              >
+                v{agent_version}
+              </Text>
+            </div>
             <Text
               variant="body"
               className="line-clamp-1 text-ellipsis text-neutral-600 dark:text-neutral-400"
@@ -150,7 +160,7 @@ export const AgentTableRow = ({
           {rating ? (
             <div className="flex items-center justify-end gap-1">
               <span className="text-sm font-medium">{rating.toFixed(1)}</span>
-              <Star weight="fill" className="h-2 w-2" />
+              <StarIcon weight="fill" className="h-2 w-2" />
             </div>
           ) : (
             <span className="text-sm text-neutral-600 dark:text-neutral-400">
@@ -166,12 +176,12 @@ export const AgentTableRow = ({
               <DotsThreeVerticalIcon className="h-5 w-5 text-neutral-800" />
             </DropdownMenu.Trigger>
             <DropdownMenu.Content className="z-10 rounded-xl border bg-white p-1 shadow-md dark:bg-gray-800">
-              {canEdit ? (
+              {canModify ? (
                 <DropdownMenu.Item
                   onSelect={handleEdit}
                   className="flex cursor-pointer items-center rounded-md px-3 py-2 hover:bg-gray-100 dark:hover:bg-gray-700"
                 >
-                  <PencilSimple className="mr-2 h-4 w-4 dark:text-gray-100" />
+                  <PencilIcon className="mr-2 h-4 w-4 dark:text-gray-100" />
                   <span className="dark:text-gray-100">Edit</span>
                 </DropdownMenu.Item>
               ) : (
@@ -179,18 +189,22 @@ export const AgentTableRow = ({
                   onSelect={handleView}
                   className="flex cursor-pointer items-center rounded-md px-3 py-2 hover:bg-gray-100 dark:hover:bg-gray-700"
                 >
-                  <Eye className="mr-2 h-4 w-4 dark:text-gray-100" />
+                  <EyeIcon className="mr-2 h-4 w-4 dark:text-gray-100" />
                   <span className="dark:text-gray-100">View</span>
                 </DropdownMenu.Item>
               )}
-              <DropdownMenu.Separator className="my-1 h-px bg-gray-300 dark:bg-gray-600" />
-              <DropdownMenu.Item
-                onSelect={handleDelete}
-                className="flex cursor-pointer items-center rounded-md px-3 py-2 text-red-500 hover:bg-gray-100 dark:hover:bg-gray-700"
-              >
-                <Trash className="mr-2 h-4 w-4 text-red-500 dark:text-red-400" />
-                <span className="dark:text-red-400">Delete</span>
-              </DropdownMenu.Item>
+              {canModify && (
+                <>
+                  <DropdownMenu.Separator className="my-1 h-px bg-gray-300 dark:bg-gray-600" />
+                  <DropdownMenu.Item
+                    onSelect={handleDelete}
+                    className="flex cursor-pointer items-center rounded-md px-3 py-2 text-red-500 hover:bg-gray-100 dark:hover:bg-gray-700"
+                  >
+                    <TrashIcon className="mr-2 h-4 w-4 text-red-500 dark:text-red-400" />
+                    <span className="dark:text-red-400">Delete</span>
+                  </DropdownMenu.Item>
+                </>
+              )}
             </DropdownMenu.Content>
           </DropdownMenu.Root>
         </div>
diff --git a/autogpt_platform/frontend/src/app/(platform)/profile/(user)/dashboard/components/AgentTableRow/useAgentTableRow.ts b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/dashboard/components/AgentTableRow/useAgentTableRow.ts
index 14fbac4336..7879446d27 100644
--- a/autogpt_platform/frontend/src/app/(platform)/profile/(user)/dashboard/components/AgentTableRow/useAgentTableRow.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/dashboard/components/AgentTableRow/useAgentTableRow.ts
@@ -26,6 +26,7 @@ interface useAgentTableRowProps {
   categories?: string[];
   store_listing_version_id?: string;
   changes_summary?: string;
+  listing_id?: string;
 }
 
 export const useAgentTableRow = ({
@@ -46,9 +47,11 @@ export const useAgentTableRow = ({
   categories,
   store_listing_version_id,
   changes_summary,
+  listing_id,
 }: useAgentTableRowProps) => {
   const handleView = () => {
     onViewSubmission({
+      listing_id: listing_id || "",
       agent_id,
       agent_version,
       slug: "",
@@ -81,7 +84,14 @@ export const useAgentTableRow = ({
   };
 
   const handleDelete = () => {
-    onDeleteSubmission(agent_id);
+    // Backend only accepts StoreListingVersion IDs for deletion
+    if (!store_listing_version_id) {
+      console.error(
+        "Cannot delete submission: store_listing_version_id is required",
+      );
+      return;
+    }
+    onDeleteSubmission(store_listing_version_id);
   };
 
   return { handleView, handleDelete, handleEdit };
diff --git a/autogpt_platform/frontend/src/app/(platform)/profile/(user)/dashboard/components/MainDashboardPage/MainDashboardPage.tsx b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/dashboard/components/MainDashboardPage/MainDashboardPage.tsx
index e53244db77..9bfc536d8b 100644
--- a/autogpt_platform/frontend/src/app/(platform)/profile/(user)/dashboard/components/MainDashboardPage/MainDashboardPage.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/dashboard/components/MainDashboardPage/MainDashboardPage.tsx
@@ -99,6 +99,7 @@ export const MainDashboardPage = () => {
               store_listing_version_id:
                 submission.store_listing_version_id || undefined,
               changes_summary: submission.changes_summary || undefined,
+              listing_id: submission.listing_id,
             }))}
             onViewSubmission={onViewSubmission}
             onDeleteSubmission={onDeleteSubmission}
diff --git a/autogpt_platform/frontend/src/app/(platform)/profile/(user)/integrations/page.tsx b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/integrations/page.tsx
index 17800a03a4..ebea63b0b6 100644
--- a/autogpt_platform/frontend/src/app/(platform)/profile/(user)/integrations/page.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/integrations/page.tsx
@@ -116,6 +116,9 @@ export default function UserIntegrationsPage() {
       "63a6e279-2dc2-448e-bf57-85776f7176dc", // ZeroBounce
       "9aa1bde0-4947-4a70-a20c-84daa3850d52", // Google Maps
       "d44045af-1c33-4833-9e19-752313214de2", // Llama API
+      "c4e6d1a0-3b5f-4789-a8e2-9b123456789f", // V0 by Vercel
+      "a5b3c7d9-2e4f-4a6b-8c1d-9e0f1a2b3c4d", // Webshare Proxy
+      "8b3d4e5f-6a7b-8c9d-0e1f-2a3b4c5d6e7f", // OpenWeatherMap
     ],
     [],
   );
diff --git a/autogpt_platform/frontend/src/app/(platform)/profile/(user)/layout.tsx b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/layout.tsx
index ca0e846557..c7b19cfe49 100644
--- a/autogpt_platform/frontend/src/app/(platform)/profile/(user)/layout.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/layout.tsx
@@ -29,7 +29,7 @@ export default function Layout({ children }: { children: React.ReactNode }) {
           href: "/profile/dashboard",
           icon: <StorefrontIcon className="size-5" />,
         },
-        ...(isPaymentEnabled || true
+        ...(isPaymentEnabled
           ? [
               {
                 text: "Billing",
diff --git a/autogpt_platform/frontend/src/app/(platform)/profile/(user)/page.tsx b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/page.tsx
index 260fbc0b52..979b113f55 100644
--- a/autogpt_platform/frontend/src/app/(platform)/profile/(user)/page.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/page.tsx
@@ -3,12 +3,14 @@
 import { useGetV2GetUserProfile } from "@/app/api/__generated__/endpoints/store/store";
 import { ProfileInfoForm } from "@/components/__legacy__/ProfileInfoForm";
 import { ErrorCard } from "@/components/molecules/ErrorCard/ErrorCard";
+import { isLogoutInProgress } from "@/lib/autogpt-server-api/helpers";
 import { ProfileDetails } from "@/lib/autogpt-server-api/types";
 import { useSupabase } from "@/lib/supabase/hooks/useSupabase";
 import { ProfileLoading } from "./ProfileLoading";
 
 export default function UserProfilePage() {
   const { user } = useSupabase();
+  const logoutInProgress = isLogoutInProgress();
 
   const {
     data: profile,
@@ -18,7 +20,7 @@ export default function UserProfilePage() {
     refetch,
   } = useGetV2GetUserProfile<ProfileDetails | null>({
     query: {
-      enabled: !!user,
+      enabled: !!user && !logoutInProgress,
       select: (res) => {
         if (res.status === 200) {
           return {
diff --git a/autogpt_platform/frontend/src/app/(platform)/signup/actions.ts b/autogpt_platform/frontend/src/app/(platform)/signup/actions.ts
index 68f7ae10ec..204482dbe9 100644
--- a/autogpt_platform/frontend/src/app/(platform)/signup/actions.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/signup/actions.ts
@@ -4,7 +4,7 @@ import { getServerSupabase } from "@/lib/supabase/server/getServerSupabase";
 import { signupFormSchema } from "@/types/auth";
 import * as Sentry from "@sentry/nextjs";
 import { isWaitlistError, logWaitlistError } from "../../api/auth/utils";
-import { shouldShowOnboarding } from "../../api/helpers";
+import { getOnboardingStatus } from "../../api/helpers";
 
 export async function signup(
   email: string,
@@ -57,8 +57,9 @@ export async function signup(
       await supabase.auth.setSession(data.session);
     }
 
-    const isOnboardingEnabled = await shouldShowOnboarding();
-    const next = isOnboardingEnabled ? "/onboarding" : "/";
+    // Get onboarding status from backend (includes chat flag evaluated for this user)
+    const { shouldShowOnboarding } = await getOnboardingStatus();
+    const next = shouldShowOnboarding ? "/onboarding" : "/";
 
     return { success: true, next };
   } catch (err) {
diff --git a/autogpt_platform/frontend/src/app/(platform)/signup/useSignupPage.ts b/autogpt_platform/frontend/src/app/(platform)/signup/useSignupPage.ts
index e6d7c68aef..fd78b48735 100644
--- a/autogpt_platform/frontend/src/app/(platform)/signup/useSignupPage.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/signup/useSignupPage.ts
@@ -26,7 +26,7 @@ export function useSignupPage() {
 
   useEffect(() => {
     if (isLoggedIn && !isSigningUp) {
-      router.push(nextUrl || "/marketplace");
+      router.push(nextUrl || "/");
     }
   }, [isLoggedIn, isSigningUp, nextUrl, router]);
 
diff --git a/autogpt_platform/frontend/src/app/api/chat/sessions/[sessionId]/stream/route.ts b/autogpt_platform/frontend/src/app/api/chat/sessions/[sessionId]/stream/route.ts
index ca33483587..d63eed0ca2 100644
--- a/autogpt_platform/frontend/src/app/api/chat/sessions/[sessionId]/stream/route.ts
+++ b/autogpt_platform/frontend/src/app/api/chat/sessions/[sessionId]/stream/route.ts
@@ -4,8 +4,91 @@ import { NextRequest } from "next/server";
 
 /**
  * SSE Proxy for chat streaming.
- * EventSource doesn't support custom headers, so we need a server-side proxy
- * that adds authentication and forwards the SSE stream to the client.
+ * Supports POST with context (page content + URL) in the request body.
+ */
+export async function POST(
+  request: NextRequest,
+  { params }: { params: Promise<{ sessionId: string }> },
+) {
+  const { sessionId } = await params;
+
+  try {
+    const body = await request.json();
+    const { message, is_user_message, context } = body;
+
+    if (!message) {
+      return new Response(
+        JSON.stringify({ error: "Missing message parameter" }),
+        { status: 400, headers: { "Content-Type": "application/json" } },
+      );
+    }
+
+    // Get auth token from server-side session
+    const token = await getServerAuthToken();
+
+    // Build backend URL
+    const backendUrl = environment.getAGPTServerBaseUrl();
+    const streamUrl = new URL(
+      `/api/chat/sessions/${sessionId}/stream`,
+      backendUrl,
+    );
+
+    // Forward request to backend with auth header
+    const headers: Record<string, string> = {
+      "Content-Type": "application/json",
+      Accept: "text/event-stream",
+      "Cache-Control": "no-cache",
+      Connection: "keep-alive",
+    };
+
+    if (token) {
+      headers["Authorization"] = `Bearer ${token}`;
+    }
+
+    const response = await fetch(streamUrl.toString(), {
+      method: "POST",
+      headers,
+      body: JSON.stringify({
+        message,
+        is_user_message: is_user_message ?? true,
+        context: context || null,
+      }),
+    });
+
+    if (!response.ok) {
+      const error = await response.text();
+      return new Response(error, {
+        status: response.status,
+        headers: { "Content-Type": "application/json" },
+      });
+    }
+
+    // Return the SSE stream directly
+    return new Response(response.body, {
+      headers: {
+        "Content-Type": "text/event-stream",
+        "Cache-Control": "no-cache, no-transform",
+        Connection: "keep-alive",
+        "X-Accel-Buffering": "no",
+      },
+    });
+  } catch (error) {
+    console.error("SSE proxy error:", error);
+    return new Response(
+      JSON.stringify({
+        error: "Failed to connect to chat service",
+        detail: error instanceof Error ? error.message : String(error),
+      }),
+      {
+        status: 500,
+        headers: { "Content-Type": "application/json" },
+      },
+    );
+  }
+}
+
+/**
+ * Legacy GET endpoint for backward compatibility
  */
 export async function GET(
   request: NextRequest,
diff --git a/autogpt_platform/frontend/src/app/api/chat/tasks/[taskId]/stream/route.ts b/autogpt_platform/frontend/src/app/api/chat/tasks/[taskId]/stream/route.ts
new file mode 100644
index 0000000000..336786bfdb
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/api/chat/tasks/[taskId]/stream/route.ts
@@ -0,0 +1,81 @@
+import { environment } from "@/services/environment";
+import { getServerAuthToken } from "@/lib/autogpt-server-api/helpers";
+import { NextRequest } from "next/server";
+
+/**
+ * SSE Proxy for task stream reconnection.
+ *
+ * This endpoint allows clients to reconnect to an ongoing or recently completed
+ * background task's stream. It replays missed messages from Redis Streams and
+ * subscribes to live updates if the task is still running.
+ *
+ * Client contract:
+ * 1. When receiving an operation_started event, store the task_id
+ * 2. To reconnect: GET /api/chat/tasks/{taskId}/stream?last_message_id={idx}
+ * 3. Messages are replayed from the last_message_id position
+ * 4. Stream ends when "finish" event is received
+ */
+export async function GET(
+  request: NextRequest,
+  { params }: { params: Promise<{ taskId: string }> },
+) {
+  const { taskId } = await params;
+  const searchParams = request.nextUrl.searchParams;
+  const lastMessageId = searchParams.get("last_message_id") || "0-0";
+
+  try {
+    // Get auth token from server-side session
+    const token = await getServerAuthToken();
+
+    // Build backend URL
+    const backendUrl = environment.getAGPTServerBaseUrl();
+    const streamUrl = new URL(`/api/chat/tasks/${taskId}/stream`, backendUrl);
+    streamUrl.searchParams.set("last_message_id", lastMessageId);
+
+    // Forward request to backend with auth header
+    const headers: Record<string, string> = {
+      Accept: "text/event-stream",
+      "Cache-Control": "no-cache",
+      Connection: "keep-alive",
+    };
+
+    if (token) {
+      headers["Authorization"] = `Bearer ${token}`;
+    }
+
+    const response = await fetch(streamUrl.toString(), {
+      method: "GET",
+      headers,
+    });
+
+    if (!response.ok) {
+      const error = await response.text();
+      return new Response(error, {
+        status: response.status,
+        headers: { "Content-Type": "application/json" },
+      });
+    }
+
+    // Return the SSE stream directly
+    return new Response(response.body, {
+      headers: {
+        "Content-Type": "text/event-stream",
+        "Cache-Control": "no-cache, no-transform",
+        Connection: "keep-alive",
+        "X-Accel-Buffering": "no",
+      },
+    });
+  } catch (error) {
+    console.error("Task stream proxy error:", error);
+    return new Response(
+      JSON.stringify({
+        error: "Failed to connect to task stream",
+        detail: error instanceof Error ? error.message : String(error),
+      }),
+      {
+        status: 500,
+        headers: { "Content-Type": "application/json" },
+      },
+    );
+  }
+}
diff --git a/autogpt_platform/frontend/src/app/api/helpers.ts b/autogpt_platform/frontend/src/app/api/helpers.ts
index e9a708ba4c..226f5fa786 100644
--- a/autogpt_platform/frontend/src/app/api/helpers.ts
+++ b/autogpt_platform/frontend/src/app/api/helpers.ts
@@ -175,9 +175,11 @@ export async function resolveResponse<
   return res.data;
 }
 
-export async function shouldShowOnboarding() {
-  const isEnabled = await resolveResponse(getV1IsOnboardingEnabled());
+export async function getOnboardingStatus() {
+  const status = await resolveResponse(getV1IsOnboardingEnabled());
   const onboarding = await resolveResponse(getV1OnboardingState());
   const isCompleted = onboarding.completedSteps.includes("CONGRATS");
-  return isEnabled && !isCompleted;
+  return {
+    shouldShowOnboarding: status.is_onboarding_enabled && !isCompleted,
+  };
 }
diff --git a/autogpt_platform/frontend/src/app/api/mutators/custom-mutator.ts b/autogpt_platform/frontend/src/app/api/mutators/custom-mutator.ts
index 315b68ab87..3c9eda7785 100644
--- a/autogpt_platform/frontend/src/app/api/mutators/custom-mutator.ts
+++ b/autogpt_platform/frontend/src/app/api/mutators/custom-mutator.ts
@@ -4,12 +4,12 @@ import {
   getServerAuthToken,
 } from "@/lib/autogpt-server-api/helpers";
 
-import { transformDates } from "./date-transformer";
-import { environment } from "@/services/environment";
 import {
   IMPERSONATION_HEADER_NAME,
   IMPERSONATION_STORAGE_KEY,
 } from "@/lib/constants";
+import { environment } from "@/services/environment";
+import { transformDates } from "./date-transformer";
 
 const FRONTEND_BASE_URL =
   process.env.NEXT_PUBLIC_FRONTEND_BASE_URL || "http://localhost:3000";
@@ -41,11 +41,9 @@ export const customMutator = async <
   T extends { data: any; status: number; headers: Headers },
 >(
   url: string,
-  options: RequestInit & {
-    params?: any;
-  } = {},
+  options: RequestInit,
 ): Promise<T> => {
-  const { params, ...requestOptions } = options;
+  const requestOptions = options;
   const method = (requestOptions.method || "GET") as
     | "GET"
     | "POST"
@@ -87,14 +85,11 @@ export const customMutator = async <
     headers["Content-Type"] = "application/json";
   }
 
-  const queryString = params
-    ? "?" + new URLSearchParams(params).toString()
-    : "";
-
   const baseUrl = getBaseUrl();
 
   // The caching in React Query in our system depends on the url, so the base_url could be different for the server and client sides.
-  const fullUrl = `${baseUrl}${url}${queryString}`;
+  // here url also contains encoded query params
+  const fullUrl = `${baseUrl}${url}`;
 
   if (environment.isServerSide()) {
     try {
diff --git a/autogpt_platform/frontend/src/app/api/openapi.json b/autogpt_platform/frontend/src/app/api/openapi.json
index ea3bbcc5d8..5ed449829d 100644
--- a/autogpt_platform/frontend/src/app/api/openapi.json
+++ b/autogpt_platform/frontend/src/app/api/openapi.json
@@ -917,11 +917,33 @@
         "security": [{ "HTTPBearerJWT": [] }]
       }
     },
+    "/api/chat/config/ttl": {
+      "get": {
+        "tags": ["v2", "chat", "chat"],
+        "summary": "Get Ttl Config",
+        "description": "Get the stream TTL configuration.\n\nReturns the Time-To-Live settings for chat streams, which determines\nhow long clients can reconnect to an active stream.\n\nReturns:\n    dict: TTL configuration with seconds and milliseconds values.",
+        "operationId": "getV2GetTtlConfig",
+        "responses": {
+          "200": {
+            "description": "Successful Response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "additionalProperties": true,
+                  "type": "object",
+                  "title": "Response Getv2Getttlconfig"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/chat/health": {
       "get": {
         "tags": ["v2", "chat", "chat"],
         "summary": "Health Check",
-        "description": "Health check endpoint for the chat service.\n\nPerforms a full cycle test of session creation, assignment, and retrieval. Should always return healthy\nif the service and data layer are operational.\n\nReturns:\n    dict: A status dictionary indicating health, service name, and API version.",
+        "description": "Health check endpoint for the chat service.\n\nPerforms a full cycle test of session creation and retrieval. Should always return healthy\nif the service and data layer are operational.\n\nReturns:\n    dict: A status dictionary indicating health, service name, and API version.",
         "operationId": "getV2HealthCheck",
         "responses": {
           "200": {
@@ -939,12 +961,125 @@
         }
       }
     },
+    "/api/chat/operations/{operation_id}/complete": {
+      "post": {
+        "tags": ["v2", "chat", "chat"],
+        "summary": "Complete Operation",
+        "description": "External completion webhook for long-running operations.\n\nCalled by Agent Generator (or other services) when an operation completes.\nThis triggers the stream registry to publish completion and continue LLM generation.\n\nArgs:\n    operation_id: The operation ID to complete.\n    request: Completion payload with success status and result/error.\n    x_api_key: Internal API key for authentication.\n\nReturns:\n    dict: Status of the completion.\n\nRaises:\n    HTTPException: If API key is invalid or operation not found.",
+        "operationId": "postV2CompleteOperation",
+        "parameters": [
+          {
+            "name": "operation_id",
+            "in": "path",
+            "required": true,
+            "schema": { "type": "string", "title": "Operation Id" }
+          },
+          {
+            "name": "x-api-key",
+            "in": "header",
+            "required": false,
+            "schema": {
+              "anyOf": [{ "type": "string" }, { "type": "null" }],
+              "title": "X-Api-Key"
+            }
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/OperationCompleteRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Successful Response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "additionalProperties": true,
+                  "title": "Response Postv2Completeoperation"
+                }
+              }
+            }
+          },
+          "422": {
+            "description": "Validation Error",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/chat/sessions": {
+      "get": {
+        "tags": ["v2", "chat", "chat"],
+        "summary": "List Sessions",
+        "description": "List chat sessions for the authenticated user.\n\nReturns a paginated list of chat sessions belonging to the current user,\nordered by most recently updated.\n\nArgs:\n    user_id: The authenticated user's ID.\n    limit: Maximum number of sessions to return (1-100).\n    offset: Number of sessions to skip for pagination.\n\nReturns:\n    ListSessionsResponse: List of session summaries and total count.",
+        "operationId": "getV2ListSessions",
+        "security": [{ "HTTPBearerJWT": [] }],
+        "parameters": [
+          {
+            "name": "limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "maximum": 100,
+              "minimum": 1,
+              "default": 50,
+              "title": "Limit"
+            }
+          },
+          {
+            "name": "offset",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "minimum": 0,
+              "default": 0,
+              "title": "Offset"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successful Response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ListSessionsResponse"
+                }
+              }
+            }
+          },
+          "401": {
+            "$ref": "#/components/responses/HTTP401NotAuthenticatedError"
+          },
+          "422": {
+            "description": "Validation Error",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
+              }
+            }
+          }
+        }
+      },
       "post": {
         "tags": ["v2", "chat", "chat"],
         "summary": "Create Session",
-        "description": "Create a new chat session.\n\nInitiates a new chat session for either an authenticated or anonymous user.\n\nArgs:\n    user_id: The optional authenticated user ID parsed from the JWT. If missing, creates an anonymous session.\n\nReturns:\n    CreateSessionResponse: Details of the created session.",
+        "description": "Create a new chat session.\n\nInitiates a new chat session for the authenticated user.\n\nArgs:\n    user_id: The authenticated user ID parsed from the JWT (required).\n\nReturns:\n    CreateSessionResponse: Details of the created session.",
         "operationId": "postV2CreateSession",
+        "security": [{ "HTTPBearerJWT": [] }],
         "responses": {
           "200": {
             "description": "Successful Response",
@@ -959,15 +1094,14 @@
           "401": {
             "$ref": "#/components/responses/HTTP401NotAuthenticatedError"
           }
-        },
-        "security": [{ "HTTPBearerJWT": [] }]
+        }
       }
     },
     "/api/chat/sessions/{session_id}": {
       "get": {
         "tags": ["v2", "chat", "chat"],
         "summary": "Get Session",
-        "description": "Retrieve the details of a specific chat session.\n\nLooks up a chat session by ID for the given user (if authenticated) and returns all session data including messages.\n\nArgs:\n    session_id: The unique identifier for the desired chat session.\n    user_id: The optional authenticated user ID, or None for anonymous access.\n\nReturns:\n    SessionDetailResponse: Details for the requested session; raises NotFoundError if not found.",
+        "description": "Retrieve the details of a specific chat session.\n\nLooks up a chat session by ID for the given user (if authenticated) and returns all session data including messages.\nIf there's an active stream for this session, returns the task_id for reconnection.\n\nArgs:\n    session_id: The unique identifier for the desired chat session.\n    user_id: The optional authenticated user ID, or None for anonymous access.\n\nReturns:\n    SessionDetailResponse: Details for the requested session, including active_stream info if applicable.",
         "operationId": "getV2GetSession",
         "security": [{ "HTTPBearerJWT": [] }],
         "parameters": [
@@ -1048,9 +1182,9 @@
     "/api/chat/sessions/{session_id}/stream": {
       "get": {
         "tags": ["v2", "chat", "chat"],
-        "summary": "Stream Chat",
-        "description": "Stream chat responses for a session.\n\nStreams the AI/completion responses in real time over Server-Sent Events (SSE), including:\n  - Text fragments as they are generated\n  - Tool call UI elements (if invoked)\n  - Tool execution results\n\nArgs:\n    session_id: The chat session identifier to associate with the streamed messages.\n    message: The user's new message to process.\n    user_id: Optional authenticated user ID.\n    is_user_message: Whether the message is a user message.\nReturns:\n    StreamingResponse: SSE-formatted response chunks.",
-        "operationId": "getV2StreamChat",
+        "summary": "Stream Chat Get",
+        "description": "Stream chat responses for a session (GET - legacy endpoint).\n\nStreams the AI/completion responses in real time over Server-Sent Events (SSE), including:\n  - Text fragments as they are generated\n  - Tool call UI elements (if invoked)\n  - Tool execution results\n\nArgs:\n    session_id: The chat session identifier to associate with the streamed messages.\n    message: The user's new message to process.\n    user_id: Optional authenticated user ID.\n    is_user_message: Whether the message is a user message.\nReturns:\n    StreamingResponse: SSE-formatted response chunks.",
+        "operationId": "getV2StreamChatGet",
         "security": [{ "HTTPBearerJWT": [] }],
         "parameters": [
           {
@@ -1098,6 +1232,134 @@
             }
           }
         }
+      },
+      "post": {
+        "tags": ["v2", "chat", "chat"],
+        "summary": "Stream Chat Post",
+        "description": "Stream chat responses for a session (POST with context support).\n\nStreams the AI/completion responses in real time over Server-Sent Events (SSE), including:\n  - Text fragments as they are generated\n  - Tool call UI elements (if invoked)\n  - Tool execution results\n\nThe AI generation runs in a background task that continues even if the client disconnects.\nAll chunks are written to Redis for reconnection support. If the client disconnects,\nthey can reconnect using GET /tasks/{task_id}/stream to resume from where they left off.\n\nArgs:\n    session_id: The chat session identifier to associate with the streamed messages.\n    request: Request body containing message, is_user_message, and optional context.\n    user_id: Optional authenticated user ID.\nReturns:\n    StreamingResponse: SSE-formatted response chunks. First chunk is a \"start\" event\n    containing the task_id for reconnection.",
+        "operationId": "postV2StreamChatPost",
+        "security": [{ "HTTPBearerJWT": [] }],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": { "type": "string", "title": "Session Id" }
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": { "$ref": "#/components/schemas/StreamChatRequest" }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Successful Response",
+            "content": { "application/json": { "schema": {} } }
+          },
+          "401": {
+            "$ref": "#/components/responses/HTTP401NotAuthenticatedError"
+          },
+          "422": {
+            "description": "Validation Error",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/chat/tasks/{task_id}": {
+      "get": {
+        "tags": ["v2", "chat", "chat"],
+        "summary": "Get Task Status",
+        "description": "Get the status of a long-running task.\n\nArgs:\n    task_id: The task ID to check.\n    user_id: Authenticated user ID for ownership validation.\n\nReturns:\n    dict: Task status including task_id, status, tool_name, and operation_id.\n\nRaises:\n    NotFoundError: If task_id is not found or user doesn't have access.",
+        "operationId": "getV2GetTaskStatus",
+        "security": [{ "HTTPBearerJWT": [] }],
+        "parameters": [
+          {
+            "name": "task_id",
+            "in": "path",
+            "required": true,
+            "schema": { "type": "string", "title": "Task Id" }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successful Response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "additionalProperties": true,
+                  "title": "Response Getv2Gettaskstatus"
+                }
+              }
+            }
+          },
+          "401": {
+            "$ref": "#/components/responses/HTTP401NotAuthenticatedError"
+          },
+          "422": {
+            "description": "Validation Error",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/chat/tasks/{task_id}/stream": {
+      "get": {
+        "tags": ["v2", "chat", "chat"],
+        "summary": "Stream Task",
+        "description": "Reconnect to a long-running task's SSE stream.\n\nWhen a long-running operation (like agent generation) starts, the client\nreceives a task_id. If the connection drops, the client can reconnect\nusing this endpoint to resume receiving updates.\n\nArgs:\n    task_id: The task ID from the operation_started response.\n    user_id: Authenticated user ID for ownership validation.\n    last_message_id: Last Redis Stream message ID received (\"0-0\" for full replay).\n\nReturns:\n    StreamingResponse: SSE-formatted response chunks starting after last_message_id.\n\nRaises:\n    HTTPException: 404 if task not found, 410 if task expired, 403 if access denied.",
+        "operationId": "getV2StreamTask",
+        "security": [{ "HTTPBearerJWT": [] }],
+        "parameters": [
+          {
+            "name": "task_id",
+            "in": "path",
+            "required": true,
+            "schema": { "type": "string", "title": "Task Id" }
+          },
+          {
+            "name": "last_message_id",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "description": "Last Redis Stream message ID received (e.g., '1706540123456-0'). Use '0-0' for full replay.",
+              "default": "0-0",
+              "title": "Last Message Id"
+            },
+            "description": "Last Redis Stream message ID received (e.g., '1706540123456-0'). Use '0-0' for full replay."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successful Response",
+            "content": { "application/json": { "schema": {} } }
+          },
+          "401": {
+            "$ref": "#/components/responses/HTTP401NotAuthenticatedError"
+          },
+          "422": {
+            "description": "Validation Error",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
+              }
+            }
+          }
+        }
       }
     },
     "/api/credits": {
@@ -2775,6 +3037,28 @@
         }
       }
     },
+    "/api/integrations/providers/system": {
+      "get": {
+        "tags": ["v1", "integrations"],
+        "summary": "List System Providers",
+        "description": "Get a list of providers that have platform credits (system credentials) available.\n\nThese providers can be used without the user providing their own API keys.",
+        "operationId": "getV1ListSystemProviders",
+        "responses": {
+          "200": {
+            "description": "Successful Response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "items": { "type": "string" },
+                  "type": "array",
+                  "title": "Response Getv1Listsystemproviders"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/integrations/webhooks/{webhook_id}/ping": {
       "post": {
         "tags": ["v1", "integrations"],
@@ -3222,7 +3506,7 @@
       "get": {
         "tags": ["v2", "library", "private"],
         "summary": "List Library Agents",
-        "description": "Get all agents in the user's library (both created and saved).\n\nArgs:\n    user_id: ID of the authenticated user.\n    search_term: Optional search term to filter agents by name/description.\n    filter_by: List of filters to apply (favorites, created by user).\n    sort_by: List of sorting criteria (created date, updated date).\n    page: Page number to retrieve.\n    page_size: Number of agents per page.\n\nReturns:\n    A LibraryAgentResponse containing agents and pagination metadata.\n\nRaises:\n    HTTPException: If a server/database error occurs.",
+        "description": "Get all agents in the user's library (both created and saved).",
         "operationId": "getV2List library agents",
         "security": [{ "HTTPBearerJWT": [] }],
         "parameters": [
@@ -3277,7 +3561,7 @@
         ],
         "responses": {
           "200": {
-            "description": "List of library agents",
+            "description": "Successful Response",
             "content": {
               "application/json": {
                 "schema": {
@@ -3296,17 +3580,13 @@
                 "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
-          },
-          "500": {
-            "description": "Server error",
-            "content": { "application/json": {} }
           }
         }
       },
       "post": {
         "tags": ["v2", "library", "private"],
         "summary": "Add Marketplace Agent",
-        "description": "Add an agent from the marketplace to the user's library.\n\nArgs:\n    store_listing_version_id: ID of the store listing version to add.\n    user_id: ID of the authenticated user.\n\nReturns:\n    library_model.LibraryAgent: Agent added to the library\n\nRaises:\n    HTTPException(404): If the listing version is not found.\n    HTTPException(500): If a server/database error occurs.",
+        "description": "Add an agent from the marketplace to the user's library.",
         "operationId": "postV2Add marketplace agent",
         "security": [{ "HTTPBearerJWT": [] }],
         "requestBody": {
@@ -3321,7 +3601,7 @@
         },
         "responses": {
           "201": {
-            "description": "Agent added successfully",
+            "description": "Successful Response",
             "content": {
               "application/json": {
                 "schema": { "$ref": "#/components/schemas/LibraryAgent" }
@@ -3331,7 +3611,6 @@
           "401": {
             "$ref": "#/components/responses/HTTP401NotAuthenticatedError"
           },
-          "404": { "description": "Store listing version not found" },
           "422": {
             "description": "Validation Error",
             "content": {
@@ -3339,8 +3618,7 @@
                 "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
-          },
-          "500": { "description": "Server error" }
+          }
         }
       }
     },
@@ -3394,7 +3672,7 @@
       "get": {
         "tags": ["v2", "library", "private"],
         "summary": "List Favorite Library Agents",
-        "description": "Get all favorite agents in the user's library.\n\nArgs:\n    user_id: ID of the authenticated user.\n    page: Page number to retrieve.\n    page_size: Number of agents per page.\n\nReturns:\n    A LibraryAgentResponse containing favorite agents and pagination metadata.\n\nRaises:\n    HTTPException: If a server/database error occurs.",
+        "description": "Get all favorite agents in the user's library.",
         "operationId": "getV2List favorite library agents",
         "security": [{ "HTTPBearerJWT": [] }],
         "parameters": [
@@ -3446,10 +3724,6 @@
                 "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
-          },
-          "500": {
-            "description": "Server error",
-            "content": { "application/json": {} }
           }
         }
       }
@@ -3471,7 +3745,7 @@
         ],
         "responses": {
           "200": {
-            "description": "Library agent found",
+            "description": "Successful Response",
             "content": {
               "application/json": {
                 "schema": {
@@ -3487,7 +3761,6 @@
           "401": {
             "$ref": "#/components/responses/HTTP401NotAuthenticatedError"
           },
-          "404": { "description": "Agent not found" },
           "422": {
             "description": "Validation Error",
             "content": {
@@ -3503,7 +3776,7 @@
       "delete": {
         "tags": ["v2", "library", "private"],
         "summary": "Delete Library Agent",
-        "description": "Soft-delete the specified library agent.\n\nArgs:\n    library_agent_id: ID of the library agent to delete.\n    user_id: ID of the authenticated user.\n\nReturns:\n    204 No Content if successful.\n\nRaises:\n    HTTPException(404): If the agent does not exist.\n    HTTPException(500): If a server/database error occurs.",
+        "description": "Soft-delete the specified library agent.",
         "operationId": "deleteV2Delete library agent",
         "security": [{ "HTTPBearerJWT": [] }],
         "parameters": [
@@ -3519,11 +3792,9 @@
             "description": "Successful Response",
             "content": { "application/json": { "schema": {} } }
           },
-          "204": { "description": "Agent deleted successfully" },
           "401": {
             "$ref": "#/components/responses/HTTP401NotAuthenticatedError"
           },
-          "404": { "description": "Agent not found" },
           "422": {
             "description": "Validation Error",
             "content": {
@@ -3531,8 +3802,7 @@
                 "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
-          },
-          "500": { "description": "Server error" }
+          }
         }
       },
       "get": {
@@ -3573,7 +3843,7 @@
       "patch": {
         "tags": ["v2", "library", "private"],
         "summary": "Update Library Agent",
-        "description": "Update the library agent with the given fields.\n\nArgs:\n    library_agent_id: ID of the library agent to update.\n    payload: Fields to update (auto_update_version, is_favorite, etc.).\n    user_id: ID of the authenticated user.\n\nRaises:\n    HTTPException(500): If a server/database error occurs.",
+        "description": "Update the library agent with the given fields.",
         "operationId": "patchV2Update library agent",
         "security": [{ "HTTPBearerJWT": [] }],
         "parameters": [
@@ -3596,7 +3866,7 @@
         },
         "responses": {
           "200": {
-            "description": "Agent updated successfully",
+            "description": "Successful Response",
             "content": {
               "application/json": {
                 "schema": { "$ref": "#/components/schemas/LibraryAgent" }
@@ -3613,8 +3883,7 @@
                 "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
-          },
-          "500": { "description": "Server error" }
+          }
         }
       }
     },
@@ -4423,8 +4692,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "type": "boolean",
-                  "title": "Response Getv1Is Onboarding Enabled"
+                  "$ref": "#/components/schemas/OnboardingStatusResponse"
                 }
               }
             }
@@ -4477,6 +4745,7 @@
                 "AGENT_NEW_RUN",
                 "AGENT_INPUT",
                 "CONGRATS",
+                "VISIT_COPILOT",
                 "MARKETPLACE_VISIT",
                 "BUILDER_OPEN"
               ],
@@ -5504,6 +5773,69 @@
         "security": [{ "HTTPBearerJWT": [] }]
       }
     },
+    "/api/store/search": {
+      "get": {
+        "tags": ["v2", "store", "public"],
+        "summary": "Unified search across all content types",
+        "description": "Search across all content types (store agents, blocks, documentation) using hybrid search.\n\nCombines semantic (embedding-based) and lexical (text-based) search for best results.\n\nArgs:\n    query: The search query string\n    content_types: Optional list of content types to filter by (STORE_AGENT, BLOCK, DOCUMENTATION)\n    page: Page number for pagination (default 1)\n    page_size: Number of results per page (default 20)\n    user_id: Optional authenticated user ID (for user-scoped content in future)\n\nReturns:\n    UnifiedSearchResponse: Paginated list of search results with relevance scores",
+        "operationId": "getV2Unified search across all content types",
+        "security": [{ "HTTPBearer": [] }],
+        "parameters": [
+          {
+            "name": "query",
+            "in": "query",
+            "required": true,
+            "schema": { "type": "string", "title": "Query" }
+          },
+          {
+            "name": "content_types",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "anyOf": [
+                { "type": "array", "items": { "type": "string" } },
+                { "type": "null" }
+              ],
+              "description": "Content types to search: STORE_AGENT, BLOCK, DOCUMENTATION. If not specified, searches all.",
+              "title": "Content Types"
+            },
+            "description": "Content types to search: STORE_AGENT, BLOCK, DOCUMENTATION. If not specified, searches all."
+          },
+          {
+            "name": "page",
+            "in": "query",
+            "required": false,
+            "schema": { "type": "integer", "default": 1, "title": "Page" }
+          },
+          {
+            "name": "page_size",
+            "in": "query",
+            "required": false,
+            "schema": { "type": "integer", "default": 20, "title": "Page Size" }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successful Response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnifiedSearchResponse"
+                }
+              }
+            }
+          },
+          "422": {
+            "description": "Validation Error",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/store/submissions": {
       "get": {
         "tags": ["v2", "store", "private"],
@@ -5747,6 +6079,40 @@
         }
       }
     },
+    "/api/workspace/files/{file_id}/download": {
+      "get": {
+        "tags": ["workspace"],
+        "summary": "Download file by ID",
+        "description": "Download a file by its ID.\n\nReturns the file content directly or redirects to a signed URL for GCS.",
+        "operationId": "getWorkspaceDownload file by id",
+        "security": [{ "HTTPBearerJWT": [] }],
+        "parameters": [
+          {
+            "name": "file_id",
+            "in": "path",
+            "required": true,
+            "schema": { "type": "string", "title": "File Id" }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successful Response",
+            "content": { "application/json": { "schema": {} } }
+          },
+          "401": {
+            "$ref": "#/components/responses/HTTP401NotAuthenticatedError"
+          },
+          "422": {
+            "description": "Validation Error",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
+              }
+            }
+          }
+        }
+      }
+    },
     "/health": {
       "get": {
         "tags": ["health"],
@@ -5969,6 +6335,18 @@
         "title": "AccuracyTrendsResponse",
         "description": "Response model for accuracy trends and alerts."
       },
+      "ActiveStreamInfo": {
+        "properties": {
+          "task_id": { "type": "string", "title": "Task Id" },
+          "last_message_id": { "type": "string", "title": "Last Message Id" },
+          "operation_id": { "type": "string", "title": "Operation Id" },
+          "tool_name": { "type": "string", "title": "Tool Name" }
+        },
+        "type": "object",
+        "required": ["task_id", "last_message_id", "operation_id", "tool_name"],
+        "title": "ActiveStreamInfo",
+        "description": "Information about an active stream for reconnection."
+      },
       "AddUserCreditsResponse": {
         "properties": {
           "new_balance": { "type": "integer", "title": "New Balance" },
@@ -6203,6 +6581,11 @@
             "title": "Has Human In The Loop",
             "readOnly": true
           },
+          "has_sensitive_action": {
+            "type": "boolean",
+            "title": "Has Sensitive Action",
+            "readOnly": true
+          },
           "trigger_setup_info": {
             "anyOf": [
               { "$ref": "#/components/schemas/GraphTriggerInfo" },
@@ -6219,6 +6602,7 @@
           "output_schema",
           "has_external_trigger",
           "has_human_in_the_loop",
+          "has_sensitive_action",
           "trigger_setup_info"
         ],
         "title": "BaseGraph"
@@ -6968,6 +7352,20 @@
           "error_message": {
             "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Error Message"
+          },
+          "started_at": {
+            "anyOf": [
+              { "type": "string", "format": "date-time" },
+              { "type": "null" }
+            ],
+            "title": "Started At"
+          },
+          "ended_at": {
+            "anyOf": [
+              { "type": "string", "format": "date-time" },
+              { "type": "null" }
+            ],
+            "title": "Ended At"
           }
         },
         "type": "object",
@@ -7074,14 +7472,20 @@
           },
           "status": { "$ref": "#/components/schemas/AgentExecutionStatus" },
           "started_at": {
-            "type": "string",
-            "format": "date-time",
-            "title": "Started At"
+            "anyOf": [
+              { "type": "string", "format": "date-time" },
+              { "type": "null" }
+            ],
+            "title": "Started At",
+            "description": "When execution started running. Null if not yet started (QUEUED)."
           },
           "ended_at": {
-            "type": "string",
-            "format": "date-time",
-            "title": "Ended At"
+            "anyOf": [
+              { "type": "string", "format": "date-time" },
+              { "type": "null" }
+            ],
+            "title": "Ended At",
+            "description": "When execution finished. Null if not yet completed (QUEUED, RUNNING, INCOMPLETE, REVIEW)."
           },
           "is_shared": {
             "type": "boolean",
@@ -7115,8 +7519,6 @@
           "nodes_input_masks",
           "preset_id",
           "status",
-          "started_at",
-          "ended_at",
           "stats",
           "outputs"
         ],
@@ -7215,14 +7617,20 @@
           },
           "status": { "$ref": "#/components/schemas/AgentExecutionStatus" },
           "started_at": {
-            "type": "string",
-            "format": "date-time",
-            "title": "Started At"
+            "anyOf": [
+              { "type": "string", "format": "date-time" },
+              { "type": "null" }
+            ],
+            "title": "Started At",
+            "description": "When execution started running. Null if not yet started (QUEUED)."
           },
           "ended_at": {
-            "type": "string",
-            "format": "date-time",
-            "title": "Ended At"
+            "anyOf": [
+              { "type": "string", "format": "date-time" },
+              { "type": "null" }
+            ],
+            "title": "Ended At",
+            "description": "When execution finished. Null if not yet completed (QUEUED, RUNNING, INCOMPLETE, REVIEW)."
           },
           "is_shared": {
             "type": "boolean",
@@ -7251,8 +7659,6 @@
           "nodes_input_masks",
           "preset_id",
           "status",
-          "started_at",
-          "ended_at",
           "stats"
         ],
         "title": "GraphExecutionMeta"
@@ -7299,14 +7705,20 @@
           },
           "status": { "$ref": "#/components/schemas/AgentExecutionStatus" },
           "started_at": {
-            "type": "string",
-            "format": "date-time",
-            "title": "Started At"
+            "anyOf": [
+              { "type": "string", "format": "date-time" },
+              { "type": "null" }
+            ],
+            "title": "Started At",
+            "description": "When execution started running. Null if not yet started (QUEUED)."
           },
           "ended_at": {
-            "type": "string",
-            "format": "date-time",
-            "title": "Ended At"
+            "anyOf": [
+              { "type": "string", "format": "date-time" },
+              { "type": "null" }
+            ],
+            "title": "Ended At",
+            "description": "When execution finished. Null if not yet completed (QUEUED, RUNNING, INCOMPLETE, REVIEW)."
           },
           "is_shared": {
             "type": "boolean",
@@ -7345,8 +7757,6 @@
           "nodes_input_masks",
           "preset_id",
           "status",
-          "started_at",
-          "ended_at",
           "stats",
           "outputs",
           "node_executions"
@@ -7423,6 +7833,11 @@
             "title": "Has Human In The Loop",
             "readOnly": true
           },
+          "has_sensitive_action": {
+            "type": "boolean",
+            "title": "Has Sensitive Action",
+            "readOnly": true
+          },
           "trigger_setup_info": {
             "anyOf": [
               { "$ref": "#/components/schemas/GraphTriggerInfo" },
@@ -7446,6 +7861,7 @@
           "output_schema",
           "has_external_trigger",
           "has_human_in_the_loop",
+          "has_sensitive_action",
           "trigger_setup_info",
           "credentials_input_schema"
         ],
@@ -7524,6 +7940,11 @@
             "title": "Has Human In The Loop",
             "readOnly": true
           },
+          "has_sensitive_action": {
+            "type": "boolean",
+            "title": "Has Sensitive Action",
+            "readOnly": true
+          },
           "trigger_setup_info": {
             "anyOf": [
               { "$ref": "#/components/schemas/GraphTriggerInfo" },
@@ -7548,6 +7969,7 @@
           "output_schema",
           "has_external_trigger",
           "has_human_in_the_loop",
+          "has_sensitive_action",
           "trigger_setup_info",
           "credentials_input_schema"
         ],
@@ -7556,8 +7978,14 @@
       "GraphSettings": {
         "properties": {
           "human_in_the_loop_safe_mode": {
-            "anyOf": [{ "type": "boolean" }, { "type": "null" }],
-            "title": "Human In The Loop Safe Mode"
+            "type": "boolean",
+            "title": "Human In The Loop Safe Mode",
+            "default": true
+          },
+          "sensitive_action_safe_mode": {
+            "type": "boolean",
+            "title": "Sensitive Action Safe Mode",
+            "default": false
           }
         },
         "type": "object",
@@ -7665,6 +8093,7 @@
           "id": { "type": "string", "title": "Id" },
           "graph_id": { "type": "string", "title": "Graph Id" },
           "graph_version": { "type": "integer", "title": "Graph Version" },
+          "owner_user_id": { "type": "string", "title": "Owner User Id" },
           "image_url": {
             "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Image Url"
@@ -7714,6 +8143,16 @@
             "title": "Has External Trigger",
             "description": "Whether the agent has an external trigger (e.g. webhook) node"
           },
+          "has_human_in_the_loop": {
+            "type": "boolean",
+            "title": "Has Human In The Loop",
+            "description": "Whether the agent has human-in-the-loop blocks"
+          },
+          "has_sensitive_action": {
+            "type": "boolean",
+            "title": "Has Sensitive Action",
+            "description": "Whether the agent has sensitive action blocks"
+          },
           "trigger_setup_info": {
             "anyOf": [
               { "$ref": "#/components/schemas/GraphTriggerInfo" },
@@ -7721,6 +8160,25 @@
             ]
           },
           "new_output": { "type": "boolean", "title": "New Output" },
+          "execution_count": {
+            "type": "integer",
+            "title": "Execution Count",
+            "default": 0
+          },
+          "success_rate": {
+            "anyOf": [{ "type": "number" }, { "type": "null" }],
+            "title": "Success Rate"
+          },
+          "avg_correctness_score": {
+            "anyOf": [{ "type": "number" }, { "type": "null" }],
+            "title": "Avg Correctness Score"
+          },
+          "recent_executions": {
+            "items": { "$ref": "#/components/schemas/RecentExecution" },
+            "type": "array",
+            "title": "Recent Executions",
+            "description": "List of recent executions with status, score, and summary"
+          },
           "can_access_graph": {
             "type": "boolean",
             "title": "Can Access Graph"
@@ -7747,6 +8205,7 @@
           "id",
           "graph_id",
           "graph_version",
+          "owner_user_id",
           "image_url",
           "creator_name",
           "creator_image_url",
@@ -7759,6 +8218,8 @@
           "output_schema",
           "credentials_input_schema",
           "has_external_trigger",
+          "has_human_in_the_loop",
+          "has_sensitive_action",
           "new_output",
           "can_access_graph",
           "is_latest_version",
@@ -8017,6 +8478,20 @@
         "required": ["source_id", "sink_id", "source_name", "sink_name"],
         "title": "Link"
       },
+      "ListSessionsResponse": {
+        "properties": {
+          "sessions": {
+            "items": { "$ref": "#/components/schemas/SessionSummaryResponse" },
+            "type": "array",
+            "title": "Sessions"
+          },
+          "total": { "type": "integer", "title": "Total" }
+        },
+        "type": "object",
+        "required": ["sessions", "total"],
+        "title": "ListSessionsResponse",
+        "description": "Response model for listing chat sessions."
+      },
       "LogRawMetricRequest": {
         "properties": {
           "metric_name": {
@@ -8486,6 +8961,19 @@
         "title": "OAuthApplicationPublicInfo",
         "description": "Public information about an OAuth application (for consent screen)"
       },
+      "OnboardingStatusResponse": {
+        "properties": {
+          "is_onboarding_enabled": {
+            "type": "boolean",
+            "title": "Is Onboarding Enabled"
+          },
+          "is_chat_enabled": { "type": "boolean", "title": "Is Chat Enabled" }
+        },
+        "type": "object",
+        "required": ["is_onboarding_enabled", "is_chat_enabled"],
+        "title": "OnboardingStatusResponse",
+        "description": "Response for onboarding status check."
+      },
       "OnboardingStep": {
         "type": "string",
         "enum": [
@@ -8496,6 +8984,7 @@
           "AGENT_NEW_RUN",
           "AGENT_INPUT",
           "CONGRATS",
+          "VISIT_COPILOT",
           "GET_RESULTS",
           "MARKETPLACE_VISIT",
           "MARKETPLACE_ADD_AGENT",
@@ -8513,6 +9002,27 @@
         ],
         "title": "OnboardingStep"
       },
+      "OperationCompleteRequest": {
+        "properties": {
+          "success": { "type": "boolean", "title": "Success" },
+          "result": {
+            "anyOf": [
+              { "additionalProperties": true, "type": "object" },
+              { "type": "string" },
+              { "type": "null" }
+            ],
+            "title": "Result"
+          },
+          "error": {
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
+            "title": "Error"
+          }
+        },
+        "type": "object",
+        "required": ["success"],
+        "title": "OperationCompleteRequest",
+        "description": "Request model for external completion webhook."
+      },
       "Pagination": {
         "properties": {
           "total_items": {
@@ -8551,6 +9061,12 @@
             "title": "Node Exec Id",
             "description": "Node execution ID (primary key)"
           },
+          "node_id": {
+            "type": "string",
+            "title": "Node Id",
+            "description": "Node definition ID (for grouping)",
+            "default": ""
+          },
           "user_id": {
             "type": "string",
             "title": "User Id",
@@ -8650,7 +9166,7 @@
           "created_at"
         ],
         "title": "PendingHumanReviewModel",
-        "description": "Response model for pending human review data.\n\nRepresents a human review request that is awaiting user action.\nContains all necessary information for a user to review and approve\nor reject data from a Human-in-the-Loop block execution.\n\nAttributes:\n    id: Unique identifier for the review record\n    user_id: ID of the user who must perform the review\n    node_exec_id: ID of the node execution that created this review\n    graph_exec_id: ID of the graph execution containing the node\n    graph_id: ID of the graph template being executed\n    graph_version: Version number of the graph template\n    payload: The actual data payload awaiting review\n    instructions: Instructions or message for the reviewer\n    editable: Whether the reviewer can edit the data\n    status: Current review status (WAITING, APPROVED, or REJECTED)\n    review_message: Optional message from the reviewer\n    created_at: Timestamp when review was created\n    updated_at: Timestamp when review was last modified\n    reviewed_at: Timestamp when review was completed (if applicable)"
+        "description": "Response model for pending human review data.\n\nRepresents a human review request that is awaiting user action.\nContains all necessary information for a user to review and approve\nor reject data from a Human-in-the-Loop block execution.\n\nAttributes:\n    id: Unique identifier for the review record\n    user_id: ID of the user who must perform the review\n    node_exec_id: ID of the node execution that created this review\n    node_id: ID of the node definition (for grouping reviews from same node)\n    graph_exec_id: ID of the graph execution containing the node\n    graph_id: ID of the graph template being executed\n    graph_version: Version number of the graph template\n    payload: The actual data payload awaiting review\n    instructions: Instructions or message for the reviewer\n    editable: Whether the reviewer can edit the data\n    status: Current review status (WAITING, APPROVED, or REJECTED)\n    review_message: Optional message from the reviewer\n    created_at: Timestamp when review was created\n    updated_at: Timestamp when review was last modified\n    reviewed_at: Timestamp when review was completed (if applicable)"
       },
       "PostmarkBounceEnum": {
         "type": "integer",
@@ -9077,6 +9593,23 @@
         "required": ["providers", "pagination"],
         "title": "ProviderResponse"
       },
+      "RecentExecution": {
+        "properties": {
+          "status": { "type": "string", "title": "Status" },
+          "correctness_score": {
+            "anyOf": [{ "type": "number" }, { "type": "null" }],
+            "title": "Correctness Score"
+          },
+          "activity_summary": {
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
+            "title": "Activity Summary"
+          }
+        },
+        "type": "object",
+        "required": ["status"],
+        "title": "RecentExecution",
+        "description": "Summary of a recent execution for quality assessment.\n\nUsed by the LLM to understand the agent's recent performance with specific examples\nrather than just aggregate statistics."
+      },
       "RefundRequest": {
         "properties": {
           "id": { "type": "string", "title": "Id" },
@@ -9153,6 +9686,12 @@
             ],
             "title": "Reviewed Data",
             "description": "Optional edited data (ignored if approved=False)"
+          },
+          "auto_approve_future": {
+            "type": "boolean",
+            "title": "Auto Approve Future",
+            "description": "If true and this review is approved, future executions of this same block (node) will be automatically approved. This only affects approved reviews.",
+            "default": false
           }
         },
         "type": "object",
@@ -9172,7 +9711,7 @@
         "type": "object",
         "required": ["reviews"],
         "title": "ReviewRequest",
-        "description": "Request model for processing ALL pending reviews for an execution.\n\nThis request must include ALL pending reviews for a graph execution.\nEach review will be either approved (with optional data modifications)\nor rejected (data ignored). The execution will resume only after ALL reviews are processed."
+        "description": "Request model for processing ALL pending reviews for an execution.\n\nThis request must include ALL pending reviews for a graph execution.\nEach review will be either approved (with optional data modifications)\nor rejected (data ignored). The execution will resume only after ALL reviews are processed.\n\nEach review item can individually specify whether to auto-approve future executions\nof the same block via the `auto_approve_future` field on ReviewItem."
       },
       "ReviewResponse": {
         "properties": {
@@ -9339,6 +9878,12 @@
             "items": { "additionalProperties": true, "type": "object" },
             "type": "array",
             "title": "Messages"
+          },
+          "active_stream": {
+            "anyOf": [
+              { "$ref": "#/components/schemas/ActiveStreamInfo" },
+              { "type": "null" }
+            ]
           }
         },
         "type": "object",
@@ -9346,6 +9891,21 @@
         "title": "SessionDetailResponse",
         "description": "Response model providing complete details for a chat session, including messages."
       },
+      "SessionSummaryResponse": {
+        "properties": {
+          "id": { "type": "string", "title": "Id" },
+          "created_at": { "type": "string", "title": "Created At" },
+          "updated_at": { "type": "string", "title": "Updated At" },
+          "title": {
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
+            "title": "Title"
+          }
+        },
+        "type": "object",
+        "required": ["id", "created_at", "updated_at"],
+        "title": "SessionSummaryResponse",
+        "description": "Response model for a session summary (without messages)."
+      },
       "SetGraphActiveVersion": {
         "properties": {
           "active_graph_version": {
@@ -9479,7 +10039,8 @@
           "sub_heading": { "type": "string", "title": "Sub Heading" },
           "description": { "type": "string", "title": "Description" },
           "runs": { "type": "integer", "title": "Runs" },
-          "rating": { "type": "number", "title": "Rating" }
+          "rating": { "type": "number", "title": "Rating" },
+          "agent_graph_id": { "type": "string", "title": "Agent Graph Id" }
         },
         "type": "object",
         "required": [
@@ -9491,7 +10052,8 @@
           "sub_heading",
           "description",
           "runs",
-          "rating"
+          "rating",
+          "agent_graph_id"
         ],
         "title": "StoreAgent"
       },
@@ -9686,6 +10248,7 @@
       },
       "StoreSubmission": {
         "properties": {
+          "listing_id": { "type": "string", "title": "Listing Id" },
           "agent_id": { "type": "string", "title": "Agent Id" },
           "agent_version": { "type": "integer", "title": "Agent Version" },
           "name": { "type": "string", "title": "Name" },
@@ -9757,6 +10320,7 @@
         },
         "type": "object",
         "required": [
+          "listing_id",
           "agent_id",
           "agent_version",
           "name",
@@ -9819,8 +10383,18 @@
       },
       "StoreSubmissionRequest": {
         "properties": {
-          "agent_id": { "type": "string", "title": "Agent Id" },
-          "agent_version": { "type": "integer", "title": "Agent Version" },
+          "agent_id": {
+            "type": "string",
+            "minLength": 1,
+            "title": "Agent Id",
+            "description": "Agent ID cannot be empty"
+          },
+          "agent_version": {
+            "type": "integer",
+            "exclusiveMinimum": 0.0,
+            "title": "Agent Version",
+            "description": "Agent version must be greater than 0"
+          },
           "slug": { "type": "string", "title": "Slug" },
           "name": { "type": "string", "title": "Name" },
           "sub_heading": { "type": "string", "title": "Sub Heading" },
@@ -9885,6 +10459,30 @@
         "required": ["submissions", "pagination"],
         "title": "StoreSubmissionsResponse"
       },
+      "StreamChatRequest": {
+        "properties": {
+          "message": { "type": "string", "title": "Message" },
+          "is_user_message": {
+            "type": "boolean",
+            "title": "Is User Message",
+            "default": true
+          },
+          "context": {
+            "anyOf": [
+              {
+                "additionalProperties": { "type": "string" },
+                "type": "object"
+              },
+              { "type": "null" }
+            ],
+            "title": "Context"
+          }
+        },
+        "type": "object",
+        "required": ["message"],
+        "title": "StreamChatRequest",
+        "description": "Request model for streaming chat with optional context."
+      },
       "SubmissionStatus": {
         "type": "string",
         "enum": ["DRAFT", "PENDING", "APPROVED", "REJECTED"],
@@ -10715,6 +11313,57 @@
         "required": ["name", "graph_id", "graph_version", "trigger_config"],
         "title": "TriggeredPresetSetupRequest"
       },
+      "UnifiedSearchResponse": {
+        "properties": {
+          "results": {
+            "items": { "$ref": "#/components/schemas/UnifiedSearchResult" },
+            "type": "array",
+            "title": "Results"
+          },
+          "pagination": { "$ref": "#/components/schemas/Pagination" }
+        },
+        "type": "object",
+        "required": ["results", "pagination"],
+        "title": "UnifiedSearchResponse",
+        "description": "Response model for unified search across all content types."
+      },
+      "UnifiedSearchResult": {
+        "properties": {
+          "content_type": { "type": "string", "title": "Content Type" },
+          "content_id": { "type": "string", "title": "Content Id" },
+          "searchable_text": { "type": "string", "title": "Searchable Text" },
+          "metadata": {
+            "anyOf": [
+              { "additionalProperties": true, "type": "object" },
+              { "type": "null" }
+            ],
+            "title": "Metadata"
+          },
+          "updated_at": {
+            "anyOf": [
+              { "type": "string", "format": "date-time" },
+              { "type": "null" }
+            ],
+            "title": "Updated At"
+          },
+          "combined_score": {
+            "anyOf": [{ "type": "number" }, { "type": "null" }],
+            "title": "Combined Score"
+          },
+          "semantic_score": {
+            "anyOf": [{ "type": "number" }, { "type": "null" }],
+            "title": "Semantic Score"
+          },
+          "lexical_score": {
+            "anyOf": [{ "type": "number" }, { "type": "null" }],
+            "title": "Lexical Score"
+          }
+        },
+        "type": "object",
+        "required": ["content_type", "content_id", "searchable_text"],
+        "title": "UnifiedSearchResult",
+        "description": "A single result from unified hybrid search across all content types."
+      },
       "UpdateAppLogoRequest": {
         "properties": {
           "logo_url": {
@@ -11679,6 +12328,7 @@
         "in": "header",
         "name": "X-Postmark-Webhook-Token"
       },
+      "HTTPBearer": { "type": "http", "scheme": "bearer" },
       "HTTPBearerJWT": {
         "type": "http",
         "scheme": "bearer",
diff --git a/autogpt_platform/frontend/src/app/api/proxy/[...path]/route.ts b/autogpt_platform/frontend/src/app/api/proxy/[...path]/route.ts
index 293c406373..442bd77e0f 100644
--- a/autogpt_platform/frontend/src/app/api/proxy/[...path]/route.ts
+++ b/autogpt_platform/frontend/src/app/api/proxy/[...path]/route.ts
@@ -1,5 +1,6 @@
 import {
   ApiError,
+  getServerAuthToken,
   makeAuthenticatedFileUpload,
   makeAuthenticatedRequest,
 } from "@/lib/autogpt-server-api/helpers";
@@ -15,6 +16,69 @@ function buildBackendUrl(path: string[], queryString: string): string {
   return `${environment.getAGPTServerBaseUrl()}/${backendPath}${queryString}`;
 }
 
+/**
+ * Check if this is a workspace file download request that needs binary response handling.
+ */
+function isWorkspaceDownloadRequest(path: string[]): boolean {
+  // Match pattern: api/workspace/files/{id}/download (5 segments)
+  return (
+    path.length == 5 &&
+    path[0] === "api" &&
+    path[1] === "workspace" &&
+    path[2] === "files" &&
+    path[path.length - 1] === "download"
+  );
+}
+
+/**
+ * Handle workspace file download requests with proper binary response streaming.
+ */
+async function handleWorkspaceDownload(
+  req: NextRequest,
+  backendUrl: string,
+): Promise<NextResponse> {
+  const token = await getServerAuthToken();
+
+  const headers: Record<string, string> = {};
+  if (token && token !== "no-token-found") {
+    headers["Authorization"] = `Bearer ${token}`;
+  }
+
+  const response = await fetch(backendUrl, {
+    method: "GET",
+    headers,
+    redirect: "follow", // Follow redirects to signed URLs
+  });
+
+  if (!response.ok) {
+    return NextResponse.json(
+      { error: `Failed to download file: ${response.statusText}` },
+      { status: response.status },
+    );
+  }
+
+  // Get the content type from the backend response
+  const contentType =
+    response.headers.get("Content-Type") || "application/octet-stream";
+  const contentDisposition = response.headers.get("Content-Disposition");
+
+  // Stream the response body
+  const responseHeaders: Record<string, string> = {
+    "Content-Type": contentType,
+  };
+
+  if (contentDisposition) {
+    responseHeaders["Content-Disposition"] = contentDisposition;
+  }
+
+  // Return the binary content
+  const arrayBuffer = await response.arrayBuffer();
+  return new NextResponse(arrayBuffer, {
+    status: 200,
+    headers: responseHeaders,
+  });
+}
+
 async function handleJsonRequest(
   req: NextRequest,
   method: string,
@@ -180,6 +244,11 @@ async function handler(
   };
 
   try {
+    // Handle workspace file downloads separately (binary response)
+    if (method === "GET" && isWorkspaceDownloadRequest(path)) {
+      return await handleWorkspaceDownload(req, backendUrl);
+    }
+
     if (method === "GET" || method === "DELETE") {
       responseBody = await handleGetDeleteRequest(method, backendUrl, req);
     } else if (contentType?.includes("application/json")) {
diff --git a/autogpt_platform/frontend/src/app/api/transcribe/route.ts b/autogpt_platform/frontend/src/app/api/transcribe/route.ts
new file mode 100644
index 0000000000..10c182cdfa
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/api/transcribe/route.ts
@@ -0,0 +1,77 @@
+import { getServerAuthToken } from "@/lib/autogpt-server-api/helpers";
+import { NextRequest, NextResponse } from "next/server";
+
+const WHISPER_API_URL = "https://api.openai.com/v1/audio/transcriptions";
+const MAX_FILE_SIZE = 25 * 1024 * 1024; // 25MB - Whisper's limit
+
+function getExtensionFromMimeType(mimeType: string): string {
+  const subtype = mimeType.split("/")[1]?.split(";")[0];
+  return subtype || "webm";
+}
+
+export async function POST(request: NextRequest) {
+  const token = await getServerAuthToken();
+
+  if (!token || token === "no-token-found") {
+    return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+  }
+
+  const apiKey = process.env.OPENAI_API_KEY;
+
+  if (!apiKey) {
+    return NextResponse.json(
+      { error: "OpenAI API key not configured" },
+      { status: 401 },
+    );
+  }
+
+  try {
+    const formData = await request.formData();
+    const audioFile = formData.get("audio");
+
+    if (!audioFile || !(audioFile instanceof Blob)) {
+      return NextResponse.json(
+        { error: "No audio file provided" },
+        { status: 400 },
+      );
+    }
+
+    if (audioFile.size > MAX_FILE_SIZE) {
+      return NextResponse.json(
+        { error: "File too large. Maximum size is 25MB." },
+        { status: 413 },
+      );
+    }
+
+    const ext = getExtensionFromMimeType(audioFile.type);
+    const whisperFormData = new FormData();
+    whisperFormData.append("file", audioFile, `recording.${ext}`);
+    whisperFormData.append("model", "whisper-1");
+
+    const response = await fetch(WHISPER_API_URL, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${apiKey}`,
+      },
+      body: whisperFormData,
+    });
+
+    if (!response.ok) {
+      const errorData = await response.json().catch(() => ({}));
+      console.error("Whisper API error:", errorData);
+      return NextResponse.json(
+        { error: errorData.error?.message || "Transcription failed" },
+        { status: response.status },
+      );
+    }
+
+    const result = await response.json();
+    return NextResponse.json({ text: result.text });
+  } catch (error) {
+    console.error("Transcription error:", error);
+    return NextResponse.json(
+      { error: "Failed to process audio" },
+      { status: 500 },
+    );
+  }
+}
diff --git a/autogpt_platform/frontend/src/app/layout.tsx b/autogpt_platform/frontend/src/app/layout.tsx
index 453f816dee..1836b1d4f2 100644
--- a/autogpt_platform/frontend/src/app/layout.tsx
+++ b/autogpt_platform/frontend/src/app/layout.tsx
@@ -54,7 +54,7 @@ export default async function RootLayout({
           }}
         />
       </head>
-      <body>
+      <body className="min-h-screen">
         <ErrorBoundary context="application">
           <Providers
             attribute="class"
diff --git a/autogpt_platform/frontend/src/app/page.tsx b/autogpt_platform/frontend/src/app/page.tsx
index b499a40d71..ce67760eda 100644
--- a/autogpt_platform/frontend/src/app/page.tsx
+++ b/autogpt_platform/frontend/src/app/page.tsx
@@ -1,5 +1,15 @@
-import { redirect } from "next/navigation";
+"use client";
+
+import { LoadingSpinner } from "@/components/atoms/LoadingSpinner/LoadingSpinner";
+import { useRouter } from "next/navigation";
+import { useEffect } from "react";
 
 export default function Page() {
-  redirect("/marketplace");
+  const router = useRouter();
+
+  useEffect(() => {
+    router.replace("/copilot");
+  }, [router]);
+
+  return <LoadingSpinner size="large" cover />;
 }
diff --git a/autogpt_platform/frontend/src/app/providers.tsx b/autogpt_platform/frontend/src/app/providers.tsx
index 8ea199abc8..267814e7c2 100644
--- a/autogpt_platform/frontend/src/app/providers.tsx
+++ b/autogpt_platform/frontend/src/app/providers.tsx
@@ -6,28 +6,40 @@ import { BackendAPIProvider } from "@/lib/autogpt-server-api/context";
 import { getQueryClient } from "@/lib/react-query/queryClient";
 import CredentialsProvider from "@/providers/agent-credentials/credentials-provider";
 import OnboardingProvider from "@/providers/onboarding/onboarding-provider";
+import {
+  PostHogPageViewTracker,
+  PostHogProvider,
+  PostHogUserTracker,
+} from "@/providers/posthog/posthog-provider";
 import { LaunchDarklyProvider } from "@/services/feature-flags/feature-flag-provider";
 import { QueryClientProvider } from "@tanstack/react-query";
 import { ThemeProvider, ThemeProviderProps } from "next-themes";
 import { NuqsAdapter } from "nuqs/adapters/next/app";
+import { Suspense } from "react";
 
 export function Providers({ children, ...props }: ThemeProviderProps) {
   const queryClient = getQueryClient();
   return (
     <QueryClientProvider client={queryClient}>
       <NuqsAdapter>
-        <BackendAPIProvider>
-          <SentryUserTracker />
-          <CredentialsProvider>
-            <LaunchDarklyProvider>
-              <OnboardingProvider>
-                <ThemeProvider forcedTheme="light" {...props}>
-                  <TooltipProvider>{children}</TooltipProvider>
-                </ThemeProvider>
-              </OnboardingProvider>
-            </LaunchDarklyProvider>
-          </CredentialsProvider>
-        </BackendAPIProvider>
+        <PostHogProvider>
+          <BackendAPIProvider>
+            <SentryUserTracker />
+            <PostHogUserTracker />
+            <Suspense fallback={null}>
+              <PostHogPageViewTracker />
+            </Suspense>
+            <CredentialsProvider>
+              <LaunchDarklyProvider>
+                <OnboardingProvider>
+                  <ThemeProvider forcedTheme="light" {...props}>
+                    <TooltipProvider>{children}</TooltipProvider>
+                  </ThemeProvider>
+                </OnboardingProvider>
+              </LaunchDarklyProvider>
+            </CredentialsProvider>
+          </BackendAPIProvider>
+        </PostHogProvider>
       </NuqsAdapter>
     </QueryClientProvider>
   );
diff --git a/autogpt_platform/frontend/src/components/atoms/Badge/Badge.test.tsx b/autogpt_platform/frontend/src/components/atoms/Badge/Badge.test.tsx
deleted file mode 100644
index cd8531375b..0000000000
--- a/autogpt_platform/frontend/src/components/atoms/Badge/Badge.test.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-// import { render, screen } from "@testing-library/react";
-// import { describe, expect, it } from "vitest";
-// import { Badge } from "./Badge";
-
-// describe("Badge Component", () => {
-//   it("renders badge with content", () => {
-//     render(<Badge variant="success">Success</Badge>);
-
-//     expect(screen.getByText("Success")).toBeInTheDocument();
-//   });
-
-//   it("applies correct variant styles", () => {
-//     const { rerender } = render(<Badge variant="success">Success</Badge>);
-//     let badge = screen.getByText("Success");
-//     expect(badge).toHaveClass("bg-green-100", "text-green-800");
-
-//     rerender(<Badge variant="error">Error</Badge>);
-//     badge = screen.getByText("Error");
-//     expect(badge).toHaveClass("bg-red-100", "text-red-800");
-
-//     rerender(<Badge variant="info">Info</Badge>);
-//     badge = screen.getByText("Info");
-//     expect(badge).toHaveClass("bg-slate-100", "text-slate-800");
-//   });
-
-//   it("applies custom className", () => {
-//     render(
-//       <Badge variant="success" className="custom-class">
-//         Success
-//       </Badge>,
-//     );
-
-//     const badge = screen.getByText("Success");
-//     expect(badge).toHaveClass("custom-class");
-//   });
-
-//   it("renders as span element", () => {
-//     render(<Badge variant="success">Success</Badge>);
-
-//     const badge = screen.getByText("Success");
-//     expect(badge.tagName).toBe("SPAN");
-//   });
-
-//   it("renders children correctly", () => {
-//     render(
-//       <Badge variant="success">
-//         <span>Custom</span> Content
-//       </Badge>,
-//     );
-
-//     expect(screen.getByText("Custom")).toBeInTheDocument();
-//     expect(screen.getByText("Content")).toBeInTheDocument();
-//   });
-
-//   it("supports all badge variants", () => {
-//     const variants = ["success", "error", "info"] as const;
-
-//     variants.forEach((variant) => {
-//       const { unmount } = render(
-//         <Badge variant={variant} data-testid={`badge-${variant}`}>
-//           {variant}
-//         </Badge>,
-//       );
-
-//       expect(screen.getByTestId(`badge-${variant}`)).toBeInTheDocument();
-//       unmount();
-//     });
-//   });
-
-//   it("handles long text content", () => {
-//     render(
-//       <Badge variant="info">
-//         Very long text that should be handled properly by the component
-//       </Badge>,
-//     );
-
-//     const badge = screen.getByText(/Very long text/);
-//     expect(badge).toBeInTheDocument();
-//     expect(badge).toHaveClass("overflow-hidden", "text-ellipsis");
-//   });
-// });
diff --git a/autogpt_platform/frontend/src/components/atoms/Button/Button.tsx b/autogpt_platform/frontend/src/components/atoms/Button/Button.tsx
index de1dec2d25..ab7b90e098 100644
--- a/autogpt_platform/frontend/src/components/atoms/Button/Button.tsx
+++ b/autogpt_platform/frontend/src/components/atoms/Button/Button.tsx
@@ -20,6 +20,7 @@ export function Button(props: ButtonProps) {
     rightIcon,
     children,
     as = "button",
+    asChild: _asChild, // Destructure to prevent passing to DOM
     ...restProps
   } = props;
 
diff --git a/autogpt_platform/frontend/src/components/atoms/Button/helpers.ts b/autogpt_platform/frontend/src/components/atoms/Button/helpers.ts
index 4d9706838c..27594bf4e3 100644
--- a/autogpt_platform/frontend/src/components/atoms/Button/helpers.ts
+++ b/autogpt_platform/frontend/src/components/atoms/Button/helpers.ts
@@ -32,7 +32,7 @@ export const extendedButtonVariants = cva(
         ),
       },
       size: {
-        small: "px-3 py-2 text-sm gap-1.5 h-[2.25rem]",
+        small: "px-3 py-2 text-sm gap-1.5 h-[2.25rem] min-w-[5.5rem]",
         large: "px-4 py-3 text-sm gap-2 h-[3.25rem]",
         icon: "p-3 !min-w-0",
       },
diff --git a/autogpt_platform/frontend/src/components/atoms/Input/Input.tsx b/autogpt_platform/frontend/src/components/atoms/Input/Input.tsx
index f59c01e77d..413ecf5d33 100644
--- a/autogpt_platform/frontend/src/components/atoms/Input/Input.tsx
+++ b/autogpt_platform/frontend/src/components/atoms/Input/Input.tsx
@@ -92,7 +92,7 @@ export function Input({
           className={cn(
             baseStyles,
             errorStyles,
-            "-mb-1 h-auto min-h-[2.875rem] rounded-medium",
+            "-mb-1 h-auto min-h-[2.875rem] rounded-3xl",
             // Size variants for textarea
             size === "small" && [
               "min-h-[2.25rem]", // 36px minimum
@@ -107,6 +107,11 @@ export function Input({
           )}
           placeholder={placeholder || label}
           onChange={handleTextareaChange}
+          onKeyDown={
+            props.onKeyDown as
+              | React.KeyboardEventHandler<HTMLTextAreaElement>
+              | undefined
+          }
           rows={props.rows || 3}
           {...(hideLabel ? { "aria-label": label } : {})}
           id={props.id}
diff --git a/autogpt_platform/frontend/src/components/atoms/Skeleton/Skeleton.tsx b/autogpt_platform/frontend/src/components/atoms/Skeleton/Skeleton.tsx
new file mode 100644
index 0000000000..4789e281ce
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/atoms/Skeleton/Skeleton.tsx
@@ -0,0 +1,14 @@
+import { cn } from "@/lib/utils";
+
+interface Props extends React.HTMLAttributes<HTMLDivElement> {
+  className?: string;
+}
+
+export function Skeleton({ className, ...props }: Props) {
+  return (
+    <div
+      className={cn("animate-pulse rounded-md bg-zinc-100", className)}
+      {...props}
+    />
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/atoms/Skeleton/skeleton.stories.tsx b/autogpt_platform/frontend/src/components/atoms/Skeleton/skeleton.stories.tsx
index 04d87a6e0e..69bb7c3440 100644
--- a/autogpt_platform/frontend/src/components/atoms/Skeleton/skeleton.stories.tsx
+++ b/autogpt_platform/frontend/src/components/atoms/Skeleton/skeleton.stories.tsx
@@ -1,4 +1,4 @@
-import { Skeleton } from "@/components/__legacy__/ui/skeleton";
+import { Skeleton } from "./Skeleton";
 import type { Meta, StoryObj } from "@storybook/nextjs";
 
 const meta: Meta<typeof Skeleton> = {
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/Chat.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/Chat.tsx
new file mode 100644
index 0000000000..da454150bf
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/Chat.tsx
@@ -0,0 +1,114 @@
+"use client";
+
+import { useCopilotSessionId } from "@/app/(platform)/copilot/useCopilotSessionId";
+import { LoadingSpinner } from "@/components/atoms/LoadingSpinner/LoadingSpinner";
+import { Text } from "@/components/atoms/Text/Text";
+import { cn } from "@/lib/utils";
+import { useEffect, useRef } from "react";
+import { ChatContainer } from "./components/ChatContainer/ChatContainer";
+import { ChatErrorState } from "./components/ChatErrorState/ChatErrorState";
+import { useChat } from "./useChat";
+
+export interface ChatProps {
+  className?: string;
+  initialPrompt?: string;
+  onSessionNotFound?: () => void;
+  onStreamingChange?: (isStreaming: boolean) => void;
+}
+
+export function Chat({
+  className,
+  initialPrompt,
+  onSessionNotFound,
+  onStreamingChange,
+}: ChatProps) {
+  const { urlSessionId } = useCopilotSessionId();
+  const hasHandledNotFoundRef = useRef(false);
+  const {
+    session,
+    messages,
+    isLoading,
+    isCreating,
+    error,
+    isSessionNotFound,
+    sessionId,
+    createSession,
+    showLoader,
+    startPollingForOperation,
+  } = useChat({ urlSessionId });
+
+  // Extract active stream info for reconnection
+  const activeStream = (
+    session as {
+      active_stream?: {
+        task_id: string;
+        last_message_id: string;
+        operation_id: string;
+        tool_name: string;
+      };
+    }
+  )?.active_stream;
+
+  useEffect(() => {
+    if (!onSessionNotFound) return;
+    if (!urlSessionId) return;
+    if (!isSessionNotFound || isLoading || isCreating) return;
+    if (hasHandledNotFoundRef.current) return;
+    hasHandledNotFoundRef.current = true;
+    onSessionNotFound();
+  }, [
+    onSessionNotFound,
+    urlSessionId,
+    isSessionNotFound,
+    isLoading,
+    isCreating,
+  ]);
+
+  const shouldShowLoader = showLoader && (isLoading || isCreating);
+
+  return (
+    <div className={cn("flex h-full flex-col", className)}>
+      {/* Main Content */}
+      <main className="flex min-h-0 w-full flex-1 flex-col overflow-hidden bg-[#f8f8f9]">
+        {/* Loading State */}
+        {shouldShowLoader && (
+          <div className="flex flex-1 items-center justify-center">
+            <div className="flex flex-col items-center gap-3">
+              <LoadingSpinner size="large" className="text-neutral-400" />
+              <Text variant="body" className="text-zinc-500">
+                Loading your chat...
+              </Text>
+            </div>
+          </div>
+        )}
+
+        {/* Error State */}
+        {error && !isLoading && (
+          <ChatErrorState error={error} onRetry={createSession} />
+        )}
+
+        {/* Session Content */}
+        {sessionId && !isLoading && !error && (
+          <ChatContainer
+            sessionId={sessionId}
+            initialMessages={messages}
+            initialPrompt={initialPrompt}
+            className="flex-1"
+            onStreamingChange={onStreamingChange}
+            onOperationStarted={startPollingForOperation}
+            activeStream={
+              activeStream
+                ? {
+                    taskId: activeStream.task_id,
+                    lastMessageId: activeStream.last_message_id,
+                    operationId: activeStream.operation_id,
+                    toolName: activeStream.tool_name,
+                  }
+                : undefined
+            }
+          />
+        )}
+      </main>
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/SSE_RECONNECTION.md b/autogpt_platform/frontend/src/components/contextual/Chat/SSE_RECONNECTION.md
new file mode 100644
index 0000000000..9e78679f4e
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/SSE_RECONNECTION.md
@@ -0,0 +1,159 @@
+# SSE Reconnection Contract for Long-Running Operations
+
+This document describes the client-side contract for handling SSE (Server-Sent Events) disconnections and reconnecting to long-running background tasks.
+
+## Overview
+
+When a user triggers a long-running operation (like agent generation), the backend:
+
+1. Spawns a background task that survives SSE disconnections
+2. Returns an `operation_started` response with a `task_id`
+3. Stores stream messages in Redis Streams for replay
+
+Clients can reconnect to the task stream at any time to receive missed messages.
+
+## Client-Side Flow
+
+### 1. Receiving Operation Started
+
+When you receive an `operation_started` tool response:
+
+```typescript
+// The response includes a task_id for reconnection
+{
+  type: "operation_started",
+  tool_name: "generate_agent",
+  operation_id: "uuid-...",
+  task_id: "task-uuid-...",  // <-- Store this for reconnection
+  message: "Operation started. You can close this tab."
+}
+```
+
+### 2. Storing Task Info
+
+Use the chat store to track the active task:
+
+```typescript
+import { useChatStore } from "./chat-store";
+
+// When operation_started is received:
+useChatStore.getState().setActiveTask(sessionId, {
+  taskId: response.task_id,
+  operationId: response.operation_id,
+  toolName: response.tool_name,
+  lastMessageId: "0",
+});
+```
+
+### 3. Reconnecting to a Task
+
+To reconnect (e.g., after page refresh or tab reopen):
+
+```typescript
+const { reconnectToTask, getActiveTask } = useChatStore.getState();
+
+// Check if there's an active task for this session
+const activeTask = getActiveTask(sessionId);
+
+if (activeTask) {
+  // Reconnect to the task stream
+  await reconnectToTask(
+    sessionId,
+    activeTask.taskId,
+    activeTask.lastMessageId, // Resume from last position
+    (chunk) => {
+      // Handle incoming chunks
+      console.log("Received chunk:", chunk);
+    },
+  );
+}
+```
+
+### 4. Tracking Message Position
+
+To enable precise replay, update the last message ID as chunks arrive:
+
+```typescript
+const { updateTaskLastMessageId } = useChatStore.getState();
+
+function handleChunk(chunk: StreamChunk) {
+  // If chunk has an index/id, track it
+  if (chunk.idx !== undefined) {
+    updateTaskLastMessageId(sessionId, String(chunk.idx));
+  }
+}
+```
+
+## API Endpoints
+
+### Task Stream Reconnection
+
+```
+GET /api/chat/tasks/{taskId}/stream?last_message_id={idx}
+```
+
+- `taskId`: The task ID from `operation_started`
+- `last_message_id`: Last received message index (default: "0" for full replay)
+
+Returns: SSE stream of missed messages + live updates
+
+## Chunk Types
+
+The reconnected stream follows the same Vercel AI SDK protocol:
+
+| Type                    | Description             |
+| ----------------------- | ----------------------- |
+| `start`                 | Message lifecycle start |
+| `text-delta`            | Streaming text content  |
+| `text-end`              | Text block completed    |
+| `tool-output-available` | Tool result available   |
+| `finish`                | Stream completed        |
+| `error`                 | Error occurred          |
+
+## Error Handling
+
+If reconnection fails:
+
+1. Check if task still exists (may have expired - default TTL: 1 hour)
+2. Fall back to polling the session for final state
+3. Show appropriate UI message to user
+
+## Persistence Considerations
+
+For robust reconnection across browser restarts:
+
+```typescript
+// Store in localStorage/sessionStorage
+const ACTIVE_TASKS_KEY = "chat_active_tasks";
+
+function persistActiveTask(sessionId: string, task: ActiveTaskInfo) {
+  const tasks = JSON.parse(localStorage.getItem(ACTIVE_TASKS_KEY) || "{}");
+  tasks[sessionId] = task;
+  localStorage.setItem(ACTIVE_TASKS_KEY, JSON.stringify(tasks));
+}
+
+function loadPersistedTasks(): Record<string, ActiveTaskInfo> {
+  return JSON.parse(localStorage.getItem(ACTIVE_TASKS_KEY) || "{}");
+}
+```
+
+## Backend Configuration
+
+The following backend settings affect reconnection behavior:
+
+| Setting             | Default | Description                        |
+| ------------------- | ------- | ---------------------------------- |
+| `stream_ttl`        | 3600s   | How long streams are kept in Redis |
+| `stream_max_length` | 1000    | Max messages per stream            |
+
+## Testing
+
+To test reconnection locally:
+
+1. Start a long-running operation (e.g., agent generation)
+2. Note the `task_id` from the `operation_started` response
+3. Close the browser tab
+4. Reopen and call `reconnectToTask` with the saved `task_id`
+5. Verify that missed messages are replayed
+
+See the main README for full local development setup.
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/chat-constants.ts b/autogpt_platform/frontend/src/components/contextual/Chat/chat-constants.ts
new file mode 100644
index 0000000000..8802de2155
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/chat-constants.ts
@@ -0,0 +1,16 @@
+/**
+ * Constants for the chat system.
+ *
+ * Centralizes magic strings and values used across chat components.
+ */
+
+// LocalStorage keys
+export const STORAGE_KEY_ACTIVE_TASKS = "chat_active_tasks";
+
+// Redis Stream IDs
+export const INITIAL_MESSAGE_ID = "0";
+export const INITIAL_STREAM_ID = "0-0";
+
+// TTL values (in milliseconds)
+export const COMPLETED_STREAM_TTL_MS = 5 * 60 * 1000; // 5 minutes
+export const ACTIVE_TASK_TTL_MS = 60 * 60 * 1000; // 1 hour
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/chat-store.ts b/autogpt_platform/frontend/src/components/contextual/Chat/chat-store.ts
new file mode 100644
index 0000000000..3083f65d2c
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/chat-store.ts
@@ -0,0 +1,501 @@
+"use client";
+
+import { create } from "zustand";
+import {
+  ACTIVE_TASK_TTL_MS,
+  COMPLETED_STREAM_TTL_MS,
+  INITIAL_STREAM_ID,
+  STORAGE_KEY_ACTIVE_TASKS,
+} from "./chat-constants";
+import type {
+  ActiveStream,
+  StreamChunk,
+  StreamCompleteCallback,
+  StreamResult,
+  StreamStatus,
+} from "./chat-types";
+import { executeStream, executeTaskReconnect } from "./stream-executor";
+
+export interface ActiveTaskInfo {
+  taskId: string;
+  sessionId: string;
+  operationId: string;
+  toolName: string;
+  lastMessageId: string;
+  startedAt: number;
+}
+
+/** Load active tasks from localStorage */
+function loadPersistedTasks(): Map<string, ActiveTaskInfo> {
+  if (typeof window === "undefined") return new Map();
+  try {
+    const stored = localStorage.getItem(STORAGE_KEY_ACTIVE_TASKS);
+    if (!stored) return new Map();
+    const parsed = JSON.parse(stored) as Record<string, ActiveTaskInfo>;
+    const now = Date.now();
+    const tasks = new Map<string, ActiveTaskInfo>();
+    // Filter out expired tasks
+    for (const [sessionId, task] of Object.entries(parsed)) {
+      if (now - task.startedAt < ACTIVE_TASK_TTL_MS) {
+        tasks.set(sessionId, task);
+      }
+    }
+    return tasks;
+  } catch {
+    return new Map();
+  }
+}
+
+/** Save active tasks to localStorage */
+function persistTasks(tasks: Map<string, ActiveTaskInfo>): void {
+  if (typeof window === "undefined") return;
+  try {
+    const obj: Record<string, ActiveTaskInfo> = {};
+    for (const [sessionId, task] of tasks) {
+      obj[sessionId] = task;
+    }
+    localStorage.setItem(STORAGE_KEY_ACTIVE_TASKS, JSON.stringify(obj));
+  } catch {
+    // Ignore storage errors
+  }
+}
+
+interface ChatStoreState {
+  activeStreams: Map<string, ActiveStream>;
+  completedStreams: Map<string, StreamResult>;
+  activeSessions: Set<string>;
+  streamCompleteCallbacks: Set<StreamCompleteCallback>;
+  /** Active tasks for SSE reconnection - keyed by sessionId */
+  activeTasks: Map<string, ActiveTaskInfo>;
+}
+
+interface ChatStoreActions {
+  startStream: (
+    sessionId: string,
+    message: string,
+    isUserMessage: boolean,
+    context?: { url: string; content: string },
+    onChunk?: (chunk: StreamChunk) => void,
+  ) => Promise<void>;
+  stopStream: (sessionId: string) => void;
+  subscribeToStream: (
+    sessionId: string,
+    onChunk: (chunk: StreamChunk) => void,
+    skipReplay?: boolean,
+  ) => () => void;
+  getStreamStatus: (sessionId: string) => StreamStatus;
+  getCompletedStream: (sessionId: string) => StreamResult | undefined;
+  clearCompletedStream: (sessionId: string) => void;
+  isStreaming: (sessionId: string) => boolean;
+  registerActiveSession: (sessionId: string) => void;
+  unregisterActiveSession: (sessionId: string) => void;
+  isSessionActive: (sessionId: string) => boolean;
+  onStreamComplete: (callback: StreamCompleteCallback) => () => void;
+  /** Track active task for SSE reconnection */
+  setActiveTask: (
+    sessionId: string,
+    taskInfo: Omit<ActiveTaskInfo, "sessionId" | "startedAt">,
+  ) => void;
+  /** Get active task for a session */
+  getActiveTask: (sessionId: string) => ActiveTaskInfo | undefined;
+  /** Clear active task when operation completes */
+  clearActiveTask: (sessionId: string) => void;
+  /** Reconnect to an existing task stream */
+  reconnectToTask: (
+    sessionId: string,
+    taskId: string,
+    lastMessageId?: string,
+    onChunk?: (chunk: StreamChunk) => void,
+  ) => Promise<void>;
+  /** Update last message ID for a task (for tracking replay position) */
+  updateTaskLastMessageId: (sessionId: string, lastMessageId: string) => void;
+}
+
+type ChatStore = ChatStoreState & ChatStoreActions;
+
+function notifyStreamComplete(
+  callbacks: Set<StreamCompleteCallback>,
+  sessionId: string,
+) {
+  for (const callback of callbacks) {
+    try {
+      callback(sessionId);
+    } catch (err) {
+      console.warn("[ChatStore] Stream complete callback error:", err);
+    }
+  }
+}
+
+function cleanupExpiredStreams(
+  completedStreams: Map<string, StreamResult>,
+): Map<string, StreamResult> {
+  const now = Date.now();
+  const cleaned = new Map(completedStreams);
+  for (const [sessionId, result] of cleaned) {
+    if (now - result.completedAt > COMPLETED_STREAM_TTL_MS) {
+      cleaned.delete(sessionId);
+    }
+  }
+  return cleaned;
+}
+
+/**
+ * Finalize a stream by moving it from activeStreams to completedStreams.
+ * Also handles cleanup and notifications.
+ */
+function finalizeStream(
+  sessionId: string,
+  stream: ActiveStream,
+  onChunk: ((chunk: StreamChunk) => void) | undefined,
+  get: () => ChatStoreState & ChatStoreActions,
+  set: (state: Partial<ChatStoreState>) => void,
+): void {
+  if (onChunk) stream.onChunkCallbacks.delete(onChunk);
+
+  if (stream.status !== "streaming") {
+    const currentState = get();
+    const finalActiveStreams = new Map(currentState.activeStreams);
+    let finalCompletedStreams = new Map(currentState.completedStreams);
+
+    const storedStream = finalActiveStreams.get(sessionId);
+    if (storedStream === stream) {
+      const result: StreamResult = {
+        sessionId,
+        status: stream.status,
+        chunks: stream.chunks,
+        completedAt: Date.now(),
+        error: stream.error,
+      };
+      finalCompletedStreams.set(sessionId, result);
+      finalActiveStreams.delete(sessionId);
+      finalCompletedStreams = cleanupExpiredStreams(finalCompletedStreams);
+      set({
+        activeStreams: finalActiveStreams,
+        completedStreams: finalCompletedStreams,
+      });
+
+      if (stream.status === "completed" || stream.status === "error") {
+        notifyStreamComplete(currentState.streamCompleteCallbacks, sessionId);
+      }
+    }
+  }
+}
+
+/**
+ * Clean up an existing stream for a session and move it to completed streams.
+ * Returns updated maps for both active and completed streams.
+ */
+function cleanupExistingStream(
+  sessionId: string,
+  activeStreams: Map<string, ActiveStream>,
+  completedStreams: Map<string, StreamResult>,
+  callbacks: Set<StreamCompleteCallback>,
+): {
+  activeStreams: Map<string, ActiveStream>;
+  completedStreams: Map<string, StreamResult>;
+} {
+  const newActiveStreams = new Map(activeStreams);
+  let newCompletedStreams = new Map(completedStreams);
+
+  const existingStream = newActiveStreams.get(sessionId);
+  if (existingStream) {
+    existingStream.abortController.abort();
+    const normalizedStatus =
+      existingStream.status === "streaming"
+        ? "completed"
+        : existingStream.status;
+    const result: StreamResult = {
+      sessionId,
+      status: normalizedStatus,
+      chunks: existingStream.chunks,
+      completedAt: Date.now(),
+      error: existingStream.error,
+    };
+    newCompletedStreams.set(sessionId, result);
+    newActiveStreams.delete(sessionId);
+    newCompletedStreams = cleanupExpiredStreams(newCompletedStreams);
+    if (normalizedStatus === "completed" || normalizedStatus === "error") {
+      notifyStreamComplete(callbacks, sessionId);
+    }
+  }
+
+  return {
+    activeStreams: newActiveStreams,
+    completedStreams: newCompletedStreams,
+  };
+}
+
+/**
+ * Create a new active stream with initial state.
+ */
+function createActiveStream(
+  sessionId: string,
+  onChunk?: (chunk: StreamChunk) => void,
+): ActiveStream {
+  const abortController = new AbortController();
+  const initialCallbacks = new Set<(chunk: StreamChunk) => void>();
+  if (onChunk) initialCallbacks.add(onChunk);
+
+  return {
+    sessionId,
+    abortController,
+    status: "streaming",
+    startedAt: Date.now(),
+    chunks: [],
+    onChunkCallbacks: initialCallbacks,
+  };
+}
+
+export const useChatStore = create<ChatStore>((set, get) => ({
+  activeStreams: new Map(),
+  completedStreams: new Map(),
+  activeSessions: new Set(),
+  streamCompleteCallbacks: new Set(),
+  activeTasks: loadPersistedTasks(),
+
+  startStream: async function startStream(
+    sessionId,
+    message,
+    isUserMessage,
+    context,
+    onChunk,
+  ) {
+    const state = get();
+    const callbacks = state.streamCompleteCallbacks;
+
+    // Clean up any existing stream for this session
+    const {
+      activeStreams: newActiveStreams,
+      completedStreams: newCompletedStreams,
+    } = cleanupExistingStream(
+      sessionId,
+      state.activeStreams,
+      state.completedStreams,
+      callbacks,
+    );
+
+    // Create new stream
+    const stream = createActiveStream(sessionId, onChunk);
+    newActiveStreams.set(sessionId, stream);
+    set({
+      activeStreams: newActiveStreams,
+      completedStreams: newCompletedStreams,
+    });
+
+    try {
+      await executeStream(stream, message, isUserMessage, context);
+    } finally {
+      finalizeStream(sessionId, stream, onChunk, get, set);
+    }
+  },
+
+  stopStream: function stopStream(sessionId) {
+    const state = get();
+    const stream = state.activeStreams.get(sessionId);
+    if (!stream) return;
+
+    stream.abortController.abort();
+    stream.status = "completed";
+
+    const newActiveStreams = new Map(state.activeStreams);
+    let newCompletedStreams = new Map(state.completedStreams);
+
+    const result: StreamResult = {
+      sessionId,
+      status: stream.status,
+      chunks: stream.chunks,
+      completedAt: Date.now(),
+      error: stream.error,
+    };
+    newCompletedStreams.set(sessionId, result);
+    newActiveStreams.delete(sessionId);
+    newCompletedStreams = cleanupExpiredStreams(newCompletedStreams);
+
+    set({
+      activeStreams: newActiveStreams,
+      completedStreams: newCompletedStreams,
+    });
+
+    notifyStreamComplete(state.streamCompleteCallbacks, sessionId);
+  },
+
+  subscribeToStream: function subscribeToStream(
+    sessionId,
+    onChunk,
+    skipReplay = false,
+  ) {
+    const state = get();
+    const stream = state.activeStreams.get(sessionId);
+
+    if (stream) {
+      if (!skipReplay) {
+        for (const chunk of stream.chunks) {
+          onChunk(chunk);
+        }
+      }
+
+      stream.onChunkCallbacks.add(onChunk);
+
+      return function unsubscribe() {
+        stream.onChunkCallbacks.delete(onChunk);
+      };
+    }
+
+    return function noop() {};
+  },
+
+  getStreamStatus: function getStreamStatus(sessionId) {
+    const { activeStreams, completedStreams } = get();
+
+    const active = activeStreams.get(sessionId);
+    if (active) return active.status;
+
+    const completed = completedStreams.get(sessionId);
+    if (completed) return completed.status;
+
+    return "idle";
+  },
+
+  getCompletedStream: function getCompletedStream(sessionId) {
+    return get().completedStreams.get(sessionId);
+  },
+
+  clearCompletedStream: function clearCompletedStream(sessionId) {
+    const state = get();
+    if (!state.completedStreams.has(sessionId)) return;
+
+    const newCompletedStreams = new Map(state.completedStreams);
+    newCompletedStreams.delete(sessionId);
+    set({ completedStreams: newCompletedStreams });
+  },
+
+  isStreaming: function isStreaming(sessionId) {
+    const stream = get().activeStreams.get(sessionId);
+    return stream?.status === "streaming";
+  },
+
+  registerActiveSession: function registerActiveSession(sessionId) {
+    const state = get();
+    if (state.activeSessions.has(sessionId)) return;
+
+    const newActiveSessions = new Set(state.activeSessions);
+    newActiveSessions.add(sessionId);
+    set({ activeSessions: newActiveSessions });
+  },
+
+  unregisterActiveSession: function unregisterActiveSession(sessionId) {
+    const state = get();
+    if (!state.activeSessions.has(sessionId)) return;
+
+    const newActiveSessions = new Set(state.activeSessions);
+    newActiveSessions.delete(sessionId);
+    set({ activeSessions: newActiveSessions });
+  },
+
+  isSessionActive: function isSessionActive(sessionId) {
+    return get().activeSessions.has(sessionId);
+  },
+
+  onStreamComplete: function onStreamComplete(callback) {
+    const state = get();
+    const newCallbacks = new Set(state.streamCompleteCallbacks);
+    newCallbacks.add(callback);
+    set({ streamCompleteCallbacks: newCallbacks });
+
+    return function unsubscribe() {
+      const currentState = get();
+      const cleanedCallbacks = new Set(currentState.streamCompleteCallbacks);
+      cleanedCallbacks.delete(callback);
+      set({ streamCompleteCallbacks: cleanedCallbacks });
+    };
+  },
+
+  setActiveTask: function setActiveTask(sessionId, taskInfo) {
+    const state = get();
+    const newActiveTasks = new Map(state.activeTasks);
+    newActiveTasks.set(sessionId, {
+      ...taskInfo,
+      sessionId,
+      startedAt: Date.now(),
+    });
+    set({ activeTasks: newActiveTasks });
+    persistTasks(newActiveTasks);
+  },
+
+  getActiveTask: function getActiveTask(sessionId) {
+    return get().activeTasks.get(sessionId);
+  },
+
+  clearActiveTask: function clearActiveTask(sessionId) {
+    const state = get();
+    if (!state.activeTasks.has(sessionId)) return;
+
+    const newActiveTasks = new Map(state.activeTasks);
+    newActiveTasks.delete(sessionId);
+    set({ activeTasks: newActiveTasks });
+    persistTasks(newActiveTasks);
+  },
+
+  reconnectToTask: async function reconnectToTask(
+    sessionId,
+    taskId,
+    lastMessageId = INITIAL_STREAM_ID,
+    onChunk,
+  ) {
+    const state = get();
+    const callbacks = state.streamCompleteCallbacks;
+
+    // Clean up any existing stream for this session
+    const {
+      activeStreams: newActiveStreams,
+      completedStreams: newCompletedStreams,
+    } = cleanupExistingStream(
+      sessionId,
+      state.activeStreams,
+      state.completedStreams,
+      callbacks,
+    );
+
+    // Create new stream for reconnection
+    const stream = createActiveStream(sessionId, onChunk);
+    newActiveStreams.set(sessionId, stream);
+    set({
+      activeStreams: newActiveStreams,
+      completedStreams: newCompletedStreams,
+    });
+
+    try {
+      await executeTaskReconnect(stream, taskId, lastMessageId);
+    } finally {
+      finalizeStream(sessionId, stream, onChunk, get, set);
+
+      // Clear active task on completion
+      if (stream.status === "completed" || stream.status === "error") {
+        const taskState = get();
+        if (taskState.activeTasks.has(sessionId)) {
+          const newActiveTasks = new Map(taskState.activeTasks);
+          newActiveTasks.delete(sessionId);
+          set({ activeTasks: newActiveTasks });
+          persistTasks(newActiveTasks);
+        }
+      }
+    }
+  },
+
+  updateTaskLastMessageId: function updateTaskLastMessageId(
+    sessionId,
+    lastMessageId,
+  ) {
+    const state = get();
+    const task = state.activeTasks.get(sessionId);
+    if (!task) return;
+
+    const newActiveTasks = new Map(state.activeTasks);
+    newActiveTasks.set(sessionId, {
+      ...task,
+      lastMessageId,
+    });
+    set({ activeTasks: newActiveTasks });
+    persistTasks(newActiveTasks);
+  },
+}));
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/chat-types.ts b/autogpt_platform/frontend/src/components/contextual/Chat/chat-types.ts
new file mode 100644
index 0000000000..34813e17fe
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/chat-types.ts
@@ -0,0 +1,163 @@
+import type { ToolArguments, ToolResult } from "@/types/chat";
+
+export type StreamStatus = "idle" | "streaming" | "completed" | "error";
+
+export interface StreamChunk {
+  type:
+    | "stream_start"
+    | "text_chunk"
+    | "text_ended"
+    | "tool_call"
+    | "tool_call_start"
+    | "tool_response"
+    | "login_needed"
+    | "need_login"
+    | "credentials_needed"
+    | "error"
+    | "usage"
+    | "stream_end";
+  taskId?: string;
+  timestamp?: string;
+  content?: string;
+  message?: string;
+  code?: string;
+  details?: Record<string, unknown>;
+  tool_id?: string;
+  tool_name?: string;
+  arguments?: ToolArguments;
+  result?: ToolResult;
+  success?: boolean;
+  idx?: number;
+  session_id?: string;
+  agent_info?: {
+    graph_id: string;
+    name: string;
+    trigger_type: string;
+  };
+  provider?: string;
+  provider_name?: string;
+  credential_type?: string;
+  scopes?: string[];
+  title?: string;
+  [key: string]: unknown;
+}
+
+export type VercelStreamChunk =
+  | { type: "start"; messageId: string; taskId?: string }
+  | { type: "finish" }
+  | { type: "text-start"; id: string }
+  | { type: "text-delta"; id: string; delta: string }
+  | { type: "text-end"; id: string }
+  | { type: "tool-input-start"; toolCallId: string; toolName: string }
+  | {
+      type: "tool-input-available";
+      toolCallId: string;
+      toolName: string;
+      input: Record<string, unknown>;
+    }
+  | {
+      type: "tool-output-available";
+      toolCallId: string;
+      toolName?: string;
+      output: unknown;
+      success?: boolean;
+    }
+  | {
+      type: "usage";
+      promptTokens: number;
+      completionTokens: number;
+      totalTokens: number;
+    }
+  | {
+      type: "error";
+      errorText: string;
+      code?: string;
+      details?: Record<string, unknown>;
+    };
+
+export interface ActiveStream {
+  sessionId: string;
+  abortController: AbortController;
+  status: StreamStatus;
+  startedAt: number;
+  chunks: StreamChunk[];
+  error?: Error;
+  onChunkCallbacks: Set<(chunk: StreamChunk) => void>;
+}
+
+export interface StreamResult {
+  sessionId: string;
+  status: StreamStatus;
+  chunks: StreamChunk[];
+  completedAt: number;
+  error?: Error;
+}
+
+export type StreamCompleteCallback = (sessionId: string) => void;
+
+// Type guards for message types
+
+/**
+ * Check if a message has a toolId property.
+ */
+export function hasToolId<T extends { type: string }>(
+  msg: T,
+): msg is T & { toolId: string } {
+  return (
+    "toolId" in msg &&
+    typeof (msg as Record<string, unknown>).toolId === "string"
+  );
+}
+
+/**
+ * Check if a message has an operationId property.
+ */
+export function hasOperationId<T extends { type: string }>(
+  msg: T,
+): msg is T & { operationId: string } {
+  return (
+    "operationId" in msg &&
+    typeof (msg as Record<string, unknown>).operationId === "string"
+  );
+}
+
+/**
+ * Check if a message has a toolCallId property.
+ */
+export function hasToolCallId<T extends { type: string }>(
+  msg: T,
+): msg is T & { toolCallId: string } {
+  return (
+    "toolCallId" in msg &&
+    typeof (msg as Record<string, unknown>).toolCallId === "string"
+  );
+}
+
+/**
+ * Check if a message is an operation message type.
+ */
+export function isOperationMessage<T extends { type: string }>(
+  msg: T,
+): msg is T & {
+  type: "operation_started" | "operation_pending" | "operation_in_progress";
+} {
+  return (
+    msg.type === "operation_started" ||
+    msg.type === "operation_pending" ||
+    msg.type === "operation_in_progress"
+  );
+}
+
+/**
+ * Get the tool ID from a message if available.
+ * Checks toolId, operationId, and toolCallId properties.
+ */
+export function getToolIdFromMessage<T extends { type: string }>(
+  msg: T,
+): string | undefined {
+  const record = msg as Record<string, unknown>;
+  if (typeof record.toolId === "string") return record.toolId;
+  if (typeof record.operationId === "string") return record.operationId;
+  if (typeof record.toolCallId === "string") return record.toolCallId;
+  return undefined;
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/AIChatBubble/AIChatBubble.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/AIChatBubble/AIChatBubble.tsx
new file mode 100644
index 0000000000..f5d56fcb15
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/AIChatBubble/AIChatBubble.tsx
@@ -0,0 +1,15 @@
+import { cn } from "@/lib/utils";
+import { ReactNode } from "react";
+
+export interface AIChatBubbleProps {
+  children: ReactNode;
+  className?: string;
+}
+
+export function AIChatBubble({ children, className }: AIChatBubbleProps) {
+  return (
+    <div className={cn("text-left text-[1rem] leading-relaxed", className)}>
+      {children}
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/components/AgentCarouselMessage/AgentCarouselMessage.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/AgentCarouselMessage/AgentCarouselMessage.tsx
similarity index 65%
rename from autogpt_platform/frontend/src/app/(platform)/chat/components/AgentCarouselMessage/AgentCarouselMessage.tsx
rename to autogpt_platform/frontend/src/components/contextual/Chat/components/AgentCarouselMessage/AgentCarouselMessage.tsx
index 125f834e05..582b24de5e 100644
--- a/autogpt_platform/frontend/src/app/(platform)/chat/components/AgentCarouselMessage/AgentCarouselMessage.tsx
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/AgentCarouselMessage/AgentCarouselMessage.tsx
@@ -1,15 +1,16 @@
-import React from "react";
-import { Text } from "@/components/atoms/Text/Text";
 import { Button } from "@/components/atoms/Button/Button";
 import { Card } from "@/components/atoms/Card/Card";
-import { List, Robot, ArrowRight } from "@phosphor-icons/react";
+import { Text } from "@/components/atoms/Text/Text";
 import { cn } from "@/lib/utils";
+import { ArrowRight, List, Robot } from "@phosphor-icons/react";
+import Image from "next/image";
 
 export interface Agent {
   id: string;
   name: string;
   description: string;
   version?: number;
+  image_url?: string;
 }
 
 export interface AgentCarouselMessageProps {
@@ -30,7 +31,7 @@ export function AgentCarouselMessage({
   return (
     <div
       className={cn(
-        "mx-4 my-2 flex flex-col gap-4 rounded-lg border border-purple-200 bg-purple-50 p-6 dark:border-purple-900 dark:bg-purple-950",
+        "mx-4 my-2 flex flex-col gap-4 rounded-lg border border-purple-200 bg-purple-50 p-6",
         className,
       )}
     >
@@ -40,13 +41,10 @@ export function AgentCarouselMessage({
           <List size={24} weight="bold" className="text-white" />
         </div>
         <div>
-          <Text variant="h3" className="text-purple-900 dark:text-purple-100">
+          <Text variant="h3" className="text-purple-900">
             Found {displayCount} {displayCount === 1 ? "Agent" : "Agents"}
           </Text>
-          <Text
-            variant="small"
-            className="text-purple-700 dark:text-purple-300"
-          >
+          <Text variant="small" className="text-purple-700">
             Select an agent to view details or run it
           </Text>
         </div>
@@ -57,40 +55,49 @@ export function AgentCarouselMessage({
         {agents.map((agent) => (
           <Card
             key={agent.id}
-            className="border border-purple-200 bg-white p-4 dark:border-purple-800 dark:bg-purple-900"
+            className="border border-purple-200 bg-white p-4"
           >
             <div className="flex gap-3">
-              <div className="flex h-10 w-10 flex-shrink-0 items-center justify-center rounded-lg bg-purple-100 dark:bg-purple-800">
-                <Robot size={20} weight="bold" className="text-purple-600" />
+              <div className="relative h-10 w-10 flex-shrink-0 overflow-hidden rounded-lg bg-purple-100">
+                {agent.image_url ? (
+                  <Image
+                    src={agent.image_url}
+                    alt={`${agent.name} preview image`}
+                    fill
+                    className="object-cover"
+                  />
+                ) : (
+                  <div className="flex h-full w-full items-center justify-center">
+                    <Robot
+                      size={20}
+                      weight="bold"
+                      className="text-purple-600"
+                    />
+                  </div>
+                )}
               </div>
               <div className="flex-1 space-y-2">
                 <div>
                   <Text
                     variant="body"
-                    className="font-semibold text-purple-900 dark:text-purple-100"
+                    className="font-semibold text-purple-900"
                   >
                     {agent.name}
                   </Text>
                   {agent.version && (
-                    <Text
-                      variant="small"
-                      className="text-purple-600 dark:text-purple-400"
-                    >
+                    <Text variant="small" className="text-purple-600">
                       v{agent.version}
                     </Text>
                   )}
                 </div>
-                <Text
-                  variant="small"
-                  className="line-clamp-2 text-purple-700 dark:text-purple-300"
-                >
+                <Text variant="small" className="line-clamp-2 text-purple-700">
                   {agent.description}
                 </Text>
                 {onSelectAgent && (
                   <Button
                     onClick={() => onSelectAgent(agent.id)}
                     variant="ghost"
-                    className="mt-2 flex items-center gap-1 p-0 text-sm text-purple-600 hover:text-purple-800 dark:text-purple-400 dark:hover:text-purple-200"
+                    className="mt-2 flex items-center gap-1 p-0 text-sm text-purple-600 hover:text-purple-800"
                   >
                     View details
                     <ArrowRight size={16} weight="bold" />
@@ -103,10 +110,7 @@ export function AgentCarouselMessage({
       </div>
 
       {totalCount && totalCount > agents.length && (
-        <Text
-          variant="small"
-          className="text-center text-purple-600 dark:text-purple-400"
-        >
+        <Text variant="small" className="text-center text-purple-600">
           Showing {agents.length} of {totalCount} results
         </Text>
       )}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/AgentInputsSetup/AgentInputsSetup.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/AgentInputsSetup/AgentInputsSetup.tsx
new file mode 100644
index 0000000000..3ef71eca09
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/AgentInputsSetup/AgentInputsSetup.tsx
@@ -0,0 +1,246 @@
+"use client";
+
+import { Button } from "@/components/atoms/Button/Button";
+import { Card } from "@/components/atoms/Card/Card";
+import { Text } from "@/components/atoms/Text/Text";
+import { CredentialsInput } from "@/components/contextual/CredentialsInput/CredentialsInput";
+import { RunAgentInputs } from "@/components/contextual/RunAgentInputs/RunAgentInputs";
+
+import type { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";
+import {
+  BlockIOCredentialsSubSchema,
+  BlockIOSubSchema,
+} from "@/lib/autogpt-server-api/types";
+import { cn, isEmpty } from "@/lib/utils";
+import { PlayIcon, WarningIcon } from "@phosphor-icons/react";
+import { useMemo } from "react";
+import { useAgentInputsSetup } from "./useAgentInputsSetup";
+
+type LibraryAgentInputSchemaProperties = LibraryAgent["input_schema"] extends {
+  properties: infer P;
+}
+  ? P extends Record<string, BlockIOSubSchema>
+    ? P
+    : Record<string, BlockIOSubSchema>
+  : Record<string, BlockIOSubSchema>;
+
+type LibraryAgentCredentialsInputSchemaProperties =
+  LibraryAgent["credentials_input_schema"] extends {
+    properties: infer P;
+  }
+    ? P extends Record<string, BlockIOCredentialsSubSchema>
+      ? P
+      : Record<string, BlockIOCredentialsSubSchema>
+    : Record<string, BlockIOCredentialsSubSchema>;
+
+interface Props {
+  agentName?: string;
+  inputSchema: LibraryAgentInputSchemaProperties | Record<string, any>;
+  credentialsSchema?:
+    | LibraryAgentCredentialsInputSchemaProperties
+    | Record<string, any>;
+  message: string;
+  requiredFields?: string[];
+  onRun: (
+    inputs: Record<string, any>,
+    credentials: Record<string, any>,
+  ) => void;
+  onCancel?: () => void;
+  className?: string;
+}
+
+export function AgentInputsSetup({
+  agentName,
+  inputSchema,
+  credentialsSchema,
+  message,
+  requiredFields,
+  onRun,
+  onCancel,
+  className,
+}: Props) {
+  const { inputValues, setInputValue, credentialsValues, setCredentialsValue } =
+    useAgentInputsSetup();
+
+  const inputSchemaObj = useMemo(() => {
+    if (!inputSchema) return { properties: {}, required: [] };
+    if ("properties" in inputSchema && "type" in inputSchema) {
+      return inputSchema as {
+        properties: Record<string, any>;
+        required?: string[];
+      };
+    }
+    return { properties: inputSchema as Record<string, any>, required: [] };
+  }, [inputSchema]);
+
+  const credentialsSchemaObj = useMemo(() => {
+    if (!credentialsSchema) return { properties: {}, required: [] };
+    if ("properties" in credentialsSchema && "type" in credentialsSchema) {
+      return credentialsSchema as {
+        properties: Record<string, any>;
+        required?: string[];
+      };
+    }
+    return {
+      properties: credentialsSchema as Record<string, any>,
+      required: [],
+    };
+  }, [credentialsSchema]);
+
+  const agentInputFields = useMemo(() => {
+    const properties = inputSchemaObj.properties || {};
+    return Object.fromEntries(
+      Object.entries(properties).filter(
+        ([_, subSchema]: [string, any]) => !subSchema.hidden,
+      ),
+    );
+  }, [inputSchemaObj]);
+
+  const agentCredentialsInputFields = useMemo(() => {
+    return credentialsSchemaObj.properties || {};
+  }, [credentialsSchemaObj]);
+
+  const inputFields = Object.entries(agentInputFields);
+  const credentialFields = Object.entries(agentCredentialsInputFields);
+
+  const defaultsFromSchema = useMemo(() => {
+    const defaults: Record<string, any> = {};
+    Object.entries(agentInputFields).forEach(([key, schema]) => {
+      if ("default" in schema && schema.default !== undefined) {
+        defaults[key] = schema.default;
+      }
+    });
+    return defaults;
+  }, [agentInputFields]);
+
+  const defaultsFromCredentialsSchema = useMemo(() => {
+    const defaults: Record<string, any> = {};
+    Object.entries(agentCredentialsInputFields).forEach(([key, schema]) => {
+      if ("default" in schema && schema.default !== undefined) {
+        defaults[key] = schema.default;
+      }
+    });
+    return defaults;
+  }, [agentCredentialsInputFields]);
+
+  const mergedInputValues = useMemo(() => {
+    return { ...defaultsFromSchema, ...inputValues };
+  }, [defaultsFromSchema, inputValues]);
+
+  const mergedCredentialsValues = useMemo(() => {
+    return { ...defaultsFromCredentialsSchema, ...credentialsValues };
+  }, [defaultsFromCredentialsSchema, credentialsValues]);
+
+  const allRequiredInputsAreSet = useMemo(() => {
+    const requiredInputs = new Set(
+      requiredFields || (inputSchemaObj.required as string[]) || [],
+    );
+    const nonEmptyInputs = new Set(
+      Object.keys(mergedInputValues).filter(
+        (k) => !isEmpty(mergedInputValues[k]),
+      ),
+    );
+    const missing = [...requiredInputs].filter(
+      (input) => !nonEmptyInputs.has(input),
+    );
+    return missing.length === 0;
+  }, [inputSchemaObj.required, mergedInputValues, requiredFields]);
+
+  const allCredentialsAreSet = useMemo(() => {
+    const requiredCredentials = new Set(
+      (credentialsSchemaObj.required as string[]) || [],
+    );
+    if (requiredCredentials.size === 0) {
+      return true;
+    }
+    const missing = [...requiredCredentials].filter((key) => {
+      const cred = mergedCredentialsValues[key];
+      return !cred || !cred.id;
+    });
+    return missing.length === 0;
+  }, [credentialsSchemaObj.required, mergedCredentialsValues]);
+
+  const canRun = allRequiredInputsAreSet && allCredentialsAreSet;
+
+  function handleRun() {
+    if (canRun) {
+      onRun(mergedInputValues, mergedCredentialsValues);
+    }
+  }
+
+  return (
+    <Card
+      className={cn(
+        "mx-4 my-2 overflow-hidden border-blue-200 bg-blue-50",
+        className,
+      )}
+    >
+      <div className="flex items-start gap-4 p-6">
+        <div className="flex h-12 w-12 flex-shrink-0 items-center justify-center rounded-full bg-blue-500">
+          <WarningIcon size={24} weight="bold" className="text-white" />
+        </div>
+        <div className="flex-1">
+          <Text variant="h3" className="mb-2 text-blue-900">
+            {agentName ? `Configure ${agentName}` : "Agent Configuration"}
+          </Text>
+          <Text variant="body" className="mb-4 text-blue-700">
+            {message}
+          </Text>
+
+          {inputFields.length > 0 && (
+            <div className="mb-4 space-y-4">
+              {inputFields.map(([key, inputSubSchema]) => (
+                <RunAgentInputs
+                  key={key}
+                  schema={inputSubSchema}
+                  value={inputValues[key] ?? inputSubSchema.default}
+                  placeholder={inputSubSchema.description}
+                  onChange={(value) => setInputValue(key, value)}
+                />
+              ))}
+            </div>
+          )}
+
+          {credentialFields.length > 0 && (
+            <div className="mb-4 space-y-4">
+              {credentialFields.map(([key, schema]) => {
+                const requiredCredentials = new Set(
+                  (credentialsSchemaObj.required as string[]) || [],
+                );
+                return (
+                  <CredentialsInput
+                    key={key}
+                    schema={schema}
+                    selectedCredentials={credentialsValues[key]}
+                    onSelectCredentials={(value) =>
+                      setCredentialsValue(key, value)
+                    }
+                    siblingInputs={mergedInputValues}
+                    isOptional={!requiredCredentials.has(key)}
+                  />
+                );
+              })}
+            </div>
+          )}
+
+          <div className="flex gap-2">
+            <Button
+              variant="primary"
+              size="small"
+              onClick={handleRun}
+              disabled={!canRun}
+            >
+              <PlayIcon className="mr-2 h-4 w-4" weight="bold" />
+              Run Agent
+            </Button>
+            {onCancel && (
+              <Button variant="outline" size="small" onClick={onCancel}>
+                Cancel
+              </Button>
+            )}
+          </div>
+        </div>
+      </div>
+    </Card>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/AgentInputsSetup/useAgentInputsSetup.ts b/autogpt_platform/frontend/src/components/contextual/Chat/components/AgentInputsSetup/useAgentInputsSetup.ts
new file mode 100644
index 0000000000..e36a3f3c5d
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/AgentInputsSetup/useAgentInputsSetup.ts
@@ -0,0 +1,38 @@
+import type { CredentialsMetaInput } from "@/lib/autogpt-server-api/types";
+import { useState } from "react";
+
+export function useAgentInputsSetup() {
+  const [inputValues, setInputValues] = useState<Record<string, any>>({});
+  const [credentialsValues, setCredentialsValues] = useState<
+    Record<string, CredentialsMetaInput>
+  >({});
+
+  function setInputValue(key: string, value: any) {
+    setInputValues((prev) => ({
+      ...prev,
+      [key]: value,
+    }));
+  }
+
+  function setCredentialsValue(key: string, value?: CredentialsMetaInput) {
+    if (value) {
+      setCredentialsValues((prev) => ({
+        ...prev,
+        [key]: value,
+      }));
+    } else {
+      setCredentialsValues((prev) => {
+        const next = { ...prev };
+        delete next[key];
+        return next;
+      });
+    }
+  }
+
+  return {
+    inputValues,
+    setInputValue,
+    credentialsValues,
+    setCredentialsValue,
+  };
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/components/AuthPromptWidget/AuthPromptWidget.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/AuthPromptWidget/AuthPromptWidget.tsx
similarity index 83%
rename from autogpt_platform/frontend/src/app/(platform)/chat/components/AuthPromptWidget/AuthPromptWidget.tsx
rename to autogpt_platform/frontend/src/components/contextual/Chat/components/AuthPromptWidget/AuthPromptWidget.tsx
index 885a06e92a..b2cf92ec56 100644
--- a/autogpt_platform/frontend/src/app/(platform)/chat/components/AuthPromptWidget/AuthPromptWidget.tsx
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/AuthPromptWidget/AuthPromptWidget.tsx
@@ -1,10 +1,9 @@
 "use client";
 
-import React from "react";
-import { useRouter } from "next/navigation";
 import { Button } from "@/components/atoms/Button/Button";
-import { SignInIcon, UserPlusIcon, ShieldIcon } from "@phosphor-icons/react";
 import { cn } from "@/lib/utils";
+import { ShieldIcon, SignInIcon, UserPlusIcon } from "@phosphor-icons/react";
+import { useRouter } from "next/navigation";
 
 export interface AuthPromptWidgetProps {
   message: string;
@@ -22,7 +21,7 @@ export function AuthPromptWidget({
   message,
   sessionId,
   agentInfo,
-  returnUrl = "/chat",
+  returnUrl = "/copilot/chat",
   className,
 }: AuthPromptWidgetProps) {
   const router = useRouter();
@@ -54,8 +53,8 @@ export function AuthPromptWidget({
   return (
     <div
       className={cn(
-        "my-4 overflow-hidden rounded-lg border border-violet-200 dark:border-violet-800",
-        "bg-gradient-to-br from-violet-50 to-purple-50 dark:from-violet-950/30 dark:to-purple-950/30",
+        "my-4 overflow-hidden rounded-lg border border-violet-200",
+        "bg-gradient-to-br from-violet-50 to-purple-50",
         "duration-500 animate-in fade-in-50 slide-in-from-bottom-2",
         className,
       )}
@@ -66,21 +65,19 @@ export function AuthPromptWidget({
             <ShieldIcon size={20} weight="fill" className="text-white" />
           </div>
           <div>
-            <h3 className="text-lg font-semibold text-neutral-900 dark:text-neutral-100">
+            <h3 className="text-lg font-semibold text-neutral-900">
               Authentication Required
             </h3>
-            <p className="text-sm text-neutral-600 dark:text-neutral-400">
+            <p className="text-sm text-neutral-600">
               Sign in to set up and manage agents
             </p>
           </div>
         </div>
 
-        <div className="mb-5 rounded-md bg-white/50 p-4 dark:bg-neutral-900/50">
-          <p className="text-sm text-neutral-700 dark:text-neutral-300">
-            {message}
-          </p>
+        <div className="mb-5 rounded-md bg-white/50 p-4">
+          <p className="text-sm text-neutral-700">{message}</p>
           {agentInfo && (
-            <div className="mt-3 text-xs text-neutral-600 dark:text-neutral-400">
+            <div className="mt-3 text-xs text-neutral-600">
               <p>
                 Ready to set up:{" "}
                 <span className="font-medium">{agentInfo.name}</span>
@@ -114,7 +111,7 @@ export function AuthPromptWidget({
           </Button>
         </div>
 
-        <div className="mt-4 text-center text-xs text-neutral-500 dark:text-neutral-500">
+        <div className="mt-4 text-center text-xs text-neutral-500">
           Your chat session will be preserved after signing in
         </div>
       </div>
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatContainer/ChatContainer.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatContainer/ChatContainer.tsx
new file mode 100644
index 0000000000..fbf2d5d143
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatContainer/ChatContainer.tsx
@@ -0,0 +1,130 @@
+import type { SessionDetailResponse } from "@/app/api/__generated__/models/sessionDetailResponse";
+import { Button } from "@/components/atoms/Button/Button";
+import { Text } from "@/components/atoms/Text/Text";
+import { Dialog } from "@/components/molecules/Dialog/Dialog";
+import { cn } from "@/lib/utils";
+import { GlobeHemisphereEastIcon } from "@phosphor-icons/react";
+import { useEffect } from "react";
+import { ChatInput } from "../ChatInput/ChatInput";
+import { MessageList } from "../MessageList/MessageList";
+import { useChatContainer } from "./useChatContainer";
+
+export interface ChatContainerProps {
+  sessionId: string | null;
+  initialMessages: SessionDetailResponse["messages"];
+  initialPrompt?: string;
+  className?: string;
+  onStreamingChange?: (isStreaming: boolean) => void;
+  onOperationStarted?: () => void;
+  /** Active stream info from the server for reconnection */
+  activeStream?: {
+    taskId: string;
+    lastMessageId: string;
+    operationId: string;
+    toolName: string;
+  };
+}
+
+export function ChatContainer({
+  sessionId,
+  initialMessages,
+  initialPrompt,
+  className,
+  onStreamingChange,
+  onOperationStarted,
+  activeStream,
+}: ChatContainerProps) {
+  const {
+    messages,
+    streamingChunks,
+    isStreaming,
+    stopStreaming,
+    isRegionBlockedModalOpen,
+    sendMessageWithContext,
+    handleRegionModalOpenChange,
+    handleRegionModalClose,
+  } = useChatContainer({
+    sessionId,
+    initialMessages,
+    initialPrompt,
+    onOperationStarted,
+    activeStream,
+  });
+
+  useEffect(() => {
+    onStreamingChange?.(isStreaming);
+  }, [isStreaming, onStreamingChange]);
+
+  return (
+    <div
+      className={cn(
+        "mx-auto flex h-full min-h-0 w-full max-w-3xl flex-col bg-[#f8f8f9]",
+        className,
+      )}
+    >
+      <Dialog
+        title={
+          <div className="flex items-center gap-2">
+            <GlobeHemisphereEastIcon className="size-6" />
+            <Text
+              variant="body"
+              className="text-md font-poppins leading-none md:text-lg"
+            >
+              Service unavailable
+            </Text>
+          </div>
+        }
+        controlled={{
+          isOpen: isRegionBlockedModalOpen,
+          set: handleRegionModalOpenChange,
+        }}
+        onClose={handleRegionModalClose}
+        styling={{ maxWidth: 550, width: "100%", minWidth: "auto" }}
+      >
+        <Dialog.Content>
+          <div className="flex flex-col gap-8">
+            <Text variant="body">
+              The Autogpt AI model is not available in your region or your
+              connection is blocking it. Please try again with a different
+              connection.
+            </Text>
+            <div className="flex justify-center">
+              <Button
+                type="button"
+                variant="primary"
+                onClick={handleRegionModalClose}
+                className="w-full"
+              >
+                Got it
+              </Button>
+            </div>
+          </div>
+        </Dialog.Content>
+      </Dialog>
+      {/* Messages - Scrollable */}
+      <div className="relative flex min-h-0 flex-1 flex-col">
+        <div className="flex min-h-full flex-col justify-end">
+          <MessageList
+            messages={messages}
+            streamingChunks={streamingChunks}
+            isStreaming={isStreaming}
+            onSendMessage={sendMessageWithContext}
+            className="flex-1"
+          />
+        </div>
+      </div>
+
+      {/* Input - Fixed at bottom */}
+      <div className="relative px-3 pb-6 pt-2">
+        <div className="pointer-events-none absolute top-[-18px] z-10 h-6 w-full bg-gradient-to-b from-transparent to-[#f8f8f9]" />
+        <ChatInput
+          onSend={sendMessageWithContext}
+          disabled={isStreaming || !sessionId}
+          isStreaming={isStreaming}
+          onStop={stopStreaming}
+          placeholder="What else can I help with?"
+        />
+      </div>
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatContainer/createStreamEventDispatcher.ts b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatContainer/createStreamEventDispatcher.ts
similarity index 51%
rename from autogpt_platform/frontend/src/app/(platform)/chat/components/ChatContainer/createStreamEventDispatcher.ts
rename to autogpt_platform/frontend/src/components/contextual/Chat/components/ChatContainer/createStreamEventDispatcher.ts
index b8421c3386..af3b3329b7 100644
--- a/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatContainer/createStreamEventDispatcher.ts
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatContainer/createStreamEventDispatcher.ts
@@ -1,21 +1,46 @@
 import { toast } from "sonner";
-import type { StreamChunk } from "@/app/(platform)/chat/useChatStream";
-import type { HandlerDependencies } from "./useChatContainer.handlers";
+import type { StreamChunk } from "../../chat-types";
+import type { HandlerDependencies } from "./handlers";
 import {
+  getErrorDisplayMessage,
+  handleError,
+  handleLoginNeeded,
+  handleStreamEnd,
   handleTextChunk,
   handleTextEnded,
   handleToolCallStart,
   handleToolResponse,
-  handleLoginNeeded,
-  handleStreamEnd,
-  handleError,
-} from "./useChatContainer.handlers";
+  isRegionBlockedError,
+} from "./handlers";
 
 export function createStreamEventDispatcher(
   deps: HandlerDependencies,
 ): (chunk: StreamChunk) => void {
   return function dispatchStreamEvent(chunk: StreamChunk): void {
+    if (
+      chunk.type === "text_chunk" ||
+      chunk.type === "tool_call_start" ||
+      chunk.type === "tool_response" ||
+      chunk.type === "login_needed" ||
+      chunk.type === "need_login" ||
+      chunk.type === "error"
+    ) {
+      deps.hasResponseRef.current = true;
+    }
+
     switch (chunk.type) {
+      case "stream_start":
+        // Store task ID for SSE reconnection
+        if (chunk.taskId && deps.onActiveTaskStarted) {
+          deps.onActiveTaskStarted({
+            taskId: chunk.taskId,
+            operationId: chunk.taskId,
+            toolName: "chat",
+            toolCallId: "chat_stream",
+          });
+        }
+        break;
+
       case "text_chunk":
         handleTextChunk(chunk, deps);
         break;
@@ -38,15 +63,19 @@ export function createStreamEventDispatcher(
         break;
 
       case "stream_end":
+        // Note: "finish" type from backend gets normalized to "stream_end" by normalizeStreamChunk
         handleStreamEnd(chunk, deps);
         break;
 
       case "error":
+        const isRegionBlocked = isRegionBlockedError(chunk);
         handleError(chunk, deps);
         // Show toast at dispatcher level to avoid circular dependencies
-        toast.error("Chat Error", {
-          description: chunk.message || chunk.content || "An error occurred",
-        });
+        if (!isRegionBlocked) {
+          toast.error("Chat Error", {
+            description: getErrorDisplayMessage(chunk),
+          });
+        }
         break;
 
       case "usage":
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatContainer/handlers.ts b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatContainer/handlers.ts
new file mode 100644
index 0000000000..5aec5b9818
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatContainer/handlers.ts
@@ -0,0 +1,362 @@
+import type { Dispatch, MutableRefObject, SetStateAction } from "react";
+import { StreamChunk } from "../../useChatStream";
+import type { ChatMessageData } from "../ChatMessage/useChatMessage";
+import {
+  extractCredentialsNeeded,
+  extractInputsNeeded,
+  parseToolResponse,
+} from "./helpers";
+
+function isToolCallMessage(
+  message: ChatMessageData,
+): message is Extract<ChatMessageData, { type: "tool_call" }> {
+  return message.type === "tool_call";
+}
+
+export interface HandlerDependencies {
+  setHasTextChunks: Dispatch<SetStateAction<boolean>>;
+  setStreamingChunks: Dispatch<SetStateAction<string[]>>;
+  streamingChunksRef: MutableRefObject<string[]>;
+  hasResponseRef: MutableRefObject<boolean>;
+  textFinalizedRef: MutableRefObject<boolean>;
+  streamEndedRef: MutableRefObject<boolean>;
+  setMessages: Dispatch<SetStateAction<ChatMessageData[]>>;
+  setIsStreamingInitiated: Dispatch<SetStateAction<boolean>>;
+  setIsRegionBlockedModalOpen: Dispatch<SetStateAction<boolean>>;
+  sessionId: string;
+  onOperationStarted?: () => void;
+  onActiveTaskStarted?: (taskInfo: {
+    taskId: string;
+    operationId: string;
+    toolName: string;
+    toolCallId: string;
+  }) => void;
+}
+
+export function isRegionBlockedError(chunk: StreamChunk): boolean {
+  if (chunk.code === "MODEL_NOT_AVAILABLE_REGION") return true;
+  const message = chunk.message || chunk.content;
+  if (typeof message !== "string") return false;
+  return message.toLowerCase().includes("not available in your region");
+}
+
+export function getUserFriendlyErrorMessage(
+  code: string | undefined,
+): string | undefined {
+  switch (code) {
+    case "TASK_EXPIRED":
+      return "This operation has expired. Please try again.";
+    case "TASK_NOT_FOUND":
+      return "Could not find the requested operation.";
+    case "ACCESS_DENIED":
+      return "You do not have access to this operation.";
+    case "QUEUE_OVERFLOW":
+      return "Connection was interrupted. Please refresh to continue.";
+    case "MODEL_NOT_AVAILABLE_REGION":
+      return "This model is not available in your region.";
+    default:
+      return undefined;
+  }
+}
+
+export function handleTextChunk(chunk: StreamChunk, deps: HandlerDependencies) {
+  if (!chunk.content) return;
+  deps.setHasTextChunks(true);
+  deps.setStreamingChunks((prev) => {
+    const updated = [...prev, chunk.content!];
+    deps.streamingChunksRef.current = updated;
+    return updated;
+  });
+}
+
+export function handleTextEnded(
+  _chunk: StreamChunk,
+  deps: HandlerDependencies,
+) {
+  if (deps.textFinalizedRef.current) {
+    return;
+  }
+
+  const completedText = deps.streamingChunksRef.current.join("");
+  if (completedText.trim()) {
+    deps.textFinalizedRef.current = true;
+
+    deps.setMessages((prev) => {
+      const exists = prev.some(
+        (msg) =>
+          msg.type === "message" &&
+          msg.role === "assistant" &&
+          msg.content === completedText,
+      );
+      if (exists) return prev;
+
+      const assistantMessage: ChatMessageData = {
+        type: "message",
+        role: "assistant",
+        content: completedText,
+        timestamp: new Date(),
+      };
+      return [...prev, assistantMessage];
+    });
+  }
+  deps.setStreamingChunks([]);
+  deps.streamingChunksRef.current = [];
+  deps.setHasTextChunks(false);
+}
+
+export function handleToolCallStart(
+  chunk: StreamChunk,
+  deps: HandlerDependencies,
+) {
+  // Use deterministic fallback instead of Date.now() to ensure same ID on replay
+  const toolId =
+    chunk.tool_id ||
+    `tool-${deps.sessionId}-${chunk.idx ?? "unknown"}-${chunk.tool_name || "unknown"}`;
+
+  const toolCallMessage: Extract<ChatMessageData, { type: "tool_call" }> = {
+    type: "tool_call",
+    toolId,
+    toolName: chunk.tool_name || "Executing",
+    arguments: chunk.arguments || {},
+    timestamp: new Date(),
+  };
+
+  function updateToolCallMessages(prev: ChatMessageData[]) {
+    const existingIndex = prev.findIndex(function findToolCallIndex(msg) {
+      return isToolCallMessage(msg) && msg.toolId === toolCallMessage.toolId;
+    });
+    if (existingIndex === -1) {
+      return [...prev, toolCallMessage];
+    }
+    const nextMessages = [...prev];
+    const existing = nextMessages[existingIndex];
+    if (!isToolCallMessage(existing)) return prev;
+    const nextArguments =
+      toolCallMessage.arguments &&
+      Object.keys(toolCallMessage.arguments).length > 0
+        ? toolCallMessage.arguments
+        : existing.arguments;
+    nextMessages[existingIndex] = {
+      ...existing,
+      toolName: toolCallMessage.toolName || existing.toolName,
+      arguments: nextArguments,
+      timestamp: toolCallMessage.timestamp,
+    };
+    return nextMessages;
+  }
+
+  deps.setMessages(updateToolCallMessages);
+}
+
+const TOOL_RESPONSE_TYPES = new Set([
+  "tool_response",
+  "operation_started",
+  "operation_pending",
+  "operation_in_progress",
+  "execution_started",
+  "agent_carousel",
+  "clarification_needed",
+]);
+
+function hasResponseForTool(
+  messages: ChatMessageData[],
+  toolId: string,
+): boolean {
+  return messages.some((msg) => {
+    if (!TOOL_RESPONSE_TYPES.has(msg.type)) return false;
+    const msgToolId =
+      (msg as { toolId?: string }).toolId ||
+      (msg as { toolCallId?: string }).toolCallId;
+    return msgToolId === toolId;
+  });
+}
+
+export function handleToolResponse(
+  chunk: StreamChunk,
+  deps: HandlerDependencies,
+) {
+  let toolName = chunk.tool_name || "unknown";
+  if (!chunk.tool_name || chunk.tool_name === "unknown") {
+    deps.setMessages((prev) => {
+      const matchingToolCall = [...prev]
+        .reverse()
+        .find(
+          (msg) => msg.type === "tool_call" && msg.toolId === chunk.tool_id,
+        );
+      if (matchingToolCall && matchingToolCall.type === "tool_call") {
+        toolName = matchingToolCall.toolName;
+      }
+      return prev;
+    });
+  }
+  const responseMessage = parseToolResponse(
+    chunk.result!,
+    chunk.tool_id!,
+    toolName,
+    new Date(),
+  );
+  if (!responseMessage) {
+    let parsedResult: Record<string, unknown> | null = null;
+    try {
+      parsedResult =
+        typeof chunk.result === "string"
+          ? JSON.parse(chunk.result)
+          : (chunk.result as Record<string, unknown>);
+    } catch {
+      parsedResult = null;
+    }
+    if (
+      (chunk.tool_name === "run_agent" || chunk.tool_name === "run_block") &&
+      chunk.success &&
+      parsedResult?.type === "setup_requirements"
+    ) {
+      const inputsMessage = extractInputsNeeded(parsedResult, chunk.tool_name);
+      if (inputsMessage) {
+        deps.setMessages((prev) => {
+          // Check for duplicate inputs_needed message
+          const exists = prev.some((msg) => msg.type === "inputs_needed");
+          if (exists) return prev;
+          return [...prev, inputsMessage];
+        });
+      }
+      const credentialsMessage = extractCredentialsNeeded(
+        parsedResult,
+        chunk.tool_name,
+      );
+      if (credentialsMessage) {
+        deps.setMessages((prev) => {
+          // Check for duplicate credentials_needed message
+          const exists = prev.some((msg) => msg.type === "credentials_needed");
+          if (exists) return prev;
+          return [...prev, credentialsMessage];
+        });
+      }
+    }
+    return;
+  }
+  if (responseMessage.type === "operation_started") {
+    deps.onOperationStarted?.();
+    const taskId = (responseMessage as { taskId?: string }).taskId;
+    if (taskId && deps.onActiveTaskStarted) {
+      deps.onActiveTaskStarted({
+        taskId,
+        operationId:
+          (responseMessage as { operationId?: string }).operationId || "",
+        toolName: (responseMessage as { toolName?: string }).toolName || "",
+        toolCallId: (responseMessage as { toolId?: string }).toolId || "",
+      });
+    }
+  }
+
+  deps.setMessages((prev) => {
+    const toolCallIndex = prev.findIndex(
+      (msg) => msg.type === "tool_call" && msg.toolId === chunk.tool_id,
+    );
+    if (hasResponseForTool(prev, chunk.tool_id!)) {
+      return prev;
+    }
+    if (toolCallIndex !== -1) {
+      const newMessages = [...prev];
+      newMessages.splice(toolCallIndex + 1, 0, responseMessage);
+      return newMessages;
+    }
+    return [...prev, responseMessage];
+  });
+}
+
+export function handleLoginNeeded(
+  chunk: StreamChunk,
+  deps: HandlerDependencies,
+) {
+  const loginNeededMessage: ChatMessageData = {
+    type: "login_needed",
+    toolName: "login_needed",
+    message: chunk.message || "Please sign in to use chat and agent features",
+    sessionId: chunk.session_id || deps.sessionId,
+    agentInfo: chunk.agent_info,
+    timestamp: new Date(),
+  };
+  deps.setMessages((prev) => {
+    // Check for duplicate login_needed message
+    const exists = prev.some((msg) => msg.type === "login_needed");
+    if (exists) return prev;
+    return [...prev, loginNeededMessage];
+  });
+}
+
+export function handleStreamEnd(
+  _chunk: StreamChunk,
+  deps: HandlerDependencies,
+) {
+  if (deps.streamEndedRef.current) {
+    return;
+  }
+  deps.streamEndedRef.current = true;
+
+  const completedContent = deps.streamingChunksRef.current.join("");
+  if (!completedContent.trim() && !deps.hasResponseRef.current) {
+    deps.setMessages((prev) => {
+      const exists = prev.some(
+        (msg) =>
+          msg.type === "message" &&
+          msg.role === "assistant" &&
+          msg.content === "No response received. Please try again.",
+      );
+      if (exists) return prev;
+      return [
+        ...prev,
+        {
+          type: "message",
+          role: "assistant",
+          content: "No response received. Please try again.",
+          timestamp: new Date(),
+        },
+      ];
+    });
+  }
+  if (completedContent.trim() && !deps.textFinalizedRef.current) {
+    deps.textFinalizedRef.current = true;
+
+    deps.setMessages((prev) => {
+      const exists = prev.some(
+        (msg) =>
+          msg.type === "message" &&
+          msg.role === "assistant" &&
+          msg.content === completedContent,
+      );
+      if (exists) return prev;
+
+      const assistantMessage: ChatMessageData = {
+        type: "message",
+        role: "assistant",
+        content: completedContent,
+        timestamp: new Date(),
+      };
+      return [...prev, assistantMessage];
+    });
+  }
+  deps.setStreamingChunks([]);
+  deps.streamingChunksRef.current = [];
+  deps.setHasTextChunks(false);
+  deps.setIsStreamingInitiated(false);
+}
+
+export function handleError(chunk: StreamChunk, deps: HandlerDependencies) {
+  if (isRegionBlockedError(chunk)) {
+    deps.setIsRegionBlockedModalOpen(true);
+  }
+  deps.setIsStreamingInitiated(false);
+  deps.setHasTextChunks(false);
+  deps.setStreamingChunks([]);
+  deps.streamingChunksRef.current = [];
+  deps.textFinalizedRef.current = false;
+  deps.streamEndedRef.current = true;
+}
+
+export function getErrorDisplayMessage(chunk: StreamChunk): string {
+  const friendlyMessage = getUserFriendlyErrorMessage(chunk.code);
+  if (friendlyMessage) {
+    return friendlyMessage;
+  }
+  return chunk.message || chunk.content || "An error occurred";
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatContainer/helpers.ts b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatContainer/helpers.ts
new file mode 100644
index 0000000000..f1e94cea17
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatContainer/helpers.ts
@@ -0,0 +1,607 @@
+import type { SessionDetailResponse } from "@/app/api/__generated__/models/sessionDetailResponse";
+import { SessionKey, sessionStorage } from "@/services/storage/session-storage";
+import type { ToolResult } from "@/types/chat";
+import type { ChatMessageData } from "../ChatMessage/useChatMessage";
+
+export function processInitialMessages(
+  initialMessages: SessionDetailResponse["messages"],
+): ChatMessageData[] {
+  const processedMessages: ChatMessageData[] = [];
+  const toolCallMap = new Map<string, string>();
+
+  for (const msg of initialMessages) {
+    if (!isValidMessage(msg)) {
+      console.warn("Invalid message structure from backend:", msg);
+      continue;
+    }
+
+    let content = String(msg.content || "");
+    const role = String(msg.role || "assistant").toLowerCase();
+    const toolCalls = msg.tool_calls;
+    const timestamp = msg.timestamp
+      ? new Date(msg.timestamp as string)
+      : undefined;
+
+    if (role === "user") {
+      content = removePageContext(content);
+      if (!content.trim()) continue;
+      processedMessages.push({
+        type: "message",
+        role: "user",
+        content,
+        timestamp,
+      });
+      continue;
+    }
+
+    if (role === "assistant") {
+      content = content
+        .replace(/<thinking>[\s\S]*?<\/thinking>/gi, "")
+        .replace(/<internal_reasoning>[\s\S]*?<\/internal_reasoning>/gi, "")
+        .trim();
+
+      if (toolCalls && isToolCallArray(toolCalls) && toolCalls.length > 0) {
+        for (const toolCall of toolCalls) {
+          const toolName = toolCall.function.name;
+          const toolId = toolCall.id;
+          toolCallMap.set(toolId, toolName);
+
+          try {
+            const args = JSON.parse(toolCall.function.arguments || "{}");
+            processedMessages.push({
+              type: "tool_call",
+              toolId,
+              toolName,
+              arguments: args,
+              timestamp,
+            });
+          } catch (err) {
+            console.warn("Failed to parse tool call arguments:", err);
+            processedMessages.push({
+              type: "tool_call",
+              toolId,
+              toolName,
+              arguments: {},
+              timestamp,
+            });
+          }
+        }
+        if (content.trim()) {
+          processedMessages.push({
+            type: "message",
+            role: "assistant",
+            content,
+            timestamp,
+          });
+        }
+      } else if (content.trim()) {
+        processedMessages.push({
+          type: "message",
+          role: "assistant",
+          content,
+          timestamp,
+        });
+      }
+      continue;
+    }
+
+    if (role === "tool") {
+      const toolCallId = (msg.tool_call_id as string) || "";
+      const toolName = toolCallMap.get(toolCallId) || "unknown";
+      const toolResponse = parseToolResponse(
+        content,
+        toolCallId,
+        toolName,
+        timestamp,
+      );
+      if (toolResponse) {
+        processedMessages.push(toolResponse);
+      }
+      continue;
+    }
+
+    if (content.trim()) {
+      processedMessages.push({
+        type: "message",
+        role: role as "user" | "assistant" | "system",
+        content,
+        timestamp,
+      });
+    }
+  }
+
+  return processedMessages;
+}
+
+export function hasSentInitialPrompt(sessionId: string): boolean {
+  try {
+    const sent = JSON.parse(
+      sessionStorage.get(SessionKey.CHAT_SENT_INITIAL_PROMPTS) || "{}",
+    );
+    return sent[sessionId] === true;
+  } catch {
+    return false;
+  }
+}
+
+export function markInitialPromptSent(sessionId: string): void {
+  try {
+    const sent = JSON.parse(
+      sessionStorage.get(SessionKey.CHAT_SENT_INITIAL_PROMPTS) || "{}",
+    );
+    sent[sessionId] = true;
+    sessionStorage.set(
+      SessionKey.CHAT_SENT_INITIAL_PROMPTS,
+      JSON.stringify(sent),
+    );
+  } catch {
+    // Ignore storage errors
+  }
+}
+
+export function removePageContext(content: string): string {
+  // Remove "Page URL: ..." pattern at start of line (case insensitive, handles various formats)
+  let cleaned = content.replace(/^\s*Page URL:\s*[^\n\r]*/gim, "");
+
+  // Find "User Message:" marker at start of line to preserve the actual user message
+  const userMessageMatch = cleaned.match(/^\s*User Message:\s*([\s\S]*)$/im);
+  if (userMessageMatch) {
+    // If we found "User Message:", extract everything after it
+    cleaned = userMessageMatch[1];
+  } else {
+    // If no "User Message:" marker, remove "Page Content:" and everything after it at start of line
+    cleaned = cleaned.replace(/^\s*Page Content:[\s\S]*$/gim, "");
+  }
+
+  // Clean up extra whitespace and newlines
+  cleaned = cleaned.replace(/\n\s*\n\s*\n+/g, "\n\n").trim();
+  return cleaned;
+}
+
+export function createUserMessage(content: string): ChatMessageData {
+  return {
+    type: "message",
+    role: "user",
+    content,
+    timestamp: new Date(),
+  };
+}
+
+export function filterAuthMessages(
+  messages: ChatMessageData[],
+): ChatMessageData[] {
+  return messages.filter(
+    (msg) => msg.type !== "credentials_needed" && msg.type !== "login_needed",
+  );
+}
+
+export function isValidMessage(msg: unknown): msg is Record<string, unknown> {
+  if (typeof msg !== "object" || msg === null) {
+    return false;
+  }
+  const m = msg as Record<string, unknown>;
+  if (typeof m.role !== "string") {
+    return false;
+  }
+  if (m.content !== undefined && typeof m.content !== "string") {
+    return false;
+  }
+  return true;
+}
+
+export function isToolCallArray(value: unknown): value is Array<{
+  id: string;
+  type: string;
+  function: { name: string; arguments: string };
+}> {
+  if (!Array.isArray(value)) {
+    return false;
+  }
+  return value.every(
+    (item) =>
+      typeof item === "object" &&
+      item !== null &&
+      "id" in item &&
+      typeof item.id === "string" &&
+      "type" in item &&
+      typeof item.type === "string" &&
+      "function" in item &&
+      typeof item.function === "object" &&
+      item.function !== null &&
+      "name" in item.function &&
+      typeof item.function.name === "string" &&
+      "arguments" in item.function &&
+      typeof item.function.arguments === "string",
+  );
+}
+
+export function isAgentArray(value: unknown): value is Array<{
+  id: string;
+  name: string;
+  description: string;
+  version?: number;
+  image_url?: string;
+}> {
+  if (!Array.isArray(value)) {
+    return false;
+  }
+  return value.every(
+    (item) =>
+      typeof item === "object" &&
+      item !== null &&
+      "id" in item &&
+      typeof item.id === "string" &&
+      "name" in item &&
+      typeof item.name === "string" &&
+      "description" in item &&
+      typeof item.description === "string" &&
+      (!("version" in item) || typeof item.version === "number") &&
+      (!("image_url" in item) || typeof item.image_url === "string"),
+  );
+}
+
+export function extractJsonFromErrorMessage(
+  message: string,
+): Record<string, unknown> | null {
+  try {
+    const start = message.indexOf("{");
+    if (start === -1) {
+      return null;
+    }
+    let depth = 0;
+    let end = -1;
+    for (let i = start; i < message.length; i++) {
+      const ch = message[i];
+      if (ch === "{") {
+        depth++;
+      } else if (ch === "}") {
+        depth--;
+        if (depth === 0) {
+          end = i;
+          break;
+        }
+      }
+    }
+    if (end === -1) {
+      return null;
+    }
+    const jsonStr = message.slice(start, end + 1);
+    return JSON.parse(jsonStr) as Record<string, unknown>;
+  } catch {
+    return null;
+  }
+}
+
+export function parseToolResponse(
+  result: ToolResult,
+  toolId: string,
+  toolName: string,
+  timestamp?: Date,
+): ChatMessageData | null {
+  let parsedResult: Record<string, unknown> | null = null;
+  try {
+    parsedResult =
+      typeof result === "string"
+        ? JSON.parse(result)
+        : (result as Record<string, unknown>);
+  } catch {
+    parsedResult = null;
+  }
+  if (parsedResult && typeof parsedResult === "object") {
+    const responseType = parsedResult.type as string | undefined;
+    if (responseType === "no_results") {
+      return {
+        type: "tool_response",
+        toolId,
+        toolName,
+        result: (parsedResult.message as string) || "No results found",
+        success: true,
+        timestamp: timestamp || new Date(),
+      };
+    }
+    if (responseType === "agent_carousel") {
+      const agentsData = parsedResult.agents;
+      if (isAgentArray(agentsData)) {
+        return {
+          type: "agent_carousel",
+          toolId,
+          toolName: "agent_carousel",
+          agents: agentsData,
+          totalCount: parsedResult.total_count as number | undefined,
+          timestamp: timestamp || new Date(),
+        };
+      } else {
+        console.warn("Invalid agents array in agent_carousel response");
+      }
+    }
+    if (responseType === "execution_started") {
+      return {
+        type: "execution_started",
+        toolId,
+        toolName: "execution_started",
+        executionId: (parsedResult.execution_id as string) || "",
+        agentName: (parsedResult.graph_name as string) || undefined,
+        message: parsedResult.message as string | undefined,
+        libraryAgentLink: parsedResult.library_agent_link as string | undefined,
+        timestamp: timestamp || new Date(),
+      };
+    }
+    if (responseType === "clarification_needed") {
+      return {
+        type: "clarification_needed",
+        toolName,
+        questions:
+          (parsedResult.questions as Array<{
+            question: string;
+            keyword: string;
+            example?: string;
+          }>) || [],
+        message:
+          (parsedResult.message as string) ||
+          "I need more information to proceed.",
+        sessionId: (parsedResult.session_id as string) || "",
+        timestamp: timestamp || new Date(),
+      };
+    }
+    if (responseType === "operation_started") {
+      return {
+        type: "operation_started",
+        toolName: (parsedResult.tool_name as string) || toolName,
+        toolId,
+        operationId: (parsedResult.operation_id as string) || "",
+        taskId: (parsedResult.task_id as string) || undefined, // For SSE reconnection
+        message:
+          (parsedResult.message as string) ||
+          "Operation started. You can close this tab.",
+        timestamp: timestamp || new Date(),
+      };
+    }
+    if (responseType === "operation_pending") {
+      return {
+        type: "operation_pending",
+        toolName: (parsedResult.tool_name as string) || toolName,
+        toolId,
+        operationId: (parsedResult.operation_id as string) || "",
+        message:
+          (parsedResult.message as string) ||
+          "Operation in progress. Please wait...",
+        timestamp: timestamp || new Date(),
+      };
+    }
+    if (responseType === "operation_in_progress") {
+      return {
+        type: "operation_in_progress",
+        toolName: (parsedResult.tool_name as string) || toolName,
+        toolCallId: (parsedResult.tool_call_id as string) || toolId,
+        message:
+          (parsedResult.message as string) ||
+          "Operation already in progress. Please wait...",
+        timestamp: timestamp || new Date(),
+      };
+    }
+    if (responseType === "need_login") {
+      return {
+        type: "login_needed",
+        toolName: "login_needed",
+        message:
+          (parsedResult.message as string) ||
+          "Please sign in to use chat and agent features",
+        sessionId: (parsedResult.session_id as string) || "",
+        agentInfo: parsedResult.agent_info as
+          | {
+              graph_id: string;
+              name: string;
+              trigger_type: string;
+            }
+          | undefined,
+        timestamp: timestamp || new Date(),
+      };
+    }
+    if (responseType === "setup_requirements") {
+      return null;
+    }
+    if (responseType === "understanding_updated") {
+      return {
+        type: "tool_response",
+        toolId,
+        toolName,
+        result: (parsedResult || result) as ToolResult,
+        success: true,
+        timestamp: timestamp || new Date(),
+      };
+    }
+  }
+  return {
+    type: "tool_response",
+    toolId,
+    toolName,
+    result: parsedResult ? (parsedResult as ToolResult) : result,
+    success: true,
+    timestamp: timestamp || new Date(),
+  };
+}
+
+export function isUserReadiness(
+  value: unknown,
+): value is { missing_credentials?: Record<string, unknown> } {
+  return (
+    typeof value === "object" &&
+    value !== null &&
+    (!("missing_credentials" in value) ||
+      typeof (value as any).missing_credentials === "object")
+  );
+}
+
+export function isMissingCredentials(
+  value: unknown,
+): value is Record<string, Record<string, unknown>> {
+  if (typeof value !== "object" || value === null) {
+    return false;
+  }
+  return Object.values(value).every((v) => typeof v === "object" && v !== null);
+}
+
+export function isSetupInfo(value: unknown): value is {
+  user_readiness?: Record<string, unknown>;
+  agent_name?: string;
+} {
+  return (
+    typeof value === "object" &&
+    value !== null &&
+    (!("user_readiness" in value) ||
+      typeof (value as any).user_readiness === "object") &&
+    (!("agent_name" in value) || typeof (value as any).agent_name === "string")
+  );
+}
+
+export function extractCredentialsNeeded(
+  parsedResult: Record<string, unknown>,
+  toolName: string = "run_agent",
+): ChatMessageData | null {
+  try {
+    const setupInfo = parsedResult?.setup_info as
+      | Record<string, unknown>
+      | undefined;
+    const userReadiness = setupInfo?.user_readiness as
+      | Record<string, unknown>
+      | undefined;
+    const missingCreds = userReadiness?.missing_credentials as
+      | Record<string, Record<string, unknown>>
+      | undefined;
+    if (missingCreds && Object.keys(missingCreds).length > 0) {
+      const agentName = (setupInfo?.agent_name as string) || "this block";
+      const credentials = Object.values(missingCreds).map((credInfo) => {
+        // Normalize to array at boundary - prefer 'types' array, fall back to single 'type'
+        const typesArray = credInfo.types as
+          | Array<"api_key" | "oauth2" | "user_password" | "host_scoped">
+          | undefined;
+        const singleType =
+          (credInfo.type as
+            | "api_key"
+            | "oauth2"
+            | "user_password"
+            | "host_scoped"
+            | undefined) || "api_key";
+        const credentialTypes =
+          typesArray && typesArray.length > 0 ? typesArray : [singleType];
+
+        return {
+          provider: (credInfo.provider as string) || "unknown",
+          providerName:
+            (credInfo.provider_name as string) ||
+            (credInfo.provider as string) ||
+            "Unknown Provider",
+          credentialTypes,
+          title:
+            (credInfo.title as string) ||
+            `${(credInfo.provider_name as string) || (credInfo.provider as string)} credentials`,
+          scopes: credInfo.scopes as string[] | undefined,
+        };
+      });
+      return {
+        type: "credentials_needed",
+        toolName,
+        credentials,
+        message: `To run ${agentName}, you need to add ${credentials.length === 1 ? "credentials" : `${credentials.length} credentials`}.`,
+        agentName,
+        timestamp: new Date(),
+      };
+    }
+    return null;
+  } catch (err) {
+    console.error("Failed to extract credentials from setup info:", err);
+    return null;
+  }
+}
+
+export function extractInputsNeeded(
+  parsedResult: Record<string, unknown>,
+  toolName: string = "run_agent",
+): ChatMessageData | null {
+  try {
+    const setupInfo = parsedResult?.setup_info as
+      | Record<string, unknown>
+      | undefined;
+    const requirements = setupInfo?.requirements as
+      | Record<string, unknown>
+      | undefined;
+    const inputs = requirements?.inputs as
+      | Array<Record<string, unknown>>
+      | undefined;
+    const credentials = requirements?.credentials as
+      | Array<Record<string, unknown>>
+      | undefined;
+
+    if (!inputs || inputs.length === 0) {
+      return null;
+    }
+
+    const agentName = (setupInfo?.agent_name as string) || "this agent";
+    const agentId = parsedResult?.graph_id as string | undefined;
+    const graphVersion = parsedResult?.graph_version as number | undefined;
+
+    const properties: Record<string, any> = {};
+    const requiredProps: string[] = [];
+    inputs.forEach((input) => {
+      const name = input.name as string;
+      if (name) {
+        properties[name] = {
+          title: input.name as string,
+          description: (input.description as string) || "",
+          type: (input.type as string) || "string",
+          default: input.default,
+          enum: input.options,
+          format: input.format,
+        };
+        if ((input.required as boolean) === true) {
+          requiredProps.push(name);
+        }
+      }
+    });
+
+    const inputSchema: Record<string, any> = {
+      type: "object",
+      properties,
+    };
+    if (requiredProps.length > 0) {
+      inputSchema.required = requiredProps;
+    }
+
+    const credentialsSchema: Record<string, any> = {};
+    if (credentials && credentials.length > 0) {
+      credentials.forEach((cred) => {
+        const id = cred.id as string;
+        if (id) {
+          const credentialTypes = Array.isArray(cred.types)
+            ? cred.types
+            : [(cred.type as string) || "api_key"];
+          credentialsSchema[id] = {
+            type: "object",
+            properties: {},
+            credentials_provider: [cred.provider as string],
+            credentials_types: credentialTypes,
+            credentials_scopes: cred.scopes as string[] | undefined,
+          };
+        }
+      });
+    }
+
+    return {
+      type: "inputs_needed",
+      toolName,
+      agentName,
+      agentId,
+      graphVersion,
+      inputSchema,
+      credentialsSchema:
+        Object.keys(credentialsSchema).length > 0
+          ? credentialsSchema
+          : undefined,
+      message: `Please provide the required inputs to run ${agentName}.`,
+      timestamp: new Date(),
+    };
+  } catch (err) {
+    console.error("Failed to extract inputs from setup info:", err);
+    return null;
+  }
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatContainer/useChatContainer.ts b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatContainer/useChatContainer.ts
new file mode 100644
index 0000000000..248383df42
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatContainer/useChatContainer.ts
@@ -0,0 +1,517 @@
+import type { SessionDetailResponse } from "@/app/api/__generated__/models/sessionDetailResponse";
+import { useEffect, useMemo, useRef, useState } from "react";
+import { INITIAL_STREAM_ID } from "../../chat-constants";
+import { useChatStore } from "../../chat-store";
+import { toast } from "sonner";
+import { useChatStream } from "../../useChatStream";
+import { usePageContext } from "../../usePageContext";
+import type { ChatMessageData } from "../ChatMessage/useChatMessage";
+import {
+  getToolIdFromMessage,
+  hasToolId,
+  isOperationMessage,
+  type StreamChunk,
+} from "../../chat-types";
+import { createStreamEventDispatcher } from "./createStreamEventDispatcher";
+import {
+  createUserMessage,
+  filterAuthMessages,
+  hasSentInitialPrompt,
+  markInitialPromptSent,
+  processInitialMessages,
+} from "./helpers";
+
+const TOOL_RESULT_TYPES = new Set([
+  "tool_response",
+  "agent_carousel",
+  "execution_started",
+  "clarification_needed",
+]);
+
+// Helper to generate deduplication key for a message
+function getMessageKey(msg: ChatMessageData): string {
+  if (msg.type === "message") {
+    // Don't include timestamp - dedupe by role + content only
+    // This handles the case where local and server timestamps differ
+    // Server messages are authoritative, so duplicates from local state are filtered
+    return `msg:${msg.role}:${msg.content}`;
+  } else if (msg.type === "tool_call") {
+    return `toolcall:${msg.toolId}`;
+  } else if (TOOL_RESULT_TYPES.has(msg.type)) {
+    // Unified key for all tool result types - same toolId with different types
+    // (tool_response vs agent_carousel) should deduplicate to the same key
+    const toolId = getToolIdFromMessage(msg);
+    // If no toolId, fall back to content-based key to avoid empty key collisions
+    if (!toolId) {
+      return `toolresult:content:${JSON.stringify(msg).slice(0, 200)}`;
+    }
+    return `toolresult:${toolId}`;
+  } else if (isOperationMessage(msg)) {
+    const toolId = getToolIdFromMessage(msg) || "";
+    return `op:${toolId}:${msg.toolName}`;
+  } else {
+    return `${msg.type}:${JSON.stringify(msg).slice(0, 100)}`;
+  }
+}
+
+interface Args {
+  sessionId: string | null;
+  initialMessages: SessionDetailResponse["messages"];
+  initialPrompt?: string;
+  onOperationStarted?: () => void;
+  /** Active stream info from the server for reconnection */
+  activeStream?: {
+    taskId: string;
+    lastMessageId: string;
+    operationId: string;
+    toolName: string;
+  };
+}
+
+export function useChatContainer({
+  sessionId,
+  initialMessages,
+  initialPrompt,
+  onOperationStarted,
+  activeStream,
+}: Args) {
+  const [messages, setMessages] = useState<ChatMessageData[]>([]);
+  const [streamingChunks, setStreamingChunks] = useState<string[]>([]);
+  const [hasTextChunks, setHasTextChunks] = useState(false);
+  const [isStreamingInitiated, setIsStreamingInitiated] = useState(false);
+  const [isRegionBlockedModalOpen, setIsRegionBlockedModalOpen] =
+    useState(false);
+  const hasResponseRef = useRef(false);
+  const streamingChunksRef = useRef<string[]>([]);
+  const textFinalizedRef = useRef(false);
+  const streamEndedRef = useRef(false);
+  const previousSessionIdRef = useRef<string | null>(null);
+  const {
+    error,
+    sendMessage: sendStreamMessage,
+    stopStreaming,
+  } = useChatStream();
+  const activeStreams = useChatStore((s) => s.activeStreams);
+  const subscribeToStream = useChatStore((s) => s.subscribeToStream);
+  const setActiveTask = useChatStore((s) => s.setActiveTask);
+  const getActiveTask = useChatStore((s) => s.getActiveTask);
+  const reconnectToTask = useChatStore((s) => s.reconnectToTask);
+  const isStreaming = isStreamingInitiated || hasTextChunks;
+  // Track whether we've already connected to this activeStream to avoid duplicate connections
+  const connectedActiveStreamRef = useRef<string | null>(null);
+  // Track if component is mounted to prevent state updates after unmount
+  const isMountedRef = useRef(true);
+  // Track current dispatcher to prevent multiple dispatchers from adding messages
+  const currentDispatcherIdRef = useRef(0);
+
+  // Set mounted flag - reset on every mount, cleanup on unmount
+  useEffect(function trackMountedState() {
+    isMountedRef.current = true;
+    return function cleanup() {
+      isMountedRef.current = false;
+    };
+  }, []);
+
+  // Callback to store active task info for SSE reconnection
+  function handleActiveTaskStarted(taskInfo: {
+    taskId: string;
+    operationId: string;
+    toolName: string;
+    toolCallId: string;
+  }) {
+    if (!sessionId) return;
+    setActiveTask(sessionId, {
+      taskId: taskInfo.taskId,
+      operationId: taskInfo.operationId,
+      toolName: taskInfo.toolName,
+      lastMessageId: INITIAL_STREAM_ID,
+    });
+  }
+
+  // Create dispatcher for stream events - stable reference for current sessionId
+  // Each dispatcher gets a unique ID to prevent stale dispatchers from updating state
+  function createDispatcher() {
+    if (!sessionId) return () => {};
+    // Increment dispatcher ID - only the most recent dispatcher should update state
+    const dispatcherId = ++currentDispatcherIdRef.current;
+
+    const baseDispatcher = createStreamEventDispatcher({
+      setHasTextChunks,
+      setStreamingChunks,
+      streamingChunksRef,
+      hasResponseRef,
+      textFinalizedRef,
+      streamEndedRef,
+      setMessages,
+      setIsRegionBlockedModalOpen,
+      sessionId,
+      setIsStreamingInitiated,
+      onOperationStarted,
+      onActiveTaskStarted: handleActiveTaskStarted,
+    });
+
+    // Wrap dispatcher to check if it's still the current one
+    return function guardedDispatcher(chunk: StreamChunk) {
+      // Skip if component unmounted or this is a stale dispatcher
+      if (!isMountedRef.current) {
+        return;
+      }
+      if (dispatcherId !== currentDispatcherIdRef.current) {
+        return;
+      }
+      baseDispatcher(chunk);
+    };
+  }
+
+  useEffect(
+    function handleSessionChange() {
+      const isSessionChange = sessionId !== previousSessionIdRef.current;
+
+      // Handle session change - reset state
+      if (isSessionChange) {
+        const prevSession = previousSessionIdRef.current;
+        if (prevSession) {
+          stopStreaming(prevSession);
+        }
+        previousSessionIdRef.current = sessionId;
+        connectedActiveStreamRef.current = null;
+        setMessages([]);
+        setStreamingChunks([]);
+        streamingChunksRef.current = [];
+        setHasTextChunks(false);
+        setIsStreamingInitiated(false);
+        hasResponseRef.current = false;
+        textFinalizedRef.current = false;
+        streamEndedRef.current = false;
+      }
+
+      if (!sessionId) return;
+
+      // Priority 1: Check if server told us there's an active stream (most authoritative)
+      if (activeStream) {
+        const streamKey = `${sessionId}:${activeStream.taskId}`;
+
+        if (connectedActiveStreamRef.current === streamKey) {
+          return;
+        }
+
+        // Skip if there's already an active stream for this session in the store
+        const existingStream = activeStreams.get(sessionId);
+        if (existingStream && existingStream.status === "streaming") {
+          connectedActiveStreamRef.current = streamKey;
+          return;
+        }
+
+        connectedActiveStreamRef.current = streamKey;
+
+        // Clear all state before reconnection to prevent duplicates
+        // Server's initialMessages is authoritative; local state will be rebuilt from SSE replay
+        setMessages([]);
+        setStreamingChunks([]);
+        streamingChunksRef.current = [];
+        setHasTextChunks(false);
+        textFinalizedRef.current = false;
+        streamEndedRef.current = false;
+        hasResponseRef.current = false;
+
+        setIsStreamingInitiated(true);
+        setActiveTask(sessionId, {
+          taskId: activeStream.taskId,
+          operationId: activeStream.operationId,
+          toolName: activeStream.toolName,
+          lastMessageId: activeStream.lastMessageId,
+        });
+        reconnectToTask(
+          sessionId,
+          activeStream.taskId,
+          activeStream.lastMessageId,
+          createDispatcher(),
+        );
+        // Don't return cleanup here - the guarded dispatcher handles stale events
+        // and the stream will complete naturally. Cleanup would prematurely stop
+        // the stream when effect re-runs due to activeStreams changing.
+        return;
+      }
+
+      // Only check localStorage/in-memory on session change
+      if (!isSessionChange) return;
+
+      // Priority 2: Check localStorage for active task
+      const activeTask = getActiveTask(sessionId);
+      if (activeTask) {
+        // Clear all state before reconnection to prevent duplicates
+        // Server's initialMessages is authoritative; local state will be rebuilt from SSE replay
+        setMessages([]);
+        setStreamingChunks([]);
+        streamingChunksRef.current = [];
+        setHasTextChunks(false);
+        textFinalizedRef.current = false;
+        streamEndedRef.current = false;
+        hasResponseRef.current = false;
+
+        setIsStreamingInitiated(true);
+        reconnectToTask(
+          sessionId,
+          activeTask.taskId,
+          activeTask.lastMessageId,
+          createDispatcher(),
+        );
+        // Don't return cleanup here - the guarded dispatcher handles stale events
+        return;
+      }
+
+      // Priority 3: Check for an in-memory active stream (same-tab scenario)
+      const inMemoryStream = activeStreams.get(sessionId);
+      if (!inMemoryStream || inMemoryStream.status !== "streaming") {
+        return;
+      }
+
+      setIsStreamingInitiated(true);
+      const skipReplay = initialMessages.length > 0;
+      return subscribeToStream(sessionId, createDispatcher(), skipReplay);
+    },
+    [
+      sessionId,
+      stopStreaming,
+      activeStreams,
+      subscribeToStream,
+      onOperationStarted,
+      getActiveTask,
+      reconnectToTask,
+      activeStream,
+      setActiveTask,
+    ],
+  );
+
+  // Collect toolIds from completed tool results in initialMessages
+  // Used to filter out operation messages when their results arrive
+  const completedToolIds = useMemo(() => {
+    const processedInitial = processInitialMessages(initialMessages);
+    const ids = new Set<string>();
+    for (const msg of processedInitial) {
+      if (
+        msg.type === "tool_response" ||
+        msg.type === "agent_carousel" ||
+        msg.type === "execution_started"
+      ) {
+        const toolId = hasToolId(msg) ? msg.toolId : undefined;
+        if (toolId) {
+          ids.add(toolId);
+        }
+      }
+    }
+    return ids;
+  }, [initialMessages]);
+
+  // Clean up local operation messages when their completed results arrive from polling
+  // This effect runs when completedToolIds changes (i.e., when polling brings new results)
+  useEffect(
+    function cleanupCompletedOperations() {
+      if (completedToolIds.size === 0) return;
+
+      setMessages((prev) => {
+        const filtered = prev.filter((msg) => {
+          if (isOperationMessage(msg)) {
+            const toolId = getToolIdFromMessage(msg);
+            if (toolId && completedToolIds.has(toolId)) {
+              return false; // Remove - operation completed
+            }
+          }
+          return true;
+        });
+        // Only update state if something was actually filtered
+        return filtered.length === prev.length ? prev : filtered;
+      });
+    },
+    [completedToolIds],
+  );
+
+  // Combine initial messages from backend with local streaming messages,
+  // Server messages maintain correct order; only append truly new local messages
+  const allMessages = useMemo(() => {
+    const processedInitial = processInitialMessages(initialMessages);
+
+    // Build a set of keys from server messages for deduplication
+    const serverKeys = new Set<string>();
+    for (const msg of processedInitial) {
+      serverKeys.add(getMessageKey(msg));
+    }
+
+    // Filter local messages: remove duplicates and completed operation messages
+    const newLocalMessages = messages.filter((msg) => {
+      // Remove operation messages for completed tools
+      if (isOperationMessage(msg)) {
+        const toolId = getToolIdFromMessage(msg);
+        if (toolId && completedToolIds.has(toolId)) {
+          return false;
+        }
+      }
+      // Remove messages that already exist in server data
+      const key = getMessageKey(msg);
+      return !serverKeys.has(key);
+    });
+
+    // Server messages first (correct order), then new local messages
+    const combined = [...processedInitial, ...newLocalMessages];
+
+    // Post-processing: Remove duplicate assistant messages that can occur during
+    // race conditions (e.g., rapid screen switching during SSE reconnection).
+    // Two assistant messages are considered duplicates if:
+    // - They are both text messages with role "assistant"
+    // - One message's content starts with the other's content (partial vs complete)
+    // - Or they have very similar content (>80% overlap at the start)
+    const deduplicated: ChatMessageData[] = [];
+    for (let i = 0; i < combined.length; i++) {
+      const current = combined[i];
+
+      // Check if this is an assistant text message
+      if (current.type !== "message" || current.role !== "assistant") {
+        deduplicated.push(current);
+        continue;
+      }
+
+      // Look for duplicate assistant messages in the rest of the array
+      let dominated = false;
+      for (let j = 0; j < combined.length; j++) {
+        if (i === j) continue;
+        const other = combined[j];
+        if (other.type !== "message" || other.role !== "assistant") continue;
+
+        const currentContent = current.content || "";
+        const otherContent = other.content || "";
+
+        // Skip empty messages
+        if (!currentContent.trim() || !otherContent.trim()) continue;
+
+        // Check if current is a prefix of other (current is incomplete version)
+        if (
+          otherContent.length > currentContent.length &&
+          otherContent.startsWith(currentContent.slice(0, 100))
+        ) {
+          // Current is a shorter/incomplete version of other - skip it
+          dominated = true;
+          break;
+        }
+
+        // Check if messages are nearly identical (within a small difference)
+        // This catches cases where content differs only slightly
+        const minLen = Math.min(currentContent.length, otherContent.length);
+        const compareLen = Math.min(minLen, 200); // Compare first 200 chars
+        if (
+          compareLen > 50 &&
+          currentContent.slice(0, compareLen) ===
+            otherContent.slice(0, compareLen)
+        ) {
+          // Same prefix - keep the longer one
+          if (otherContent.length > currentContent.length) {
+            dominated = true;
+            break;
+          }
+        }
+      }
+
+      if (!dominated) {
+        deduplicated.push(current);
+      }
+    }
+
+    return deduplicated;
+  }, [initialMessages, messages, completedToolIds]);
+
+  async function sendMessage(
+    content: string,
+    isUserMessage: boolean = true,
+    context?: { url: string; content: string },
+  ) {
+    if (!sessionId) return;
+
+    setIsRegionBlockedModalOpen(false);
+    if (isUserMessage) {
+      const userMessage = createUserMessage(content);
+      setMessages((prev) => [...filterAuthMessages(prev), userMessage]);
+    } else {
+      setMessages((prev) => filterAuthMessages(prev));
+    }
+    setStreamingChunks([]);
+    streamingChunksRef.current = [];
+    setHasTextChunks(false);
+    setIsStreamingInitiated(true);
+    hasResponseRef.current = false;
+    textFinalizedRef.current = false;
+    streamEndedRef.current = false;
+
+    try {
+      await sendStreamMessage(
+        sessionId,
+        content,
+        createDispatcher(),
+        isUserMessage,
+        context,
+      );
+    } catch (err) {
+      setIsStreamingInitiated(false);
+      if (err instanceof Error && err.name === "AbortError") return;
+
+      const errorMessage =
+        err instanceof Error ? err.message : "Failed to send message";
+      toast.error("Failed to send message", {
+        description: errorMessage,
+      });
+    }
+  }
+
+  function handleStopStreaming() {
+    stopStreaming();
+    setStreamingChunks([]);
+    streamingChunksRef.current = [];
+    setHasTextChunks(false);
+    setIsStreamingInitiated(false);
+  }
+
+  const { capturePageContext } = usePageContext();
+  const sendMessageRef = useRef(sendMessage);
+  sendMessageRef.current = sendMessage;
+
+  useEffect(
+    function handleInitialPrompt() {
+      if (!initialPrompt || !sessionId) return;
+      if (initialMessages.length > 0) return;
+      if (hasSentInitialPrompt(sessionId)) return;
+
+      markInitialPromptSent(sessionId);
+      const context = capturePageContext();
+      sendMessageRef.current(initialPrompt, true, context);
+    },
+    [initialPrompt, sessionId, initialMessages.length, capturePageContext],
+  );
+
+  async function sendMessageWithContext(
+    content: string,
+    isUserMessage: boolean = true,
+  ) {
+    const context = capturePageContext();
+    await sendMessage(content, isUserMessage, context);
+  }
+
+  function handleRegionModalOpenChange(open: boolean) {
+    setIsRegionBlockedModalOpen(open);
+  }
+
+  function handleRegionModalClose() {
+    setIsRegionBlockedModalOpen(false);
+  }
+
+  return {
+    messages: allMessages,
+    streamingChunks,
+    isStreaming,
+    error,
+    isRegionBlockedModalOpen,
+    setIsRegionBlockedModalOpen,
+    sendMessageWithContext,
+    handleRegionModalOpenChange,
+    handleRegionModalClose,
+    sendMessage,
+    stopStreaming: handleStopStreaming,
+  };
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatCredentialsSetup/ChatCredentialsSetup.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatCredentialsSetup/ChatCredentialsSetup.tsx
new file mode 100644
index 0000000000..f0dfadd1f7
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatCredentialsSetup/ChatCredentialsSetup.tsx
@@ -0,0 +1,151 @@
+import { Text } from "@/components/atoms/Text/Text";
+import { CredentialsInput } from "@/components/contextual/CredentialsInput/CredentialsInput";
+import type { BlockIOCredentialsSubSchema } from "@/lib/autogpt-server-api";
+import { cn } from "@/lib/utils";
+import { CheckIcon, RobotIcon, WarningIcon } from "@phosphor-icons/react";
+import { useEffect, useRef } from "react";
+import { useChatCredentialsSetup } from "./useChatCredentialsSetup";
+
+export interface CredentialInfo {
+  provider: string;
+  providerName: string;
+  credentialTypes: Array<
+    "api_key" | "oauth2" | "user_password" | "host_scoped"
+  >;
+  title: string;
+  scopes?: string[];
+}
+
+interface Props {
+  credentials: CredentialInfo[];
+  agentName?: string;
+  message: string;
+  onAllCredentialsComplete: () => void;
+  onCancel: () => void;
+  className?: string;
+}
+
+function createSchemaFromCredentialInfo(
+  credential: CredentialInfo,
+): BlockIOCredentialsSubSchema {
+  return {
+    type: "object",
+    properties: {},
+    credentials_provider: [credential.provider],
+    credentials_types: credential.credentialTypes,
+    credentials_scopes: credential.scopes,
+    discriminator: undefined,
+    discriminator_mapping: undefined,
+    discriminator_values: undefined,
+  };
+}
+
+export function ChatCredentialsSetup({
+  credentials,
+  agentName: _agentName,
+  message,
+  onAllCredentialsComplete,
+  onCancel: _onCancel,
+}: Props) {
+  const { selectedCredentials, isAllComplete, handleCredentialSelect } =
+    useChatCredentialsSetup(credentials);
+
+  // Track if we've already called completion to prevent double calls
+  const hasCalledCompleteRef = useRef(false);
+
+  // Reset the completion flag when credentials change (new credential setup flow)
+  useEffect(
+    function resetCompletionFlag() {
+      hasCalledCompleteRef.current = false;
+    },
+    [credentials],
+  );
+
+  // Auto-call completion when all credentials are configured
+  useEffect(
+    function autoCompleteWhenReady() {
+      if (isAllComplete && !hasCalledCompleteRef.current) {
+        hasCalledCompleteRef.current = true;
+        onAllCredentialsComplete();
+      }
+    },
+    [isAllComplete, onAllCredentialsComplete],
+  );
+
+  return (
+    <div className="group relative flex w-full justify-start gap-3 px-4 py-3">
+      <div className="flex w-full max-w-3xl gap-3">
+        <div className="flex-shrink-0">
+          <div className="flex h-7 w-7 items-center justify-center rounded-lg bg-indigo-500">
+            <RobotIcon className="h-4 w-4 text-indigo-50" />
+          </div>
+        </div>
+
+        <div className="flex min-w-0 flex-1 flex-col">
+          <div className="group relative min-w-20 overflow-hidden rounded-xl border border-slate-100 bg-slate-50/20 px-6 py-2.5 text-sm leading-relaxed backdrop-blur-xl">
+            <div className="absolute inset-0 bg-gradient-to-br from-slate-200/20 via-slate-300/10 to-transparent" />
+            <div className="relative z-10 space-y-3 text-slate-900">
+              <div>
+                <Text variant="h4" className="mb-1 text-slate-900">
+                  Credentials Required
+                </Text>
+                <Text variant="small" className="text-slate-600">
+                  {message}
+                </Text>
+              </div>
+
+              <div className="space-y-3">
+                {credentials.map((cred, index) => {
+                  const schema = createSchemaFromCredentialInfo(cred);
+                  const isSelected = !!selectedCredentials[cred.provider];
+
+                  return (
+                    <div
+                      key={`${cred.provider}-${index}`}
+                      className={cn(
+                        "relative rounded-lg border p-3",
+                        isSelected
+                          ? "border-green-500 bg-green-50/50"
+                          : "border-slate-200 bg-white/50",
+                      )}
+                    >
+                      <div className="mb-2 flex items-center gap-2">
+                        {isSelected ? (
+                          <CheckIcon
+                            size={16}
+                            className="text-green-500"
+                            weight="bold"
+                          />
+                        ) : (
+                          <WarningIcon
+                            size={16}
+                            className="text-slate-500"
+                            weight="bold"
+                          />
+                        )}
+                        <Text
+                          variant="small"
+                          className="font-semibold text-slate-900"
+                        >
+                          {cred.providerName}
+                        </Text>
+                      </div>
+
+                      <CredentialsInput
+                        schema={schema}
+                        selectedCredentials={selectedCredentials[cred.provider]}
+                        onSelectCredentials={(credMeta) =>
+                          handleCredentialSelect(cred.provider, credMeta)
+                        }
+                      />
+                    </div>
+                  );
+                })}
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatCredentialsSetup/useChatCredentialsSetup.ts b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatCredentialsSetup/useChatCredentialsSetup.ts
similarity index 100%
rename from autogpt_platform/frontend/src/app/(platform)/chat/components/ChatCredentialsSetup/useChatCredentialsSetup.ts
rename to autogpt_platform/frontend/src/components/contextual/Chat/components/ChatCredentialsSetup/useChatCredentialsSetup.ts
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatErrorState/ChatErrorState.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatErrorState/ChatErrorState.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/(platform)/chat/components/ChatErrorState/ChatErrorState.tsx
rename to autogpt_platform/frontend/src/components/contextual/Chat/components/ChatErrorState/ChatErrorState.tsx
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatInput/ChatInput.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatInput/ChatInput.tsx
new file mode 100644
index 0000000000..bac004f6ed
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatInput/ChatInput.tsx
@@ -0,0 +1,176 @@
+import { Button } from "@/components/atoms/Button/Button";
+import { cn } from "@/lib/utils";
+import {
+  ArrowUpIcon,
+  CircleNotchIcon,
+  MicrophoneIcon,
+  StopIcon,
+} from "@phosphor-icons/react";
+import { RecordingIndicator } from "./components/RecordingIndicator";
+import { useChatInput } from "./useChatInput";
+import { useVoiceRecording } from "./useVoiceRecording";
+
+export interface Props {
+  onSend: (message: string) => void;
+  disabled?: boolean;
+  isStreaming?: boolean;
+  onStop?: () => void;
+  placeholder?: string;
+  className?: string;
+}
+
+export function ChatInput({
+  onSend,
+  disabled = false,
+  isStreaming = false,
+  onStop,
+  placeholder = "Type your message...",
+  className,
+}: Props) {
+  const inputId = "chat-input";
+  const {
+    value,
+    setValue,
+    handleKeyDown: baseHandleKeyDown,
+    handleSubmit,
+    handleChange,
+    hasMultipleLines,
+  } = useChatInput({
+    onSend,
+    disabled: disabled || isStreaming,
+    maxRows: 4,
+    inputId,
+  });
+
+  const {
+    isRecording,
+    isTranscribing,
+    elapsedTime,
+    toggleRecording,
+    handleKeyDown,
+    showMicButton,
+    isInputDisabled,
+    audioStream,
+  } = useVoiceRecording({
+    setValue,
+    disabled: disabled || isStreaming,
+    isStreaming,
+    value,
+    baseHandleKeyDown,
+    inputId,
+  });
+
+  return (
+    <form onSubmit={handleSubmit} className={cn("relative flex-1", className)}>
+      <div className="relative">
+        <div
+          id={`${inputId}-wrapper`}
+          className={cn(
+            "relative overflow-hidden border bg-white shadow-sm",
+            "focus-within:ring-1",
+            isRecording
+              ? "border-red-400 focus-within:border-red-400 focus-within:ring-red-400"
+              : "border-neutral-200 focus-within:border-zinc-400 focus-within:ring-zinc-400",
+            hasMultipleLines ? "rounded-xlarge" : "rounded-full",
+          )}
+        >
+          {!value && !isRecording && (
+            <div
+              className="pointer-events-none absolute inset-0 top-0.5 flex items-center justify-start pl-14 text-[1rem] text-zinc-400"
+              aria-hidden="true"
+            >
+              {isTranscribing ? "Transcribing..." : placeholder}
+            </div>
+          )}
+          <textarea
+            id={inputId}
+            aria-label="Chat message input"
+            value={value}
+            onChange={handleChange}
+            onKeyDown={handleKeyDown}
+            disabled={isInputDisabled}
+            rows={1}
+            className={cn(
+              "w-full resize-none overflow-y-auto border-0 bg-transparent text-[1rem] leading-6 text-black",
+              "placeholder:text-zinc-400",
+              "focus:outline-none focus:ring-0",
+              "disabled:text-zinc-500",
+              hasMultipleLines
+                ? "pb-6 pl-4 pr-4 pt-2"
+                : showMicButton
+                  ? "pb-4 pl-14 pr-14 pt-4"
+                  : "pb-4 pl-4 pr-14 pt-4",
+            )}
+          />
+          {isRecording && !value && (
+            <div className="pointer-events-none absolute inset-0 flex items-center justify-center">
+              <RecordingIndicator
+                elapsedTime={elapsedTime}
+                audioStream={audioStream}
+              />
+            </div>
+          )}
+        </div>
+        <span id="chat-input-hint" className="sr-only">
+          Press Enter to send, Shift+Enter for new line, Space to record voice
+        </span>
+
+        {showMicButton && (
+          <div className="absolute bottom-[7px] left-2 flex items-center gap-1">
+            <Button
+              type="button"
+              variant="icon"
+              size="icon"
+              aria-label={isRecording ? "Stop recording" : "Start recording"}
+              onClick={toggleRecording}
+              disabled={disabled || isTranscribing || isStreaming}
+              className={cn(
+                isRecording
+                  ? "animate-pulse border-red-500 bg-red-500 text-white hover:border-red-600 hover:bg-red-600"
+                  : isTranscribing
+                    ? "border-zinc-300 bg-zinc-100 text-zinc-400"
+                    : "border-zinc-300 bg-white text-zinc-500 hover:border-zinc-400 hover:bg-zinc-50 hover:text-zinc-700",
+                isStreaming && "opacity-40",
+              )}
+            >
+              {isTranscribing ? (
+                <CircleNotchIcon className="h-4 w-4 animate-spin" />
+              ) : (
+                <MicrophoneIcon className="h-4 w-4" weight="bold" />
+              )}
+            </Button>
+          </div>
+        )}
+
+        <div className="absolute bottom-[7px] right-2 flex items-center gap-1">
+          {isStreaming ? (
+            <Button
+              type="button"
+              variant="icon"
+              size="icon"
+              aria-label="Stop generating"
+              onClick={onStop}
+              className="border-red-600 bg-red-600 text-white hover:border-red-800 hover:bg-red-800"
+            >
+              <StopIcon className="h-4 w-4" weight="bold" />
+            </Button>
+          ) : (
+            <Button
+              type="submit"
+              variant="icon"
+              size="icon"
+              aria-label="Send message"
+              className={cn(
+                "border-zinc-800 bg-zinc-800 text-white hover:border-zinc-900 hover:bg-zinc-900",
+                (disabled || !value.trim() || isRecording) && "opacity-20",
+              )}
+              disabled={disabled || !value.trim() || isRecording}
+            >
+              <ArrowUpIcon className="h-4 w-4" weight="bold" />
+            </Button>
+          )}
+        </div>
+      </div>
+    </form>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatInput/components/AudioWaveform.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatInput/components/AudioWaveform.tsx
new file mode 100644
index 0000000000..50414adc89
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatInput/components/AudioWaveform.tsx
@@ -0,0 +1,143 @@
+"use client";
+
+import { useEffect, useRef, useState } from "react";
+
+interface Props {
+  stream: MediaStream | null;
+  barCount?: number;
+  barWidth?: number;
+  barGap?: number;
+  barColor?: string;
+  minBarHeight?: number;
+  maxBarHeight?: number;
+}
+
+export function AudioWaveform({
+  stream,
+  barCount = 24,
+  barWidth = 3,
+  barGap = 2,
+  barColor = "#ef4444", // red-500
+  minBarHeight = 4,
+  maxBarHeight = 32,
+}: Props) {
+  const [bars, setBars] = useState<number[]>(() =>
+    Array(barCount).fill(minBarHeight),
+  );
+  const analyserRef = useRef<AnalyserNode | null>(null);
+  const audioContextRef = useRef<AudioContext | null>(null);
+  const sourceRef = useRef<MediaStreamAudioSourceNode | null>(null);
+  const animationRef = useRef<number | null>(null);
+
+  useEffect(() => {
+    if (!stream) {
+      setBars(Array(barCount).fill(minBarHeight));
+      return;
+    }
+
+    // Create audio context and analyser
+    const audioContext = new AudioContext();
+    const analyser = audioContext.createAnalyser();
+    analyser.fftSize = 256;
+    analyser.smoothingTimeConstant = 0.3;
+
+    // Connect the stream to the analyser
+    const source = audioContext.createMediaStreamSource(stream);
+    source.connect(analyser);
+
+    audioContextRef.current = audioContext;
+    analyserRef.current = analyser;
+    sourceRef.current = source;
+
+    const timeData = new Uint8Array(analyser.frequencyBinCount);
+
+    const updateBars = () => {
+      if (!analyserRef.current) return;
+
+      analyserRef.current.getByteTimeDomainData(timeData);
+
+      // Distribute time-domain data across bars
+      // This shows waveform amplitude, making all bars respond to audio
+      const newBars: number[] = [];
+      const samplesPerBar = timeData.length / barCount;
+
+      for (let i = 0; i < barCount; i++) {
+        // Sample waveform data for this bar
+        let maxAmplitude = 0;
+        const startIdx = Math.floor(i * samplesPerBar);
+        const endIdx = Math.floor((i + 1) * samplesPerBar);
+
+        for (let j = startIdx; j < endIdx && j < timeData.length; j++) {
+          // Convert to amplitude (distance from center 128)
+          const amplitude = Math.abs(timeData[j] - 128);
+          maxAmplitude = Math.max(maxAmplitude, amplitude);
+        }
+
+        // Normalize amplitude (0-128 range) to 0-1
+        const normalized = maxAmplitude / 128;
+        // Apply sensitivity boost (multiply by 4) and use sqrt curve to amplify quiet sounds
+        const boosted = Math.min(1, Math.sqrt(normalized) * 4);
+        const height = minBarHeight + boosted * (maxBarHeight - minBarHeight);
+        newBars.push(height);
+      }
+
+      setBars(newBars);
+      animationRef.current = requestAnimationFrame(updateBars);
+    };
+
+    updateBars();
+
+    return () => {
+      if (animationRef.current) {
+        cancelAnimationFrame(animationRef.current);
+      }
+      if (sourceRef.current) {
+        sourceRef.current.disconnect();
+      }
+      if (audioContextRef.current) {
+        audioContextRef.current.close();
+      }
+      analyserRef.current = null;
+      audioContextRef.current = null;
+      sourceRef.current = null;
+    };
+  }, [stream, barCount, minBarHeight, maxBarHeight]);
+
+  const totalWidth = barCount * barWidth + (barCount - 1) * barGap;
+
+  return (
+    <div
+      className="flex items-center justify-center"
+      style={{
+        width: totalWidth,
+        height: maxBarHeight,
+        gap: barGap,
+      }}
+    >
+      {bars.map((height, i) => {
+        const barHeight = Math.max(minBarHeight, height);
+        return (
+          <div
+            key={i}
+            className="relative"
+            style={{
+              width: barWidth,
+              height: maxBarHeight,
+            }}
+          >
+            <div
+              className="absolute left-0 rounded-full transition-[height] duration-75"
+              style={{
+                width: barWidth,
+                height: barHeight,
+                top: "50%",
+                transform: "translateY(-50%)",
+                backgroundColor: barColor,
+              }}
+            />
+          </div>
+        );
+      })}
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatInput/components/RecordingIndicator.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatInput/components/RecordingIndicator.tsx
new file mode 100644
index 0000000000..0be0d069bb
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatInput/components/RecordingIndicator.tsx
@@ -0,0 +1,26 @@
+import { formatElapsedTime } from "../helpers";
+import { AudioWaveform } from "./AudioWaveform";
+
+type Props = {
+  elapsedTime: number;
+  audioStream: MediaStream | null;
+};
+
+export function RecordingIndicator({ elapsedTime, audioStream }: Props) {
+  return (
+    <div className="flex items-center gap-3">
+      <AudioWaveform
+        stream={audioStream}
+        barCount={20}
+        barWidth={3}
+        barGap={2}
+        barColor="#ef4444"
+        minBarHeight={4}
+        maxBarHeight={24}
+      />
+      <span className="min-w-[3ch] text-sm font-medium text-red-500">
+        {formatElapsedTime(elapsedTime)}
+      </span>
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatInput/helpers.ts b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatInput/helpers.ts
new file mode 100644
index 0000000000..26bae8c9d9
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatInput/helpers.ts
@@ -0,0 +1,6 @@
+export function formatElapsedTime(ms: number): string {
+  const seconds = Math.floor(ms / 1000);
+  const minutes = Math.floor(seconds / 60);
+  const remainingSeconds = seconds % 60;
+  return `${minutes}:${remainingSeconds.toString().padStart(2, "0")}`;
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatInput/useChatInput.ts b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatInput/useChatInput.ts
new file mode 100644
index 0000000000..a053e6080f
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatInput/useChatInput.ts
@@ -0,0 +1,146 @@
+import {
+  ChangeEvent,
+  FormEvent,
+  KeyboardEvent,
+  useEffect,
+  useState,
+} from "react";
+
+interface Args {
+  onSend: (message: string) => void;
+  disabled?: boolean;
+  maxRows?: number;
+  inputId?: string;
+}
+
+export function useChatInput({
+  onSend,
+  disabled = false,
+  maxRows = 5,
+  inputId = "chat-input",
+}: Args) {
+  const [value, setValue] = useState("");
+  const [hasMultipleLines, setHasMultipleLines] = useState(false);
+
+  useEffect(
+    function focusOnMount() {
+      const textarea = document.getElementById(inputId) as HTMLTextAreaElement;
+      if (textarea) textarea.focus();
+    },
+    [inputId],
+  );
+
+  useEffect(
+    function focusWhenEnabled() {
+      if (disabled) return;
+      const textarea = document.getElementById(inputId) as HTMLTextAreaElement;
+      if (textarea) textarea.focus();
+    },
+    [disabled, inputId],
+  );
+
+  useEffect(() => {
+    const textarea = document.getElementById(inputId) as HTMLTextAreaElement;
+    const wrapper = document.getElementById(
+      `${inputId}-wrapper`,
+    ) as HTMLDivElement;
+    if (!textarea || !wrapper) return;
+
+    const isEmpty = !value.trim();
+    const lines = value.split("\n").length;
+    const hasExplicitNewlines = lines > 1;
+
+    const computedStyle = window.getComputedStyle(textarea);
+    const lineHeight = parseInt(computedStyle.lineHeight, 10);
+    const paddingTop = parseInt(computedStyle.paddingTop, 10);
+    const paddingBottom = parseInt(computedStyle.paddingBottom, 10);
+
+    const singleLinePadding = paddingTop + paddingBottom;
+
+    textarea.style.height = "auto";
+    const scrollHeight = textarea.scrollHeight;
+
+    const singleLineHeight = lineHeight + singleLinePadding;
+    const isMultiLine =
+      hasExplicitNewlines || scrollHeight > singleLineHeight + 2;
+    setHasMultipleLines(isMultiLine);
+
+    if (isEmpty) {
+      wrapper.style.height = `${singleLineHeight}px`;
+      wrapper.style.maxHeight = "";
+      textarea.style.height = `${singleLineHeight}px`;
+      textarea.style.maxHeight = "";
+      textarea.style.overflowY = "hidden";
+      return;
+    }
+
+    if (isMultiLine) {
+      const wrapperMaxHeight = 196;
+      const currentMultilinePadding = paddingTop + paddingBottom;
+      const contentMaxHeight = wrapperMaxHeight - currentMultilinePadding;
+      const minMultiLineHeight = lineHeight * 2 + currentMultilinePadding;
+      const contentHeight = scrollHeight;
+      const targetWrapperHeight = Math.min(
+        Math.max(contentHeight + currentMultilinePadding, minMultiLineHeight),
+        wrapperMaxHeight,
+      );
+
+      wrapper.style.height = `${targetWrapperHeight}px`;
+      wrapper.style.maxHeight = `${wrapperMaxHeight}px`;
+      textarea.style.height = `${contentHeight}px`;
+      textarea.style.maxHeight = `${contentMaxHeight}px`;
+      textarea.style.overflowY =
+        contentHeight > contentMaxHeight ? "auto" : "hidden";
+    } else {
+      wrapper.style.height = `${singleLineHeight}px`;
+      wrapper.style.maxHeight = "";
+      textarea.style.height = `${singleLineHeight}px`;
+      textarea.style.maxHeight = "";
+      textarea.style.overflowY = "hidden";
+    }
+  }, [value, maxRows, inputId]);
+
+  const handleSend = () => {
+    if (disabled || !value.trim()) return;
+    onSend(value.trim());
+    setValue("");
+    setHasMultipleLines(false);
+    const textarea = document.getElementById(inputId) as HTMLTextAreaElement;
+    const wrapper = document.getElementById(
+      `${inputId}-wrapper`,
+    ) as HTMLDivElement;
+    if (textarea) {
+      textarea.style.height = "auto";
+    }
+    if (wrapper) {
+      wrapper.style.height = "";
+      wrapper.style.maxHeight = "";
+    }
+  };
+
+  function handleKeyDown(event: KeyboardEvent<HTMLTextAreaElement>) {
+    if (event.key === "Enter" && !event.shiftKey) {
+      event.preventDefault();
+      handleSend();
+    }
+  }
+
+  function handleSubmit(e: FormEvent<HTMLFormElement>) {
+    e.preventDefault();
+    handleSend();
+  }
+
+  function handleChange(e: ChangeEvent<HTMLTextAreaElement>) {
+    setValue(e.target.value);
+  }
+
+  return {
+    value,
+    setValue,
+    handleKeyDown,
+    handleSend,
+    handleSubmit,
+    handleChange,
+    hasMultipleLines,
+  };
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatInput/useVoiceRecording.ts b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatInput/useVoiceRecording.ts
new file mode 100644
index 0000000000..4fd500d96a
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatInput/useVoiceRecording.ts
@@ -0,0 +1,251 @@
+import { useToast } from "@/components/molecules/Toast/use-toast";
+import React, {
+  KeyboardEvent,
+  useCallback,
+  useEffect,
+  useRef,
+  useState,
+} from "react";
+
+const MAX_RECORDING_DURATION = 2 * 60 * 1000; // 2 minutes in ms
+
+interface Args {
+  setValue: React.Dispatch<React.SetStateAction<string>>;
+  disabled?: boolean;
+  isStreaming?: boolean;
+  value: string;
+  baseHandleKeyDown: (event: KeyboardEvent<HTMLTextAreaElement>) => void;
+  inputId?: string;
+}
+
+export function useVoiceRecording({
+  setValue,
+  disabled = false,
+  isStreaming = false,
+  value,
+  baseHandleKeyDown,
+  inputId,
+}: Args) {
+  const [isRecording, setIsRecording] = useState(false);
+  const [isTranscribing, setIsTranscribing] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const [elapsedTime, setElapsedTime] = useState(0);
+
+  const mediaRecorderRef = useRef<MediaRecorder | null>(null);
+  const chunksRef = useRef<Blob[]>([]);
+  const timerRef = useRef<NodeJS.Timeout | null>(null);
+  const startTimeRef = useRef<number>(0);
+  const streamRef = useRef<MediaStream | null>(null);
+  const isRecordingRef = useRef(false);
+
+  const isSupported =
+    typeof window !== "undefined" &&
+    !!(navigator.mediaDevices && navigator.mediaDevices.getUserMedia);
+
+  const clearTimer = useCallback(() => {
+    if (timerRef.current) {
+      clearInterval(timerRef.current);
+      timerRef.current = null;
+    }
+  }, []);
+
+  const cleanup = useCallback(() => {
+    clearTimer();
+    if (streamRef.current) {
+      streamRef.current.getTracks().forEach((track) => track.stop());
+      streamRef.current = null;
+    }
+    mediaRecorderRef.current = null;
+    chunksRef.current = [];
+    setElapsedTime(0);
+  }, [clearTimer]);
+
+  const handleTranscription = useCallback(
+    (text: string) => {
+      setValue((prev) => {
+        const trimmedPrev = prev.trim();
+        if (trimmedPrev) {
+          return `${trimmedPrev} ${text}`;
+        }
+        return text;
+      });
+    },
+    [setValue],
+  );
+
+  const transcribeAudio = useCallback(
+    async (audioBlob: Blob) => {
+      setIsTranscribing(true);
+      setError(null);
+
+      try {
+        const formData = new FormData();
+        formData.append("audio", audioBlob);
+
+        const response = await fetch("/api/transcribe", {
+          method: "POST",
+          body: formData,
+        });
+
+        if (!response.ok) {
+          const data = await response.json().catch(() => ({}));
+          throw new Error(data.error || "Transcription failed");
+        }
+
+        const data = await response.json();
+        if (data.text) {
+          handleTranscription(data.text);
+        }
+      } catch (err) {
+        const message =
+          err instanceof Error ? err.message : "Transcription failed";
+        setError(message);
+        console.error("Transcription error:", err);
+      } finally {
+        setIsTranscribing(false);
+      }
+    },
+    [handleTranscription, inputId],
+  );
+
+  const stopRecording = useCallback(() => {
+    if (mediaRecorderRef.current && isRecordingRef.current) {
+      mediaRecorderRef.current.stop();
+      isRecordingRef.current = false;
+      setIsRecording(false);
+      clearTimer();
+    }
+  }, [clearTimer]);
+
+  const startRecording = useCallback(async () => {
+    if (disabled || isRecordingRef.current || isTranscribing) return;
+
+    setError(null);
+    chunksRef.current = [];
+
+    try {
+      const stream = await navigator.mediaDevices.getUserMedia({ audio: true });
+      streamRef.current = stream;
+
+      const mediaRecorder = new MediaRecorder(stream, {
+        mimeType: MediaRecorder.isTypeSupported("audio/webm")
+          ? "audio/webm"
+          : "audio/mp4",
+      });
+
+      mediaRecorderRef.current = mediaRecorder;
+
+      mediaRecorder.ondataavailable = (event) => {
+        if (event.data.size > 0) {
+          chunksRef.current.push(event.data);
+        }
+      };
+
+      mediaRecorder.onstop = async () => {
+        const audioBlob = new Blob(chunksRef.current, {
+          type: mediaRecorder.mimeType,
+        });
+
+        // Cleanup stream
+        if (streamRef.current) {
+          streamRef.current.getTracks().forEach((track) => track.stop());
+          streamRef.current = null;
+        }
+
+        if (audioBlob.size > 0) {
+          await transcribeAudio(audioBlob);
+        }
+      };
+
+      mediaRecorder.start(1000); // Collect data every second
+      isRecordingRef.current = true;
+      setIsRecording(true);
+      startTimeRef.current = Date.now();
+
+      // Start elapsed time timer
+      timerRef.current = setInterval(() => {
+        const elapsed = Date.now() - startTimeRef.current;
+        setElapsedTime(elapsed);
+
+        // Auto-stop at max duration
+        if (elapsed >= MAX_RECORDING_DURATION) {
+          stopRecording();
+        }
+      }, 100);
+    } catch (err) {
+      console.error("Failed to start recording:", err);
+      if (err instanceof DOMException && err.name === "NotAllowedError") {
+        setError("Microphone permission denied");
+      } else {
+        setError("Failed to access microphone");
+      }
+      cleanup();
+    }
+  }, [disabled, isTranscribing, stopRecording, transcribeAudio, cleanup]);
+
+  const toggleRecording = useCallback(() => {
+    if (isRecording) {
+      stopRecording();
+    } else {
+      startRecording();
+    }
+  }, [isRecording, startRecording, stopRecording]);
+
+  const { toast } = useToast();
+
+  useEffect(() => {
+    if (error) {
+      toast({
+        title: "Voice recording failed",
+        description: error,
+        variant: "destructive",
+      });
+    }
+  }, [error, toast]);
+
+  useEffect(() => {
+    if (!isTranscribing && inputId) {
+      const inputElement = document.getElementById(inputId);
+      if (inputElement) {
+        inputElement.focus();
+      }
+    }
+  }, [isTranscribing, inputId]);
+
+  const handleKeyDown = useCallback(
+    (event: KeyboardEvent<HTMLTextAreaElement>) => {
+      if (event.key === " " && !value.trim() && !isTranscribing) {
+        event.preventDefault();
+        toggleRecording();
+        return;
+      }
+      baseHandleKeyDown(event);
+    },
+    [value, isTranscribing, toggleRecording, baseHandleKeyDown],
+  );
+
+  const showMicButton = isSupported;
+  const isInputDisabled = disabled || isStreaming || isTranscribing;
+
+  // Cleanup on unmount
+  useEffect(() => {
+    return () => {
+      cleanup();
+    };
+  }, [cleanup]);
+
+  return {
+    isRecording,
+    isTranscribing,
+    error,
+    elapsedTime,
+    startRecording,
+    stopRecording,
+    toggleRecording,
+    isSupported,
+    handleKeyDown,
+    showMicButton,
+    isInputDisabled,
+    audioStream: streamRef.current,
+  };
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatLoader/ChatLoader.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatLoader/ChatLoader.tsx
new file mode 100644
index 0000000000..76cee8dbae
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatLoader/ChatLoader.tsx
@@ -0,0 +1,7 @@
+export function ChatLoader() {
+  return (
+    <div className="flex items-center gap-2">
+      <div className="h-5 w-5 animate-loader rounded-full bg-black" />
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatLoadingState/ChatLoadingState.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatLoadingState/ChatLoadingState.tsx
new file mode 100644
index 0000000000..c0cdb33c50
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatLoadingState/ChatLoadingState.tsx
@@ -0,0 +1,19 @@
+import { LoadingSpinner } from "@/components/atoms/LoadingSpinner/LoadingSpinner";
+import { cn } from "@/lib/utils";
+
+export interface ChatLoadingStateProps {
+  message?: string;
+  className?: string;
+}
+
+export function ChatLoadingState({ className }: ChatLoadingStateProps) {
+  return (
+    <div
+      className={cn("flex flex-1 items-center justify-center p-6", className)}
+    >
+      <div className="flex flex-col items-center gap-4 text-center">
+        <LoadingSpinner />
+      </div>
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatMessage/ChatMessage.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatMessage/ChatMessage.tsx
new file mode 100644
index 0000000000..2ac433a272
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatMessage/ChatMessage.tsx
@@ -0,0 +1,443 @@
+"use client";
+
+import { Button } from "@/components/atoms/Button/Button";
+import { useSupabase } from "@/lib/supabase/hooks/useSupabase";
+import { cn } from "@/lib/utils";
+import {
+  ArrowsClockwiseIcon,
+  CheckCircleIcon,
+  CheckIcon,
+} from "@phosphor-icons/react";
+import { useRouter } from "next/navigation";
+import { useCallback, useState } from "react";
+import { AgentCarouselMessage } from "../AgentCarouselMessage/AgentCarouselMessage";
+import { AIChatBubble } from "../AIChatBubble/AIChatBubble";
+import { AuthPromptWidget } from "../AuthPromptWidget/AuthPromptWidget";
+import { ChatCredentialsSetup } from "../ChatCredentialsSetup/ChatCredentialsSetup";
+import { ClarificationQuestionsWidget } from "../ClarificationQuestionsWidget/ClarificationQuestionsWidget";
+import { ExecutionStartedMessage } from "../ExecutionStartedMessage/ExecutionStartedMessage";
+import { PendingOperationWidget } from "../PendingOperationWidget/PendingOperationWidget";
+import { MarkdownContent } from "../MarkdownContent/MarkdownContent";
+import { NoResultsMessage } from "../NoResultsMessage/NoResultsMessage";
+import { ToolCallMessage } from "../ToolCallMessage/ToolCallMessage";
+import { ToolResponseMessage } from "../ToolResponseMessage/ToolResponseMessage";
+import { UserChatBubble } from "../UserChatBubble/UserChatBubble";
+import { useChatMessage, type ChatMessageData } from "./useChatMessage";
+
+function stripInternalReasoning(content: string): string {
+  const cleaned = content.replace(
+    /<internal_reasoning>[\s\S]*?<\/internal_reasoning>/gi,
+    "",
+  );
+  return cleaned.replace(/\n{3,}/g, "\n\n").trim();
+}
+
+function getDisplayContent(message: ChatMessageData, isUser: boolean): string {
+  if (message.type !== "message") return "";
+  if (isUser) return message.content;
+  return stripInternalReasoning(message.content);
+}
+
+export interface ChatMessageProps {
+  message: ChatMessageData;
+  messages?: ChatMessageData[];
+  index?: number;
+  isStreaming?: boolean;
+  className?: string;
+  onDismissLogin?: () => void;
+  onDismissCredentials?: () => void;
+  onSendMessage?: (content: string, isUserMessage?: boolean) => void;
+  agentOutput?: ChatMessageData;
+  isFinalMessage?: boolean;
+}
+
+export function ChatMessage({
+  message,
+  messages = [],
+  index = -1,
+  isStreaming = false,
+  className,
+  onDismissCredentials,
+  onSendMessage,
+  agentOutput,
+  isFinalMessage = true,
+}: ChatMessageProps) {
+  const { user } = useSupabase();
+  const router = useRouter();
+  const [copied, setCopied] = useState(false);
+  const {
+    isUser,
+    isToolCall,
+    isToolResponse,
+    isLoginNeeded,
+    isCredentialsNeeded,
+    isClarificationNeeded,
+    isOperationStarted,
+    isOperationPending,
+    isOperationInProgress,
+  } = useChatMessage(message);
+  const displayContent = getDisplayContent(message, isUser);
+
+  const handleAllCredentialsComplete = useCallback(
+    function handleAllCredentialsComplete() {
+      // Send a user message that explicitly asks to retry the setup
+      // This ensures the LLM calls get_required_setup_info again and proceeds with execution
+      if (onSendMessage) {
+        onSendMessage(
+          "I've configured the required credentials. Please check if everything is ready and proceed with setting up the agent.",
+        );
+      }
+      // Optionally dismiss the credentials prompt
+      if (onDismissCredentials) {
+        onDismissCredentials();
+      }
+    },
+    [onSendMessage, onDismissCredentials],
+  );
+
+  function handleCancelCredentials() {
+    // Dismiss the credentials prompt
+    if (onDismissCredentials) {
+      onDismissCredentials();
+    }
+  }
+
+  function handleClarificationAnswers(answers: Record<string, string>) {
+    if (onSendMessage) {
+      const contextMessage = Object.entries(answers)
+        .map(([keyword, answer]) => `${keyword}: ${answer}`)
+        .join("\n");
+
+      onSendMessage(
+        `I have the answers to your questions:\n\n${contextMessage}\n\nPlease proceed with creating the agent.`,
+      );
+    }
+  }
+
+  const handleCopy = useCallback(
+    async function handleCopy() {
+      if (message.type !== "message") return;
+      if (!displayContent) return;
+
+      try {
+        await navigator.clipboard.writeText(displayContent);
+        setCopied(true);
+        setTimeout(() => setCopied(false), 2000);
+      } catch (error) {
+        console.error("Failed to copy:", error);
+      }
+    },
+    [displayContent, message],
+  );
+
+  const handleTryAgain = useCallback(() => {
+    if (message.type !== "message" || !onSendMessage) return;
+    onSendMessage(message.content, message.role === "user");
+  }, [message, onSendMessage]);
+
+  const handleViewExecution = useCallback(() => {
+    if (message.type === "execution_started" && message.libraryAgentLink) {
+      router.push(message.libraryAgentLink);
+    }
+  }, [message, router]);
+
+  // Render credentials needed messages
+  if (isCredentialsNeeded && message.type === "credentials_needed") {
+    return (
+      <ChatCredentialsSetup
+        credentials={message.credentials}
+        agentName={message.agentName}
+        message={message.message}
+        onAllCredentialsComplete={handleAllCredentialsComplete}
+        onCancel={handleCancelCredentials}
+        className={className}
+      />
+    );
+  }
+
+  if (isClarificationNeeded && message.type === "clarification_needed") {
+    const hasUserReplyAfter =
+      index >= 0 &&
+      messages
+        .slice(index + 1)
+        .some((m) => m.type === "message" && m.role === "user");
+
+    return (
+      <ClarificationQuestionsWidget
+        questions={message.questions}
+        message={message.message}
+        sessionId={message.sessionId}
+        onSubmitAnswers={handleClarificationAnswers}
+        isAnswered={hasUserReplyAfter}
+        className={className}
+      />
+    );
+  }
+
+  // Render login needed messages
+  if (isLoginNeeded && message.type === "login_needed") {
+    // If user is already logged in, show success message instead of auth prompt
+    if (user) {
+      return (
+        <div className={cn("px-4 py-2", className)}>
+          <div className="my-4 overflow-hidden rounded-lg border border-green-200 bg-gradient-to-br from-green-50 to-emerald-50">
+            <div className="px-6 py-4">
+              <div className="flex items-center gap-3">
+                <div className="flex h-10 w-10 items-center justify-center rounded-full bg-green-600">
+                  <CheckCircleIcon
+                    size={20}
+                    weight="fill"
+                    className="text-white"
+                  />
+                </div>
+                <div>
+                  <h3 className="text-lg font-semibold text-neutral-900">
+                    Successfully Authenticated
+                  </h3>
+                  <p className="text-sm text-neutral-600">
+                    You&apos;re now signed in and ready to continue
+                  </p>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      );
+    }
+
+    // Show auth prompt if not logged in
+    return (
+      <div className={cn("px-4 py-2", className)}>
+        <AuthPromptWidget
+          message={message.message}
+          sessionId={message.sessionId}
+          agentInfo={message.agentInfo}
+        />
+      </div>
+    );
+  }
+
+  // Render tool call messages
+  if (isToolCall && message.type === "tool_call") {
+    // Check if this tool call is currently streaming
+    // A tool call is streaming if:
+    // 1. isStreaming is true
+    // 2. This is the last tool_call message
+    // 3. There's no tool_response for this tool call yet
+    const isToolCallStreaming =
+      isStreaming &&
+      index >= 0 &&
+      (() => {
+        // Find the last tool_call index
+        let lastToolCallIndex = -1;
+        for (let i = messages.length - 1; i >= 0; i--) {
+          if (messages[i].type === "tool_call") {
+            lastToolCallIndex = i;
+            break;
+          }
+        }
+        // Check if this is the last tool_call and there's no response yet
+        if (index === lastToolCallIndex) {
+          // Check if there's a tool_response for this tool call
+          const hasResponse = messages
+            .slice(index + 1)
+            .some(
+              (msg) =>
+                msg.type === "tool_response" && msg.toolId === message.toolId,
+            );
+          return !hasResponse;
+        }
+        return false;
+      })();
+
+    return (
+      <div className={cn("px-4 py-2", className)}>
+        <ToolCallMessage
+          toolId={message.toolId}
+          toolName={message.toolName}
+          arguments={message.arguments}
+          isStreaming={isToolCallStreaming}
+        />
+      </div>
+    );
+  }
+
+  // Render no_results messages - use dedicated component, not ToolResponseMessage
+  if (message.type === "no_results") {
+    return (
+      <div className={cn("px-4 py-2", className)}>
+        <NoResultsMessage
+          message={message.message}
+          suggestions={message.suggestions}
+        />
+      </div>
+    );
+  }
+
+  // Render agent_carousel messages - use dedicated component, not ToolResponseMessage
+  if (message.type === "agent_carousel") {
+    return (
+      <div className={cn("px-4 py-2", className)}>
+        <AgentCarouselMessage
+          agents={message.agents}
+          totalCount={message.totalCount}
+        />
+      </div>
+    );
+  }
+
+  // Render execution_started messages - use dedicated component, not ToolResponseMessage
+  if (message.type === "execution_started") {
+    return (
+      <div className={cn("px-4 py-2", className)}>
+        <ExecutionStartedMessage
+          executionId={message.executionId}
+          agentName={message.agentName}
+          message={message.message}
+          onViewExecution={
+            message.libraryAgentLink ? handleViewExecution : undefined
+          }
+        />
+      </div>
+    );
+  }
+
+  // Render operation_started messages (long-running background operations)
+  if (isOperationStarted && message.type === "operation_started") {
+    return (
+      <PendingOperationWidget
+        status="started"
+        message={message.message}
+        toolName={message.toolName}
+        className={className}
+      />
+    );
+  }
+
+  // Render operation_pending messages (operations in progress when refreshing)
+  if (isOperationPending && message.type === "operation_pending") {
+    return (
+      <PendingOperationWidget
+        status="pending"
+        message={message.message}
+        toolName={message.toolName}
+        className={className}
+      />
+    );
+  }
+
+  // Render operation_in_progress messages (duplicate request while operation running)
+  if (isOperationInProgress && message.type === "operation_in_progress") {
+    return (
+      <PendingOperationWidget
+        status="in_progress"
+        message={message.message}
+        toolName={message.toolName}
+        className={className}
+      />
+    );
+  }
+
+  // Render tool response messages (but skip agent_output if it's being rendered inside assistant message)
+  if (isToolResponse && message.type === "tool_response") {
+    return (
+      <div className={cn("px-4 py-2", className)}>
+        <ToolResponseMessage
+          toolId={message.toolId}
+          toolName={message.toolName}
+          result={message.result}
+        />
+      </div>
+    );
+  }
+
+  // Render regular chat messages
+  if (message.type === "message") {
+    return (
+      <div
+        className={cn(
+          "group relative flex w-full gap-3 px-4 py-3",
+          isUser ? "justify-end" : "justify-start",
+          className,
+        )}
+      >
+        <div className="flex w-full max-w-3xl gap-3">
+          <div
+            className={cn(
+              "flex min-w-0 flex-1 flex-col",
+              isUser && "items-end",
+            )}
+          >
+            {isUser ? (
+              <UserChatBubble>
+                <MarkdownContent content={displayContent} />
+              </UserChatBubble>
+            ) : (
+              <AIChatBubble>
+                <MarkdownContent content={displayContent} />
+                {agentOutput && agentOutput.type === "tool_response" && (
+                  <div className="mt-4">
+                    <ToolResponseMessage
+                      toolId={agentOutput.toolId}
+                      toolName={agentOutput.toolName || "Agent Output"}
+                      result={agentOutput.result}
+                    />
+                  </div>
+                )}
+              </AIChatBubble>
+            )}
+            <div
+              className={cn(
+                "flex gap-0",
+                isUser ? "justify-end" : "justify-start",
+              )}
+            >
+              {isUser && onSendMessage && (
+                <Button
+                  variant="ghost"
+                  size="icon"
+                  onClick={handleTryAgain}
+                  aria-label="Try again"
+                >
+                  <ArrowsClockwiseIcon className="size-4 text-zinc-600" />
+                </Button>
+              )}
+              {!isUser && isFinalMessage && !isStreaming && (
+                <Button
+                  variant="ghost"
+                  size="icon"
+                  onClick={handleCopy}
+                  aria-label="Copy message"
+                  className="p-1"
+                >
+                  {copied ? (
+                    <CheckIcon className="size-4 text-green-600" />
+                  ) : (
+                    <svg
+                      xmlns="http://www.w3.org/2000/svg"
+                      width="24"
+                      height="24"
+                      viewBox="0 0 24 24"
+                      fill="none"
+                      stroke="currentColor"
+                      strokeWidth="2"
+                      strokeLinecap="round"
+                      strokeLinejoin="round"
+                      className="size-3 text-zinc-600"
+                    >
+                      <rect width="14" height="14" x="8" y="8" rx="2" ry="2" />
+                      <path d="M4 16c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2h10c1.1 0 2 .9 2 2" />
+                    </svg>
+                  )}
+                </Button>
+              )}
+            </div>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  // Fallback for unknown message types
+  return null;
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatMessage/useChatMessage.ts b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatMessage/useChatMessage.ts
similarity index 62%
rename from autogpt_platform/frontend/src/app/(platform)/chat/components/ChatMessage/useChatMessage.ts
rename to autogpt_platform/frontend/src/components/contextual/Chat/components/ChatMessage/useChatMessage.ts
index ae4f48f35b..6809497a93 100644
--- a/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatMessage/useChatMessage.ts
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/ChatMessage/useChatMessage.ts
@@ -1,5 +1,5 @@
-import { formatDistanceToNow } from "date-fns";
 import type { ToolArguments, ToolResult } from "@/types/chat";
+import { formatDistanceToNow } from "date-fns";
 
 export type ChatMessageData =
   | {
@@ -41,7 +41,9 @@ export type ChatMessageData =
       credentials: Array<{
         provider: string;
         providerName: string;
-        credentialType: "api_key" | "oauth2" | "user_password" | "host_scoped";
+        credentialTypes: Array<
+          "api_key" | "oauth2" | "user_password" | "host_scoped"
+        >;
         title: string;
         scopes?: string[];
       }>;
@@ -59,24 +61,74 @@ export type ChatMessageData =
     }
   | {
       type: "agent_carousel";
+      toolId: string;
       toolName: string;
       agents: Array<{
         id: string;
         name: string;
         description: string;
         version?: number;
+        image_url?: string;
       }>;
       totalCount?: number;
       timestamp?: string | Date;
     }
   | {
       type: "execution_started";
+      toolId: string;
       toolName: string;
       executionId: string;
       agentName?: string;
       message?: string;
       libraryAgentLink?: string;
       timestamp?: string | Date;
+    }
+  | {
+      type: "inputs_needed";
+      toolName: string;
+      agentName?: string;
+      agentId?: string;
+      graphVersion?: number;
+      inputSchema: Record<string, any>;
+      credentialsSchema?: Record<string, any>;
+      message: string;
+      timestamp?: string | Date;
+    }
+  | {
+      type: "clarification_needed";
+      toolName: string;
+      questions: Array<{
+        question: string;
+        keyword: string;
+        example?: string;
+      }>;
+      message: string;
+      sessionId: string;
+      timestamp?: string | Date;
+    }
+  | {
+      type: "operation_started";
+      toolName: string;
+      toolId: string;
+      operationId: string;
+      taskId?: string; // For SSE reconnection
+      message: string;
+      timestamp?: string | Date;
+    }
+  | {
+      type: "operation_pending";
+      toolName: string;
+      toolId: string;
+      operationId: string;
+      message: string;
+      timestamp?: string | Date;
+    }
+  | {
+      type: "operation_in_progress";
+      toolName: string;
+      toolCallId: string;
+      message: string;
+      timestamp?: string | Date;
     };
 
 export function useChatMessage(message: ChatMessageData) {
@@ -96,5 +148,10 @@ export function useChatMessage(message: ChatMessageData) {
     isNoResults: message.type === "no_results",
     isAgentCarousel: message.type === "agent_carousel",
     isExecutionStarted: message.type === "execution_started",
+    isInputsNeeded: message.type === "inputs_needed",
+    isClarificationNeeded: message.type === "clarification_needed",
+    isOperationStarted: message.type === "operation_started",
+    isOperationPending: message.type === "operation_pending",
+    isOperationInProgress: message.type === "operation_in_progress",
   };
 }
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/ClarificationQuestionsWidget/ClarificationQuestionsWidget.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/ClarificationQuestionsWidget/ClarificationQuestionsWidget.tsx
new file mode 100644
index 0000000000..3b225d1ef1
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/ClarificationQuestionsWidget/ClarificationQuestionsWidget.tsx
@@ -0,0 +1,243 @@
+"use client";
+
+import { Button } from "@/components/atoms/Button/Button";
+import { Card } from "@/components/atoms/Card/Card";
+import { Input } from "@/components/atoms/Input/Input";
+import { Text } from "@/components/atoms/Text/Text";
+import { cn } from "@/lib/utils";
+import { CheckCircleIcon, QuestionIcon } from "@phosphor-icons/react";
+import { useState, useEffect, useRef } from "react";
+
+export interface ClarifyingQuestion {
+  question: string;
+  keyword: string;
+  example?: string;
+}
+
+interface Props {
+  questions: ClarifyingQuestion[];
+  message: string;
+  sessionId?: string;
+  onSubmitAnswers: (answers: Record<string, string>) => void;
+  onCancel?: () => void;
+  isAnswered?: boolean;
+  className?: string;
+}
+
+function getStorageKey(sessionId?: string): string | null {
+  if (!sessionId) return null;
+  return `clarification_answers_${sessionId}`;
+}
+
+export function ClarificationQuestionsWidget({
+  questions,
+  message,
+  sessionId,
+  onSubmitAnswers,
+  onCancel,
+  isAnswered = false,
+  className,
+}: Props) {
+  const [answers, setAnswers] = useState<Record<string, string>>({});
+  const [isSubmitted, setIsSubmitted] = useState(false);
+  const lastSessionIdRef = useRef<string | undefined>(undefined);
+
+  useEffect(() => {
+    const storageKey = getStorageKey(sessionId);
+    if (!storageKey) {
+      setAnswers({});
+      setIsSubmitted(false);
+      lastSessionIdRef.current = sessionId;
+      return;
+    }
+
+    try {
+      const saved = localStorage.getItem(storageKey);
+      if (saved) {
+        const parsed = JSON.parse(saved) as Record<string, string>;
+        setAnswers(parsed);
+      } else {
+        setAnswers({});
+      }
+      setIsSubmitted(false);
+    } catch {
+      setAnswers({});
+      setIsSubmitted(false);
+    }
+    lastSessionIdRef.current = sessionId;
+  }, [sessionId]);
+
+  useEffect(() => {
+    if (lastSessionIdRef.current !== sessionId) {
+      return;
+    }
+    const storageKey = getStorageKey(sessionId);
+    if (!storageKey) return;
+
+    const hasAnswers = Object.values(answers).some((v) => v.trim());
+    try {
+      if (hasAnswers) {
+        localStorage.setItem(storageKey, JSON.stringify(answers));
+      } else {
+        localStorage.removeItem(storageKey);
+      }
+    } catch {}
+  }, [answers, sessionId]);
+
+  function handleAnswerChange(keyword: string, value: string) {
+    setAnswers((prev) => ({ ...prev, [keyword]: value }));
+  }
+
+  function handleSubmit() {
+    const allAnswered = questions.every((q) => answers[q.keyword]?.trim());
+    if (!allAnswered) {
+      return;
+    }
+    setIsSubmitted(true);
+    onSubmitAnswers(answers);
+
+    const storageKey = getStorageKey(sessionId);
+    try {
+      if (storageKey) {
+        localStorage.removeItem(storageKey);
+      }
+    } catch {}
+  }
+
+  const allAnswered = questions.every((q) => answers[q.keyword]?.trim());
+
+  if (isAnswered || isSubmitted) {
+    return (
+      <div
+        className={cn(
+          "group relative flex w-full justify-start gap-3 px-4 py-3",
+          className,
+        )}
+      >
+        <div className="flex w-full max-w-3xl gap-3">
+          <div className="flex-shrink-0">
+            <div className="flex h-7 w-7 items-center justify-center rounded-lg bg-green-500">
+              <CheckCircleIcon className="h-4 w-4 text-white" weight="bold" />
+            </div>
+          </div>
+          <div className="flex min-w-0 flex-1 flex-col">
+            <Card className="p-4">
+              <Text variant="h4" className="mb-1 text-slate-900">
+                Answers submitted
+              </Text>
+              <Text variant="small" className="text-slate-600">
+                Processing your responses...
+              </Text>
+            </Card>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div
+      className={cn(
+        "group relative flex w-full justify-start gap-3 px-4 py-3",
+        className,
+      )}
+    >
+      <div className="flex w-full max-w-3xl gap-3">
+        <div className="flex-shrink-0">
+          <div className="flex h-7 w-7 items-center justify-center rounded-lg bg-indigo-500">
+            <QuestionIcon className="h-4 w-4 text-indigo-50" weight="bold" />
+          </div>
+        </div>
+
+        <div className="flex min-w-0 flex-1 flex-col">
+          <Card className="space-y-4 p-4">
+            <div>
+              <Text variant="h4" className="mb-1 text-slate-900">
+                I need more information
+              </Text>
+              <Text variant="small" className="text-slate-600">
+                {message}
+              </Text>
+            </div>
+
+            <div className="space-y-3">
+              {questions.map((q, index) => {
+                const isAnswered = !!answers[q.keyword]?.trim();
+
+                return (
+                  <div
+                    key={`${q.keyword}-${index}`}
+                    className={cn(
+                      "relative rounded-lg border p-3",
+                      isAnswered
+                        ? "border-green-500 bg-green-50/50"
+                        : "border-slate-200 bg-white/50",
+                    )}
+                  >
+                    <div className="mb-2 flex items-start gap-2">
+                      {isAnswered ? (
+                        <CheckCircleIcon
+                          size={16}
+                          className="mt-0.5 text-green-500"
+                          weight="bold"
+                        />
+                      ) : (
+                        <div className="mt-0.5 flex h-4 w-4 items-center justify-center rounded-full border border-slate-300 bg-white text-xs text-slate-500">
+                          {index + 1}
+                        </div>
+                      )}
+                      <div className="flex-1">
+                        <Text
+                          variant="small"
+                          className="mb-2 font-semibold text-slate-900"
+                        >
+                          {q.question}
+                        </Text>
+                        {q.example && (
+                          <Text
+                            variant="small"
+                            className="mb-2 italic text-slate-500"
+                          >
+                            Example: {q.example}
+                          </Text>
+                        )}
+                        <Input
+                          type="textarea"
+                          id={`clarification-${q.keyword}-${index}`}
+                          label={q.question}
+                          hideLabel
+                          placeholder="Your answer..."
+                          rows={2}
+                          value={answers[q.keyword] || ""}
+                          onChange={(e) =>
+                            handleAnswerChange(q.keyword, e.target.value)
+                          }
+                        />
+                      </div>
+                    </div>
+                  </div>
+                );
+              })}
+            </div>
+
+            <div className="flex gap-2">
+              <Button
+                onClick={handleSubmit}
+                disabled={!allAnswered}
+                className="flex-1"
+                variant="primary"
+              >
+                Submit Answers
+              </Button>
+              {onCancel && (
+                <Button onClick={onCancel} variant="outline">
+                  Cancel
+                </Button>
+              )}
+            </div>
+          </Card>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/components/ExecutionStartedMessage/ExecutionStartedMessage.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/ExecutionStartedMessage/ExecutionStartedMessage.tsx
similarity index 67%
rename from autogpt_platform/frontend/src/app/(platform)/chat/components/ExecutionStartedMessage/ExecutionStartedMessage.tsx
rename to autogpt_platform/frontend/src/components/contextual/Chat/components/ExecutionStartedMessage/ExecutionStartedMessage.tsx
index 77c7f8fe9b..1ac3b440e0 100644
--- a/autogpt_platform/frontend/src/app/(platform)/chat/components/ExecutionStartedMessage/ExecutionStartedMessage.tsx
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/ExecutionStartedMessage/ExecutionStartedMessage.tsx
@@ -1,8 +1,7 @@
-import React from "react";
-import { Text } from "@/components/atoms/Text/Text";
 import { Button } from "@/components/atoms/Button/Button";
-import { CheckCircle, Play, ArrowSquareOut } from "@phosphor-icons/react";
+import { Text } from "@/components/atoms/Text/Text";
 import { cn } from "@/lib/utils";
+import { ArrowSquareOut, CheckCircle, Play } from "@phosphor-icons/react";
 
 export interface ExecutionStartedMessageProps {
   executionId: string;
@@ -22,7 +21,7 @@ export function ExecutionStartedMessage({
   return (
     <div
       className={cn(
-        "mx-4 my-2 flex flex-col gap-4 rounded-lg border border-green-200 bg-green-50 p-6 dark:border-green-900 dark:bg-green-950",
+        "mx-4 my-2 flex flex-col gap-4 rounded-lg border border-green-200 bg-green-50 p-6",
         className,
       )}
     >
@@ -32,48 +31,33 @@ export function ExecutionStartedMessage({
           <CheckCircle size={24} weight="bold" className="text-white" />
         </div>
         <div className="flex-1">
-          <Text
-            variant="h3"
-            className="mb-1 text-green-900 dark:text-green-100"
-          >
+          <Text variant="h3" className="mb-1 text-green-900">
             Execution Started
           </Text>
-          <Text variant="body" className="text-green-700 dark:text-green-300">
+          <Text variant="body" className="text-green-700">
             {message}
           </Text>
         </div>
       </div>
 
       {/* Details */}
-      <div className="rounded-md bg-green-100 p-4 dark:bg-green-900">
+      <div className="rounded-md bg-green-100 p-4">
         <div className="space-y-2">
           {agentName && (
             <div className="flex items-center justify-between">
-              <Text
-                variant="small"
-                className="font-semibold text-green-900 dark:text-green-100"
-              >
+              <Text variant="small" className="font-semibold text-green-900">
                 Agent:
               </Text>
-              <Text
-                variant="body"
-                className="text-green-800 dark:text-green-200"
-              >
+              <Text variant="body" className="text-green-800">
                 {agentName}
               </Text>
             </div>
           )}
           <div className="flex items-center justify-between">
-            <Text
-              variant="small"
-              className="font-semibold text-green-900 dark:text-green-100"
-            >
+            <Text variant="small" className="font-semibold text-green-900">
               Execution ID:
             </Text>
-            <Text
-              variant="small"
-              className="font-mono text-green-800 dark:text-green-200"
-            >
+            <Text variant="small" className="font-mono text-green-800">
               {executionId.slice(0, 16)}...
             </Text>
           </div>
@@ -94,7 +78,7 @@ export function ExecutionStartedMessage({
         </div>
       )}
 
-      <div className="flex items-center gap-2 text-green-600 dark:text-green-400">
+      <div className="flex items-center gap-2 text-green-600">
         <Play size={16} weight="fill" />
         <Text variant="small">
           Your agent is now running. You can monitor its progress in the monitor
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/components/MarkdownContent/MarkdownContent.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/MarkdownContent/MarkdownContent.tsx
similarity index 61%
rename from autogpt_platform/frontend/src/app/(platform)/chat/components/MarkdownContent/MarkdownContent.tsx
rename to autogpt_platform/frontend/src/components/contextual/Chat/components/MarkdownContent/MarkdownContent.tsx
index e82e29c438..3dd5eca692 100644
--- a/autogpt_platform/frontend/src/app/(platform)/chat/components/MarkdownContent/MarkdownContent.tsx
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/MarkdownContent/MarkdownContent.tsx
@@ -1,9 +1,11 @@
 "use client";
 
+import { getGetWorkspaceDownloadFileByIdUrl } from "@/app/api/__generated__/endpoints/workspace/workspace";
+import { cn } from "@/lib/utils";
+import { EyeSlash } from "@phosphor-icons/react";
 import React from "react";
 import ReactMarkdown from "react-markdown";
 import remarkGfm from "remark-gfm";
-import { cn } from "@/lib/utils";
 
 interface MarkdownContentProps {
   content: string;
@@ -29,19 +31,95 @@ interface InputProps extends React.InputHTMLAttributes<HTMLInputElement> {
   type?: string;
 }
 
+/**
+ * Converts a workspace:// URL to a proxy URL that routes through Next.js to the backend.
+ * workspace://abc123 -> /api/proxy/api/workspace/files/abc123/download
+ *
+ * Uses the generated API URL helper and routes through the Next.js proxy
+ * which handles authentication and proper backend routing.
+ */
+/**
+ * URL transformer for ReactMarkdown.
+ * Converts workspace:// URLs to proxy URLs that route through Next.js to the backend.
+ * workspace://abc123 -> /api/proxy/api/workspace/files/abc123/download
+ *
+ * This is needed because ReactMarkdown sanitizes URLs and only allows
+ * http, https, mailto, and tel protocols by default.
+ */
+function resolveWorkspaceUrl(src: string): string {
+  if (src.startsWith("workspace://")) {
+    const fileId = src.replace("workspace://", "");
+    // Use the generated API URL helper to get the correct path
+    const apiPath = getGetWorkspaceDownloadFileByIdUrl(fileId);
+    // Route through the Next.js proxy (same pattern as customMutator for client-side)
+    return `/api/proxy${apiPath}`;
+  }
+  return src;
+}
+
+/**
+ * Check if the image URL is a workspace file (AI cannot see these yet).
+ * After URL transformation, workspace files have URLs like /api/proxy/api/workspace/files/...
+ */
+function isWorkspaceImage(src: string | undefined): boolean {
+  return src?.includes("/workspace/files/") ?? false;
+}
+
+/**
+ * Custom image component that shows an indicator when the AI cannot see the image.
+ * Note: src is already transformed by urlTransform, so workspace:// is now /api/workspace/...
+ */
+function MarkdownImage(props: Record<string, unknown>) {
+  const src = props.src as string | undefined;
+  const alt = props.alt as string | undefined;
+
+  const aiCannotSee = isWorkspaceImage(src);
+
+  // If no src, show a placeholder
+  if (!src) {
+    return (
+      <span className="my-2 inline-block rounded border border-amber-200 bg-amber-50 px-2 py-1 text-sm text-amber-700">
+        [Image: {alt || "missing src"}]
+      </span>
+    );
+  }
+
+  return (
+    <span className="relative my-2 inline-block">
+      {/* eslint-disable-next-line @next/next/no-img-element */}
+      <img
+        src={src}
+        alt={alt || "Image"}
+        className="h-auto max-w-full rounded-md border border-zinc-200"
+        loading="lazy"
+      />
+      {aiCannotSee && (
+        <span
+          className="absolute bottom-2 right-2 flex items-center gap-1 rounded bg-black/70 px-2 py-1 text-xs text-white"
+          title="The AI cannot see this image"
+        >
+          <EyeSlash size={14} />
+          <span>AI cannot see this image</span>
+        </span>
+      )}
+    </span>
+  );
+}
+
 export function MarkdownContent({ content, className }: MarkdownContentProps) {
   return (
     <div className={cn("markdown-content", className)}>
       <ReactMarkdown
         skipHtml={true}
         remarkPlugins={[remarkGfm]}
+        urlTransform={resolveWorkspaceUrl}
         components={{
           code: ({ children, className, ...props }: CodeProps) => {
             const isInline = !className?.includes("language-");
             if (isInline) {
               return (
                 <code
-                  className="rounded bg-zinc-100 px-1.5 py-0.5 font-mono text-sm text-zinc-800 dark:bg-zinc-800 dark:text-zinc-200"
+                  className="rounded bg-zinc-100 px-1.5 py-0.5 font-mono text-sm text-zinc-800"
                   {...props}
                 >
                   {children}
@@ -49,17 +127,14 @@ export function MarkdownContent({ content, className }: MarkdownContentProps) {
               );
             }
             return (
-              <code
-                className="font-mono text-sm text-zinc-100 dark:text-zinc-200"
-                {...props}
-              >
+              <code className="font-mono text-sm text-zinc-100" {...props}>
                 {children}
               </code>
             );
           },
           pre: ({ children, ...props }) => (
             <pre
-              className="my-2 overflow-x-auto rounded-md bg-zinc-900 p-3 dark:bg-zinc-950"
+              className="my-2 overflow-x-auto rounded-md bg-zinc-900 p-3"
               {...props}
             >
               {children}
@@ -70,7 +145,7 @@ export function MarkdownContent({ content, className }: MarkdownContentProps) {
               href={href}
               target="_blank"
               rel="noopener noreferrer"
-              className="text-purple-600 underline decoration-1 underline-offset-2 hover:text-purple-700 dark:text-purple-400 dark:hover:text-purple-300"
+              className="text-purple-600 underline decoration-1 underline-offset-2 hover:text-purple-700"
               {...props}
             >
               {children}
@@ -126,7 +201,7 @@ export function MarkdownContent({ content, className }: MarkdownContentProps) {
               return (
                 <input
                   type="checkbox"
-                  className="mr-2 h-4 w-4 rounded border-zinc-300 text-purple-600 focus:ring-purple-500 disabled:cursor-not-allowed disabled:opacity-70 dark:border-zinc-600"
+                  className="mr-2 h-4 w-4 rounded border-zinc-300 text-purple-600 focus:ring-purple-500 disabled:cursor-not-allowed disabled:opacity-70"
                   disabled
                   {...props}
                 />
@@ -136,57 +211,42 @@ export function MarkdownContent({ content, className }: MarkdownContentProps) {
           },
           blockquote: ({ children, ...props }) => (
             <blockquote
-              className="my-2 border-l-4 border-zinc-300 pl-3 italic text-zinc-700 dark:border-zinc-600 dark:text-zinc-300"
+              className="my-2 border-l-4 border-zinc-300 pl-3 italic text-zinc-700"
               {...props}
             >
               {children}
             </blockquote>
           ),
           h1: ({ children, ...props }) => (
-            <h1
-              className="my-2 text-xl font-bold text-zinc-900 dark:text-zinc-100"
-              {...props}
-            >
+            <h1 className="my-2 text-xl font-bold text-zinc-900" {...props}>
               {children}
             </h1>
           ),
           h2: ({ children, ...props }) => (
-            <h2
-              className="my-2 text-lg font-semibold text-zinc-800 dark:text-zinc-200"
-              {...props}
-            >
+            <h2 className="my-2 text-lg font-semibold text-zinc-800" {...props}>
               {children}
             </h2>
           ),
           h3: ({ children, ...props }) => (
             <h3
-              className="my-1 text-base font-semibold text-zinc-800 dark:text-zinc-200"
+              className="my-1 text-base font-semibold text-zinc-800"
               {...props}
             >
               {children}
             </h3>
           ),
           h4: ({ children, ...props }) => (
-            <h4
-              className="my-1 text-sm font-medium text-zinc-700 dark:text-zinc-300"
-              {...props}
-            >
+            <h4 className="my-1 text-sm font-medium text-zinc-700" {...props}>
               {children}
             </h4>
           ),
           h5: ({ children, ...props }) => (
-            <h5
-              className="my-1 text-sm font-medium text-zinc-700 dark:text-zinc-300"
-              {...props}
-            >
+            <h5 className="my-1 text-sm font-medium text-zinc-700" {...props}>
               {children}
             </h5>
           ),
           h6: ({ children, ...props }) => (
-            <h6
-              className="my-1 text-xs font-medium text-zinc-600 dark:text-zinc-400"
-              {...props}
-            >
+            <h6 className="my-1 text-xs font-medium text-zinc-600" {...props}>
               {children}
             </h6>
           ),
@@ -196,15 +256,12 @@ export function MarkdownContent({ content, className }: MarkdownContentProps) {
             </p>
           ),
           hr: ({ ...props }) => (
-            <hr
-              className="my-3 border-zinc-300 dark:border-zinc-700"
-              {...props}
-            />
+            <hr className="my-3 border-zinc-300" {...props} />
           ),
           table: ({ children, ...props }) => (
             <div className="my-2 overflow-x-auto">
               <table
-                className="min-w-full divide-y divide-zinc-200 rounded border border-zinc-200 dark:divide-zinc-700 dark:border-zinc-700"
+                className="min-w-full divide-y divide-zinc-200 rounded border border-zinc-200"
                 {...props}
               >
                 {children}
@@ -213,7 +270,7 @@ export function MarkdownContent({ content, className }: MarkdownContentProps) {
           ),
           th: ({ children, ...props }) => (
             <th
-              className="bg-zinc-50 px-3 py-2 text-left text-xs font-semibold text-zinc-700 dark:bg-zinc-800 dark:text-zinc-300"
+              className="bg-zinc-50 px-3 py-2 text-left text-xs font-semibold text-zinc-700"
               {...props}
             >
               {children}
@@ -221,12 +278,15 @@ export function MarkdownContent({ content, className }: MarkdownContentProps) {
           ),
           td: ({ children, ...props }) => (
             <td
-              className="border-t border-zinc-200 px-3 py-2 text-sm dark:border-zinc-700"
+              className="border-t border-zinc-200 px-3 py-2 text-sm"
               {...props}
             >
               {children}
             </td>
           ),
+          img: ({ src, alt, ...props }) => (
+            <MarkdownImage src={src} alt={alt} {...props} />
+          ),
         }}
       >
         {content}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/MessageBubble/MessageBubble.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/MessageBubble/MessageBubble.tsx
new file mode 100644
index 0000000000..70d5d135a1
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/MessageBubble/MessageBubble.tsx
@@ -0,0 +1,53 @@
+import { cn } from "@/lib/utils";
+import { ReactNode } from "react";
+
+export interface MessageBubbleProps {
+  children: ReactNode;
+  variant: "user" | "assistant";
+  className?: string;
+}
+
+export function MessageBubble({
+  children,
+  variant,
+  className,
+}: MessageBubbleProps) {
+  const userTheme = {
+    bg: "bg-purple-100",
+    border: "border-purple-100",
+    text: "text-slate-900",
+  };
+
+  const assistantTheme = {
+    bg: "bg-slate-50/20",
+    border: "border-slate-100",
+    gradient: "from-slate-200/20 via-slate-300/10 to-transparent",
+    text: "text-slate-900",
+  };
+
+  const theme = variant === "user" ? userTheme : assistantTheme;
+
+  return (
+    <div
+      className={cn(
+        "group relative min-w-20 overflow-hidden rounded-xl border px-6 py-2.5 text-sm leading-relaxed backdrop-blur-xl transition-all duration-500 ease-in-out",
+        theme.bg,
+        theme.border,
+        variant === "user" && "text-right",
+        variant === "assistant" && "text-left",
+        className,
+      )}
+    >
+      {/* Gradient flare background */}
+      <div className={cn("absolute inset-0 bg-gradient-to-br")} />
+      <div
+        className={cn(
+          "relative z-10 transition-all duration-500 ease-in-out",
+          theme.text,
+        )}
+      >
+        {children}
+      </div>
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/MessageList/MessageList.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/MessageList/MessageList.tsx
new file mode 100644
index 0000000000..01d107c64e
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/MessageList/MessageList.tsx
@@ -0,0 +1,114 @@
+"use client";
+
+import { cn } from "@/lib/utils";
+import type { ChatMessageData } from "../ChatMessage/useChatMessage";
+import { StreamingMessage } from "../StreamingMessage/StreamingMessage";
+import { ThinkingMessage } from "../ThinkingMessage/ThinkingMessage";
+import { LastToolResponse } from "./components/LastToolResponse/LastToolResponse";
+import { MessageItem } from "./components/MessageItem/MessageItem";
+import { findLastMessageIndex, shouldSkipAgentOutput } from "./helpers";
+import { useMessageList } from "./useMessageList";
+
+export interface MessageListProps {
+  messages: ChatMessageData[];
+  streamingChunks?: string[];
+  isStreaming?: boolean;
+  className?: string;
+  onStreamComplete?: () => void;
+  onSendMessage?: (content: string) => void;
+}
+
+export function MessageList({
+  messages,
+  streamingChunks = [],
+  isStreaming = false,
+  className,
+  onStreamComplete,
+  onSendMessage,
+}: MessageListProps) {
+  const { messagesEndRef, messagesContainerRef } = useMessageList({
+    messageCount: messages.length,
+    isStreaming,
+  });
+
+  return (
+    <div className="relative flex min-h-0 flex-1 flex-col">
+      {/* Top fade shadow */}
+      <div className="pointer-events-none absolute top-0 z-10 h-8 w-full bg-gradient-to-b from-[#f8f8f9] to-transparent" />
+
+      <div
+        ref={messagesContainerRef}
+        className={cn(
+          "flex-1 overflow-y-auto overflow-x-hidden",
+          "scrollbar-thin scrollbar-track-transparent scrollbar-thumb-zinc-300",
+          className,
+        )}
+      >
+        <div className="mx-auto flex min-w-0 flex-col hyphens-auto break-words py-4">
+          {/* Render all persisted messages */}
+          {(() => {
+            const lastAssistantMessageIndex = findLastMessageIndex(
+              messages,
+              (msg) => msg.type === "message" && msg.role === "assistant",
+            );
+
+            const lastToolResponseIndex = findLastMessageIndex(
+              messages,
+              (msg) => msg.type === "tool_response",
+            );
+
+            return messages.map((message, index) => {
+              // Skip agent_output tool_responses that should be rendered inside assistant messages
+              if (shouldSkipAgentOutput(message, messages[index - 1])) {
+                return null;
+              }
+
+              // Render last tool_response as AIChatBubble
+              if (
+                message.type === "tool_response" &&
+                index === lastToolResponseIndex
+              ) {
+                return (
+                  <LastToolResponse
+                    key={index}
+                    message={message}
+                    prevMessage={messages[index - 1]}
+                  />
+                );
+              }
+
+              return (
+                <MessageItem
+                  key={index}
+                  message={message}
+                  messages={messages}
+                  index={index}
+                  lastAssistantMessageIndex={lastAssistantMessageIndex}
+                  isStreaming={isStreaming}
+                  onSendMessage={onSendMessage}
+                />
+              );
+            });
+          })()}
+
+          {/* Render thinking message when streaming but no chunks yet */}
+          {isStreaming && streamingChunks.length === 0 && <ThinkingMessage />}
+
+          {/* Render streaming message if active */}
+          {isStreaming && streamingChunks.length > 0 && (
+            <StreamingMessage
+              chunks={streamingChunks}
+              onComplete={onStreamComplete}
+            />
+          )}
+
+          {/* Invisible div to scroll to */}
+          <div ref={messagesEndRef} />
+        </div>
+      </div>
+
+      {/* Bottom fade shadow */}
+      <div className="pointer-events-none absolute bottom-0 z-10 h-8 w-full bg-gradient-to-t from-[#f8f8f9] to-transparent" />
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/MessageList/components/LastToolResponse/LastToolResponse.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/MessageList/components/LastToolResponse/LastToolResponse.tsx
new file mode 100644
index 0000000000..15b10e5715
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/MessageList/components/LastToolResponse/LastToolResponse.tsx
@@ -0,0 +1,27 @@
+import type { ChatMessageData } from "../../../ChatMessage/useChatMessage";
+import { ToolResponseMessage } from "../../../ToolResponseMessage/ToolResponseMessage";
+import { shouldSkipAgentOutput } from "../../helpers";
+
+export interface LastToolResponseProps {
+  message: ChatMessageData;
+  prevMessage: ChatMessageData | undefined;
+}
+
+export function LastToolResponse({
+  message,
+  prevMessage,
+}: LastToolResponseProps) {
+  if (message.type !== "tool_response") return null;
+
+  if (shouldSkipAgentOutput(message, prevMessage)) return null;
+
+  return (
+    <div className="min-w-0 overflow-x-hidden hyphens-auto break-words px-4 py-2">
+      <ToolResponseMessage
+        toolId={message.toolId}
+        toolName={message.toolName}
+        result={message.result}
+      />
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/MessageList/components/MessageItem/MessageItem.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/MessageList/components/MessageItem/MessageItem.tsx
new file mode 100644
index 0000000000..d455633b66
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/MessageList/components/MessageItem/MessageItem.tsx
@@ -0,0 +1,40 @@
+import { ChatMessage } from "../../../ChatMessage/ChatMessage";
+import type { ChatMessageData } from "../../../ChatMessage/useChatMessage";
+import { useMessageItem } from "./useMessageItem";
+
+export interface MessageItemProps {
+  message: ChatMessageData;
+  messages: ChatMessageData[];
+  index: number;
+  lastAssistantMessageIndex: number;
+  isStreaming?: boolean;
+  onSendMessage?: (content: string) => void;
+}
+
+export function MessageItem({
+  message,
+  messages,
+  index,
+  lastAssistantMessageIndex,
+  isStreaming = false,
+  onSendMessage,
+}: MessageItemProps) {
+  const { messageToRender, agentOutput, isFinalMessage } = useMessageItem({
+    message,
+    messages,
+    index,
+    lastAssistantMessageIndex,
+  });
+
+  return (
+    <ChatMessage
+      message={messageToRender}
+      messages={messages}
+      index={index}
+      isStreaming={isStreaming}
+      onSendMessage={onSendMessage}
+      agentOutput={agentOutput}
+      isFinalMessage={isFinalMessage}
+    />
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/MessageList/components/MessageItem/useMessageItem.ts b/autogpt_platform/frontend/src/components/contextual/Chat/components/MessageList/components/MessageItem/useMessageItem.ts
new file mode 100644
index 0000000000..65c2e02cc8
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/MessageList/components/MessageItem/useMessageItem.ts
@@ -0,0 +1,62 @@
+import type { ChatMessageData } from "../../../ChatMessage/useChatMessage";
+import { isAgentOutputResult, isToolOutputPattern } from "../../helpers";
+
+export interface UseMessageItemArgs {
+  message: ChatMessageData;
+  messages: ChatMessageData[];
+  index: number;
+  lastAssistantMessageIndex: number;
+}
+
+export function useMessageItem({
+  message,
+  messages,
+  index,
+  lastAssistantMessageIndex,
+}: UseMessageItemArgs) {
+  let agentOutput: ChatMessageData | undefined;
+  let messageToRender: ChatMessageData = message;
+
+  // Check if assistant message follows a tool_call and looks like a tool output
+  if (message.type === "message" && message.role === "assistant") {
+    const prevMessage = messages[index - 1];
+
+    // Check if next message is an agent_output tool_response to include in current assistant message
+    const nextMessage = messages[index + 1];
+    if (
+      nextMessage &&
+      nextMessage.type === "tool_response" &&
+      nextMessage.result
+    ) {
+      if (isAgentOutputResult(nextMessage.result)) {
+        agentOutput = nextMessage;
+      }
+    }
+
+    // Only convert to tool_response if it follows a tool_call AND looks like a tool output
+    if (prevMessage && prevMessage.type === "tool_call") {
+      if (isToolOutputPattern(message.content)) {
+        // Convert this message to a tool_response format for rendering
+        messageToRender = {
+          type: "tool_response",
+          toolId: prevMessage.toolId,
+          toolName: prevMessage.toolName,
+          result: message.content,
+          success: true,
+          timestamp: message.timestamp,
+        } as ChatMessageData;
+      }
+    }
+  }
+
+  const isFinalMessage =
+    messageToRender.type !== "message" ||
+    messageToRender.role !== "assistant" ||
+    index === lastAssistantMessageIndex;
+
+  return {
+    messageToRender,
+    agentOutput,
+    isFinalMessage,
+  };
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/MessageList/helpers.ts b/autogpt_platform/frontend/src/components/contextual/Chat/components/MessageList/helpers.ts
new file mode 100644
index 0000000000..f6731c66c7
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/MessageList/helpers.ts
@@ -0,0 +1,68 @@
+import type { ChatMessageData } from "../ChatMessage/useChatMessage";
+
+export function parseToolResult(
+  result: unknown,
+): Record<string, unknown> | null {
+  try {
+    return typeof result === "string"
+      ? JSON.parse(result)
+      : (result as Record<string, unknown>);
+  } catch {
+    return null;
+  }
+}
+
+export function isAgentOutputResult(result: unknown): boolean {
+  const parsed = parseToolResult(result);
+  return parsed?.type === "agent_output";
+}
+
+export function isToolOutputPattern(content: string): boolean {
+  const normalizedContent = content.toLowerCase().trim();
+
+  return (
+    normalizedContent.startsWith("no agents found") ||
+    normalizedContent.startsWith("no results found") ||
+    normalizedContent.includes("no agents found matching") ||
+    !!normalizedContent.match(/^no \w+ found/i) ||
+    (content.length < 150 && normalizedContent.includes("try different")) ||
+    (content.length < 200 &&
+      !normalizedContent.includes("i'll") &&
+      !normalizedContent.includes("let me") &&
+      !normalizedContent.includes("i can") &&
+      !normalizedContent.includes("i will"))
+  );
+}
+
+export function formatToolResultValue(result: unknown): string {
+  return typeof result === "string"
+    ? result
+    : result
+      ? JSON.stringify(result, null, 2)
+      : "";
+}
+
+export function findLastMessageIndex(
+  messages: ChatMessageData[],
+  predicate: (msg: ChatMessageData) => boolean,
+): number {
+  for (let i = messages.length - 1; i >= 0; i--) {
+    if (predicate(messages[i])) return i;
+  }
+  return -1;
+}
+
+export function shouldSkipAgentOutput(
+  message: ChatMessageData,
+  prevMessage: ChatMessageData | undefined,
+): boolean {
+  if (message.type !== "tool_response" || !message.result) return false;
+
+  const isAgentOutput = isAgentOutputResult(message.result);
+  return (
+    isAgentOutput &&
+    !!prevMessage &&
+    prevMessage.type === "message" &&
+    prevMessage.role === "assistant"
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/components/MessageList/useMessageList.ts b/autogpt_platform/frontend/src/components/contextual/Chat/components/MessageList/useMessageList.ts
similarity index 100%
rename from autogpt_platform/frontend/src/app/(platform)/chat/components/MessageList/useMessageList.ts
rename to autogpt_platform/frontend/src/components/contextual/Chat/components/MessageList/useMessageList.ts
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/components/NoResultsMessage/NoResultsMessage.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/NoResultsMessage/NoResultsMessage.tsx
similarity index 72%
rename from autogpt_platform/frontend/src/app/(platform)/chat/components/NoResultsMessage/NoResultsMessage.tsx
rename to autogpt_platform/frontend/src/components/contextual/Chat/components/NoResultsMessage/NoResultsMessage.tsx
index 38eac24bce..b6adc8b93c 100644
--- a/autogpt_platform/frontend/src/app/(platform)/chat/components/NoResultsMessage/NoResultsMessage.tsx
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/NoResultsMessage/NoResultsMessage.tsx
@@ -1,7 +1,6 @@
-import React from "react";
 import { Text } from "@/components/atoms/Text/Text";
-import { MagnifyingGlass, X } from "@phosphor-icons/react";
 import { cn } from "@/lib/utils";
+import { MagnifyingGlass, X } from "@phosphor-icons/react";
 
 export interface NoResultsMessageProps {
   message: string;
@@ -17,26 +16,26 @@ export function NoResultsMessage({
   return (
     <div
       className={cn(
-        "mx-4 my-2 flex flex-col items-center gap-4 rounded-lg border border-gray-200 bg-gray-50 p-6 dark:border-gray-800 dark:bg-gray-900",
+        "mx-4 my-2 flex flex-col items-center gap-4 rounded-lg border border-gray-200 bg-gray-50 p-6",
         className,
       )}
     >
       {/* Icon */}
       <div className="relative flex h-16 w-16 items-center justify-center">
-        <div className="flex h-16 w-16 items-center justify-center rounded-full bg-gray-200 dark:bg-gray-700">
+        <div className="flex h-16 w-16 items-center justify-center rounded-full bg-gray-200">
           <MagnifyingGlass size={32} weight="bold" className="text-gray-500" />
         </div>
-        <div className="absolute -right-1 -top-1 flex h-8 w-8 items-center justify-center rounded-full bg-gray-400 dark:bg-gray-600">
+        <div className="absolute -right-1 -top-1 flex h-8 w-8 items-center justify-center rounded-full bg-gray-400">
           <X size={20} weight="bold" className="text-white" />
         </div>
       </div>
 
       {/* Content */}
       <div className="text-center">
-        <Text variant="h3" className="mb-2 text-gray-900 dark:text-gray-100">
+        <Text variant="h3" className="mb-2 text-gray-900">
           No Results Found
         </Text>
-        <Text variant="body" className="text-gray-700 dark:text-gray-300">
+        <Text variant="body" className="text-gray-700">
           {message}
         </Text>
       </div>
@@ -44,17 +43,14 @@ export function NoResultsMessage({
       {/* Suggestions */}
       {suggestions.length > 0 && (
         <div className="w-full space-y-2">
-          <Text
-            variant="small"
-            className="font-semibold text-gray-900 dark:text-gray-100"
-          >
+          <Text variant="small" className="font-semibold text-gray-900">
             Try these suggestions:
           </Text>
-          <ul className="space-y-1 rounded-md bg-gray-100 p-4 dark:bg-gray-800">
+          <ul className="space-y-1 rounded-md bg-gray-100 p-4">
             {suggestions.map((suggestion, index) => (
               <li
                 key={index}
-                className="flex items-start gap-2 text-sm text-gray-700 dark:text-gray-300"
+                className="flex items-start gap-2 text-sm text-gray-700"
               >
                 <span className="mt-1 text-gray-500">•</span>
                 <span>{suggestion}</span>
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/PendingOperationWidget/PendingOperationWidget.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/PendingOperationWidget/PendingOperationWidget.tsx
new file mode 100644
index 0000000000..6cfea7f327
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/PendingOperationWidget/PendingOperationWidget.tsx
@@ -0,0 +1,109 @@
+"use client";
+
+import { Card } from "@/components/atoms/Card/Card";
+import { Text } from "@/components/atoms/Text/Text";
+import { cn } from "@/lib/utils";
+import { CircleNotch, CheckCircle, XCircle } from "@phosphor-icons/react";
+
+type OperationStatus =
+  | "pending"
+  | "started"
+  | "in_progress"
+  | "completed"
+  | "error";
+
+interface Props {
+  status: OperationStatus;
+  message: string;
+  toolName?: string;
+  className?: string;
+}
+
+function getOperationTitle(toolName?: string): string {
+  if (!toolName) return "Operation";
+  // Convert tool name to human-readable format
+  // e.g., "create_agent" -> "Creating Agent", "edit_agent" -> "Editing Agent"
+  if (toolName === "create_agent") return "Creating Agent";
+  if (toolName === "edit_agent") return "Editing Agent";
+  // Default: capitalize and format tool name
+  return toolName
+    .split("_")
+    .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+    .join(" ");
+}
+
+export function PendingOperationWidget({
+  status,
+  message,
+  toolName,
+  className,
+}: Props) {
+  const isPending =
+    status === "pending" || status === "started" || status === "in_progress";
+  const isCompleted = status === "completed";
+  const isError = status === "error";
+
+  const operationTitle = getOperationTitle(toolName);
+
+  return (
+    <div
+      className={cn(
+        "group relative flex w-full justify-start gap-3 px-4 py-3",
+        className,
+      )}
+    >
+      <div className="flex w-full max-w-3xl gap-3">
+        <div className="flex-shrink-0">
+          <div
+            className={cn(
+              "flex h-7 w-7 items-center justify-center rounded-lg",
+              isPending && "bg-blue-500",
+              isCompleted && "bg-green-500",
+              isError && "bg-red-500",
+            )}
+          >
+            {isPending && (
+              <CircleNotch
+                className="h-4 w-4 animate-spin text-white"
+                weight="bold"
+              />
+            )}
+            {isCompleted && (
+              <CheckCircle className="h-4 w-4 text-white" weight="bold" />
+            )}
+            {isError && (
+              <XCircle className="h-4 w-4 text-white" weight="bold" />
+            )}
+          </div>
+        </div>
+
+        <div className="flex min-w-0 flex-1 flex-col">
+          <Card className="space-y-2 p-4">
+            <div>
+              <Text variant="h4" className="mb-1 text-slate-900">
+                {isPending && operationTitle}
+                {isCompleted && `${operationTitle} Complete`}
+                {isError && `${operationTitle} Failed`}
+              </Text>
+              <Text variant="small" className="text-slate-600">
+                {message}
+              </Text>
+            </div>
+
+            {isPending && (
+              <Text variant="small" className="italic text-slate-500">
+                Check your library in a few minutes.
+              </Text>
+            )}
+
+            {toolName && (
+              <Text variant="small" className="text-slate-400">
+                Tool: {toolName}
+              </Text>
+            )}
+          </Card>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/QuickActionsWelcome/QuickActionsWelcome.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/QuickActionsWelcome/QuickActionsWelcome.tsx
new file mode 100644
index 0000000000..dd76fd9fb6
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/QuickActionsWelcome/QuickActionsWelcome.tsx
@@ -0,0 +1,94 @@
+"use client";
+
+import { Text } from "@/components/atoms/Text/Text";
+import { cn } from "@/lib/utils";
+
+export interface QuickActionsWelcomeProps {
+  title: string;
+  description: string;
+  actions: string[];
+  onActionClick: (action: string) => void;
+  disabled?: boolean;
+  className?: string;
+}
+
+export function QuickActionsWelcome({
+  title,
+  description,
+  actions,
+  onActionClick,
+  disabled = false,
+  className,
+}: QuickActionsWelcomeProps) {
+  return (
+    <div
+      className={cn("flex flex-1 items-center justify-center p-8", className)}
+    >
+      <div className="w-full max-w-3xl">
+        <div className="mb-12 text-center">
+          <Text
+            variant="h2"
+            className="mb-3 text-2xl font-semibold text-zinc-900"
+          >
+            {title}
+          </Text>
+          <Text variant="body" className="text-zinc-500">
+            {description}
+          </Text>
+        </div>
+        <div className="grid gap-3 sm:grid-cols-2">
+          {actions.map((action) => {
+            // Use slate theme for all cards
+            const theme = {
+              bg: "bg-slate-50/10",
+              border: "border-slate-100",
+              hoverBg: "hover:bg-slate-50/20",
+              hoverBorder: "hover:border-slate-200",
+              gradient: "from-slate-200/20 via-slate-300/10 to-transparent",
+              text: "text-slate-900",
+              hoverText: "group-hover:text-slate-900",
+            };
+
+            return (
+              <button
+                key={action}
+                onClick={() => onActionClick(action)}
+                disabled={disabled}
+                className={cn(
+                  "group relative overflow-hidden rounded-xl border p-5 text-left backdrop-blur-xl",
+                  "transition-all duration-200",
+                  theme.bg,
+                  theme.border,
+                  theme.hoverBg,
+                  theme.hoverBorder,
+                  "hover:shadow-sm",
+                  "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-white/50 focus-visible:ring-offset-2",
+                  "disabled:cursor-not-allowed disabled:opacity-50 disabled:hover:shadow-none",
+                )}
+              >
+                {/* Gradient flare background */}
+                <div
+                  className={cn(
+                    "absolute inset-0 bg-gradient-to-br",
+                    theme.gradient,
+                  )}
+                />
+
+                <Text
+                  variant="body"
+                  className={cn(
+                    "relative z-10 font-medium",
+                    theme.text,
+                    theme.hoverText,
+                  )}
+                >
+                  {action}
+                </Text>
+              </button>
+            );
+          })}
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/SessionsDrawer/SessionsDrawer.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/SessionsDrawer/SessionsDrawer.tsx
new file mode 100644
index 0000000000..ee2896f1e2
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/SessionsDrawer/SessionsDrawer.tsx
@@ -0,0 +1,136 @@
+"use client";
+
+import { useGetV2ListSessions } from "@/app/api/__generated__/endpoints/chat/chat";
+import { Text } from "@/components/atoms/Text/Text";
+import { scrollbarStyles } from "@/components/styles/scrollbars";
+import { cn } from "@/lib/utils";
+import { X } from "@phosphor-icons/react";
+import { formatDistanceToNow } from "date-fns";
+import { Drawer } from "vaul";
+
+interface SessionsDrawerProps {
+  isOpen: boolean;
+  onClose: () => void;
+  onSelectSession: (sessionId: string) => void;
+  currentSessionId?: string | null;
+}
+
+export function SessionsDrawer({
+  isOpen,
+  onClose,
+  onSelectSession,
+  currentSessionId,
+}: SessionsDrawerProps) {
+  const { data, isLoading } = useGetV2ListSessions(
+    { limit: 100 },
+    {
+      query: {
+        enabled: isOpen,
+      },
+    },
+  );
+
+  const sessions =
+    data?.status === 200
+      ? data.data.sessions.filter((session) => {
+          // Filter out sessions without messages (sessions that were never updated)
+          // If updated_at equals created_at, the session was created but never had messages
+          return session.updated_at !== session.created_at;
+        })
+      : [];
+
+  function handleSelectSession(sessionId: string) {
+    onSelectSession(sessionId);
+    onClose();
+  }
+
+  return (
+    <Drawer.Root
+      open={isOpen}
+      onOpenChange={(open) => !open && onClose()}
+      direction="right"
+    >
+      <Drawer.Portal>
+        <Drawer.Overlay className="fixed inset-0 z-[60] bg-black/10 backdrop-blur-sm" />
+        <Drawer.Content
+          className={cn(
+            "fixed right-0 top-0 z-[70] flex h-full w-96 flex-col border-l border-zinc-200 bg-white",
+            scrollbarStyles,
+          )}
+        >
+          <div className="shrink-0 p-4">
+            <div className="flex items-center justify-between">
+              <Drawer.Title className="text-lg font-semibold">
+                Chat Sessions
+              </Drawer.Title>
+              <button
+                aria-label="Close"
+                onClick={onClose}
+                className="flex size-8 items-center justify-center rounded hover:bg-zinc-100"
+              >
+                <X width="1.25rem" height="1.25rem" />
+              </button>
+            </div>
+          </div>
+
+          <div className="flex-1 overflow-y-auto p-4">
+            {isLoading ? (
+              <div className="flex items-center justify-center py-8">
+                <Text variant="body" className="text-zinc-500">
+                  Loading sessions...
+                </Text>
+              </div>
+            ) : sessions.length === 0 ? (
+              <div className="flex h-full items-center justify-center">
+                <Text variant="body" className="text-zinc-500">
+                  You don&apos;t have previously started chats
+                </Text>
+              </div>
+            ) : (
+              <div className="space-y-2">
+                {sessions.map((session) => {
+                  const isActive = session.id === currentSessionId;
+                  const updatedAt = session.updated_at
+                    ? formatDistanceToNow(new Date(session.updated_at), {
+                        addSuffix: true,
+                      })
+                    : "";
+
+                  return (
+                    <button
+                      key={session.id}
+                      onClick={() => handleSelectSession(session.id)}
+                      className={cn(
+                        "w-full rounded-lg border p-3 text-left transition-colors",
+                        isActive
+                          ? "border-indigo-500 bg-zinc-50"
+                          : "border-zinc-200 bg-zinc-100/50 hover:border-zinc-300 hover:bg-zinc-50",
+                      )}
+                    >
+                      <div className="flex flex-col gap-1">
+                        <Text
+                          variant="body"
+                          className={cn(
+                            "font-medium",
+                            isActive ? "text-indigo-900" : "text-zinc-900",
+                          )}
+                        >
+                          {session.title || "Untitled Chat"}
+                        </Text>
+                        <div className="flex items-center gap-2 text-xs text-zinc-500">
+                          <span>{session.id.slice(0, 8)}...</span>
+                          {updatedAt && <span>•</span>}
+                          <span>{updatedAt}</span>
+                        </div>
+                      </div>
+                    </button>
+                  );
+                })}
+              </div>
+            )}
+          </div>
+        </Drawer.Content>
+      </Drawer.Portal>
+    </Drawer.Root>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/StreamingMessage/StreamingMessage.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/StreamingMessage/StreamingMessage.tsx
new file mode 100644
index 0000000000..5b1f8b1617
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/StreamingMessage/StreamingMessage.tsx
@@ -0,0 +1,35 @@
+import { cn } from "@/lib/utils";
+import { AIChatBubble } from "../AIChatBubble/AIChatBubble";
+import { MarkdownContent } from "../MarkdownContent/MarkdownContent";
+import { useStreamingMessage } from "./useStreamingMessage";
+
+export interface StreamingMessageProps {
+  chunks: string[];
+  className?: string;
+  onComplete?: () => void;
+}
+
+export function StreamingMessage({
+  chunks,
+  className,
+  onComplete,
+}: StreamingMessageProps) {
+  const { displayText } = useStreamingMessage({ chunks, onComplete });
+
+  return (
+    <div
+      className={cn(
+        "group relative flex w-full justify-start gap-3 px-4 py-3",
+        className,
+      )}
+    >
+      <div className="flex w-full max-w-3xl gap-3">
+        <div className="flex min-w-0 flex-1 flex-col">
+          <AIChatBubble>
+            <MarkdownContent content={displayText} />
+          </AIChatBubble>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/components/StreamingMessage/useStreamingMessage.ts b/autogpt_platform/frontend/src/components/contextual/Chat/components/StreamingMessage/useStreamingMessage.ts
similarity index 100%
rename from autogpt_platform/frontend/src/app/(platform)/chat/components/StreamingMessage/useStreamingMessage.ts
rename to autogpt_platform/frontend/src/components/contextual/Chat/components/StreamingMessage/useStreamingMessage.ts
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/ThinkingMessage/ThinkingMessage.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/ThinkingMessage/ThinkingMessage.tsx
new file mode 100644
index 0000000000..047c2277b0
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/ThinkingMessage/ThinkingMessage.tsx
@@ -0,0 +1,70 @@
+import { cn } from "@/lib/utils";
+import { useEffect, useRef, useState } from "react";
+import { AIChatBubble } from "../AIChatBubble/AIChatBubble";
+
+export interface ThinkingMessageProps {
+  className?: string;
+}
+
+export function ThinkingMessage({ className }: ThinkingMessageProps) {
+  const [showSlowLoader, setShowSlowLoader] = useState(false);
+  const [showCoffeeMessage, setShowCoffeeMessage] = useState(false);
+  const timerRef = useRef<NodeJS.Timeout | null>(null);
+  const coffeeTimerRef = useRef<NodeJS.Timeout | null>(null);
+
+  useEffect(() => {
+    if (timerRef.current === null) {
+      timerRef.current = setTimeout(() => {
+        setShowSlowLoader(true);
+      }, 8000);
+    }
+
+    if (coffeeTimerRef.current === null) {
+      coffeeTimerRef.current = setTimeout(() => {
+        setShowCoffeeMessage(true);
+      }, 10000);
+    }
+
+    return () => {
+      if (timerRef.current) {
+        clearTimeout(timerRef.current);
+        timerRef.current = null;
+      }
+      if (coffeeTimerRef.current) {
+        clearTimeout(coffeeTimerRef.current);
+        coffeeTimerRef.current = null;
+      }
+    };
+  }, []);
+
+  return (
+    <div
+      className={cn(
+        "group relative flex w-full justify-start gap-3 px-4 py-3",
+        className,
+      )}
+    >
+      <div className="flex w-full max-w-3xl gap-3">
+        <div className="flex min-w-0 flex-1 flex-col">
+          <AIChatBubble>
+            <div className="transition-all duration-500 ease-in-out">
+              {showCoffeeMessage ? (
+                <span className="inline-block animate-shimmer bg-gradient-to-r from-neutral-400 via-neutral-600 to-neutral-400 bg-[length:200%_100%] bg-clip-text text-transparent">
+                  This could take a few minutes, grab a coffee ☕️
+                </span>
+              ) : showSlowLoader ? (
+                <span className="inline-block animate-shimmer bg-gradient-to-r from-neutral-400 via-neutral-600 to-neutral-400 bg-[length:200%_100%] bg-clip-text text-transparent">
+                  Taking a bit more time...
+                </span>
+              ) : (
+                <span className="inline-block animate-shimmer bg-gradient-to-r from-neutral-400 via-neutral-600 to-neutral-400 bg-[length:200%_100%] bg-clip-text text-transparent">
+                  Thinking...
+                </span>
+              )}
+            </div>
+          </AIChatBubble>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/ToolCallMessage/ToolCallMessage.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/ToolCallMessage/ToolCallMessage.tsx
new file mode 100644
index 0000000000..67aa975f15
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/ToolCallMessage/ToolCallMessage.tsx
@@ -0,0 +1,55 @@
+import { Text } from "@/components/atoms/Text/Text";
+import { cn } from "@/lib/utils";
+import type { ToolArguments } from "@/types/chat";
+import { AIChatBubble } from "../AIChatBubble/AIChatBubble";
+import {
+  formatToolArguments,
+  getToolActionPhrase,
+  getToolIcon,
+} from "./helpers";
+
+export interface ToolCallMessageProps {
+  toolId?: string;
+  toolName: string;
+  arguments?: ToolArguments;
+  isStreaming?: boolean;
+  className?: string;
+}
+
+export function ToolCallMessage({
+  toolName,
+  arguments: toolArguments,
+  isStreaming = false,
+  className,
+}: ToolCallMessageProps) {
+  const actionPhrase = getToolActionPhrase(toolName);
+  const argumentsText = formatToolArguments(toolName, toolArguments);
+  const displayText = `${actionPhrase}${argumentsText}`;
+  const IconComponent = getToolIcon(toolName);
+
+  return (
+    <AIChatBubble className={className}>
+      <div className="flex items-center gap-2">
+        <IconComponent
+          size={14}
+          weight={isStreaming ? "regular" : "regular"}
+          className={cn(
+            "shrink-0",
+            isStreaming ? "text-neutral-500" : "text-neutral-400",
+          )}
+        />
+        <Text
+          variant="small"
+          className={cn(
+            "text-xs",
+            isStreaming
+              ? "bg-gradient-to-r from-neutral-600 via-neutral-500 to-neutral-600 bg-[length:200%_100%] bg-clip-text text-transparent [animation:shimmer_2s_ease-in-out_infinite]"
+              : "text-neutral-500",
+          )}
+        >
+          {displayText}
+        </Text>
+      </div>
+    </AIChatBubble>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/ToolCallMessage/helpers.ts b/autogpt_platform/frontend/src/components/contextual/Chat/components/ToolCallMessage/helpers.ts
new file mode 100644
index 0000000000..2f9f50b455
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/ToolCallMessage/helpers.ts
@@ -0,0 +1,184 @@
+import type { ToolArguments } from "@/types/chat";
+import {
+  BrainIcon,
+  EyeIcon,
+  FileMagnifyingGlassIcon,
+  FileTextIcon,
+  MagnifyingGlassIcon,
+  PackageIcon,
+  PencilLineIcon,
+  PlayIcon,
+  PlusIcon,
+  SquaresFourIcon,
+  type Icon,
+} from "@phosphor-icons/react";
+
+/**
+ * Maps internal tool names to human-friendly action phrases (present continuous).
+ * Used for tool call messages to indicate what action is currently happening.
+ *
+ * @param toolName - The internal tool name from the backend
+ * @returns A human-friendly action phrase in present continuous tense
+ */
+export function getToolActionPhrase(toolName: string): string {
+  const normalizedName = toolName.trim();
+  if (!normalizedName) return "Executing";
+  if (normalizedName.toLowerCase().startsWith("executing")) {
+    return normalizedName;
+  }
+  if (normalizedName.toLowerCase() === "unknown") return "Executing";
+  const toolActionPhrases: Record<string, string> = {
+    add_understanding: "Updating your business information",
+    create_agent: "Creating a new agent",
+    edit_agent: "Editing the agent",
+    find_agent: "Looking for agents in the marketplace",
+    find_block: "Searching for blocks",
+    find_library_agent: "Looking for library agents",
+    run_agent: "Running the agent",
+    run_block: "Running the block",
+    view_agent_output: "Retrieving agent output",
+    search_docs: "Searching documentation",
+    get_doc_page: "Loading documentation page",
+    agent_carousel: "Looking for agents in the marketplace",
+    execution_started: "Running the agent",
+    get_required_setup_info: "Getting setup requirements",
+    schedule_agent: "Scheduling the agent to run",
+  };
+
+  // Return mapped phrase or generate human-friendly fallback
+  return (
+    toolActionPhrases[toolName] ||
+    toolName
+      .replace(/_/g, " ")
+      .replace(/\b\w/g, (l) => l.toUpperCase())
+      .replace(/^/, "Executing ")
+  );
+}
+
+/**
+ * Formats tool call arguments into user-friendly text.
+ * Handles different tool types and formats their arguments nicely.
+ *
+ * @param toolName - The tool name
+ * @param args - The tool arguments
+ * @returns Formatted user-friendly text to append to action phrase
+ */
+export function formatToolArguments(
+  toolName: string,
+  args: ToolArguments | undefined,
+): string {
+  if (!args || Object.keys(args).length === 0) {
+    return "";
+  }
+
+  switch (toolName) {
+    case "find_agent":
+    case "find_library_agent":
+    case "agent_carousel":
+      if (args.query) {
+        return ` matching "${args.query as string}"`;
+      }
+      break;
+
+    case "find_block":
+      if (args.query) {
+        return ` matching "${args.query as string}"`;
+      }
+      break;
+
+    case "search_docs":
+      if (args.query) {
+        return ` for "${args.query as string}"`;
+      }
+      break;
+
+    case "get_doc_page":
+      if (args.path) {
+        return ` "${args.path as string}"`;
+      }
+      break;
+
+    case "run_agent":
+      if (args.username_agent_slug) {
+        return ` "${args.username_agent_slug as string}"`;
+      }
+      if (args.library_agent_id) {
+        return ` (library agent)`;
+      }
+      break;
+
+    case "run_block":
+      if (args.block_id) {
+        return ` "${args.block_id as string}"`;
+      }
+      break;
+
+    case "view_agent_output":
+      if (args.library_agent_id) {
+        return ` (library agent)`;
+      }
+      if (args.username_agent_slug) {
+        return ` "${args.username_agent_slug as string}"`;
+      }
+      break;
+
+    case "create_agent":
+    case "edit_agent":
+      if (args.name) {
+        return ` "${args.name as string}"`;
+      }
+      break;
+
+    case "add_understanding":
+      const understandingFields = Object.entries(args)
+        .filter(
+          ([_, value]) => value !== null && value !== undefined && value !== "",
+        )
+        .map(([key, value]) => {
+          if (key === "user_name" && typeof value === "string") {
+            return `for ${value}`;
+          }
+          if (typeof value === "string") {
+            return `${key}: ${value}`;
+          }
+          if (Array.isArray(value) && value.length > 0) {
+            return `${key}: ${value.slice(0, 2).join(", ")}${value.length > 2 ? ` (+${value.length - 2} more)` : ""}`;
+          }
+          return key;
+        });
+      if (understandingFields.length > 0) {
+        return ` ${understandingFields[0]}`;
+      }
+      break;
+  }
+
+  return "";
+}
+
+/**
+ * Maps tool names to their corresponding Phosphor icon components.
+ *
+ * @param toolName - The tool name from the backend
+ * @returns The Icon component for the tool
+ */
+export function getToolIcon(toolName: string): Icon {
+  const iconMap: Record<string, Icon> = {
+    add_understanding: BrainIcon,
+    create_agent: PlusIcon,
+    edit_agent: PencilLineIcon,
+    find_agent: SquaresFourIcon,
+    find_library_agent: MagnifyingGlassIcon,
+    find_block: PackageIcon,
+    run_agent: PlayIcon,
+    run_block: PlayIcon,
+    view_agent_output: EyeIcon,
+    search_docs: FileMagnifyingGlassIcon,
+    get_doc_page: FileTextIcon,
+    agent_carousel: MagnifyingGlassIcon,
+    execution_started: PlayIcon,
+    get_required_setup_info: SquaresFourIcon,
+    schedule_agent: PlayIcon,
+  };
+
+  return iconMap[toolName] || SquaresFourIcon;
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/ToolResponseMessage/ToolResponseMessage.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/ToolResponseMessage/ToolResponseMessage.tsx
new file mode 100644
index 0000000000..27da02beb8
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/ToolResponseMessage/ToolResponseMessage.tsx
@@ -0,0 +1,53 @@
+import { Text } from "@/components/atoms/Text/Text";
+import { cn } from "@/lib/utils";
+import type { ToolResult } from "@/types/chat";
+import { WarningCircleIcon } from "@phosphor-icons/react";
+import { AIChatBubble } from "../AIChatBubble/AIChatBubble";
+import { MarkdownContent } from "../MarkdownContent/MarkdownContent";
+import {
+  formatToolResponse,
+  getErrorMessage,
+  isErrorResponse,
+} from "./helpers";
+
+export interface ToolResponseMessageProps {
+  toolId?: string;
+  toolName: string;
+  result?: ToolResult;
+  success?: boolean;
+  className?: string;
+}
+
+export function ToolResponseMessage({
+  toolId: _toolId,
+  toolName,
+  result,
+  success: _success,
+  className,
+}: ToolResponseMessageProps) {
+  if (isErrorResponse(result)) {
+    const errorMessage = getErrorMessage(result);
+    return (
+      <AIChatBubble className={className}>
+        <div className="flex items-center gap-2">
+          <WarningCircleIcon
+            size={14}
+            weight="regular"
+            className="shrink-0 text-neutral-400"
+          />
+          <Text variant="small" className={cn("text-xs text-neutral-500")}>
+            {errorMessage}
+          </Text>
+        </div>
+      </AIChatBubble>
+    );
+  }
+
+  const formattedText = formatToolResponse(result, toolName);
+
+  return (
+    <AIChatBubble className={className}>
+      <MarkdownContent content={formattedText} />
+    </AIChatBubble>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/ToolResponseMessage/helpers.ts b/autogpt_platform/frontend/src/components/contextual/Chat/components/ToolResponseMessage/helpers.ts
new file mode 100644
index 0000000000..2397176603
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/ToolResponseMessage/helpers.ts
@@ -0,0 +1,392 @@
+function stripInternalReasoning(content: string): string {
+  return content
+    .replace(/<internal_reasoning>[\s\S]*?<\/internal_reasoning>/gi, "")
+    .replace(/<thinking>[\s\S]*?<\/thinking>/gi, "")
+    .replace(/\n{3,}/g, "\n\n")
+    .trim();
+}
+
+export function isErrorResponse(result: unknown): boolean {
+  if (typeof result === "string") {
+    const lower = result.toLowerCase();
+    return (
+      lower.startsWith("error:") ||
+      lower.includes("not found") ||
+      lower.includes("does not exist") ||
+      lower.includes("failed to") ||
+      lower.includes("unable to")
+    );
+  }
+  if (typeof result === "object" && result !== null) {
+    const response = result as Record<string, unknown>;
+    return response.type === "error" || response.error !== undefined;
+  }
+  return false;
+}
+
+export function getErrorMessage(result: unknown): string {
+  if (typeof result === "string") {
+    return stripInternalReasoning(result.replace(/^error:\s*/i, ""));
+  }
+  if (typeof result === "object" && result !== null) {
+    const response = result as Record<string, unknown>;
+    if (response.message)
+      return stripInternalReasoning(String(response.message));
+    if (response.error) return stripInternalReasoning(String(response.error));
+  }
+  return "An error occurred";
+}
+
+/**
+ * Check if a value is a workspace file reference.
+ */
+function isWorkspaceRef(value: unknown): value is string {
+  return typeof value === "string" && value.startsWith("workspace://");
+}
+
+/**
+ * Check if a workspace reference appears to be an image based on common patterns.
+ * Since workspace refs don't have extensions, we check the context or assume image
+ * for certain block types.
+ *
+ * TODO: Replace keyword matching with MIME type encoded in workspace ref.
+ * e.g., workspace://abc123#image/png or workspace://abc123#video/mp4
+ * This would let frontend render correctly without fragile keyword matching.
+ */
+function isLikelyImageRef(value: string, outputKey?: string): boolean {
+  if (!isWorkspaceRef(value)) return false;
+
+  // Check output key name for video-related hints (these are NOT images)
+  const videoKeywords = ["video", "mp4", "mov", "avi", "webm", "movie", "clip"];
+  if (outputKey) {
+    const lowerKey = outputKey.toLowerCase();
+    if (videoKeywords.some((kw) => lowerKey.includes(kw))) {
+      return false;
+    }
+  }
+
+  // Check output key name for image-related hints
+  const imageKeywords = [
+    "image",
+    "img",
+    "photo",
+    "picture",
+    "thumbnail",
+    "avatar",
+    "icon",
+    "screenshot",
+  ];
+  if (outputKey) {
+    const lowerKey = outputKey.toLowerCase();
+    if (imageKeywords.some((kw) => lowerKey.includes(kw))) {
+      return true;
+    }
+  }
+
+  // Default to treating workspace refs as potential images
+  // since that's the most common case for generated content
+  return true;
+}
+
+/**
+ * Format a single output value, converting workspace refs to markdown images.
+ */
+function formatOutputValue(value: unknown, outputKey?: string): string {
+  if (isWorkspaceRef(value) && isLikelyImageRef(value, outputKey)) {
+    // Format as markdown image
+    return `![${outputKey || "Generated image"}](${value})`;
+  }
+
+  if (typeof value === "string") {
+    // Check for data URIs (images)
+    if (value.startsWith("data:image/")) {
+      return `![${outputKey || "Generated image"}](${value})`;
+    }
+    return value;
+  }
+
+  if (Array.isArray(value)) {
+    return value
+      .map((item, idx) => formatOutputValue(item, `${outputKey}_${idx}`))
+      .join("\n\n");
+  }
+
+  if (typeof value === "object" && value !== null) {
+    return JSON.stringify(value, null, 2);
+  }
+
+  return String(value);
+}
+
+function getToolCompletionPhrase(toolName: string): string {
+  const toolCompletionPhrases: Record<string, string> = {
+    add_understanding: "Updated your business information",
+    create_agent: "Created the agent",
+    edit_agent: "Updated the agent",
+    find_agent: "Found agents in the marketplace",
+    find_block: "Found blocks",
+    find_library_agent: "Found library agents",
+    run_agent: "Started agent execution",
+    run_block: "Executed the block",
+    view_agent_output: "Retrieved agent output",
+    search_docs: "Found documentation",
+    get_doc_page: "Loaded documentation page",
+  };
+
+  // Return mapped phrase or generate human-friendly fallback
+  return (
+    toolCompletionPhrases[toolName] ||
+    `Completed ${toolName.replace(/_/g, " ").replace("...", "")}`
+  );
+}
+
+export function formatToolResponse(result: unknown, toolName: string): string {
+  if (typeof result === "string") {
+    const trimmed = result.trim();
+    if (trimmed.startsWith("{") && trimmed.endsWith("}")) {
+      try {
+        const parsed = JSON.parse(trimmed);
+        return formatToolResponse(parsed, toolName);
+      } catch {
+        return stripInternalReasoning(trimmed);
+      }
+    }
+    return stripInternalReasoning(result);
+  }
+
+  if (typeof result !== "object" || result === null) {
+    return String(result);
+  }
+
+  const response = result as Record<string, unknown>;
+
+  // Handle different response types
+  const responseType = response.type as string | undefined;
+
+  if (!responseType) {
+    if (response.message) {
+      return String(response.message);
+    }
+    return getToolCompletionPhrase(toolName);
+  }
+
+  switch (responseType) {
+    case "agents_found":
+      const agents = (response.agents as Array<{ name: string }>) || [];
+      const count =
+        typeof response.count === "number" && !isNaN(response.count)
+          ? response.count
+          : agents.length;
+      if (count === 0) {
+        return "No agents found matching your search.";
+      }
+      return `Found ${count} agent${count === 1 ? "" : "s"}: ${agents
+        .slice(0, 3)
+        .map((a) => a.name)
+        .join(", ")}${count > 3 ? ` and ${count - 3} more` : ""}`;
+
+    case "agent_details":
+      const agent = response.agent as { name: string; description?: string };
+      if (agent) {
+        return `Agent: ${agent.name}${agent.description ? `\n\n${agent.description}` : ""}`;
+      }
+      break;
+
+    case "block_list":
+      const blocks = (response.blocks as Array<{ name: string }>) || [];
+      const blockCount =
+        typeof response.count === "number" && !isNaN(response.count)
+          ? response.count
+          : blocks.length;
+      if (blockCount === 0) {
+        return "No blocks found matching your search.";
+      }
+      return `Found ${blockCount} block${blockCount === 1 ? "" : "s"}: ${blocks
+        .slice(0, 3)
+        .map((b) => b.name)
+        .join(", ")}${blockCount > 3 ? ` and ${blockCount - 3} more` : ""}`;
+
+    case "block_output":
+      const blockName = (response.block_name as string) || "Block";
+      const outputs = response.outputs as Record<string, unknown[]> | undefined;
+      if (outputs && Object.keys(outputs).length > 0) {
+        const formattedOutputs: string[] = [];
+
+        for (const [key, values] of Object.entries(outputs)) {
+          if (!Array.isArray(values) || values.length === 0) continue;
+
+          // Format each value in the output array
+          for (const value of values) {
+            const formatted = formatOutputValue(value, key);
+            if (formatted) {
+              formattedOutputs.push(formatted);
+            }
+          }
+        }
+
+        if (formattedOutputs.length > 0) {
+          return `${blockName} executed successfully.\n\n${formattedOutputs.join("\n\n")}`;
+        }
+        return `${blockName} executed successfully.`;
+      }
+      return `${blockName} executed successfully.`;
+
+    case "doc_search_results":
+      const docResults = (response.results as Array<{ title: string }>) || [];
+      const docCount =
+        typeof response.count === "number" && !isNaN(response.count)
+          ? response.count
+          : docResults.length;
+      if (docCount === 0) {
+        return "No documentation found matching your search.";
+      }
+      return `Found ${docCount} documentation result${docCount === 1 ? "" : "s"}: ${docResults
+        .slice(0, 3)
+        .map((r) => r.title)
+        .join(", ")}${docCount > 3 ? ` and ${docCount - 3} more` : ""}`;
+
+    case "doc_page":
+      const title = (response.title as string) || "Documentation";
+      const content = (response.content as string) || "";
+      if (content) {
+        const preview = content.substring(0, 200).trim();
+        return `${title}\n\n${preview}${content.length > 200 ? "..." : ""}`;
+      }
+      return title;
+
+    case "understanding_updated":
+      const currentUnderstanding = response.current_understanding as
+        | Record<string, unknown>
+        | undefined;
+      const fields = (response.updated_fields as string[]) || [];
+
+      if (response.message && typeof response.message === "string") {
+        let message = response.message;
+        if (currentUnderstanding) {
+          for (const [key, value] of Object.entries(currentUnderstanding)) {
+            if (value !== null && value !== undefined && value !== "") {
+              const placeholder = key;
+              const actualValue = String(value);
+              message = message.replace(
+                new RegExp(`\\b${placeholder}\\b`, "g"),
+                actualValue,
+              );
+            }
+          }
+        }
+        return message;
+      }
+
+      if (
+        currentUnderstanding &&
+        Object.keys(currentUnderstanding).length > 0
+      ) {
+        const understandingEntries = Object.entries(currentUnderstanding)
+          .filter(
+            ([_, value]) =>
+              value !== null && value !== undefined && value !== "",
+          )
+          .map(([key, value]) => {
+            if (key === "user_name" && typeof value === "string") {
+              return `Updated information for ${value}`;
+            }
+            return `${key}: ${String(value)}`;
+          });
+        if (understandingEntries.length > 0) {
+          return understandingEntries[0];
+        }
+      }
+      if (fields.length > 0) {
+        return `Updated business information: ${fields.join(", ")}`;
+      }
+      return "Updated your business information.";
+
+    case "agent_saved":
+      const agentName = (response.agent_name as string) || "Agent";
+      return `Successfully saved "${agentName}" to your library.`;
+
+    case "agent_preview":
+      const previewAgentName = (response.agent_name as string) || "Agent";
+      const nodeCount = (response.node_count as number) || 0;
+      const linkCount = (response.link_count as number) || 0;
+      const description = (response.description as string) || "";
+      let previewText = `Preview: "${previewAgentName}"`;
+      if (description) {
+        previewText += `\n\n${description}`;
+      }
+      previewText += `\n\n${nodeCount} node${nodeCount === 1 ? "" : "s"}, ${linkCount} link${linkCount === 1 ? "" : "s"}`;
+      return previewText;
+
+    case "clarification_needed":
+      const questions =
+        (response.questions as Array<{ question: string }>) || [];
+      if (questions.length === 0) {
+        return response.message
+          ? String(response.message)
+          : "I need more information to proceed.";
+      }
+      if (questions.length === 1) {
+        return questions[0].question;
+      }
+      return `I need clarification on ${questions.length} points:\n\n${questions
+        .map((q, i) => `${i + 1}. ${q.question}`)
+        .join("\n")}`;
+
+    case "agent_output":
+      if (response.message) {
+        return String(response.message);
+      }
+      const outputAgentName = (response.agent_name as string) || "Agent";
+      const execution = response.execution as
+        | {
+            status?: string;
+            outputs?: Record<string, unknown>;
+          }
+        | undefined;
+      if (execution) {
+        const status = execution.status || "completed";
+        const outputs = execution.outputs || {};
+        const outputKeys = Object.keys(outputs);
+        if (outputKeys.length > 0) {
+          return `${outputAgentName} execution ${status}. Outputs: ${outputKeys.join(", ")}`;
+        }
+        return `${outputAgentName} execution ${status}.`;
+      }
+      return `${outputAgentName} output retrieved.`;
+
+    case "execution_started":
+      const execAgentName = (response.graph_name as string) || "Agent";
+      if (response.message) {
+        return String(response.message);
+      }
+      return `Started execution of "${execAgentName}".`;
+
+    case "error":
+      const errorMsg =
+        (response.message as string) || response.error || "An error occurred";
+      return stripInternalReasoning(String(errorMsg));
+
+    case "no_results":
+      const suggestions = (response.suggestions as string[]) || [];
+      let noResultsText = (response.message as string) || "No results found.";
+      if (suggestions.length > 0) {
+        noResultsText += `\n\nSuggestions: ${suggestions.join(", ")}`;
+      }
+      return noResultsText;
+
+    default:
+      // Try to extract a message field
+      if (response.message) {
+        return String(response.message);
+      }
+      // Fallback: try to stringify nicely
+      if (Object.keys(response).length === 0) {
+        return getToolCompletionPhrase(toolName);
+      }
+      // If we have a response object but no recognized type, try to format it nicely
+      // Don't return raw JSON - return a completion phrase instead
+      return getToolCompletionPhrase(toolName);
+  }
+
+  return getToolCompletionPhrase(toolName);
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/components/UserChatBubble/UserChatBubble.tsx b/autogpt_platform/frontend/src/components/contextual/Chat/components/UserChatBubble/UserChatBubble.tsx
new file mode 100644
index 0000000000..39a6cb36ad
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/components/UserChatBubble/UserChatBubble.tsx
@@ -0,0 +1,25 @@
+import { cn } from "@/lib/utils";
+import { ReactNode } from "react";
+
+export interface UserChatBubbleProps {
+  children: ReactNode;
+  className?: string;
+}
+
+export function UserChatBubble({ children, className }: UserChatBubbleProps) {
+  return (
+    <div
+      className={cn(
+        "group relative min-w-20 overflow-hidden rounded-xl bg-purple-100 px-3 text-left text-[1rem] leading-relaxed transition-all duration-500 ease-in-out",
+        className,
+      )}
+      style={{
+        borderBottomRightRadius: 0,
+      }}
+    >
+      <div className="relative z-10 text-slate-900 transition-all duration-500 ease-in-out">
+        {children}
+      </div>
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/stream-executor.ts b/autogpt_platform/frontend/src/components/contextual/Chat/stream-executor.ts
new file mode 100644
index 0000000000..8f4c8f9fec
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/stream-executor.ts
@@ -0,0 +1,255 @@
+import { INITIAL_STREAM_ID } from "./chat-constants";
+import type {
+  ActiveStream,
+  StreamChunk,
+  VercelStreamChunk,
+} from "./chat-types";
+import {
+  INITIAL_RETRY_DELAY,
+  MAX_RETRIES,
+  normalizeStreamChunk,
+  parseSSELine,
+} from "./stream-utils";
+
+function notifySubscribers(
+  stream: ActiveStream,
+  chunk: StreamChunk,
+  skipStore = false,
+) {
+  if (!skipStore) {
+    stream.chunks.push(chunk);
+  }
+  for (const callback of stream.onChunkCallbacks) {
+    try {
+      callback(chunk);
+    } catch (err) {
+      console.warn("[StreamExecutor] Subscriber callback error:", err);
+    }
+  }
+}
+
+interface StreamExecutionOptions {
+  stream: ActiveStream;
+  mode: "new" | "reconnect";
+  message?: string;
+  isUserMessage?: boolean;
+  context?: { url: string; content: string };
+  taskId?: string;
+  lastMessageId?: string;
+  retryCount?: number;
+}
+
+async function executeStreamInternal(
+  options: StreamExecutionOptions,
+): Promise<void> {
+  const {
+    stream,
+    mode,
+    message,
+    isUserMessage,
+    context,
+    taskId,
+    lastMessageId = INITIAL_STREAM_ID,
+    retryCount = 0,
+  } = options;
+
+  const { sessionId, abortController } = stream;
+  const isReconnect = mode === "reconnect";
+
+  if (isReconnect) {
+    if (!taskId) {
+      throw new Error("taskId is required for reconnect mode");
+    }
+    if (lastMessageId === null || lastMessageId === undefined) {
+      throw new Error("lastMessageId is required for reconnect mode");
+    }
+  } else {
+    if (!message) {
+      throw new Error("message is required for new stream mode");
+    }
+    if (isUserMessage === undefined) {
+      throw new Error("isUserMessage is required for new stream mode");
+    }
+  }
+
+  try {
+    let url: string;
+    let fetchOptions: RequestInit;
+
+    if (isReconnect) {
+      url = `/api/chat/tasks/${taskId}/stream?last_message_id=${encodeURIComponent(lastMessageId)}`;
+      fetchOptions = {
+        method: "GET",
+        headers: {
+          Accept: "text/event-stream",
+        },
+        signal: abortController.signal,
+      };
+    } else {
+      url = `/api/chat/sessions/${sessionId}/stream`;
+      fetchOptions = {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Accept: "text/event-stream",
+        },
+        body: JSON.stringify({
+          message,
+          is_user_message: isUserMessage,
+          context: context || null,
+        }),
+        signal: abortController.signal,
+      };
+    }
+
+    const response = await fetch(url, fetchOptions);
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      let errorCode: string | undefined;
+      let errorMessage = errorText || `HTTP ${response.status}`;
+      try {
+        const parsed = JSON.parse(errorText);
+        if (parsed.detail) {
+          const detail =
+            typeof parsed.detail === "string"
+              ? parsed.detail
+              : parsed.detail.message || JSON.stringify(parsed.detail);
+          errorMessage = detail;
+          errorCode =
+            typeof parsed.detail === "object" ? parsed.detail.code : undefined;
+        }
+      } catch {}
+
+      const isPermanentError =
+        isReconnect &&
+        (response.status === 404 ||
+          response.status === 403 ||
+          response.status === 410);
+
+      const error = new Error(errorMessage) as Error & {
+        status?: number;
+        isPermanent?: boolean;
+        taskErrorCode?: string;
+      };
+      error.status = response.status;
+      error.isPermanent = isPermanentError;
+      error.taskErrorCode = errorCode;
+      throw error;
+    }
+
+    if (!response.body) {
+      throw new Error("Response body is null");
+    }
+
+    const reader = response.body.getReader();
+    const decoder = new TextDecoder();
+    let buffer = "";
+
+    while (true) {
+      const { done, value } = await reader.read();
+
+      if (done) {
+        notifySubscribers(stream, { type: "stream_end" });
+        stream.status = "completed";
+        return;
+      }
+
+      buffer += decoder.decode(value, { stream: true });
+      const lines = buffer.split("\n");
+      buffer = lines.pop() || "";
+
+      for (const line of lines) {
+        const data = parseSSELine(line);
+        if (data !== null) {
+          if (data === "[DONE]") {
+            notifySubscribers(stream, { type: "stream_end" });
+            stream.status = "completed";
+            return;
+          }
+
+          try {
+            const rawChunk = JSON.parse(data) as
+              | StreamChunk
+              | VercelStreamChunk;
+            const chunk = normalizeStreamChunk(rawChunk);
+            if (!chunk) continue;
+
+            notifySubscribers(stream, chunk);
+
+            if (chunk.type === "stream_end") {
+              stream.status = "completed";
+              return;
+            }
+
+            if (chunk.type === "error") {
+              stream.status = "error";
+              stream.error = new Error(
+                chunk.message || chunk.content || "Stream error",
+              );
+              return;
+            }
+          } catch {}
+        }
+      }
+    }
+  } catch (err) {
+    if (err instanceof Error && err.name === "AbortError") {
+      notifySubscribers(stream, { type: "stream_end" });
+      stream.status = "completed";
+      return;
+    }
+
+    const isPermanentError =
+      err instanceof Error &&
+      (err as Error & { isPermanent?: boolean }).isPermanent;
+
+    if (!isPermanentError && retryCount < MAX_RETRIES) {
+      const retryDelay = INITIAL_RETRY_DELAY * Math.pow(2, retryCount);
+      await new Promise((resolve) => setTimeout(resolve, retryDelay));
+      return executeStreamInternal({
+        ...options,
+        retryCount: retryCount + 1,
+      });
+    }
+
+    stream.status = "error";
+    stream.error = err instanceof Error ? err : new Error("Stream failed");
+    notifySubscribers(stream, {
+      type: "error",
+      message: stream.error.message,
+    });
+  }
+}
+
+export async function executeStream(
+  stream: ActiveStream,
+  message: string,
+  isUserMessage: boolean,
+  context?: { url: string; content: string },
+  retryCount: number = 0,
+): Promise<void> {
+  return executeStreamInternal({
+    stream,
+    mode: "new",
+    message,
+    isUserMessage,
+    context,
+    retryCount,
+  });
+}
+
+export async function executeTaskReconnect(
+  stream: ActiveStream,
+  taskId: string,
+  lastMessageId: string = INITIAL_STREAM_ID,
+  retryCount: number = 0,
+): Promise<void> {
+  return executeStreamInternal({
+    stream,
+    mode: "reconnect",
+    taskId,
+    lastMessageId,
+    retryCount,
+  });
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/stream-utils.ts b/autogpt_platform/frontend/src/components/contextual/Chat/stream-utils.ts
new file mode 100644
index 0000000000..253e47b874
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/stream-utils.ts
@@ -0,0 +1,89 @@
+import type { ToolArguments, ToolResult } from "@/types/chat";
+import type { StreamChunk, VercelStreamChunk } from "./chat-types";
+
+const LEGACY_STREAM_TYPES = new Set<StreamChunk["type"]>([
+  "text_chunk",
+  "text_ended",
+  "tool_call",
+  "tool_call_start",
+  "tool_response",
+  "login_needed",
+  "need_login",
+  "credentials_needed",
+  "error",
+  "usage",
+  "stream_end",
+]);
+
+export function isLegacyStreamChunk(
+  chunk: StreamChunk | VercelStreamChunk,
+): chunk is StreamChunk {
+  return LEGACY_STREAM_TYPES.has(chunk.type as StreamChunk["type"]);
+}
+
+export function normalizeStreamChunk(
+  chunk: StreamChunk | VercelStreamChunk,
+): StreamChunk | null {
+  if (isLegacyStreamChunk(chunk)) return chunk;
+
+  switch (chunk.type) {
+    case "text-delta":
+      // Vercel AI SDK sends "delta" for text content
+      return { type: "text_chunk", content: chunk.delta };
+    case "text-end":
+      return { type: "text_ended" };
+    case "tool-input-available":
+      return {
+        type: "tool_call_start",
+        tool_id: chunk.toolCallId,
+        tool_name: chunk.toolName,
+        arguments: chunk.input as ToolArguments,
+      };
+    case "tool-output-available":
+      return {
+        type: "tool_response",
+        tool_id: chunk.toolCallId,
+        tool_name: chunk.toolName,
+        result: chunk.output as ToolResult,
+        success: chunk.success ?? true,
+      };
+    case "usage":
+      return {
+        type: "usage",
+        promptTokens: chunk.promptTokens,
+        completionTokens: chunk.completionTokens,
+        totalTokens: chunk.totalTokens,
+      };
+    case "error":
+      return {
+        type: "error",
+        message: chunk.errorText,
+        code: chunk.code,
+        details: chunk.details,
+      };
+    case "finish":
+      return { type: "stream_end" };
+    case "start":
+      // Start event with optional taskId for reconnection
+      return chunk.taskId
+        ? { type: "stream_start", taskId: chunk.taskId }
+        : null;
+    case "text-start":
+      return null;
+    case "tool-input-start":
+      return {
+        type: "tool_call_start",
+        tool_id: chunk.toolCallId,
+        tool_name: chunk.toolName,
+        arguments: {},
+      };
+  }
+}
+
+export const MAX_RETRIES = 3;
+export const INITIAL_RETRY_DELAY = 1000;
+
+export function parseSSELine(line: string): string | null {
+  if (line.startsWith("data: ")) return line.slice(6);
+  return null;
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/useChat.ts b/autogpt_platform/frontend/src/components/contextual/Chat/useChat.ts
new file mode 100644
index 0000000000..124301abc4
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/useChat.ts
@@ -0,0 +1,100 @@
+"use client";
+
+import { useSupabase } from "@/lib/supabase/hooks/useSupabase";
+import { useEffect, useRef, useState } from "react";
+import { useChatSession } from "./useChatSession";
+import { useChatStream } from "./useChatStream";
+
+interface UseChatArgs {
+  urlSessionId?: string | null;
+}
+
+export function useChat({ urlSessionId }: UseChatArgs = {}) {
+  const hasClaimedSessionRef = useRef(false);
+  const { user } = useSupabase();
+  const { sendMessage: sendStreamMessage } = useChatStream();
+  const [showLoader, setShowLoader] = useState(false);
+  const {
+    session,
+    sessionId: sessionIdFromHook,
+    messages,
+    isLoading,
+    isCreating,
+    error,
+    isSessionNotFound,
+    createSession,
+    claimSession,
+    clearSession: clearSessionBase,
+    loadSession,
+    startPollingForOperation,
+  } = useChatSession({
+    urlSessionId,
+    autoCreate: false,
+  });
+
+  useEffect(
+    function autoClaimSession() {
+      if (
+        session &&
+        !session.user_id &&
+        user &&
+        !hasClaimedSessionRef.current &&
+        !isLoading &&
+        sessionIdFromHook
+      ) {
+        hasClaimedSessionRef.current = true;
+        claimSession(sessionIdFromHook)
+          .then(() => {
+            sendStreamMessage(
+              sessionIdFromHook,
+              "User has successfully logged in.",
+              () => {},
+              false,
+            ).catch(() => {});
+          })
+          .catch(() => {
+            hasClaimedSessionRef.current = false;
+          });
+      }
+    },
+    [
+      session,
+      user,
+      isLoading,
+      sessionIdFromHook,
+      claimSession,
+      sendStreamMessage,
+    ],
+  );
+
+  useEffect(
+    function showLoaderWithDelay() {
+      if (isLoading || isCreating) {
+        const timer = setTimeout(() => setShowLoader(true), 300);
+        return () => clearTimeout(timer);
+      }
+      setShowLoader(false);
+    },
+    [isLoading, isCreating],
+  );
+
+  function clearSession() {
+    clearSessionBase();
+    hasClaimedSessionRef.current = false;
+  }
+
+  return {
+    session,
+    messages,
+    isLoading,
+    isCreating,
+    error,
+    isSessionNotFound,
+    createSession,
+    clearSession,
+    loadSession,
+    sessionId: sessionIdFromHook,
+    showLoader,
+    startPollingForOperation,
+  };
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/useChatSession.ts b/autogpt_platform/frontend/src/components/contextual/Chat/useChatSession.ts
new file mode 100644
index 0000000000..936a49936c
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/useChatSession.ts
@@ -0,0 +1,385 @@
+import {
+  getGetV2GetSessionQueryKey,
+  getGetV2GetSessionQueryOptions,
+  getGetV2ListSessionsQueryKey,
+  postV2CreateSession,
+  useGetV2GetSession,
+  usePatchV2SessionAssignUser,
+  usePostV2CreateSession,
+} from "@/app/api/__generated__/endpoints/chat/chat";
+import type { SessionDetailResponse } from "@/app/api/__generated__/models/sessionDetailResponse";
+import { okData } from "@/app/api/helpers";
+import { isValidUUID } from "@/lib/utils";
+import { useQueryClient } from "@tanstack/react-query";
+import { useEffect, useMemo, useRef, useState } from "react";
+import { toast } from "sonner";
+
+interface UseChatSessionArgs {
+  urlSessionId?: string | null;
+  autoCreate?: boolean;
+}
+
+export function useChatSession({
+  urlSessionId,
+  autoCreate = false,
+}: UseChatSessionArgs = {}) {
+  const queryClient = useQueryClient();
+  const [sessionId, setSessionId] = useState<string | null>(null);
+  const [error, setError] = useState<Error | null>(null);
+  const justCreatedSessionIdRef = useRef<string | null>(null);
+
+  useEffect(() => {
+    if (urlSessionId) {
+      if (!isValidUUID(urlSessionId)) {
+        console.error("Invalid session ID format:", urlSessionId);
+        toast.error("Invalid session ID", {
+          description:
+            "The session ID in the URL is not valid. Starting a new session...",
+        });
+        setSessionId(null);
+        return;
+      }
+      setSessionId(urlSessionId);
+    } else if (autoCreate) {
+      setSessionId(null);
+    } else {
+      setSessionId(null);
+    }
+  }, [urlSessionId, autoCreate]);
+
+  const { isPending: isCreating, error: createError } =
+    usePostV2CreateSession();
+
+  const {
+    data: sessionData,
+    isLoading: isLoadingSession,
+    error: loadError,
+    refetch,
+  } = useGetV2GetSession(sessionId || "", {
+    query: {
+      enabled: !!sessionId,
+      select: okData,
+      staleTime: 0,
+      retry: shouldRetrySessionLoad,
+      retryDelay: getSessionRetryDelay,
+    },
+  });
+
+  const { mutateAsync: claimSessionMutation } = usePatchV2SessionAssignUser();
+
+  const session = useMemo(() => {
+    if (sessionData) return sessionData;
+
+    if (sessionId && justCreatedSessionIdRef.current === sessionId) {
+      return {
+        id: sessionId,
+        user_id: null,
+        messages: [],
+        created_at: new Date().toISOString(),
+        updated_at: new Date().toISOString(),
+      } as SessionDetailResponse;
+    }
+    return null;
+  }, [sessionData, sessionId]);
+
+  const messages = session?.messages || [];
+  const isLoading = isCreating || isLoadingSession;
+
+  useEffect(() => {
+    if (createError) {
+      setError(
+        createError instanceof Error
+          ? createError
+          : new Error("Failed to create session"),
+      );
+    } else if (loadError) {
+      setError(
+        loadError instanceof Error
+          ? loadError
+          : new Error("Failed to load session"),
+      );
+    } else {
+      setError(null);
+    }
+  }, [createError, loadError]);
+
+  // Track if we should be polling (set by external callers when they receive operation_started via SSE)
+  const [forcePolling, setForcePolling] = useState(false);
+  // Track if we've seen server acknowledge the pending operation (to avoid clearing forcePolling prematurely)
+  const hasSeenServerPendingRef = useRef(false);
+
+  // Check if there are any pending operations in the messages
+  // Must check all operation types: operation_pending, operation_started, operation_in_progress
+  const hasPendingOperationsFromServer = useMemo(() => {
+    if (!messages || messages.length === 0) return false;
+    const pendingTypes = new Set([
+      "operation_pending",
+      "operation_in_progress",
+      "operation_started",
+    ]);
+    return messages.some((msg) => {
+      if (msg.role !== "tool" || !msg.content) return false;
+      try {
+        const content =
+          typeof msg.content === "string"
+            ? JSON.parse(msg.content)
+            : msg.content;
+        return pendingTypes.has(content?.type);
+      } catch {
+        return false;
+      }
+    });
+  }, [messages]);
+
+  // Track when server has acknowledged the pending operation
+  useEffect(() => {
+    if (hasPendingOperationsFromServer) {
+      hasSeenServerPendingRef.current = true;
+    }
+  }, [hasPendingOperationsFromServer]);
+
+  // Combined: poll if server has pending ops OR if we received operation_started via SSE
+  const hasPendingOperations = hasPendingOperationsFromServer || forcePolling;
+
+  // Clear forcePolling only after server has acknowledged AND completed the operation
+  useEffect(() => {
+    if (
+      forcePolling &&
+      !hasPendingOperationsFromServer &&
+      hasSeenServerPendingRef.current
+    ) {
+      // Server acknowledged the operation and it's now complete
+      setForcePolling(false);
+      hasSeenServerPendingRef.current = false;
+    }
+  }, [forcePolling, hasPendingOperationsFromServer]);
+
+  // Function to trigger polling (called when operation_started is received via SSE)
+  function startPollingForOperation() {
+    setForcePolling(true);
+    hasSeenServerPendingRef.current = false; // Reset for new operation
+  }
+
+  // Refresh sessions list when a pending operation completes
+  // (hasPendingOperations transitions from true to false)
+  const prevHasPendingOperationsRef = useRef(hasPendingOperations);
+  useEffect(
+    function refreshSessionsListOnOperationComplete() {
+      const wasHasPending = prevHasPendingOperationsRef.current;
+      prevHasPendingOperationsRef.current = hasPendingOperations;
+
+      // Only invalidate when transitioning from pending to not pending
+      if (wasHasPending && !hasPendingOperations && sessionId) {
+        queryClient.invalidateQueries({
+          queryKey: getGetV2ListSessionsQueryKey(),
+        });
+      }
+    },
+    [hasPendingOperations, sessionId, queryClient],
+  );
+
+  // Poll for updates when there are pending operations
+  // Backoff: 2s, 4s, 6s, 8s, 10s, ... up to 30s max
+  const pollAttemptRef = useRef(0);
+  const hasPendingOperationsRef = useRef(hasPendingOperations);
+  hasPendingOperationsRef.current = hasPendingOperations;
+
+  useEffect(
+    function pollForPendingOperations() {
+      if (!sessionId || !hasPendingOperations) {
+        pollAttemptRef.current = 0;
+        return;
+      }
+
+      let cancelled = false;
+      let timeoutId: ReturnType<typeof setTimeout> | null = null;
+
+      function schedule() {
+        // 2s, 4s, 6s, 8s, 10s, ... 30s (max)
+        const delay = Math.min((pollAttemptRef.current + 1) * 2000, 30000);
+        timeoutId = setTimeout(async () => {
+          if (cancelled) return;
+          pollAttemptRef.current += 1;
+          try {
+            await refetch();
+          } catch (err) {
+            console.error("[useChatSession] Poll failed:", err);
+          } finally {
+            if (!cancelled && hasPendingOperationsRef.current) {
+              schedule();
+            }
+          }
+        }, delay);
+      }
+
+      schedule();
+
+      return () => {
+        cancelled = true;
+        if (timeoutId) clearTimeout(timeoutId);
+      };
+    },
+    [sessionId, hasPendingOperations, refetch],
+  );
+
+  async function createSession() {
+    try {
+      setError(null);
+      const response = await postV2CreateSession({
+        body: JSON.stringify({}),
+      });
+      if (response.status !== 200) {
+        throw new Error("Failed to create session");
+      }
+      const newSessionId = response.data.id;
+      setSessionId(newSessionId);
+      justCreatedSessionIdRef.current = newSessionId;
+      setTimeout(() => {
+        if (justCreatedSessionIdRef.current === newSessionId) {
+          justCreatedSessionIdRef.current = null;
+        }
+      }, 10000);
+      return newSessionId;
+    } catch (err) {
+      const error =
+        err instanceof Error ? err : new Error("Failed to create session");
+      setError(error);
+      toast.error("Failed to create chat session", {
+        description: error.message,
+      });
+      throw error;
+    }
+  }
+
+  async function loadSession(id: string) {
+    try {
+      setError(null);
+      // Invalidate the query cache for this session to force a fresh fetch
+      await queryClient.invalidateQueries({
+        queryKey: getGetV2GetSessionQueryKey(id),
+      });
+      // Set sessionId after invalidation to ensure the hook refetches
+      setSessionId(id);
+      // Force fetch with fresh data (bypass cache)
+      const queryOptions = getGetV2GetSessionQueryOptions(id, {
+        query: {
+          staleTime: 0, // Force fresh fetch
+          retry: shouldRetrySessionLoad,
+          retryDelay: getSessionRetryDelay,
+        },
+      });
+      const result = await queryClient.fetchQuery(queryOptions);
+      if (!result || ("status" in result && result.status !== 200)) {
+        console.warn("Session not found on server");
+        setSessionId(null);
+        throw new Error("Session not found");
+      }
+    } catch (err) {
+      const error =
+        err instanceof Error ? err : new Error("Failed to load session");
+      setError(error);
+      throw error;
+    }
+  }
+
+  async function refreshSession() {
+    if (!sessionId) return;
+    try {
+      setError(null);
+      await refetch();
+    } catch (err) {
+      const error =
+        err instanceof Error ? err : new Error("Failed to refresh session");
+      setError(error);
+      throw error;
+    }
+  }
+
+  async function claimSession(id: string) {
+    try {
+      setError(null);
+      await claimSessionMutation({ sessionId: id });
+      if (justCreatedSessionIdRef.current === id) {
+        justCreatedSessionIdRef.current = null;
+      }
+      await queryClient.invalidateQueries({
+        queryKey: getGetV2GetSessionQueryKey(id),
+      });
+      await refetch();
+      toast.success("Session claimed successfully", {
+        description: "Your chat history has been saved to your account",
+      });
+    } catch (err: unknown) {
+      const error =
+        err instanceof Error ? err : new Error("Failed to claim session");
+      const is404 =
+        (typeof err === "object" &&
+          err !== null &&
+          "status" in err &&
+          err.status === 404) ||
+        (typeof err === "object" &&
+          err !== null &&
+          "response" in err &&
+          typeof err.response === "object" &&
+          err.response !== null &&
+          "status" in err.response &&
+          err.response.status === 404);
+      if (!is404) {
+        setError(error);
+        toast.error("Failed to claim session", {
+          description: error.message || "Unable to claim session",
+        });
+      }
+      throw error;
+    }
+  }
+
+  function clearSession() {
+    setSessionId(null);
+    setError(null);
+    justCreatedSessionIdRef.current = null;
+  }
+
+  return {
+    session,
+    sessionId,
+    messages,
+    isLoading,
+    isCreating,
+    error,
+    isSessionNotFound: isNotFoundError(loadError),
+    hasPendingOperations,
+    createSession,
+    loadSession,
+    refreshSession,
+    claimSession,
+    clearSession,
+    startPollingForOperation,
+  };
+}
+
+function isNotFoundError(error: unknown): boolean {
+  if (!error || typeof error !== "object") return false;
+  if ("status" in error && error.status === 404) return true;
+  if (
+    "response" in error &&
+    typeof error.response === "object" &&
+    error.response !== null &&
+    "status" in error.response &&
+    error.response.status === 404
+  ) {
+    return true;
+  }
+  return false;
+}
+
+function shouldRetrySessionLoad(failureCount: number, error: unknown): boolean {
+  if (!isNotFoundError(error)) return false;
+  return failureCount <= 2;
+}
+
+function getSessionRetryDelay(attemptIndex: number): number {
+  if (attemptIndex === 0) return 3000;
+  if (attemptIndex === 1) return 5000;
+  return 0;
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/useChatStream.ts b/autogpt_platform/frontend/src/components/contextual/Chat/useChatStream.ts
new file mode 100644
index 0000000000..5a9f637457
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/useChatStream.ts
@@ -0,0 +1,115 @@
+"use client";
+
+import { useEffect, useRef, useState } from "react";
+import { toast } from "sonner";
+import { useChatStore } from "./chat-store";
+import type { StreamChunk } from "./chat-types";
+
+export type { StreamChunk } from "./chat-types";
+
+export function useChatStream() {
+  const [isStreaming, setIsStreaming] = useState(false);
+  const [error, setError] = useState<Error | null>(null);
+  const currentSessionIdRef = useRef<string | null>(null);
+  const onChunkCallbackRef = useRef<((chunk: StreamChunk) => void) | null>(
+    null,
+  );
+
+  const stopStream = useChatStore((s) => s.stopStream);
+  const unregisterActiveSession = useChatStore(
+    (s) => s.unregisterActiveSession,
+  );
+  const isSessionActive = useChatStore((s) => s.isSessionActive);
+  const onStreamComplete = useChatStore((s) => s.onStreamComplete);
+  const getCompletedStream = useChatStore((s) => s.getCompletedStream);
+  const registerActiveSession = useChatStore((s) => s.registerActiveSession);
+  const startStream = useChatStore((s) => s.startStream);
+  const getStreamStatus = useChatStore((s) => s.getStreamStatus);
+
+  function stopStreaming(sessionId?: string) {
+    const targetSession = sessionId || currentSessionIdRef.current;
+    if (targetSession) {
+      stopStream(targetSession);
+      unregisterActiveSession(targetSession);
+    }
+    setIsStreaming(false);
+  }
+
+  useEffect(() => {
+    return function cleanup() {
+      const sessionId = currentSessionIdRef.current;
+      if (sessionId && !isSessionActive(sessionId)) {
+        stopStream(sessionId);
+      }
+      currentSessionIdRef.current = null;
+      onChunkCallbackRef.current = null;
+    };
+  }, []);
+
+  useEffect(() => {
+    const unsubscribe = onStreamComplete(
+      function handleStreamComplete(completedSessionId) {
+        if (completedSessionId !== currentSessionIdRef.current) return;
+
+        setIsStreaming(false);
+        const completed = getCompletedStream(completedSessionId);
+        if (completed?.error) {
+          setError(completed.error);
+        }
+        unregisterActiveSession(completedSessionId);
+      },
+    );
+
+    return unsubscribe;
+  }, []);
+
+  async function sendMessage(
+    sessionId: string,
+    message: string,
+    onChunk: (chunk: StreamChunk) => void,
+    isUserMessage: boolean = true,
+    context?: { url: string; content: string },
+  ) {
+    const previousSessionId = currentSessionIdRef.current;
+    if (previousSessionId && previousSessionId !== sessionId) {
+      stopStreaming(previousSessionId);
+    }
+
+    currentSessionIdRef.current = sessionId;
+    onChunkCallbackRef.current = onChunk;
+    setIsStreaming(true);
+    setError(null);
+
+    registerActiveSession(sessionId);
+
+    try {
+      await startStream(sessionId, message, isUserMessage, context, onChunk);
+
+      const status = getStreamStatus(sessionId);
+      if (status === "error") {
+        const completed = getCompletedStream(sessionId);
+        if (completed?.error) {
+          setError(completed.error);
+          toast.error("Connection Failed", {
+            description: "Unable to connect to chat service. Please try again.",
+          });
+          throw completed.error;
+        }
+      }
+    } catch (err) {
+      const streamError =
+        err instanceof Error ? err : new Error("Failed to start stream");
+      setError(streamError);
+      throw streamError;
+    } finally {
+      setIsStreaming(false);
+    }
+  }
+
+  return {
+    isStreaming,
+    error,
+    sendMessage,
+    stopStreaming,
+  };
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/Chat/usePageContext.ts b/autogpt_platform/frontend/src/components/contextual/Chat/usePageContext.ts
new file mode 100644
index 0000000000..c567422a5c
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/Chat/usePageContext.ts
@@ -0,0 +1,98 @@
+import { useCallback } from "react";
+
+export interface PageContext {
+  url: string;
+  content: string;
+}
+
+const MAX_CONTENT_CHARS = 10000;
+
+/**
+ * Hook to capture the current page context (URL + full page content)
+ * Privacy-hardened: removes sensitive inputs and enforces content size limits
+ */
+export function usePageContext() {
+  const capturePageContext = useCallback((): PageContext => {
+    if (typeof window === "undefined" || typeof document === "undefined") {
+      return { url: "", content: "" };
+    }
+
+    const url = window.location.href;
+
+    // Clone document to avoid modifying the original
+    const clone = document.cloneNode(true) as Document;
+
+    // Remove script, style, and noscript elements
+    const scripts = clone.querySelectorAll("script, style, noscript");
+    scripts.forEach((el) => el.remove());
+
+    // Remove sensitive elements and their content
+    const sensitiveSelectors = [
+      "input",
+      "textarea",
+      "[contenteditable]",
+      'input[type="password"]',
+      'input[type="email"]',
+      'input[type="tel"]',
+      'input[type="search"]',
+      'input[type="hidden"]',
+      "form",
+      "[data-sensitive]",
+      "[data-sensitive='true']",
+    ];
+
+    sensitiveSelectors.forEach((selector) => {
+      const elements = clone.querySelectorAll(selector);
+      elements.forEach((el) => {
+        // For form elements, remove the entire element
+        if (el.tagName === "FORM") {
+          el.remove();
+        } else {
+          // For inputs and textareas, clear their values but keep the element structure
+          if (
+            el instanceof HTMLInputElement ||
+            el instanceof HTMLTextAreaElement
+          ) {
+            el.value = "";
+            el.textContent = "";
+          } else {
+            // For other sensitive elements, remove them entirely
+            el.remove();
+          }
+        }
+      });
+    });
+
+    // Strip any remaining input values that might have been missed
+    const allInputs = clone.querySelectorAll("input, textarea");
+    allInputs.forEach((el) => {
+      if (el instanceof HTMLInputElement || el instanceof HTMLTextAreaElement) {
+        el.value = "";
+        el.textContent = "";
+      }
+    });
+
+    // Get text content from body
+    const body = clone.body;
+    const content = body?.textContent || body?.innerText || "";
+
+    // Clean up whitespace
+    let cleanedContent = content
+      .replace(/\s+/g, " ")
+      .replace(/\n\s*\n/g, "\n")
+      .trim();
+
+    // Enforce maximum content size
+    if (cleanedContent.length > MAX_CONTENT_CHARS) {
+      cleanedContent =
+        cleanedContent.substring(0, MAX_CONTENT_CHARS) + "... [truncated]";
+    }
+
+    return {
+      url,
+      content: cleanedContent,
+    };
+  }, []);
+
+  return { capturePageContext };
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/CredentialsInputs.tsx b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/CredentialsInput.tsx
similarity index 54%
rename from autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/CredentialsInputs.tsx
rename to autogpt_platform/frontend/src/components/contextual/CredentialsInput/CredentialsInput.tsx
index 60d61fab57..eba814fe08 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/CredentialsInputs.tsx
+++ b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/CredentialsInput.tsx
@@ -1,6 +1,6 @@
-import { Button } from "@/components/atoms/Button/Button";
+"use client";
+
 import { Text } from "@/components/atoms/Text/Text";
-import { InformationTooltip } from "@/components/molecules/InformationTooltip/InformationTooltip";
 import {
   BlockIOCredentialsSubSchema,
   CredentialsMetaInput,
@@ -8,13 +8,11 @@ import {
 import { cn } from "@/lib/utils";
 import { toDisplayName } from "@/providers/agent-credentials/helper";
 import { APIKeyCredentialsModal } from "./components/APIKeyCredentialsModal/APIKeyCredentialsModal";
-import { CredentialRow } from "./components/CredentialRow/CredentialRow";
-import { CredentialsSelect } from "./components/CredentialsSelect/CredentialsSelect";
-import { DeleteConfirmationModal } from "./components/DeleteConfirmationModal/DeleteConfirmationModal";
+import { CredentialsFlatView } from "./components/CredentialsFlatView/CredentialsFlatView";
 import { HostScopedCredentialsModal } from "./components/HotScopedCredentialsModal/HotScopedCredentialsModal";
 import { OAuthFlowWaitingModal } from "./components/OAuthWaitingModal/OAuthWaitingModal";
 import { PasswordCredentialsModal } from "./components/PasswordCredentialsModal/PasswordCredentialsModal";
-import { getCredentialDisplayName } from "./helpers";
+import { isSystemCredential } from "./helpers";
 import {
   CredentialsInputState,
   useCredentialsInput,
@@ -34,7 +32,9 @@ type Props = {
   onSelectCredentials: (newValue?: CredentialsMetaInput) => void;
   onLoaded?: (loaded: boolean) => void;
   readOnly?: boolean;
+  isOptional?: boolean;
   showTitle?: boolean;
+  variant?: "default" | "node";
 };
 
 export function CredentialsInput({
@@ -45,7 +45,9 @@ export function CredentialsInput({
   siblingInputs,
   onLoaded,
   readOnly = false,
+  isOptional = false,
   showTitle = true,
+  variant = "default",
 }: Props) {
   const hookData = useCredentialsInput({
     schema,
@@ -54,6 +56,7 @@ export function CredentialsInput({
     siblingInputs,
     onLoaded,
     readOnly,
+    isOptional,
   });
 
   if (!isLoaded(hookData)) {
@@ -67,105 +70,53 @@ export function CredentialsInput({
     supportsOAuth2,
     supportsUserPassword,
     supportsHostScoped,
-    credentialsToShow,
+    userCredentials,
+    systemCredentials,
     oAuthError,
     isAPICredentialsModalOpen,
     isUserPasswordCredentialsModalOpen,
     isHostScopedCredentialsModalOpen,
     isOAuth2FlowInProgress,
     oAuthPopupController,
-    credentialToDelete,
-    deleteCredentialsMutation,
     actionButtonText,
     setAPICredentialsModalOpen,
     setUserPasswordCredentialsModalOpen,
     setHostScopedCredentialsModalOpen,
-    setCredentialToDelete,
     handleActionButtonClick,
     handleCredentialSelect,
-    handleDeleteCredential,
-    handleDeleteConfirm,
   } = hookData;
 
   const displayName = toDisplayName(provider);
-  const hasCredentialsToShow = credentialsToShow.length > 0;
+  const selectedCredentialIsSystem =
+    selectedCredential && isSystemCredential(selectedCredential);
+
+  const allCredentials = [...userCredentials, ...systemCredentials];
+
+  if (readOnly && selectedCredentialIsSystem) {
+    return null;
+  }
 
   return (
     <div className={cn("mb-6", className)}>
-      {showTitle && (
-        <div className="mb-2 flex items-center gap-2">
-          <Text variant="large-medium">{displayName} credentials</Text>
-          {schema.description && (
-            <InformationTooltip description={schema.description} />
-          )}
-        </div>
-      )}
-
-      {hasCredentialsToShow ? (
-        <>
-          {credentialsToShow.length > 1 && !readOnly ? (
-            <CredentialsSelect
-              credentials={credentialsToShow}
-              provider={provider}
-              displayName={displayName}
-              selectedCredentials={selectedCredential}
-              onSelectCredential={handleCredentialSelect}
-              readOnly={readOnly}
-            />
-          ) : (
-            <div className="mb-4 space-y-2">
-              {credentialsToShow.map((credential) => {
-                return (
-                  <CredentialRow
-                    key={credential.id}
-                    credential={credential}
-                    provider={provider}
-                    displayName={displayName}
-                    onSelect={() => handleCredentialSelect(credential.id)}
-                    onDelete={() =>
-                      handleDeleteCredential({
-                        id: credential.id,
-                        title: getCredentialDisplayName(
-                          credential,
-                          displayName,
-                        ),
-                      })
-                    }
-                    readOnly={readOnly}
-                  />
-                );
-              })}
-            </div>
-          )}
-          {!readOnly && (
-            <Button
-              variant="secondary"
-              size="small"
-              onClick={handleActionButtonClick}
-              className="w-fit"
-              type="button"
-            >
-              {actionButtonText}
-            </Button>
-          )}
-        </>
-      ) : (
-        !readOnly && (
-          <Button
-            variant="secondary"
-            size="small"
-            onClick={handleActionButtonClick}
-            className="w-fit"
-            type="button"
-          >
-            {actionButtonText}
-          </Button>
-        )
-      )}
+      <CredentialsFlatView
+        schema={schema}
+        provider={provider}
+        displayName={displayName}
+        credentials={allCredentials}
+        selectedCredential={selectedCredential}
+        onSelectCredential={handleCredentialSelect}
+        onClearCredential={() => onSelectCredential(undefined)}
+        onAddCredential={handleActionButtonClick}
+        actionButtonText={actionButtonText}
+        isOptional={isOptional}
+        showTitle={showTitle}
+        readOnly={readOnly}
+        variant={variant}
+      />
 
       {!readOnly && (
         <>
-          {supportsApiKey ? (
+          {supportsApiKey && (
             <APIKeyCredentialsModal
               schema={schema}
               open={isAPICredentialsModalOpen}
@@ -176,15 +127,15 @@ export function CredentialsInput({
               }}
               siblingInputs={siblingInputs}
             />
-          ) : null}
-          {supportsOAuth2 ? (
+          )}
+          {supportsOAuth2 && (
             <OAuthFlowWaitingModal
               open={isOAuth2FlowInProgress}
               onClose={() => oAuthPopupController?.abort("canceled")}
               providerName={providerName}
             />
-          ) : null}
-          {supportsUserPassword ? (
+          )}
+          {supportsUserPassword && (
             <PasswordCredentialsModal
               schema={schema}
               open={isUserPasswordCredentialsModalOpen}
@@ -195,8 +146,8 @@ export function CredentialsInput({
               }}
               siblingInputs={siblingInputs}
             />
-          ) : null}
-          {supportsHostScoped ? (
+          )}
+          {supportsHostScoped && (
             <HostScopedCredentialsModal
               schema={schema}
               open={isHostScopedCredentialsModalOpen}
@@ -207,20 +158,13 @@ export function CredentialsInput({
               }}
               siblingInputs={siblingInputs}
             />
-          ) : null}
+          )}
 
-          {oAuthError ? (
+          {oAuthError && (
             <Text variant="body" className="mt-2 text-red-500">
               Error: {oAuthError}
             </Text>
-          ) : null}
-
-          <DeleteConfirmationModal
-            credentialToDelete={credentialToDelete}
-            isDeleting={deleteCredentialsMutation.isPending}
-            onClose={() => setCredentialToDelete(null)}
-            onConfirm={handleDeleteConfirm}
-          />
+          )}
         </>
       )}
     </div>
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/APIKeyCredentialsModal/APIKeyCredentialsModal.tsx b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/APIKeyCredentialsModal/APIKeyCredentialsModal.tsx
similarity index 72%
rename from autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/APIKeyCredentialsModal/APIKeyCredentialsModal.tsx
rename to autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/APIKeyCredentialsModal/APIKeyCredentialsModal.tsx
index 0180c4ebf9..90f6c0ff70 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/APIKeyCredentialsModal/APIKeyCredentialsModal.tsx
+++ b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/APIKeyCredentialsModal/APIKeyCredentialsModal.tsx
@@ -1,11 +1,11 @@
-import { Input } from "@/components/atoms/Input/Input";
-import { Button } from "@/components/atoms/Button/Button";
-import { Dialog } from "@/components/molecules/Dialog/Dialog";
 import {
   Form,
   FormDescription,
   FormField,
 } from "@/components/__legacy__/ui/form";
+import { Button } from "@/components/atoms/Button/Button";
+import { Input } from "@/components/atoms/Input/Input";
+import { Dialog } from "@/components/molecules/Dialog/Dialog";
 import {
   BlockIOCredentialsSubSchema,
   CredentialsMetaInput,
@@ -60,7 +60,23 @@ export function APIKeyCredentialsModal({
         )}
 
         <Form {...form}>
-          <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-2">
+          <form
+            onSubmit={form.handleSubmit(onSubmit)}
+            className="space-y-2 px-2"
+          >
+            <FormField
+              control={form.control}
+              name="title"
+              render={({ field }) => (
+                <Input
+                  id="title"
+                  label="Name"
+                  type="text"
+                  placeholder="Enter a name for this API Key..."
+                  {...field}
+                />
+              )}
+            />
             <FormField
               control={form.control}
               name="apiKey"
@@ -70,8 +86,7 @@ export function APIKeyCredentialsModal({
                     id="apiKey"
                     label="API Key"
                     type="password"
-                    placeholder="Enter API key..."
-                    size="small"
+                    placeholder="Enter API Key..."
                     hint={
                       schema.credentials_scopes ? (
                         <FormDescription>
@@ -90,20 +105,7 @@ export function APIKeyCredentialsModal({
                 </>
               )}
             />
-            <FormField
-              control={form.control}
-              name="title"
-              render={({ field }) => (
-                <Input
-                  id="title"
-                  label="Name"
-                  type="text"
-                  placeholder="Enter a name for this API key..."
-                  size="small"
-                  {...field}
-                />
-              )}
-            />
+
             <FormField
               control={form.control}
               name="expiresAt"
@@ -113,13 +115,31 @@ export function APIKeyCredentialsModal({
                   label="Expiration Date"
                   type="datetime-local"
                   placeholder="Select expiration date..."
-                  size="small"
-                  {...field}
+                  value={field.value}
+                  onChange={(e) => {
+                    const value = e.target.value;
+                    if (value) {
+                      const dateTime = new Date(value);
+                      dateTime.setHours(0, 0, 0, 0);
+                      const year = dateTime.getFullYear();
+                      const month = String(dateTime.getMonth() + 1).padStart(
+                        2,
+                        "0",
+                      );
+                      const day = String(dateTime.getDate()).padStart(2, "0");
+                      const normalizedValue = `${year}-${month}-${day}T00:00`;
+                      field.onChange(normalizedValue);
+                    } else {
+                      field.onChange(value);
+                    }
+                  }}
+                  onBlur={field.onBlur}
+                  name={field.name}
                 />
               )}
             />
-            <Button type="submit" size="small" className="min-w-68">
-              Save & use this API key
+            <Button type="submit" className="min-w-68">
+              Add API Key
             </Button>
           </form>
         </Form>
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/APIKeyCredentialsModal/useAPIKeyCredentialsModal.ts b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/APIKeyCredentialsModal/useAPIKeyCredentialsModal.ts
similarity index 79%
rename from autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/APIKeyCredentialsModal/useAPIKeyCredentialsModal.ts
rename to autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/APIKeyCredentialsModal/useAPIKeyCredentialsModal.ts
index 391633bed5..72599a2e79 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/APIKeyCredentialsModal/useAPIKeyCredentialsModal.ts
+++ b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/APIKeyCredentialsModal/useAPIKeyCredentialsModal.ts
@@ -1,11 +1,11 @@
-import { z } from "zod";
-import { useForm, type UseFormReturn } from "react-hook-form";
-import { zodResolver } from "@hookform/resolvers/zod";
 import useCredentials from "@/hooks/useCredentials";
 import {
   BlockIOCredentialsSubSchema,
   CredentialsMetaInput,
 } from "@/lib/autogpt-server-api/types";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useForm, type UseFormReturn } from "react-hook-form";
+import { z } from "zod";
 
 export type APIKeyFormValues = {
   apiKey: string;
@@ -40,12 +40,24 @@ export function useAPIKeyCredentialsModal({
     expiresAt: z.string().optional(),
   });
 
+  function getDefaultExpirationDate(): string {
+    const tomorrow = new Date();
+    tomorrow.setDate(tomorrow.getDate() + 1);
+    tomorrow.setHours(0, 0, 0, 0);
+    const year = tomorrow.getFullYear();
+    const month = String(tomorrow.getMonth() + 1).padStart(2, "0");
+    const day = String(tomorrow.getDate()).padStart(2, "0");
+    const hours = String(tomorrow.getHours()).padStart(2, "0");
+    const minutes = String(tomorrow.getMinutes()).padStart(2, "0");
+    return `${year}-${month}-${day}T${hours}:${minutes}`;
+  }
+
   const form = useForm<APIKeyFormValues>({
     resolver: zodResolver(formSchema),
     defaultValues: {
       apiKey: "",
       title: "",
-      expiresAt: "",
+      expiresAt: getDefaultExpirationDate(),
     },
   });
 
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/CredentialRow/CredentialRow.tsx b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/CredentialRow/CredentialRow.tsx
similarity index 52%
rename from autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/CredentialRow/CredentialRow.tsx
rename to autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/CredentialRow/CredentialRow.tsx
index 21ec1200e4..dc69c34d93 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/CredentialRow/CredentialRow.tsx
+++ b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/CredentialRow/CredentialRow.tsx
@@ -7,7 +7,8 @@ import {
   DropdownMenuTrigger,
 } from "@/components/molecules/DropdownMenu/DropdownMenu";
 import { cn } from "@/lib/utils";
-import { CaretDown, DotsThreeVertical } from "@phosphor-icons/react";
+import { CaretDownIcon, DotsThreeVertical } from "@phosphor-icons/react";
+import { useEffect, useRef, useState } from "react";
 import {
   fallbackIcon,
   getCredentialDisplayName,
@@ -26,10 +27,12 @@ type CredentialRowProps = {
   provider: string;
   displayName: string;
   onSelect: () => void;
-  onDelete: () => void;
+  onDelete?: () => void;
   readOnly?: boolean;
   showCaret?: boolean;
   asSelectTrigger?: boolean;
+  /** When "node", applies compact styling for node context */
+  variant?: "default" | "node";
 };
 
 export function CredentialRow({
@@ -41,14 +44,43 @@ export function CredentialRow({
   readOnly = false,
   showCaret = false,
   asSelectTrigger = false,
+  variant = "default",
 }: CredentialRowProps) {
   const ProviderIcon = providerIcons[provider] || fallbackIcon;
+  const isNodeVariant = variant === "node";
+  const containerRef = useRef<HTMLDivElement>(null);
+  const [showMaskedKey, setShowMaskedKey] = useState(true);
+
+  useEffect(() => {
+    const container = containerRef.current;
+    if (!container) return;
+
+    const resizeObserver = new ResizeObserver((entries) => {
+      for (const entry of entries) {
+        const width = entry.contentRect.width;
+        setShowMaskedKey(width >= 360);
+      }
+    });
+
+    resizeObserver.observe(container);
+
+    return () => {
+      resizeObserver.disconnect();
+    };
+  }, []);
 
   return (
     <div
+      ref={containerRef}
       className={cn(
-        "flex items-center gap-3 rounded-medium border border-zinc-200 bg-white p-3 transition-colors",
-        asSelectTrigger ? "border-0 bg-transparent" : readOnly ? "w-fit" : "",
+        "flex min-w-[20rem] items-center gap-3 rounded-medium border border-zinc-200 bg-white p-3 transition-colors",
+        asSelectTrigger && isNodeVariant
+          ? "min-w-0 flex-1 overflow-hidden border-0 bg-transparent"
+          : asSelectTrigger
+            ? "border-0 bg-transparent"
+            : readOnly
+              ? "w-fit"
+              : "",
       )}
       onClick={readOnly || showCaret || asSelectTrigger ? undefined : onSelect}
       style={
@@ -61,24 +93,37 @@ export function CredentialRow({
         <ProviderIcon className="h-3 w-3 text-white" />
       </div>
       <IconKey className="h-5 w-5 shrink-0 text-zinc-800" />
-      <div className="flex min-w-0 flex-1 flex-nowrap items-center gap-4">
+      <div
+        className={cn(
+          "relative flex min-w-0 flex-1 flex-nowrap items-center gap-4",
+          isNodeVariant && "overflow-hidden",
+        )}
+      >
         <Text
           variant="body"
-          className="line-clamp-1 flex-[0_0_50%] text-ellipsis tracking-tight"
+          className={cn(
+            "min-w-0 flex-1 tracking-tight",
+            isNodeVariant ? "truncate" : "line-clamp-1 text-ellipsis",
+          )}
         >
           {getCredentialDisplayName(credential, displayName)}
         </Text>
-        <Text
-          variant="large"
-          className="lex-[0_0_40%] relative top-1 hidden overflow-hidden whitespace-nowrap font-mono tracking-tight md:block"
-        >
-          {"*".repeat(MASKED_KEY_LENGTH)}
-        </Text>
+        {!(asSelectTrigger && isNodeVariant) && showMaskedKey && (
+          <Text
+            variant="large"
+            className={cn(
+              "absolute top-[65%] -translate-y-1/2 overflow-hidden whitespace-nowrap font-mono tracking-tight",
+              asSelectTrigger ? "right-0" : "right-6",
+            )}
+          >
+            {"*".repeat(MASKED_KEY_LENGTH)}
+          </Text>
+        )}
       </div>
-      {showCaret && !asSelectTrigger && (
-        <CaretDown className="h-4 w-4 shrink-0 text-gray-400" />
+      {(showCaret || (asSelectTrigger && !readOnly)) && (
+        <CaretDownIcon className="h-4 w-4 shrink-0 text-gray-400" />
       )}
-      {!readOnly && !showCaret && !asSelectTrigger && (
+      {!readOnly && !showCaret && !asSelectTrigger && onDelete && (
         <DropdownMenu>
           <DropdownMenuTrigger asChild>
             <button
diff --git a/autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/CredentialsAccordionView/CredentialsAccordionView.tsx b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/CredentialsAccordionView/CredentialsAccordionView.tsx
new file mode 100644
index 0000000000..9204a4d9b0
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/CredentialsAccordionView/CredentialsAccordionView.tsx
@@ -0,0 +1,203 @@
+import { Button } from "@/components/atoms/Button/Button";
+import { Text } from "@/components/atoms/Text/Text";
+import {
+  Accordion,
+  AccordionContent,
+  AccordionItem,
+  AccordionTrigger,
+} from "@/components/molecules/Accordion/Accordion";
+import { InformationTooltip } from "@/components/molecules/InformationTooltip/InformationTooltip";
+import {
+  BlockIOCredentialsSubSchema,
+  CredentialsMetaInput,
+} from "@/lib/autogpt-server-api/types";
+import { SlidersHorizontalIcon } from "lucide-react";
+import { CredentialRow } from "../CredentialRow/CredentialRow";
+import { CredentialsSelect } from "../CredentialsSelect/CredentialsSelect";
+
+type Credential = {
+  id: string;
+  title?: string;
+  username?: string;
+  type: string;
+  provider: string;
+};
+
+type Props = {
+  schema: BlockIOCredentialsSubSchema;
+  provider: string;
+  displayName: string;
+  userCredentials: Credential[];
+  systemCredentials: Credential[];
+  isSystemProvider: boolean;
+  selectedCredential?: CredentialsMetaInput;
+  onSelectCredential: (credentialId: string) => void;
+  onClearCredential: () => void;
+  onAddCredential: () => void;
+  actionButtonText: string;
+  isOptional: boolean;
+  showTitle: boolean;
+  variant: "default" | "node";
+};
+
+export function CredentialsAccordionView({
+  schema,
+  provider,
+  displayName,
+  userCredentials,
+  systemCredentials,
+  isSystemProvider,
+  selectedCredential,
+  onSelectCredential,
+  onClearCredential,
+  onAddCredential,
+  actionButtonText,
+  isOptional,
+  showTitle,
+  variant,
+}: Props) {
+  const allCredentials = [...userCredentials, ...systemCredentials];
+  const hasSystemCredentials = systemCredentials.length > 0;
+  const hasUserCredentials = userCredentials.length > 0;
+
+  const credentialsInAccordion = isSystemProvider
+    ? allCredentials
+    : systemCredentials;
+
+  const shouldOpenAccordionByDefault =
+    hasSystemCredentials && !isOptional && !selectedCredential;
+
+  const showUserCredentialsOutsideAccordion =
+    !isSystemProvider && hasUserCredentials;
+
+  return (
+    <>
+      {showTitle && showUserCredentialsOutsideAccordion && (
+        <div className="mb-2 flex items-center gap-2">
+          <Text variant="large-medium">
+            {displayName} credentials
+            {isOptional && (
+              <span className="ml-1 text-sm font-normal text-gray-500">
+                (optional)
+              </span>
+            )}
+          </Text>
+          {schema.description && (
+            <InformationTooltip description={schema.description} />
+          )}
+        </div>
+      )}
+
+      {showUserCredentialsOutsideAccordion && (
+        <>
+          {userCredentials.length > 1 || isOptional ? (
+            <CredentialsSelect
+              credentials={userCredentials}
+              provider={provider}
+              displayName={displayName}
+              selectedCredentials={selectedCredential}
+              onSelectCredential={onSelectCredential}
+              onClearCredential={onClearCredential}
+              allowNone={isOptional}
+              variant={variant}
+            />
+          ) : (
+            <div className="mb-4 space-y-2">
+              {userCredentials.map((credential) => (
+                <CredentialRow
+                  key={credential.id}
+                  credential={credential}
+                  provider={provider}
+                  displayName={displayName}
+                  onSelect={() => onSelectCredential(credential.id)}
+                />
+              ))}
+            </div>
+          )}
+          <Button
+            variant="secondary"
+            size="small"
+            onClick={onAddCredential}
+            className="w-fit"
+            type="button"
+          >
+            {actionButtonText}
+          </Button>
+        </>
+      )}
+
+      {hasSystemCredentials && (
+        <Accordion
+          type="single"
+          collapsible
+          defaultValue={
+            shouldOpenAccordionByDefault ? "system-credentials" : undefined
+          }
+          className={showUserCredentialsOutsideAccordion ? "mt-4" : ""}
+        >
+          <AccordionItem value="system-credentials" className="border-none">
+            <AccordionTrigger className="py-2 text-sm text-muted-foreground hover:no-underline">
+              <div className="flex items-center gap-1">
+                <SlidersHorizontalIcon className="size-4" /> System credentials
+              </div>
+            </AccordionTrigger>
+            <AccordionContent>
+              <div className="space-y-4 px-1 pt-2">
+                {showTitle && (
+                  <div className="flex items-center gap-2">
+                    <Text variant="large-medium">
+                      {displayName} credentials
+                      {isOptional && (
+                        <span className="ml-1 text-sm font-normal text-gray-500">
+                          (optional)
+                        </span>
+                      )}
+                    </Text>
+                    {schema.description && (
+                      <InformationTooltip description={schema.description} />
+                    )}
+                  </div>
+                )}
+                {credentialsInAccordion.length > 0 && (
+                  <CredentialsSelect
+                    credentials={credentialsInAccordion}
+                    provider={provider}
+                    displayName={displayName}
+                    selectedCredentials={selectedCredential}
+                    onSelectCredential={onSelectCredential}
+                    onClearCredential={onClearCredential}
+                    allowNone={isOptional}
+                    variant={variant}
+                  />
+                )}
+                {isSystemProvider && (
+                  <Button
+                    variant="secondary"
+                    size="small"
+                    onClick={onAddCredential}
+                    className="w-fit"
+                    type="button"
+                  >
+                    {actionButtonText}
+                  </Button>
+                )}
+              </div>
+            </AccordionContent>
+          </AccordionItem>
+        </Accordion>
+      )}
+
+      {!showUserCredentialsOutsideAccordion && !isSystemProvider && (
+        <Button
+          variant="secondary"
+          size="small"
+          onClick={onAddCredential}
+          className="w-fit"
+          type="button"
+        >
+          {actionButtonText}
+        </Button>
+      )}
+    </>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/CredentialsFlatView/CredentialsFlatView.tsx b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/CredentialsFlatView/CredentialsFlatView.tsx
new file mode 100644
index 0000000000..4d220a5359
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/CredentialsFlatView/CredentialsFlatView.tsx
@@ -0,0 +1,134 @@
+import { Button } from "@/components/atoms/Button/Button";
+import { Text } from "@/components/atoms/Text/Text";
+import { InformationTooltip } from "@/components/molecules/InformationTooltip/InformationTooltip";
+import {
+  BlockIOCredentialsSubSchema,
+  CredentialsMetaInput,
+} from "@/lib/autogpt-server-api/types";
+import { ExclamationTriangleIcon } from "@radix-ui/react-icons";
+import { CredentialRow } from "../CredentialRow/CredentialRow";
+import { CredentialsSelect } from "../CredentialsSelect/CredentialsSelect";
+
+type Credential = {
+  id: string;
+  title?: string;
+  username?: string;
+  type: string;
+  provider: string;
+};
+
+type Props = {
+  schema: BlockIOCredentialsSubSchema;
+  provider: string;
+  displayName: string;
+  credentials: Credential[];
+  selectedCredential?: CredentialsMetaInput;
+  actionButtonText: string;
+  isOptional: boolean;
+  showTitle: boolean;
+  readOnly: boolean;
+  variant: "default" | "node";
+  onSelectCredential: (credentialId: string) => void;
+  onClearCredential: () => void;
+  onAddCredential: () => void;
+};
+
+export function CredentialsFlatView({
+  schema,
+  provider,
+  displayName,
+  credentials,
+  selectedCredential,
+  actionButtonText,
+  isOptional,
+  showTitle,
+  readOnly,
+  variant,
+  onSelectCredential,
+  onClearCredential,
+  onAddCredential,
+}: Props) {
+  const hasCredentials = credentials.length > 0;
+
+  return (
+    <>
+      {showTitle && (
+        <div className="mb-2 flex items-center gap-2">
+          <Text variant="large-medium" className="flex items-center gap-2">
+            <span className="inline-flex items-center gap-1">
+              {displayName} credentials
+              {isOptional && (
+                <span className="text-sm font-normal text-gray-500">
+                  (optional)
+                </span>
+              )}
+              {!isOptional && !selectedCredential && (
+                <span className="inline-flex items-center gap-1 text-red-600">
+                  <ExclamationTriangleIcon className="size-4" />
+                  <span className="text-sm font-normal">required</span>
+                </span>
+              )}
+            </span>
+          </Text>
+          {schema.description && (
+            <InformationTooltip description={schema.description} />
+          )}
+        </div>
+      )}
+
+      {hasCredentials ? (
+        <>
+          {(credentials.length > 1 || isOptional) && !readOnly ? (
+            <CredentialsSelect
+              credentials={credentials}
+              provider={provider}
+              displayName={displayName}
+              selectedCredentials={selectedCredential}
+              onSelectCredential={onSelectCredential}
+              onClearCredential={onClearCredential}
+              readOnly={readOnly}
+              allowNone={isOptional}
+              variant={variant}
+            />
+          ) : (
+            <div className="mb-4 space-y-2">
+              {credentials.map((credential) => (
+                <CredentialRow
+                  key={credential.id}
+                  credential={credential}
+                  provider={provider}
+                  displayName={displayName}
+                  onSelect={() => onSelectCredential(credential.id)}
+                  readOnly={readOnly}
+                />
+              ))}
+            </div>
+          )}
+          {!readOnly && (
+            <Button
+              variant="secondary"
+              size="small"
+              onClick={onAddCredential}
+              className="w-fit"
+              type="button"
+            >
+              {actionButtonText}
+            </Button>
+          )}
+        </>
+      ) : (
+        !readOnly && (
+          <Button
+            variant="secondary"
+            size="small"
+            onClick={onAddCredential}
+            className="w-fit"
+            type="button"
+          >
+            {actionButtonText}
+          </Button>
+        )
+      )}
+    </>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/CredentialsGroupedView/CredentialsGroupedView.tsx b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/CredentialsGroupedView/CredentialsGroupedView.tsx
new file mode 100644
index 0000000000..135a960431
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/CredentialsGroupedView/CredentialsGroupedView.tsx
@@ -0,0 +1,189 @@
+import { CredentialsInput } from "@/components/contextual/CredentialsInput/CredentialsInput";
+import {
+  Accordion,
+  AccordionContent,
+  AccordionItem,
+  AccordionTrigger,
+} from "@/components/molecules/Accordion/Accordion";
+import {
+  CredentialsMetaInput,
+  CredentialsType,
+} from "@/lib/autogpt-server-api/types";
+import { CredentialsProvidersContext } from "@/providers/agent-credentials/credentials-provider";
+import { SlidersHorizontalIcon } from "@phosphor-icons/react";
+import { useContext, useEffect, useMemo, useRef } from "react";
+import {
+  areSystemCredentialProvidersLoading,
+  CredentialField,
+  findSavedCredentialByProviderAndType,
+  hasMissingRequiredSystemCredentials,
+  splitCredentialFieldsBySystem,
+} from "./helpers";
+
+type Props = {
+  credentialFields: CredentialField[];
+  requiredCredentials: Set<string>;
+  inputCredentials: Record<string, CredentialsMetaInput | undefined>;
+  inputValues: Record<string, any>;
+  onCredentialChange: (key: string, value?: CredentialsMetaInput) => void;
+};
+
+export function CredentialsGroupedView({
+  credentialFields,
+  requiredCredentials,
+  inputCredentials,
+  inputValues,
+  onCredentialChange,
+}: Props) {
+  const allProviders = useContext(CredentialsProvidersContext);
+
+  const { userCredentialFields, systemCredentialFields } = useMemo(
+    () =>
+      splitCredentialFieldsBySystem(
+        credentialFields,
+        allProviders,
+        inputCredentials,
+      ),
+    [credentialFields, allProviders, inputCredentials],
+  );
+
+  const hasSystemCredentials = systemCredentialFields.length > 0;
+  const hasUserCredentials = userCredentialFields.length > 0;
+  const hasAttemptedAutoSelect = useRef(false);
+
+  const isLoadingProviders = useMemo(
+    () =>
+      areSystemCredentialProvidersLoading(systemCredentialFields, allProviders),
+    [systemCredentialFields, allProviders],
+  );
+
+  const hasMissingSystemCredentials = useMemo(() => {
+    if (isLoadingProviders) return false;
+    return hasMissingRequiredSystemCredentials(
+      systemCredentialFields,
+      requiredCredentials,
+      inputCredentials,
+      allProviders,
+    );
+  }, [
+    isLoadingProviders,
+    systemCredentialFields,
+    requiredCredentials,
+    inputCredentials,
+    allProviders,
+  ]);
+
+  useEffect(() => {
+    if (hasAttemptedAutoSelect.current) return;
+    if (!hasSystemCredentials) return;
+    if (isLoadingProviders) return;
+
+    for (const [key, schema] of systemCredentialFields) {
+      const alreadySelected = inputCredentials?.[key];
+      const isRequired = requiredCredentials.has(key);
+      if (alreadySelected || !isRequired) continue;
+
+      const providerNames = schema.credentials_provider || [];
+      const credentialTypes = schema.credentials_types || [];
+      const requiredScopes = schema.credentials_scopes;
+      const savedCredential = findSavedCredentialByProviderAndType(
+        providerNames,
+        credentialTypes,
+        requiredScopes,
+        allProviders,
+      );
+
+      if (savedCredential) {
+        onCredentialChange(key, {
+          id: savedCredential.id,
+          provider: savedCredential.provider,
+          type: savedCredential.type as CredentialsType,
+          title: savedCredential.title,
+        });
+      }
+    }
+
+    hasAttemptedAutoSelect.current = true;
+  }, [
+    allProviders,
+    hasSystemCredentials,
+    systemCredentialFields,
+    requiredCredentials,
+    inputCredentials,
+    onCredentialChange,
+    isLoadingProviders,
+  ]);
+
+  return (
+    <div className="space-y-6">
+      {hasUserCredentials && (
+        <>
+          {userCredentialFields.map(
+            ([key, inputSubSchema]: CredentialField) => {
+              const selectedCred = inputCredentials?.[key];
+
+              return (
+                <CredentialsInput
+                  key={key}
+                  schema={
+                    { ...inputSubSchema, discriminator: undefined } as any
+                  }
+                  selectedCredentials={selectedCred}
+                  onSelectCredentials={(value) => {
+                    onCredentialChange(key, value);
+                  }}
+                  siblingInputs={inputValues}
+                  isOptional={!requiredCredentials.has(key)}
+                />
+              );
+            },
+          )}
+        </>
+      )}
+
+      {hasSystemCredentials && (
+        <Accordion
+          type="single"
+          collapsible
+          className={hasUserCredentials ? "mt-4" : ""}
+        >
+          <AccordionItem value="system-credentials" className="border-none">
+            <AccordionTrigger className="py-2 text-sm text-muted-foreground hover:no-underline">
+              <div className="flex items-center gap-1">
+                <SlidersHorizontalIcon size={16} weight="bold" /> System
+                credentials
+                {hasMissingSystemCredentials && (
+                  <span className="text-destructive">(missing)</span>
+                )}
+              </div>
+            </AccordionTrigger>
+            <AccordionContent>
+              <div className="space-y-6 px-1 pt-2">
+                {systemCredentialFields.map(
+                  ([key, inputSubSchema]: CredentialField) => {
+                    const selectedCred = inputCredentials?.[key];
+
+                    return (
+                      <CredentialsInput
+                        key={key}
+                        schema={
+                          { ...inputSubSchema, discriminator: undefined } as any
+                        }
+                        selectedCredentials={selectedCred}
+                        onSelectCredentials={(value) => {
+                          onCredentialChange(key, value);
+                        }}
+                        siblingInputs={inputValues}
+                        isOptional={!requiredCredentials.has(key)}
+                      />
+                    );
+                  },
+                )}
+              </div>
+            </AccordionContent>
+          </AccordionItem>
+        </Accordion>
+      )}
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/CredentialsGroupedView/helpers.ts b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/CredentialsGroupedView/helpers.ts
new file mode 100644
index 0000000000..5f439d3a32
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/CredentialsGroupedView/helpers.ts
@@ -0,0 +1,249 @@
+import { CredentialsProvidersContextType } from "@/providers/agent-credentials/credentials-provider";
+import { filterSystemCredentials, getSystemCredentials } from "../../helpers";
+
+export type CredentialField = [string, any];
+
+type SavedCredential = {
+  id: string;
+  provider: string;
+  type: string;
+  title?: string | null;
+};
+
+function hasRequiredScopes(
+  credential: { scopes?: string[]; type: string },
+  requiredScopes?: string[],
+) {
+  if (credential.type !== "oauth2") return true;
+  if (!requiredScopes || requiredScopes.length === 0) return true;
+  const grantedScopes = new Set(credential.scopes || []);
+  for (const scope of requiredScopes) {
+    if (!grantedScopes.has(scope)) return false;
+  }
+  return true;
+}
+
+export function splitCredentialFieldsBySystem(
+  credentialFields: CredentialField[],
+  allProviders: CredentialsProvidersContextType | null,
+  inputCredentials?: Record<string, unknown>,
+) {
+  if (!allProviders || credentialFields.length === 0) {
+    return {
+      userCredentialFields: [] as CredentialField[],
+      systemCredentialFields: [] as CredentialField[],
+    };
+  }
+
+  const userFields: CredentialField[] = [];
+  const systemFields: CredentialField[] = [];
+
+  for (const [key, schema] of credentialFields) {
+    const providerNames = schema.credentials_provider || [];
+    const isSystemField = providerNames.some((providerName: string) => {
+      const providerData = allProviders[providerName];
+      return providerData?.isSystemProvider === true;
+    });
+
+    if (isSystemField) {
+      systemFields.push([key, schema]);
+    } else {
+      userFields.push([key, schema]);
+    }
+  }
+
+  const sortByUnsetFirst = (a: CredentialField, b: CredentialField) => {
+    const aIsSet = Boolean(inputCredentials?.[a[0]]);
+    const bIsSet = Boolean(inputCredentials?.[b[0]]);
+
+    if (aIsSet === bIsSet) return 0;
+    return aIsSet ? 1 : -1;
+  };
+
+  return {
+    userCredentialFields: userFields.sort(sortByUnsetFirst),
+    systemCredentialFields: systemFields.sort(sortByUnsetFirst),
+  };
+}
+
+export function areSystemCredentialProvidersLoading(
+  systemCredentialFields: CredentialField[],
+  allProviders: CredentialsProvidersContextType | null,
+): boolean {
+  if (!systemCredentialFields.length) return false;
+  if (allProviders === null) return true;
+
+  for (const [_, schema] of systemCredentialFields) {
+    const providerNames = schema.credentials_provider || [];
+    const hasAllProviders = providerNames.every(
+      (providerName: string) => allProviders?.[providerName] !== undefined,
+    );
+    if (!hasAllProviders) return true;
+  }
+
+  return false;
+}
+
+export function hasMissingRequiredSystemCredentials(
+  systemCredentialFields: CredentialField[],
+  requiredCredentials: Set<string>,
+  inputCredentials?: Record<string, unknown>,
+  allProviders?: CredentialsProvidersContextType | null,
+) {
+  if (systemCredentialFields.length === 0) return false;
+  if (allProviders === null) return false;
+
+  return systemCredentialFields.some(([key, schema]) => {
+    if (!requiredCredentials.has(key)) return false;
+    if (inputCredentials?.[key]) return false;
+
+    const providerNames = schema.credentials_provider || [];
+    const credentialTypes = schema.credentials_types || [];
+    const requiredScopes = schema.credentials_scopes;
+
+    return !hasAvailableSystemCredential(
+      providerNames,
+      credentialTypes,
+      requiredScopes,
+      allProviders,
+    );
+  });
+}
+
+function hasAvailableSystemCredential(
+  providerNames: string[],
+  credentialTypes: string[],
+  requiredScopes: string[] | undefined,
+  allProviders: CredentialsProvidersContextType | null | undefined,
+) {
+  if (!allProviders) return false;
+
+  for (const providerName of providerNames) {
+    const providerData = allProviders[providerName];
+    if (!providerData) continue;
+
+    const systemCredentials = getSystemCredentials(
+      providerData.savedCredentials ?? [],
+    );
+
+    for (const credential of systemCredentials) {
+      const typeMatches =
+        credentialTypes.length === 0 ||
+        credentialTypes.includes(credential.type);
+      const scopesMatch = hasRequiredScopes(credential, requiredScopes);
+
+      if (!typeMatches) continue;
+      if (!scopesMatch) continue;
+
+      return true;
+    }
+
+    const allCredentials = providerData.savedCredentials ?? [];
+    for (const credential of allCredentials) {
+      const typeMatches =
+        credentialTypes.length === 0 ||
+        credentialTypes.includes(credential.type);
+      const scopesMatch = hasRequiredScopes(credential, requiredScopes);
+
+      if (!typeMatches) continue;
+      if (!scopesMatch) continue;
+
+      return true;
+    }
+  }
+
+  return false;
+}
+
+export function findSavedCredentialByProviderAndType(
+  providerNames: string[],
+  credentialTypes: string[],
+  requiredScopes: string[] | undefined,
+  allProviders: CredentialsProvidersContextType | null,
+): SavedCredential | undefined {
+  for (const providerName of providerNames) {
+    const providerData = allProviders?.[providerName];
+    if (!providerData) continue;
+
+    const systemCredentials = getSystemCredentials(
+      providerData.savedCredentials ?? [],
+    );
+
+    const matchingCredentials: SavedCredential[] = [];
+
+    for (const credential of systemCredentials) {
+      const typeMatches =
+        credentialTypes.length === 0 ||
+        credentialTypes.includes(credential.type);
+      const scopesMatch = hasRequiredScopes(credential, requiredScopes);
+
+      if (!typeMatches) continue;
+      if (!scopesMatch) continue;
+
+      matchingCredentials.push(credential as SavedCredential);
+    }
+
+    if (matchingCredentials.length === 0) {
+      const allCredentials = providerData.savedCredentials ?? [];
+      for (const credential of allCredentials) {
+        const typeMatches =
+          credentialTypes.length === 0 ||
+          credentialTypes.includes(credential.type);
+        const scopesMatch = hasRequiredScopes(credential, requiredScopes);
+
+        if (!typeMatches) continue;
+        if (!scopesMatch) continue;
+
+        matchingCredentials.push(credential as SavedCredential);
+      }
+    }
+
+    if (matchingCredentials.length === 1) {
+      return matchingCredentials[0];
+    }
+    if (matchingCredentials.length > 1) {
+      return undefined;
+    }
+  }
+
+  return undefined;
+}
+
+export function findSavedUserCredentialByProviderAndType(
+  providerNames: string[],
+  credentialTypes: string[],
+  requiredScopes: string[] | undefined,
+  allProviders: CredentialsProvidersContextType | null,
+): SavedCredential | undefined {
+  for (const providerName of providerNames) {
+    const providerData = allProviders?.[providerName];
+    if (!providerData) continue;
+
+    const userCredentials = filterSystemCredentials(
+      providerData.savedCredentials ?? [],
+    );
+
+    const matchingCredentials: SavedCredential[] = [];
+
+    for (const credential of userCredentials) {
+      const typeMatches =
+        credentialTypes.length === 0 ||
+        credentialTypes.includes(credential.type);
+      const scopesMatch = hasRequiredScopes(credential, requiredScopes);
+
+      if (!typeMatches) continue;
+      if (!scopesMatch) continue;
+
+      matchingCredentials.push(credential as SavedCredential);
+    }
+
+    if (matchingCredentials.length === 1) {
+      return matchingCredentials[0];
+    }
+    if (matchingCredentials.length > 1) {
+      return undefined;
+    }
+  }
+
+  return undefined;
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/CredentialsSelect/CredentialsSelect.tsx b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/CredentialsSelect/CredentialsSelect.tsx
new file mode 100644
index 0000000000..18e772dd00
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/CredentialsSelect/CredentialsSelect.tsx
@@ -0,0 +1,108 @@
+import { CredentialsMetaInput } from "@/app/api/__generated__/models/credentialsMetaInput";
+import { getCredentialDisplayName } from "../../helpers";
+import { CredentialRow } from "../CredentialRow/CredentialRow";
+
+interface Props {
+  credentials: Array<{
+    id: string;
+    title?: string;
+    username?: string;
+    type: string;
+    provider: string;
+  }>;
+  provider: string;
+  displayName: string;
+  selectedCredentials?: CredentialsMetaInput;
+  onSelectCredential: (credentialId: string) => void;
+  onClearCredential?: () => void;
+  readOnly?: boolean;
+  allowNone?: boolean;
+  /** When "node", applies compact styling for node context */
+  variant?: "default" | "node";
+}
+
+export function CredentialsSelect({
+  credentials,
+  provider,
+  displayName,
+  selectedCredentials,
+  onSelectCredential,
+  onClearCredential,
+  readOnly = false,
+  allowNone = true,
+  variant = "default",
+}: Props) {
+  function handleValueChange(e: React.ChangeEvent<HTMLSelectElement>) {
+    const value = e.target.value;
+    if (value === "__none__") {
+      onClearCredential?.();
+    } else {
+      onSelectCredential(value);
+    }
+  }
+
+  const selectedCredential = selectedCredentials
+    ? credentials.find((c) => c.id === selectedCredentials.id)
+    : null;
+
+  const displayCredential = selectedCredential
+    ? {
+        id: selectedCredential.id,
+        title: selectedCredential.title,
+        username: selectedCredential.username,
+        type: selectedCredential.type,
+        provider: selectedCredential.provider,
+      }
+    : allowNone
+      ? {
+          id: "__none__",
+          title: "None (skip this credential)",
+          type: "none",
+          provider: provider,
+        }
+      : {
+          id: "__placeholder__",
+          title: "Select credential",
+          type: "placeholder",
+          provider: provider,
+        };
+
+  return (
+    <div className="mb-4 w-full">
+      <div className="relative">
+        <select
+          value={selectedCredentials?.id ?? "__none__"}
+          onChange={handleValueChange}
+          disabled={readOnly}
+          className="absolute inset-0 z-10 cursor-pointer opacity-0"
+          aria-label={`Select ${displayName} credential`}
+        >
+          {allowNone ? (
+            <option value="__none__">None (skip this credential)</option>
+          ) : (
+            <option value="__none__" disabled hidden>
+              Select a credential
+            </option>
+          )}
+          {credentials.map((credential) => (
+            <option key={credential.id} value={credential.id}>
+              {getCredentialDisplayName(credential, displayName)}
+            </option>
+          ))}
+        </select>
+        <div className="rounded-medium border border-zinc-200 bg-white">
+          <CredentialRow
+            credential={displayCredential}
+            provider={provider}
+            displayName={displayName}
+            onSelect={() => {}}
+            onDelete={() => {}}
+            readOnly={readOnly}
+            asSelectTrigger={true}
+            variant={variant}
+          />
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/DeleteConfirmationModal/DeleteConfirmationModal.tsx b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/DeleteConfirmationModal/DeleteConfirmationModal.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/DeleteConfirmationModal/DeleteConfirmationModal.tsx
rename to autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/DeleteConfirmationModal/DeleteConfirmationModal.tsx
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/HotScopedCredentialsModal/HotScopedCredentialsModal.tsx b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/HotScopedCredentialsModal/HotScopedCredentialsModal.tsx
similarity index 94%
rename from autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/HotScopedCredentialsModal/HotScopedCredentialsModal.tsx
rename to autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/HotScopedCredentialsModal/HotScopedCredentialsModal.tsx
index 547952841b..63d2ae1ac5 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/HotScopedCredentialsModal/HotScopedCredentialsModal.tsx
+++ b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/HotScopedCredentialsModal/HotScopedCredentialsModal.tsx
@@ -41,7 +41,17 @@ export function HostScopedCredentialsModal({
   const currentHost = currentUrl ? getHostFromUrl(currentUrl) : "";
 
   const formSchema = z.object({
-    host: z.string().min(1, "Host is required"),
+    host: z
+      .string()
+      .min(1, "Host is required")
+      .refine((val) => !/^[a-zA-Z][a-zA-Z\d+\-.]*:\/\//.test(val), {
+        message: "Enter only the host (e.g. api.example.com), not a full URL",
+      })
+      .refine((val) => !val.includes("/"), {
+        message:
+          "Enter only the host (e.g. api.example.com), without a trailing path. " +
+          "You may specify a port (e.g. api.example.com:8080) if needed.",
+      }),
     title: z.string().optional(),
     headers: z.record(z.string()).optional(),
   });
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/OAuthWaitingModal/OAuthWaitingModal.tsx b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/OAuthWaitingModal/OAuthWaitingModal.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/OAuthWaitingModal/OAuthWaitingModal.tsx
rename to autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/OAuthWaitingModal/OAuthWaitingModal.tsx
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/PasswordCredentialsModal/PasswordCredentialsModal.tsx b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/PasswordCredentialsModal/PasswordCredentialsModal.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/PasswordCredentialsModal/PasswordCredentialsModal.tsx
rename to autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/PasswordCredentialsModal/PasswordCredentialsModal.tsx
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/helpers.ts b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/helpers.ts
similarity index 75%
rename from autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/helpers.ts
rename to autogpt_platform/frontend/src/components/contextual/CredentialsInput/helpers.ts
index 4cca825747..ef965d5382 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/helpers.ts
+++ b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/helpers.ts
@@ -99,4 +99,30 @@ export function getCredentialDisplayName(
 }
 
 export const OAUTH_TIMEOUT_MS = 5 * 60 * 1000;
-export const MASKED_KEY_LENGTH = 30;
+export const MASKED_KEY_LENGTH = 15;
+
+export function isSystemCredential(credential: {
+  title?: string | null;
+  is_system?: boolean;
+}): boolean {
+  if (credential.is_system === true) return true;
+  if (!credential.title) return false;
+  const titleLower = credential.title.toLowerCase();
+  return (
+    titleLower.includes("system") ||
+    titleLower.startsWith("use credits for") ||
+    titleLower.includes("use credits")
+  );
+}
+
+export function filterSystemCredentials<
+  T extends { title?: string; is_system?: boolean },
+>(credentials: T[]): T[] {
+  return credentials.filter((cred) => !isSystemCredential(cred));
+}
+
+export function getSystemCredentials<
+  T extends { title?: string; is_system?: boolean },
+>(credentials: T[]): T[] {
+  return credentials.filter((cred) => isSystemCredential(cred));
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/useCredentialsInput.ts b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/useCredentialsInput.ts
similarity index 83%
rename from autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/useCredentialsInput.ts
rename to autogpt_platform/frontend/src/components/contextual/CredentialsInput/useCredentialsInput.ts
index 6f5ca48126..509713ff1e 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/useCredentialsInput.ts
+++ b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/useCredentialsInput.ts
@@ -6,9 +6,11 @@ import {
   CredentialsMetaInput,
 } from "@/lib/autogpt-server-api/types";
 import { useQueryClient } from "@tanstack/react-query";
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import {
+  filterSystemCredentials,
   getActionButtonText,
+  getSystemCredentials,
   OAUTH_TIMEOUT_MS,
   OAuthPopupResultMessage,
 } from "./helpers";
@@ -22,6 +24,7 @@ type Params = {
   siblingInputs?: Record<string, any>;
   onLoaded?: (loaded: boolean) => void;
   readOnly?: boolean;
+  isOptional?: boolean;
 };
 
 export function useCredentialsInput({
@@ -31,6 +34,7 @@ export function useCredentialsInput({
   siblingInputs,
   onLoaded,
   readOnly = false,
+  isOptional = false,
 }: Params) {
   const [isAPICredentialsModalOpen, setAPICredentialsModalOpen] =
     useState(false);
@@ -52,6 +56,7 @@ export function useCredentialsInput({
   const api = useBackendAPI();
   const queryClient = useQueryClient();
   const credentials = useCredentials(schema, siblingInputs);
+  const hasAttemptedAutoSelect = useRef(false);
 
   const deleteCredentialsMutation = useDeleteV1DeleteCredentials({
     mutation: {
@@ -80,32 +85,49 @@ export function useCredentialsInput({
   useEffect(() => {
     if (readOnly) return;
     if (!credentials || !("savedCredentials" in credentials)) return;
+    const availableCreds = credentials.savedCredentials;
     if (
       selectedCredential &&
-      !credentials.savedCredentials.some((c) => c.id === selectedCredential.id)
+      !availableCreds.some((c) => c.id === selectedCredential.id)
     ) {
       onSelectCredential(undefined);
+      // Reset auto-selection flag so it can run again after unsetting invalid credential
+      hasAttemptedAutoSelect.current = false;
     }
   }, [credentials, selectedCredential, onSelectCredential, readOnly]);
 
-  // The available credential, if there is only one
-  const singleCredential = useMemo(() => {
-    if (!credentials || !("savedCredentials" in credentials)) {
-      return null;
-    }
+  // Auto-select the first available credential on initial mount
+  // Once a user has made a selection, we don't override it
+  useEffect(
+    function autoSelectCredential() {
+      if (readOnly) return;
+      if (!credentials || !("savedCredentials" in credentials)) return;
+      if (selectedCredential?.id) return;
 
-    return credentials.savedCredentials.length === 1
-      ? credentials.savedCredentials[0]
-      : null;
-  }, [credentials]);
+      const savedCreds = credentials.savedCredentials;
+      if (savedCreds.length === 0) return;
 
-  // Auto-select the one available credential
-  useEffect(() => {
-    if (readOnly) return;
-    if (singleCredential && !selectedCredential) {
-      onSelectCredential(singleCredential);
-    }
-  }, [singleCredential, selectedCredential, onSelectCredential, readOnly]);
+      if (hasAttemptedAutoSelect.current) return;
+      hasAttemptedAutoSelect.current = true;
+
+      if (isOptional) return;
+
+      const cred = savedCreds[0];
+      onSelectCredential({
+        id: cred.id,
+        type: cred.type,
+        provider: credentials.provider,
+        title: (cred as any).title,
+      });
+    },
+    [
+      credentials,
+      selectedCredential?.id,
+      readOnly,
+      isOptional,
+      onSelectCredential,
+    ],
+  );
 
   if (
     !credentials ||
@@ -126,8 +148,13 @@ export function useCredentialsInput({
     supportsHostScoped,
     savedCredentials,
     oAuthCallback,
+    isSystemProvider,
   } = credentials;
 
+  // Split credentials into user and system
+  const userCredentials = filterSystemCredentials(savedCredentials);
+  const systemCredentials = getSystemCredentials(savedCredentials);
+
   async function handleOAuthLogin() {
     setOAuthError(null);
     const { login_url, state_token } = await api.oAuthLogin(
@@ -282,7 +309,10 @@ export function useCredentialsInput({
     supportsOAuth2,
     supportsUserPassword,
     supportsHostScoped,
-    credentialsToShow: savedCredentials,
+    isSystemProvider,
+    userCredentials,
+    systemCredentials,
+    allCredentials: savedCredentials,
     selectedCredential,
     oAuthError,
     isAPICredentialsModalOpen,
@@ -297,7 +327,7 @@ export function useCredentialsInput({
       supportsApiKey,
       supportsUserPassword,
       supportsHostScoped,
-      savedCredentials.length > 0,
+      userCredentials.length > 0,
     ),
     setAPICredentialsModalOpen,
     setUserPasswordCredentialsModalOpen,
diff --git a/autogpt_platform/frontend/src/components/contextual/EditAgentModal/EditAgentModal.tsx b/autogpt_platform/frontend/src/components/contextual/EditAgentModal/EditAgentModal.tsx
index 501650a36b..243b478f49 100644
--- a/autogpt_platform/frontend/src/components/contextual/EditAgentModal/EditAgentModal.tsx
+++ b/autogpt_platform/frontend/src/components/contextual/EditAgentModal/EditAgentModal.tsx
@@ -27,6 +27,7 @@ export function EditAgentModal({
 
   return (
     <Dialog
+      title="Edit Agent"
       styling={{
         maxWidth: "45rem",
       }}
diff --git a/autogpt_platform/frontend/src/components/contextual/EditAgentModal/components/EditAgentForm.tsx b/autogpt_platform/frontend/src/components/contextual/EditAgentModal/components/EditAgentForm.tsx
index 7f04f91a92..5c0c4fa1de 100644
--- a/autogpt_platform/frontend/src/components/contextual/EditAgentModal/components/EditAgentForm.tsx
+++ b/autogpt_platform/frontend/src/components/contextual/EditAgentModal/components/EditAgentForm.tsx
@@ -8,7 +8,6 @@ import { Form, FormField } from "@/components/__legacy__/ui/form";
 import { StoreSubmission } from "@/app/api/__generated__/models/storeSubmission";
 import { ThumbnailImages } from "../../PublishAgentModal/components/AgentInfoStep/components/ThumbnailImages";
 import { StoreSubmissionEditRequest } from "@/app/api/__generated__/models/storeSubmissionEditRequest";
-import { StepHeader } from "../../PublishAgentModal/components/StepHeader";
 import { useEditAgentForm } from "./useEditAgentForm";
 
 interface EditAgentFormProps {
@@ -31,12 +30,10 @@ export function EditAgentForm({
     isSubmitting,
     handleFormSubmit,
     handleImagesChange,
-  } = useEditAgentForm({ submission, onSuccess });
+  } = useEditAgentForm({ submission, onSuccess, onClose });
 
   return (
     <div className="mx-auto flex w-full flex-col rounded-3xl">
-      <StepHeader title="Edit Agent" description="Update your agent details" />
-
       <Form {...form}>
         <form
           onSubmit={form.handleSubmit(handleFormSubmit)}
@@ -75,7 +72,7 @@ export function EditAgentForm({
           <ThumbnailImages
             agentId={submission.agent_id}
             onImagesChange={handleImagesChange}
-            initialImages={submission.image_urls || []}
+            initialImages={Array.from(new Set(submission.image_urls || []))}
             initialSelectedImage={submission.image_urls?.[0] || null}
             errorMessage={form.formState.errors.root?.message}
           />
@@ -136,7 +133,7 @@ export function EditAgentForm({
               <Input
                 id={field.name}
                 label="Changes Summary"
-                type="text"
+                type="textarea"
                 placeholder="Briefly describe what you changed"
                 error={form.formState.errors.changes_summary?.message}
                 {...field}
diff --git a/autogpt_platform/frontend/src/components/contextual/EditAgentModal/components/useEditAgentForm.ts b/autogpt_platform/frontend/src/components/contextual/EditAgentModal/components/useEditAgentForm.ts
index 8de7c43659..4f2ea49506 100644
--- a/autogpt_platform/frontend/src/components/contextual/EditAgentModal/components/useEditAgentForm.ts
+++ b/autogpt_platform/frontend/src/components/contextual/EditAgentModal/components/useEditAgentForm.ts
@@ -19,11 +19,13 @@ interface useEditAgentFormProps {
     agent_id: string;
   };
   onSuccess: (submission: StoreSubmission) => void;
+  onClose: () => void;
 }
 
 export const useEditAgentForm = ({
   submission,
   onSuccess,
+  onClose,
 }: useEditAgentFormProps) => {
   const editAgentSchema = z.object({
     title: z
@@ -45,7 +47,7 @@ export const useEditAgentForm = ({
     changes_summary: z
       .string()
       .min(1, "Changes summary is required")
-      .max(200, "Changes summary must be less than 200 characters"),
+      .max(500, "Changes summary must be less than 500 characters"),
     agentOutputDemo: z
       .string()
       .refine(validateYouTubeUrl, "Please enter a valid YouTube URL"),
@@ -54,19 +56,11 @@ export const useEditAgentForm = ({
   type EditAgentFormData = z.infer<typeof editAgentSchema>;
 
   const [images, setImages] = React.useState<string[]>(
-    submission.image_urls || [],
+    Array.from(new Set(submission.image_urls || [])), // Remove duplicates
   );
   const [isSubmitting, setIsSubmitting] = React.useState(false);
 
-  const { mutateAsync: editSubmission } = usePutV2EditStoreSubmission({
-    mutation: {
-      onSuccess: () => {
-        queryClient.invalidateQueries({
-          queryKey: getGetV2ListMySubmissionsQueryKey(),
-        });
-      },
-    },
-  });
+  const { mutateAsync: editSubmission } = usePutV2EditStoreSubmission();
 
   const queryClient = useQueryClient();
   const { toast } = useToast();
@@ -132,7 +126,20 @@ export const useEditAgentForm = ({
 
       // Extract the StoreSubmission from the response
       if (response.status === 200 && response.data) {
+        toast({
+          title: "Agent Updated",
+          description: "Your agent submission has been updated successfully.",
+          duration: 3000,
+          variant: "default",
+        });
+
+        queryClient.invalidateQueries({
+          queryKey: getGetV2ListMySubmissionsQueryKey(),
+        });
+
+        // Call onSuccess and explicitly close the modal
         onSuccess(response.data);
+        onClose();
       } else {
         throw new Error("Failed to update submission");
       }
diff --git a/autogpt_platform/frontend/src/components/contextual/GoogleDrivePicker/GoogleDrivePicker.tsx b/autogpt_platform/frontend/src/components/contextual/GoogleDrivePicker/GoogleDrivePicker.tsx
index e0a43b8c77..b05bab8a9a 100644
--- a/autogpt_platform/frontend/src/components/contextual/GoogleDrivePicker/GoogleDrivePicker.tsx
+++ b/autogpt_platform/frontend/src/components/contextual/GoogleDrivePicker/GoogleDrivePicker.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { CredentialsInput } from "@/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/CredentialsInputs";
 import { Button } from "@/components/atoms/Button/Button";
+import { CredentialsInput } from "@/components/contextual/CredentialsInput/CredentialsInput";
 import { CircleNotchIcon, FolderOpenIcon } from "@phosphor-icons/react";
 import {
   Props as BaseProps,
diff --git a/autogpt_platform/frontend/src/components/contextual/InfiniteScroll/InfiniteScroll.tsx b/autogpt_platform/frontend/src/components/contextual/InfiniteScroll/InfiniteScroll.tsx
index 12aa95d564..adf93fa8d6 100644
--- a/autogpt_platform/frontend/src/components/contextual/InfiniteScroll/InfiniteScroll.tsx
+++ b/autogpt_platform/frontend/src/components/contextual/InfiniteScroll/InfiniteScroll.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import React from "react";
+import { LoadingSpinner } from "@/components/atoms/LoadingSpinner/LoadingSpinner";
 import { cn } from "@/lib/utils";
+import React from "react";
 import { useInfiniteScroll } from "./useInfiniteScroll";
-import LoadingBox from "@/components/__legacy__/ui/loading";
 
 type InfiniteScrollProps = {
   children: React.ReactNode;
@@ -47,7 +47,7 @@ export const InfiniteScroll: React.FC<InfiniteScrollProps> = ({
     hasNextPage,
   });
 
-  const defaultLoader = <LoadingBox className="w-full py-4" spinnerSize={12} />;
+  const defaultLoader = <LoadingSpinner size="medium" />;
 
   return (
     <div
diff --git a/autogpt_platform/frontend/src/components/contextual/InfiniteScroll/useInfiniteScroll.ts b/autogpt_platform/frontend/src/components/contextual/InfiniteScroll/useInfiniteScroll.ts
index 7fa0aa936c..259ef5ffe3 100644
--- a/autogpt_platform/frontend/src/components/contextual/InfiniteScroll/useInfiniteScroll.ts
+++ b/autogpt_platform/frontend/src/components/contextual/InfiniteScroll/useInfiniteScroll.ts
@@ -49,7 +49,26 @@ export const useInfiniteScroll = ({
 
     observer.observe(endOfListRef.current);
 
+    // Check if element is initially in view after a short delay to ensure DOM is ready
+    const checkInitialView = () => {
+      if (endOfListRef.current) {
+        const rect = endOfListRef.current.getBoundingClientRect();
+        const isInitiallyInView =
+          rect.top <= window.innerHeight + scrollThreshold &&
+          rect.bottom >= -scrollThreshold;
+
+        if (isInitiallyInView) {
+          setIsInView(true);
+        }
+      }
+    };
+
+    // Check immediately and after a short delay to catch cases where DOM updates
+    checkInitialView();
+    const timeoutId = setTimeout(checkInitialView, 100);
+
     return () => {
+      clearTimeout(timeoutId);
       observer.disconnect();
     };
   }, [hasNextPage, scrollThreshold]);
@@ -58,7 +77,7 @@ export const useInfiniteScroll = ({
     if (isInView && hasNextPage && !isLoadingRef.current) {
       loadMore();
     }
-  }, [isInView, hasNextPage]);
+  }, [isInView, hasNextPage, loadMore]);
 
   return {
     containerRef,
diff --git a/autogpt_platform/frontend/src/components/contextual/OutputRenderers/components/OutputActions.tsx b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/components/OutputActions.tsx
new file mode 100644
index 0000000000..cfe69e8709
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/components/OutputActions.tsx
@@ -0,0 +1,106 @@
+"use client";
+
+import React, { useState } from "react";
+import { CheckIcon, CopyIcon, DownloadIcon } from "@phosphor-icons/react";
+import { Button } from "@/components/atoms/Button/Button";
+import { OutputRenderer, OutputMetadata } from "../types";
+import { downloadOutputs } from "../utils/download";
+import { cn } from "@/lib/utils";
+
+interface OutputActionsProps {
+  items: Array<{
+    value: unknown;
+    metadata?: OutputMetadata;
+    renderer: OutputRenderer;
+  }>;
+  isPrimary?: boolean;
+  className?: string;
+}
+
+export function OutputActions({
+  items,
+  isPrimary = false,
+}: OutputActionsProps) {
+  const [copied, setCopied] = useState(false);
+
+  const handleCopyAll = async () => {
+    const textContents: string[] = [];
+
+    for (const item of items) {
+      const copyContent = item.renderer.getCopyContent(
+        item.value,
+        item.metadata,
+      );
+      if (
+        copyContent &&
+        item.renderer.isConcatenable(item.value, item.metadata)
+      ) {
+        // For concatenable items, extract the text
+        let text: string;
+        if (typeof copyContent.data === "string") {
+          text = copyContent.data;
+        } else if (copyContent.fallbackText) {
+          text = copyContent.fallbackText;
+        } else {
+          continue;
+        }
+        textContents.push(text);
+      }
+    }
+
+    if (textContents.length > 0) {
+      const combinedText = textContents.join("\n\n");
+      try {
+        await navigator.clipboard.writeText(combinedText);
+        setCopied(true);
+        setTimeout(() => setCopied(false), 2000);
+      } catch (error) {
+        console.error("Failed to copy:", error);
+      }
+    }
+  };
+
+  const handleDownloadAll = () => {
+    downloadOutputs(items);
+  };
+
+  return (
+    <div className="flex items-center gap-3">
+      <Button
+        variant={isPrimary ? "primary" : "ghost"}
+        size={isPrimary ? "small" : "icon"}
+        onClick={handleCopyAll}
+        aria-label="Copy all text outputs"
+        className={cn(isPrimary ? "min-w-0" : "")}
+      >
+        {copied ? (
+          <CheckIcon className="size-4 text-green-600" />
+        ) : (
+          <CopyIcon
+            className={cn(
+              "size-4",
+              isPrimary ? "text-white" : "text-neutral-500",
+            )}
+          />
+        )}
+        {isPrimary && <span>Copy All</span>}
+      </Button>
+
+      <Button
+        variant={isPrimary ? "primary" : "ghost"}
+        size={isPrimary ? "small" : "icon"}
+        onClick={handleDownloadAll}
+        aria-label="Download outputs"
+        className={cn(isPrimary ? "min-w-0" : "")}
+      >
+        <DownloadIcon
+          className={cn(
+            "size-4",
+            isPrimary ? "text-white" : "text-neutral-500",
+          )}
+        />
+        {isPrimary && <span>Download All</span>}
+      </Button>
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/OutputRenderers/components/OutputItem.tsx b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/components/OutputItem.tsx
new file mode 100644
index 0000000000..c5c91d5d48
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/components/OutputItem.tsx
@@ -0,0 +1,30 @@
+"use client";
+
+import { Text } from "@/components/atoms/Text/Text";
+import { OutputMetadata, OutputRenderer } from "../types";
+
+interface OutputItemProps {
+  value: any;
+  metadata?: OutputMetadata;
+  renderer: OutputRenderer;
+  label?: string;
+}
+
+export function OutputItem({
+  value,
+  metadata,
+  renderer,
+  label,
+}: OutputItemProps) {
+  return (
+    <div className="relative">
+      {label && (
+        <Text variant="large-medium" className="capitalize">
+          {label}
+        </Text>
+      )}
+
+      <div className="relative">{renderer.render(value, metadata)}</div>
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/OutputRenderers/index.ts b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/index.ts
new file mode 100644
index 0000000000..ba26054eb2
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/index.ts
@@ -0,0 +1,20 @@
+import { globalRegistry } from "./types";
+import { textRenderer } from "./renderers/TextRenderer";
+import { codeRenderer } from "./renderers/CodeRenderer";
+import { imageRenderer } from "./renderers/ImageRenderer";
+import { videoRenderer } from "./renderers/VideoRenderer";
+import { jsonRenderer } from "./renderers/JSONRenderer";
+import { markdownRenderer } from "./renderers/MarkdownRenderer";
+
+// Register all renderers in priority order
+globalRegistry.register(videoRenderer);
+globalRegistry.register(imageRenderer);
+globalRegistry.register(codeRenderer);
+globalRegistry.register(markdownRenderer);
+globalRegistry.register(jsonRenderer);
+globalRegistry.register(textRenderer);
+
+export { globalRegistry };
+export type { OutputRenderer, OutputMetadata, DownloadContent } from "./types";
+export { OutputItem } from "./components/OutputItem";
+export { OutputActions } from "./components/OutputActions";
diff --git a/autogpt_platform/frontend/src/components/contextual/OutputRenderers/renderers/CodeRenderer.tsx b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/renderers/CodeRenderer.tsx
new file mode 100644
index 0000000000..93df7d8ddd
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/renderers/CodeRenderer.tsx
@@ -0,0 +1,135 @@
+import React from "react";
+import {
+  OutputRenderer,
+  OutputMetadata,
+  DownloadContent,
+  CopyContent,
+} from "../types";
+
+function getFileExtension(language: string): string {
+  const extensionMap: Record<string, string> = {
+    javascript: "js",
+    typescript: "ts",
+    python: "py",
+    java: "java",
+    csharp: "cs",
+    cpp: "cpp",
+    c: "c",
+    html: "html",
+    css: "css",
+    json: "json",
+    xml: "xml",
+    yaml: "yaml",
+    markdown: "md",
+    sql: "sql",
+    bash: "sh",
+    shell: "sh",
+    plaintext: "txt",
+  };
+
+  return extensionMap[language.toLowerCase()] || "txt";
+}
+
+function canRenderCode(value: unknown, metadata?: OutputMetadata): boolean {
+  if (metadata?.type === "code" || metadata?.language) {
+    return typeof value === "string";
+  }
+
+  if (typeof value !== "string") return false;
+
+  const markdownIndicators = [
+    /^#{1,6}\s+/m,
+    /\*\*[^*]+\*\*/,
+    /\[([^\]]+)\]\(([^)]+)\)/,
+    /^>\s+/m,
+    /^\s*[-*+]\s+\w+/m,
+    /!\[([^\]]*)\]\(([^)]+)\)/,
+  ];
+
+  let markdownMatches = 0;
+  for (const pattern of markdownIndicators) {
+    if (pattern.test(value)) {
+      markdownMatches++;
+      if (markdownMatches >= 2) {
+        return false;
+      }
+    }
+  }
+
+  const codeIndicators = [
+    /^(function|const|let|var|class|import|export|if|for|while)\s/m,
+    /^def\s+\w+\s*\(/m,
+    /^import\s+/m,
+    /^from\s+\w+\s+import/m,
+    /^\s*<[^>]+>/,
+    /[{}[\]();]/,
+  ];
+
+  return codeIndicators.some((pattern) => pattern.test(value));
+}
+
+function renderCode(
+  value: unknown,
+  metadata?: OutputMetadata,
+): React.ReactNode {
+  const codeValue = String(value);
+  const language = metadata?.language || "plaintext";
+
+  return (
+    <div className="group relative">
+      {metadata?.language && (
+        <div className="absolute right-2 top-2 rounded bg-background/80 px-2 py-1 text-xs text-muted-foreground">
+          {language}
+        </div>
+      )}
+      <pre className="overflow-x-auto rounded-md bg-muted p-3">
+        <code className="font-mono text-sm">{codeValue}</code>
+      </pre>
+    </div>
+  );
+}
+
+function getCopyContentCode(
+  value: unknown,
+  _metadata?: OutputMetadata,
+): CopyContent | null {
+  const codeValue = String(value);
+  return {
+    mimeType: "text/plain",
+    data: codeValue,
+    fallbackText: codeValue,
+  };
+}
+
+function getDownloadContentCode(
+  value: unknown,
+  metadata?: OutputMetadata,
+): DownloadContent | null {
+  const codeValue = String(value);
+  const language = metadata?.language || "txt";
+  const extension = getFileExtension(language);
+  const blob = new Blob([codeValue], { type: "text/plain" });
+
+  return {
+    data: blob,
+    filename: metadata?.filename || `code.${extension}`,
+    mimeType: "text/plain",
+  };
+}
+
+function isConcatenableCode(
+  _value: unknown,
+  _metadata?: OutputMetadata,
+): boolean {
+  return true;
+}
+
+export const codeRenderer: OutputRenderer = {
+  name: "CodeRenderer",
+  priority: 30,
+  canRender: canRenderCode,
+  render: renderCode,
+  getCopyContent: getCopyContentCode,
+  getDownloadContent: getDownloadContentCode,
+  isConcatenable: isConcatenableCode,
+};
diff --git a/autogpt_platform/frontend/src/components/contextual/OutputRenderers/renderers/ImageRenderer.tsx b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/renderers/ImageRenderer.tsx
new file mode 100644
index 0000000000..f2a7636c6e
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/renderers/ImageRenderer.tsx
@@ -0,0 +1,209 @@
+import React from "react";
+import {
+  OutputRenderer,
+  OutputMetadata,
+  DownloadContent,
+  CopyContent,
+} from "../types";
+
+const imageExtensions = [
+  ".jpg",
+  ".jpeg",
+  ".png",
+  ".gif",
+  ".bmp",
+  ".svg",
+  ".webp",
+  ".ico",
+];
+
+const imageMimeTypes = [
+  "image/jpeg",
+  "image/png",
+  "image/gif",
+  "image/bmp",
+  "image/svg+xml",
+  "image/webp",
+  "image/x-icon",
+];
+
+function guessMimeType(url: string): string | null {
+  const extension = url.split(".").pop()?.toLowerCase();
+  const mimeMap: Record<string, string> = {
+    jpg: "image/jpeg",
+    jpeg: "image/jpeg",
+    png: "image/png",
+    gif: "image/gif",
+    bmp: "image/bmp",
+    svg: "image/svg+xml",
+    webp: "image/webp",
+    ico: "image/x-icon",
+  };
+  return extension ? mimeMap[extension] || null : null;
+}
+
+function canRenderImage(value: unknown, metadata?: OutputMetadata): boolean {
+  if (
+    metadata?.type === "image" ||
+    (metadata?.mimeType && imageMimeTypes.includes(metadata.mimeType))
+  ) {
+    return true;
+  }
+
+  if (typeof value === "object" && value !== null) {
+    const obj = value as any;
+    if (obj.url || obj.data || obj.path) {
+      const urlOrData = obj.url || obj.data || obj.path;
+
+      if (typeof urlOrData === "string") {
+        if (urlOrData.startsWith("data:image/")) {
+          return true;
+        }
+
+        if (
+          urlOrData.startsWith("http://") ||
+          urlOrData.startsWith("https://")
+        ) {
+          const hasImageExt = imageExtensions.some((ext) =>
+            urlOrData.toLowerCase().includes(ext),
+          );
+          return hasImageExt;
+        }
+      }
+    }
+
+    if (obj.filename) {
+      const hasImageExt = imageExtensions.some((ext) =>
+        obj.filename.toLowerCase().endsWith(ext),
+      );
+      return hasImageExt;
+    }
+  }
+
+  if (typeof value === "string") {
+    if (value.startsWith("data:image/")) {
+      return true;
+    }
+
+    if (value.startsWith("http://") || value.startsWith("https://")) {
+      const hasImageExt = imageExtensions.some((ext) =>
+        value.toLowerCase().includes(ext),
+      );
+      return hasImageExt;
+    }
+
+    if (metadata?.filename) {
+      const hasImageExt = imageExtensions.some((ext) =>
+        metadata.filename!.toLowerCase().endsWith(ext),
+      );
+      return hasImageExt;
+    }
+  }
+
+  return false;
+}
+
+function renderImage(
+  value: unknown,
+  metadata?: OutputMetadata,
+): React.ReactNode {
+  const imageUrl = String(value);
+  const altText = metadata?.filename || "Output image";
+
+  return (
+    <div className="group relative">
+      {/* eslint-disable-next-line @next/next/no-img-element */}
+      <img
+        src={imageUrl}
+        alt={altText}
+        className="h-auto max-w-full rounded-md border border-gray-200"
+        loading="lazy"
+      />
+    </div>
+  );
+}
+
+function getCopyContentImage(
+  value: unknown,
+  metadata?: OutputMetadata,
+): CopyContent | null {
+  const imageUrl = String(value);
+
+  if (imageUrl.startsWith("data:")) {
+    const mimeMatch = imageUrl.match(/data:([^;]+)/);
+    const mimeType = mimeMatch?.[1] || "image/png";
+
+    return {
+      mimeType: mimeType,
+      data: async () => {
+        const response = await fetch(imageUrl);
+        return await response.blob();
+      },
+      alternativeMimeTypes: ["image/png", "text/plain"],
+      fallbackText: imageUrl,
+    };
+  }
+
+  const mimeType = metadata?.mimeType || guessMimeType(imageUrl) || "image/png";
+
+  return {
+    mimeType: mimeType,
+    data: async () => {
+      const response = await fetch(imageUrl);
+      return await response.blob();
+    },
+    alternativeMimeTypes: ["image/png", "text/plain"],
+    fallbackText: imageUrl,
+  };
+}
+
+function getDownloadContentImage(
+  value: unknown,
+  metadata?: OutputMetadata,
+): DownloadContent | null {
+  const imageUrl = String(value);
+
+  if (imageUrl.startsWith("data:")) {
+    const [mimeInfo, base64Data] = imageUrl.split(",");
+    const mimeType = mimeInfo.match(/data:([^;]+)/)?.[1] || "image/png";
+    const byteCharacters = atob(base64Data);
+    const byteNumbers = new Array(byteCharacters.length);
+
+    for (let i = 0; i < byteCharacters.length; i++) {
+      byteNumbers[i] = byteCharacters.charCodeAt(i);
+    }
+
+    const byteArray = new Uint8Array(byteNumbers);
+    const blob = new Blob([byteArray], { type: mimeType });
+
+    const extension = mimeType.split("/")[1] || "png";
+    return {
+      data: blob,
+      filename: metadata?.filename || `image.${extension}`,
+      mimeType,
+    };
+  }
+
+  return {
+    data: imageUrl,
+    filename: metadata?.filename || "image.png",
+    mimeType: metadata?.mimeType || "image/png",
+  };
+}
+
+function isConcatenableImage(
+  _value: unknown,
+  _metadata?: OutputMetadata,
+): boolean {
+  return false;
+}
+
+export const imageRenderer: OutputRenderer = {
+  name: "ImageRenderer",
+  priority: 40,
+  canRender: canRenderImage,
+  render: renderImage,
+  getCopyContent: getCopyContentImage,
+  getDownloadContent: getDownloadContentImage,
+  isConcatenable: isConcatenableImage,
+};
diff --git a/autogpt_platform/frontend/src/components/contextual/OutputRenderers/renderers/JSONRenderer.tsx b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/renderers/JSONRenderer.tsx
new file mode 100644
index 0000000000..668f9179c3
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/renderers/JSONRenderer.tsx
@@ -0,0 +1,204 @@
+"use client";
+
+import React, { useState } from "react";
+import { CaretDown, CaretRight } from "@phosphor-icons/react";
+import {
+  OutputRenderer,
+  OutputMetadata,
+  DownloadContent,
+  CopyContent,
+} from "../types";
+
+function canRenderJSON(value: unknown, _metadata?: OutputMetadata): boolean {
+  if (_metadata?.type === "json") {
+    return true;
+  }
+
+  if (typeof value === "object" && value !== null) {
+    return true;
+  }
+
+  if (typeof value === "string") {
+    try {
+      JSON.parse(value);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
+  return false;
+}
+
+function renderJSON(
+  value: unknown,
+  _metadata?: OutputMetadata,
+): React.ReactNode {
+  let jsonData = value;
+
+  if (typeof value === "string") {
+    try {
+      jsonData = JSON.parse(value);
+    } catch {
+      return null;
+    }
+  }
+
+  return <JSONViewer data={jsonData} />;
+}
+
+function getCopyContentJSON(
+  value: unknown,
+  _metadata?: OutputMetadata,
+): CopyContent | null {
+  const jsonString =
+    typeof value === "string" ? value : JSON.stringify(value, null, 2);
+
+  return {
+    mimeType: "application/json",
+    data: jsonString,
+    alternativeMimeTypes: ["text/plain"],
+    fallbackText: jsonString,
+  };
+}
+
+function getDownloadContentJSON(
+  value: unknown,
+  _metadata?: OutputMetadata,
+): DownloadContent | null {
+  const jsonString =
+    typeof value === "string" ? value : JSON.stringify(value, null, 2);
+  const blob = new Blob([jsonString], { type: "application/json" });
+
+  return {
+    data: blob,
+    filename: _metadata?.filename || "output.json",
+    mimeType: "application/json",
+  };
+}
+
+function isConcatenableJSON(
+  _value: unknown,
+  _metadata?: OutputMetadata,
+): boolean {
+  return true;
+}
+
+export const jsonRenderer: OutputRenderer = {
+  name: "JSONRenderer",
+  priority: 20,
+  canRender: canRenderJSON,
+  render: renderJSON,
+  getCopyContent: getCopyContentJSON,
+  getDownloadContent: getDownloadContentJSON,
+  isConcatenable: isConcatenableJSON,
+};
+
+function JSONViewer({ data }: { data: any }) {
+  const [collapsed, setCollapsed] = useState<Record<string, boolean>>({});
+
+  const toggleCollapse = (key: string) => {
+    setCollapsed((prev) => ({ ...prev, [key]: !prev[key] }));
+  };
+
+  const renderValue = (value: any, key: string = ""): React.ReactNode => {
+    if (value === null)
+      return <span className="text-muted-foreground">null</span>;
+    if (value === undefined)
+      return <span className="text-muted-foreground">undefined</span>;
+
+    if (typeof value === "boolean") {
+      return <span className="text-blue-600">{value.toString()}</span>;
+    }
+
+    if (typeof value === "number") {
+      return <span className="text-green-600">{value}</span>;
+    }
+
+    if (typeof value === "string") {
+      return <span className="text-orange-600">&quot;{value}&quot;</span>;
+    }
+
+    if (Array.isArray(value)) {
+      const isCollapsed = collapsed[key];
+      const itemCount = value.length;
+
+      if (itemCount === 0) {
+        return <span className="text-muted-foreground">[]</span>;
+      }
+
+      return (
+        <div className="inline-block">
+          <button
+            onClick={() => toggleCollapse(key)}
+            className="inline-flex items-center rounded px-1 hover:bg-muted"
+          >
+            {isCollapsed ? (
+              <CaretRight className="size-3" />
+            ) : (
+              <CaretDown className="size-3" />
+            )}
+            <span className="ml-1 text-muted-foreground">
+              Array({itemCount})
+            </span>
+          </button>
+          {!isCollapsed && (
+            <div className="ml-4 mt-1">
+              {value.map((item, index) => (
+                <div key={index} className="flex">
+                  <span className="mr-2 text-muted-foreground">{index}:</span>
+                  {renderValue(item, `${key}[${index}]`)}
+                </div>
+              ))}
+            </div>
+          )}
+        </div>
+      );
+    }
+
+    if (typeof value === "object") {
+      const isCollapsed = collapsed[key];
+      const keys = Object.keys(value);
+
+      if (keys.length === 0) {
+        return <span className="text-muted-foreground">{"{}"}</span>;
+      }
+
+      return (
+        <div className="inline-block">
+          <button
+            onClick={() => toggleCollapse(key)}
+            className="inline-flex items-center rounded px-1 hover:bg-muted"
+          >
+            {isCollapsed ? (
+              <CaretRight className="size-3" />
+            ) : (
+              <CaretDown className="size-3" />
+            )}
+            <span className="ml-1 text-muted-foreground">Object</span>
+          </button>
+          {!isCollapsed && (
+            <div className="ml-4 mt-1">
+              {keys.map((objKey) => (
+                <div key={objKey} className="flex">
+                  <span className="mr-2 text-purple-600">
+                    &quot;{objKey}&quot;:
+                  </span>
+                  {renderValue(value[objKey], `${key}.${objKey}`)}
+                </div>
+              ))}
+            </div>
+          )}
+        </div>
+      );
+    }
+
+    return <span className="text-muted-foreground">{String(value)}</span>;
+  };
+
+  return (
+    <div className="overflow-x-auto rounded-md bg-muted p-3 font-mono text-sm">
+      {renderValue(data, "root")}
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/OutputRenderers/renderers/MarkdownRenderer.tsx b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/renderers/MarkdownRenderer.tsx
new file mode 100644
index 0000000000..d94966c6c8
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/renderers/MarkdownRenderer.tsx
@@ -0,0 +1,456 @@
+"use client";
+
+import React from "react";
+import ReactMarkdown from "react-markdown";
+import remarkGfm from "remark-gfm";
+import remarkMath from "remark-math";
+import rehypeKatex from "rehype-katex";
+import rehypeHighlight from "rehype-highlight";
+import rehypeSlug from "rehype-slug";
+import rehypeAutolinkHeadings from "rehype-autolink-headings";
+import {
+  OutputRenderer,
+  OutputMetadata,
+  DownloadContent,
+  CopyContent,
+} from "../types";
+import "highlight.js/styles/github-dark.css";
+import "katex/dist/katex.min.css";
+
+const markdownPatterns = [
+  /```[\s\S]*?```/u, // Fenced code blocks (check first)
+  /^#{1,6}\s+\S+/gmu, // ATX headers (require content)
+  /\*\*[^*\n]+?\*\*/u, // **bold**
+  /__(?!_)[^_\n]+?__(?!_)/u, // __bold__ (avoid ___/snake_case_)
+  /(?<!\*)\*(?!\*)(?:[^*\n]|(?<=\\)\*)+?(?<!\\)\*(?!\*)/u, // *italic* (try to avoid **)
+  /(?<!_)_(?!_)(?:[^_\n]|(?<=\\)_)+?(?<!\\)_(?!_)/u, // _italic_ with guards
+  /\[([^\]\n]+)\]\(([^)\s]+)(?:\s+"[^"]*")?\)/u, // Links with optional title (simple)
+  /!\[([^\]\n]*)\]\(([^)\s]+)(?:\s+"[^"]*")?\)/u, // Images with optional title (simple)
+  /`[^`\n]+`/u, // Inline code
+  /^(?:\s*[-*+]\s+\S.*)(?:\n\s*[-*+]\s+\S.*)+$/gmu, // UL list (≥2 items)
+  /^(?:\s*\d+\.\s+\S.*)(?:\n\s*\d+\.\s+\S.*)+$/gmu, // OL list (≥2 items)
+  /^>\s+\S.*/gm, // Blockquotes
+  /^\|[^|\n]+(\|[^|\n]+)+\|\s*$/gm, // Table row (at least two cells)
+  /^\s*\|(?:\s*:?[-=]{3,}\s*\|)+\s*$/gm, // Table separator row
+  /\$\$[\s\S]+?\$\$/u, // Display math
+  /(?<!\\)(?<!\w)\$[^$\n]+?\$(?!\w)/u, // Inline math: avoid prices/ids
+];
+
+const videoExtensions = [".mp4", ".webm", ".ogg", ".mov", ".avi"];
+
+function isVideoUrl(url: string): boolean {
+  if (url.includes("youtube.com/watch") || url.includes("youtu.be/")) {
+    return true;
+  }
+  try {
+    const parsed = new URL(url);
+    if (
+      parsed.hostname === "vimeo.com" ||
+      parsed.hostname === "www.vimeo.com"
+    ) {
+      return true;
+    }
+  } catch {
+    // If URL parsing fails, treat as not a Vimeo URL.
+  }
+  return videoExtensions.some((ext) => url.toLowerCase().includes(ext));
+}
+
+function getVideoEmbedUrl(url: string): string | null {
+  const youtubeMatch = url.match(
+    /(?:youtube\.com\/watch\?v=|youtu\.be\/)([^&\s]+)/,
+  );
+  if (youtubeMatch) {
+    return `https://www.youtube.com/embed/${youtubeMatch[1]}`;
+  }
+
+  const vimeoMatch = url.match(/vimeo\.com\/(\d+)/);
+  if (vimeoMatch) {
+    return `https://player.vimeo.com/video/${vimeoMatch[1]}`;
+  }
+
+  if (videoExtensions.some((ext) => url.toLowerCase().includes(ext))) {
+    return url;
+  }
+
+  return null;
+}
+
+function renderVideoEmbed(url: string): React.ReactNode {
+  const embedUrl = getVideoEmbedUrl(url);
+
+  if (!embedUrl) {
+    return (
+      <a
+        href={url}
+        target="_blank"
+        rel="noopener noreferrer"
+        className="text-blue-600 underline"
+      >
+        {url}
+      </a>
+    );
+  }
+
+  if (videoExtensions.some((ext) => embedUrl.toLowerCase().includes(ext))) {
+    return (
+      <div className="my-4">
+        <video
+          controls
+          className="w-full max-w-2xl rounded-lg shadow-md"
+          preload="metadata"
+        >
+          <source src={embedUrl} />
+          Your browser does not support the video tag.
+        </video>
+      </div>
+    );
+  }
+
+  return (
+    <div className="my-4">
+      <div className="relative aspect-video">
+        <iframe
+          src={embedUrl}
+          title="Embedded video player"
+          className="absolute left-0 top-0 h-full w-full rounded-lg shadow-md"
+          allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+          allowFullScreen
+        />
+      </div>
+    </div>
+  );
+}
+
+function canRenderMarkdown(value: unknown, metadata?: OutputMetadata): boolean {
+  if (
+    metadata?.type === "markdown" ||
+    metadata?.mimeType === "text/markdown" ||
+    metadata?.mimeType === "text/x-markdown"
+  ) {
+    return true;
+  }
+
+  if (typeof value !== "string") {
+    return false;
+  }
+
+  if (metadata?.filename?.toLowerCase().endsWith(".md")) {
+    return true;
+  }
+
+  let matchCount = 0;
+  const requiredMatches = 2;
+
+  for (const pattern of markdownPatterns) {
+    if (pattern.test(value)) {
+      matchCount++;
+      if (matchCount >= requiredMatches) {
+        return true;
+      }
+    }
+  }
+
+  return false;
+}
+
+function renderMarkdown(
+  value: unknown,
+  _metadata?: OutputMetadata,
+): React.ReactNode {
+  const markdownContent = String(value);
+
+  return (
+    <div className="markdown-output">
+      <ReactMarkdown
+        className="prose prose-sm dark:prose-invert max-w-none"
+        remarkPlugins={[
+          remarkGfm, // GitHub Flavored Markdown (tables, task lists, strikethrough)
+          [remarkMath, { singleDollarTextMath: false }], // Math support for LaTeX
+        ]}
+        rehypePlugins={[
+          rehypeKatex, // Render math with KaTeX
+          rehypeHighlight, // Syntax highlighting for code blocks
+          rehypeSlug, // Add IDs to headings
+          [rehypeAutolinkHeadings, { behavior: "wrap" }], // Make headings clickable
+        ]}
+        components={{
+          // Custom components for better rendering
+          pre: ({ children, ...props }) => (
+            <pre
+              className="my-4 overflow-x-auto rounded-md bg-gray-900 p-4 dark:bg-gray-950"
+              {...props}
+            >
+              {children}
+            </pre>
+          ),
+          code: ({ children, ...props }: any) => {
+            // Check if it's inline code by looking at the parent
+            const isInline = !props.className?.includes("language-");
+            if (isInline) {
+              return (
+                <code
+                  className="rounded bg-gray-100 px-1.5 py-0.5 font-mono text-sm text-gray-800 dark:bg-gray-800 dark:text-gray-200"
+                  {...props}
+                >
+                  {children}
+                </code>
+              );
+            }
+            // Block code is handled by rehype-highlight
+            return (
+              <code className="font-mono text-sm text-gray-100" {...props}>
+                {children}
+              </code>
+            );
+          },
+          a: ({ children, href, ...props }) => (
+            <a
+              href={href}
+              target="_blank"
+              rel="noopener noreferrer"
+              className="text-black underline decoration-1 underline-offset-2 transition-colors"
+              {...props}
+            >
+              {children}
+            </a>
+          ),
+          blockquote: ({ children, ...props }) => (
+            <blockquote
+              className="my-4 border-l-4 border-blue-500 pl-4 italic text-gray-700 dark:border-blue-400 dark:text-gray-300"
+              {...props}
+            >
+              {children}
+            </blockquote>
+          ),
+          table: ({ children, ...props }) => (
+            <div className="my-4 overflow-x-auto">
+              <table
+                className="min-w-full divide-y divide-gray-200 rounded-lg border border-gray-200 dark:divide-gray-700 dark:border-gray-700"
+                {...props}
+              >
+                {children}
+              </table>
+            </div>
+          ),
+          th: ({ children, ...props }) => (
+            <th
+              className="bg-gray-50 px-4 py-3 text-left text-xs font-semibold uppercase tracking-wider text-gray-700 dark:bg-gray-800 dark:text-gray-300"
+              {...props}
+            >
+              {children}
+            </th>
+          ),
+          td: ({ children, ...props }) => (
+            <td
+              className="border-t border-gray-200 px-4 py-3 text-sm text-gray-600 dark:border-gray-700 dark:text-gray-400"
+              {...props}
+            >
+              {children}
+            </td>
+          ),
+          // GitHub Flavored Markdown task lists
+          input: ({ ...props }: any) => {
+            if (props.type === "checkbox") {
+              return (
+                <input
+                  type="checkbox"
+                  className="mr-2 h-4 w-4 rounded border-gray-300 text-blue-600 focus:ring-blue-500 disabled:cursor-not-allowed disabled:opacity-70"
+                  disabled
+                  {...props}
+                />
+              );
+            }
+            return <input {...props} />;
+          },
+          // Better list styling
+          ul: ({ children, ...props }: any) => (
+            <ul
+              className={`my-4 list-disc space-y-2 pl-6 ${
+                props.className?.includes("contains-task-list")
+                  ? "list-none pl-0"
+                  : ""
+              }`}
+              {...props}
+            >
+              {children}
+            </ul>
+          ),
+          ol: ({ children, ...props }) => (
+            <ol className="my-4 list-decimal space-y-2 pl-6" {...props}>
+              {children}
+            </ol>
+          ),
+          li: ({ children, ...props }: any) => (
+            <li
+              className={`text-gray-700 dark:text-gray-300 ${
+                props.className?.includes("task-list-item")
+                  ? "flex items-start"
+                  : ""
+              }`}
+              {...props}
+            >
+              {children}
+            </li>
+          ),
+          // Better heading styles
+          h1: ({ children, ...props }) => (
+            <h1
+              className="my-6 text-3xl font-bold text-gray-900 dark:text-gray-100"
+              {...props}
+            >
+              {children}
+            </h1>
+          ),
+          h2: ({ children, ...props }) => (
+            <h2
+              className="my-5 text-2xl font-semibold text-gray-800 dark:text-gray-200"
+              {...props}
+            >
+              {children}
+            </h2>
+          ),
+          h3: ({ children, ...props }) => (
+            <h3
+              className="my-4 text-xl font-semibold text-gray-800 dark:text-gray-200"
+              {...props}
+            >
+              {children}
+            </h3>
+          ),
+          h4: ({ children, ...props }) => (
+            <h4
+              className="my-3 text-lg font-medium text-gray-700 dark:text-gray-300"
+              {...props}
+            >
+              {children}
+            </h4>
+          ),
+          h5: ({ children, ...props }) => (
+            <h5
+              className="my-2 text-base font-medium text-gray-700 dark:text-gray-300"
+              {...props}
+            >
+              {children}
+            </h5>
+          ),
+          h6: ({ children, ...props }) => (
+            <h6
+              className="my-2 text-sm font-medium text-gray-600 dark:text-gray-400"
+              {...props}
+            >
+              {children}
+            </h6>
+          ),
+          // Horizontal rule
+          hr: ({ ...props }) => (
+            <hr
+              className="my-6 border-gray-300 dark:border-gray-700"
+              {...props}
+            />
+          ),
+          // Strikethrough (GFM)
+          del: ({ children, ...props }) => (
+            <del
+              className="text-gray-500 line-through dark:text-gray-500"
+              {...props}
+            >
+              {children}
+            </del>
+          ),
+          // Image handling
+          img: ({ src, alt, ...props }) => {
+            // Check if it's a video URL pattern
+            if (src && isVideoUrl(src)) {
+              return renderVideoEmbed(src);
+            }
+
+            return (
+              // eslint-disable-next-line @next/next/no-img-element
+              <img
+                src={src}
+                alt={alt}
+                className="my-4 h-auto max-w-full rounded-lg shadow-md"
+                loading="lazy"
+                {...props}
+              />
+            );
+          },
+          // Custom paragraph to handle standalone video URLs
+          p: ({ children, ...props }) => {
+            // Check if paragraph contains just a video URL
+            if (typeof children === "string" && isVideoUrl(children.trim())) {
+              return renderVideoEmbed(children.trim());
+            }
+
+            // Check for video URLs in link children
+            if (React.Children.count(children) === 1) {
+              const child = React.Children.toArray(children)[0];
+              if (React.isValidElement(child) && child.type === "a") {
+                const href = child.props.href;
+                if (href && isVideoUrl(href)) {
+                  return renderVideoEmbed(href);
+                }
+              }
+            }
+
+            return (
+              <p
+                className="my-3 leading-relaxed text-gray-700 dark:text-gray-300"
+                {...props}
+              >
+                {children}
+              </p>
+            );
+          },
+        }}
+      >
+        {markdownContent}
+      </ReactMarkdown>
+    </div>
+  );
+}
+
+function getCopyContentMarkdown(
+  value: unknown,
+  _metadata?: OutputMetadata,
+): CopyContent | null {
+  const markdownText = String(value);
+  return {
+    mimeType: "text/markdown",
+    data: markdownText,
+    fallbackText: markdownText,
+    alternativeMimeTypes: ["text/plain"],
+  };
+}
+
+function getDownloadContentMarkdown(
+  value: unknown,
+  metadata?: OutputMetadata,
+): DownloadContent | null {
+  const markdownText = String(value);
+  const blob = new Blob([markdownText], { type: "text/markdown" });
+
+  return {
+    data: blob,
+    filename: metadata?.filename || "output.md",
+    mimeType: "text/markdown",
+  };
+}
+
+function isConcatenableMarkdown(
+  _value: unknown,
+  _metadata?: OutputMetadata,
+): boolean {
+  return true;
+}
+
+export const markdownRenderer: OutputRenderer = {
+  name: "MarkdownRenderer",
+  priority: 35,
+  canRender: canRenderMarkdown,
+  render: renderMarkdown,
+  getCopyContent: getCopyContentMarkdown,
+  getDownloadContent: getDownloadContentMarkdown,
+  isConcatenable: isConcatenableMarkdown,
+};
diff --git a/autogpt_platform/frontend/src/components/contextual/OutputRenderers/renderers/TextRenderer.tsx b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/renderers/TextRenderer.tsx
new file mode 100644
index 0000000000..725743fb7e
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/renderers/TextRenderer.tsx
@@ -0,0 +1,71 @@
+import React from "react";
+import {
+  OutputRenderer,
+  OutputMetadata,
+  DownloadContent,
+  CopyContent,
+} from "../types";
+
+function canRenderText(value: unknown, _metadata?: OutputMetadata): boolean {
+  return (
+    typeof value === "string" ||
+    typeof value === "number" ||
+    typeof value === "boolean"
+  );
+}
+
+function renderText(
+  value: unknown,
+  _metadata?: OutputMetadata,
+): React.ReactNode {
+  const textValue = String(value);
+
+  return (
+    <p className="resize-none overflow-x-auto whitespace-pre-wrap break-words border-none text-sm text-neutral-700">
+      {textValue}
+    </p>
+  );
+}
+
+function getCopyContentText(
+  value: unknown,
+  _metadata?: OutputMetadata,
+): CopyContent | null {
+  const textValue = String(value);
+  return {
+    mimeType: "text/plain",
+    data: textValue,
+    fallbackText: textValue,
+  };
+}
+
+function getDownloadContentText(
+  value: unknown,
+  _metadata?: OutputMetadata,
+): DownloadContent | null {
+  const textValue = String(value);
+  const blob = new Blob([textValue], { type: "text/plain" });
+
+  return {
+    data: blob,
+    filename: _metadata?.filename || "output.txt",
+    mimeType: "text/plain",
+  };
+}
+
+function isConcatenableText(
+  _value: unknown,
+  _metadata?: OutputMetadata,
+): boolean {
+  return true;
+}
+
+export const textRenderer: OutputRenderer = {
+  name: "TextRenderer",
+  priority: 0,
+  canRender: canRenderText,
+  render: renderText,
+  getCopyContent: getCopyContentText,
+  getDownloadContent: getDownloadContentText,
+  isConcatenable: isConcatenableText,
+};
diff --git a/autogpt_platform/frontend/src/components/contextual/OutputRenderers/renderers/VideoRenderer.tsx b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/renderers/VideoRenderer.tsx
new file mode 100644
index 0000000000..bd74eacbd6
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/renderers/VideoRenderer.tsx
@@ -0,0 +1,169 @@
+import React from "react";
+import {
+  OutputRenderer,
+  OutputMetadata,
+  DownloadContent,
+  CopyContent,
+} from "../types";
+
+const videoExtensions = [
+  ".mp4",
+  ".webm",
+  ".ogg",
+  ".mov",
+  ".avi",
+  ".mkv",
+  ".m4v",
+];
+
+const videoMimeTypes = [
+  "video/mp4",
+  "video/webm",
+  "video/ogg",
+  "video/quicktime",
+  "video/x-msvideo",
+  "video/x-matroska",
+];
+
+function guessMimeType(url: string): string | null {
+  const extension = url.split(".").pop()?.toLowerCase();
+  const mimeMap: Record<string, string> = {
+    mp4: "video/mp4",
+    webm: "video/webm",
+    ogg: "video/ogg",
+    mov: "video/quicktime",
+    avi: "video/x-msvideo",
+    mkv: "video/x-matroska",
+    m4v: "video/mp4",
+  };
+  return extension ? mimeMap[extension] || null : null;
+}
+
+function canRenderVideo(value: unknown, metadata?: OutputMetadata): boolean {
+  if (
+    metadata?.type === "video" ||
+    (metadata?.mimeType && videoMimeTypes.includes(metadata.mimeType))
+  ) {
+    return true;
+  }
+
+  if (typeof value === "string") {
+    if (value.startsWith("data:video/")) {
+      return true;
+    }
+
+    if (value.startsWith("http://") || value.startsWith("https://")) {
+      return videoExtensions.some((ext) => value.toLowerCase().includes(ext));
+    }
+
+    if (metadata?.filename) {
+      return videoExtensions.some((ext) =>
+        metadata.filename!.toLowerCase().endsWith(ext),
+      );
+    }
+  }
+
+  return false;
+}
+
+function renderVideo(
+  value: unknown,
+  metadata?: OutputMetadata,
+): React.ReactNode {
+  const videoUrl = String(value);
+
+  return (
+    <div className="group relative">
+      <video
+        controls
+        className="h-auto max-w-full rounded-md border border-gray-200"
+        preload="metadata"
+      >
+        <source src={videoUrl} type={metadata?.mimeType || "video/mp4"} />
+        Your browser does not support the video tag.
+      </video>
+    </div>
+  );
+}
+
+function getCopyContentVideo(
+  value: unknown,
+  metadata?: OutputMetadata,
+): CopyContent | null {
+  const videoUrl = String(value);
+
+  if (videoUrl.startsWith("data:")) {
+    const mimeMatch = videoUrl.match(/data:([^;]+)/);
+    const mimeType = mimeMatch?.[1] || "video/mp4";
+
+    return {
+      mimeType: mimeType,
+      data: videoUrl,
+      alternativeMimeTypes: ["text/plain"],
+      fallbackText: videoUrl,
+    };
+  }
+
+  const mimeType = metadata?.mimeType || guessMimeType(videoUrl) || "video/mp4";
+
+  return {
+    mimeType: mimeType,
+    data: async () => {
+      const response = await fetch(videoUrl);
+      return await response.blob();
+    },
+    alternativeMimeTypes: ["text/plain"],
+    fallbackText: videoUrl,
+  };
+}
+
+function getDownloadContentVideo(
+  value: unknown,
+  metadata?: OutputMetadata,
+): DownloadContent | null {
+  const videoUrl = String(value);
+
+  if (videoUrl.startsWith("data:")) {
+    const [mimeInfo, base64Data] = videoUrl.split(",");
+    const mimeType = mimeInfo.match(/data:([^;]+)/)?.[1] || "video/mp4";
+    const byteCharacters = atob(base64Data);
+    const byteNumbers = new Array(byteCharacters.length);
+
+    for (let i = 0; i < byteCharacters.length; i++) {
+      byteNumbers[i] = byteCharacters.charCodeAt(i);
+    }
+
+    const byteArray = new Uint8Array(byteNumbers);
+    const blob = new Blob([byteArray], { type: mimeType });
+
+    const extension = mimeType.split("/")[1] || "mp4";
+    return {
+      data: blob,
+      filename: metadata?.filename || `video.${extension}`,
+      mimeType,
+    };
+  }
+
+  return {
+    data: videoUrl,
+    filename: metadata?.filename || "video.mp4",
+    mimeType: metadata?.mimeType || "video/mp4",
+  };
+}
+
+function isConcatenableVideo(
+  _value: unknown,
+  _metadata?: OutputMetadata,
+): boolean {
+  return false;
+}
+
+export const videoRenderer: OutputRenderer = {
+  name: "VideoRenderer",
+  priority: 45,
+  canRender: canRenderVideo,
+  render: renderVideo,
+  getCopyContent: getCopyContentVideo,
+  getDownloadContent: getDownloadContentVideo,
+  isConcatenable: isConcatenableVideo,
+};
diff --git a/autogpt_platform/frontend/src/components/contextual/OutputRenderers/types.ts b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/types.ts
new file mode 100644
index 0000000000..0b2c8ed6bf
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/types.ts
@@ -0,0 +1,60 @@
+import { ReactNode } from "react";
+
+export interface OutputMetadata {
+  type?: string;
+  language?: string;
+  mimeType?: string;
+  filename?: string;
+  [key: string]: any;
+}
+
+export interface DownloadContent {
+  data: Blob | string;
+  filename: string;
+  mimeType: string;
+}
+
+export interface CopyContent {
+  mimeType: string; // Primary MIME type to try
+  data: Blob | string | (() => Promise<Blob | string>); // Data or async function to get data
+  fallbackText?: string; // Optional fallback text if rich copy fails
+  alternativeMimeTypes?: string[]; // Alternative MIME types to try if primary isn't supported
+}
+
+export interface OutputRenderer {
+  name: string;
+  priority: number;
+  canRender(value: any, metadata?: OutputMetadata): boolean;
+  render(value: any, metadata?: OutputMetadata): ReactNode;
+  getCopyContent(value: any, metadata?: OutputMetadata): CopyContent | null;
+  getDownloadContent(
+    value: any,
+    metadata?: OutputMetadata,
+  ): DownloadContent | null;
+  isConcatenable(value: any, metadata?: OutputMetadata): boolean;
+}
+
+export class OutputRendererRegistry {
+  private renderers: OutputRenderer[] = [];
+
+  register(renderer: OutputRenderer): void {
+    const index = this.renderers.findIndex(
+      (r) => r.priority < renderer.priority,
+    );
+    if (index === -1) {
+      this.renderers.push(renderer);
+    } else {
+      this.renderers.splice(index, 0, renderer);
+    }
+  }
+
+  getRenderer(value: any, metadata?: OutputMetadata): OutputRenderer | null {
+    return this.renderers.find((r) => r.canRender(value, metadata)) || null;
+  }
+
+  getAllRenderers(): OutputRenderer[] {
+    return [...this.renderers];
+  }
+}
+
+export const globalRegistry = new OutputRendererRegistry();
diff --git a/autogpt_platform/frontend/src/components/contextual/OutputRenderers/utils/copy.ts b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/utils/copy.ts
new file mode 100644
index 0000000000..5b18f44669
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/utils/copy.ts
@@ -0,0 +1,115 @@
+import { CopyContent } from "../types";
+
+export function isClipboardTypeSupported(mimeType: string): boolean {
+  // ClipboardItem.supports() is the proper way to check
+  if ("ClipboardItem" in window && "supports" in ClipboardItem) {
+    return ClipboardItem.supports(mimeType);
+  }
+
+  // Fallback for browsers that don't support the supports() method
+  // These are generally supported
+  const fallbackSupported = ["text/plain", "text/html", "image/png"];
+
+  return fallbackSupported.includes(mimeType);
+}
+
+export function getSupportedClipboardType(
+  preferredTypes: string[],
+): string | null {
+  for (const type of preferredTypes) {
+    if (isClipboardTypeSupported(type)) {
+      return type;
+    }
+  }
+  return null;
+}
+
+export async function copyToClipboard(copyContent: CopyContent): Promise<void> {
+  try {
+    // Determine the best supported MIME type
+    const supportedTypes = [
+      copyContent.mimeType,
+      ...(copyContent.alternativeMimeTypes || []),
+    ];
+    const bestType = getSupportedClipboardType(supportedTypes);
+
+    if (!bestType) {
+      // No supported type found, use fallback text if available
+      if (copyContent.fallbackText) {
+        await navigator.clipboard.writeText(copyContent.fallbackText);
+        return;
+      }
+      throw new Error(
+        `None of the MIME types are supported: ${supportedTypes.join(", ")}`,
+      );
+    }
+
+    // Get the data (resolve if it's a function)
+    let data = copyContent.data;
+    if (typeof data === "function") {
+      data = await data();
+    }
+
+    // If data is already a Blob, use it directly
+    if (data instanceof Blob) {
+      // If we need a different MIME type than the blob has, recreate it
+      if (bestType !== data.type && bestType !== copyContent.mimeType) {
+        data = new Blob([data], { type: bestType });
+      }
+
+      await navigator.clipboard.write([
+        new ClipboardItem({
+          [bestType]: data,
+        }),
+      ]);
+      return;
+    }
+
+    // If data is a string
+    if (typeof data === "string") {
+      // For plain text, use the simpler writeText API
+      if (bestType === "text/plain") {
+        await navigator.clipboard.writeText(data);
+        return;
+      }
+
+      // For other text formats (HTML, JSON, etc.), create a blob
+      const blob = new Blob([data], { type: bestType });
+      await navigator.clipboard.write([
+        new ClipboardItem({
+          [bestType]: blob,
+        }),
+      ]);
+    }
+  } catch (_error) {
+    // If rich copy fails and we have fallback text, try that
+    if (copyContent.fallbackText) {
+      try {
+        await navigator.clipboard.writeText(copyContent.fallbackText);
+        return;
+      } catch {
+        // Even fallback failed
+      }
+    }
+    throw _error;
+  }
+}
+
+export async function fetchAndCopyImage(imageUrl: string): Promise<void> {
+  try {
+    const response = await fetch(imageUrl);
+    if (!response.ok) throw new Error("Failed to fetch image");
+
+    const blob = await response.blob();
+    const mimeType = blob.type || "image/png";
+
+    await navigator.clipboard.write([
+      new ClipboardItem({
+        [mimeType]: blob,
+      }),
+    ]);
+  } catch (_error) {
+    // If fetching fails (e.g., CORS), fall back to copying the URL
+    await navigator.clipboard.writeText(imageUrl);
+  }
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/OutputRenderers/utils/download.ts b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/utils/download.ts
new file mode 100644
index 0000000000..78adda8029
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/utils/download.ts
@@ -0,0 +1,74 @@
+import { OutputRenderer, OutputMetadata } from "../types";
+
+export interface DownloadItem {
+  value: any;
+  metadata?: OutputMetadata;
+  renderer: OutputRenderer;
+}
+
+export async function downloadOutputs(items: DownloadItem[]) {
+  const concatenableTexts: string[] = [];
+  const nonConcatenableDownloads: Array<{ blob: Blob; filename: string }> = [];
+
+  for (const item of items) {
+    if (item.renderer.isConcatenable(item.value, item.metadata)) {
+      const copyContent = item.renderer.getCopyContent(
+        item.value,
+        item.metadata,
+      );
+      if (copyContent) {
+        // Extract text from CopyContent
+        let text: string;
+        if (typeof copyContent.data === "string") {
+          text = copyContent.data;
+        } else if (copyContent.fallbackText) {
+          text = copyContent.fallbackText;
+        } else {
+          continue;
+        }
+        concatenableTexts.push(text);
+      }
+    } else {
+      const downloadContent = item.renderer.getDownloadContent(
+        item.value,
+        item.metadata,
+      );
+      if (downloadContent) {
+        if (typeof downloadContent.data === "string") {
+          if (downloadContent.data.startsWith("http")) {
+            const link = document.createElement("a");
+            link.href = downloadContent.data;
+            link.download = downloadContent.filename;
+            link.click();
+          }
+        } else {
+          nonConcatenableDownloads.push({
+            blob: downloadContent.data as Blob,
+            filename: downloadContent.filename,
+          });
+        }
+      }
+    }
+  }
+
+  if (concatenableTexts.length > 0) {
+    const combinedText = concatenableTexts.join("\n\n---\n\n");
+    const blob = new Blob([combinedText], { type: "text/plain" });
+    downloadBlob(blob, "combined_output.txt");
+  }
+
+  for (const download of nonConcatenableDownloads) {
+    downloadBlob(download.blob, download.filename);
+  }
+}
+
+function downloadBlob(blob: Blob, filename: string) {
+  const url = URL.createObjectURL(blob);
+  const link = document.createElement("a");
+  link.href = url;
+  link.download = filename;
+  document.body.appendChild(link);
+  link.click();
+  document.body.removeChild(link);
+  URL.revokeObjectURL(url);
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/PublishAgentModal/components/AgentInfoStep/useAgentInfoStep.ts b/autogpt_platform/frontend/src/components/contextual/PublishAgentModal/components/AgentInfoStep/useAgentInfoStep.ts
index f3dcfa1f21..448d65b195 100644
--- a/autogpt_platform/frontend/src/components/contextual/PublishAgentModal/components/AgentInfoStep/useAgentInfoStep.ts
+++ b/autogpt_platform/frontend/src/components/contextual/PublishAgentModal/components/AgentInfoStep/useAgentInfoStep.ts
@@ -1,10 +1,8 @@
 import { useEffect, useCallback, useState } from "react";
 import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { useQueryClient } from "@tanstack/react-query";
 import { useToast } from "@/components/molecules/Toast/use-toast";
 import { useBackendAPI } from "@/lib/autogpt-server-api/context";
-import { getGetV2ListMySubmissionsQueryKey } from "@/app/api/__generated__/endpoints/store/store";
 import * as Sentry from "@sentry/nextjs";
 import {
   PublishAgentFormData,
@@ -33,7 +31,6 @@ export function useAgentInfoStep({
   const [images, setImages] = useState<string[]>([]);
   const [isSubmitting, setIsSubmitting] = useState(false);
 
-  const queryClient = useQueryClient();
   const { toast } = useToast();
   const api = useBackendAPI();
 
@@ -54,23 +51,26 @@ export function useAgentInfoStep({
   });
 
   useEffect(() => {
-    if (initialData) {
+    if (initialData?.agent_id) {
       setAgentId(initialData.agent_id);
-      const initialImages = [
-        ...(initialData?.thumbnailSrc ? [initialData.thumbnailSrc] : []),
-        ...(initialData.additionalImages || []),
-      ];
-      setImages(initialImages);
-
-      // Update form with initial data
+      setImages(
+        Array.from(
+          new Set([
+            ...(initialData?.thumbnailSrc ? [initialData.thumbnailSrc] : []),
+            ...(initialData.additionalImages || []),
+          ]),
+        ),
+      );
       form.reset({
-        changesSummary: initialData.changesSummary || "",
+        changesSummary: isMarketplaceUpdate
+          ? ""
+          : initialData.changesSummary || "",
         title: initialData.title,
         subheader: initialData.subheader,
         slug: initialData.slug.toLocaleLowerCase().trim(),
         youtubeLink: initialData.youtubeLink,
         category: initialData.category,
-        description: initialData.description,
+        description: isMarketplaceUpdate ? "" : initialData.description,
         recommendedScheduleCron: initialData.recommendedScheduleCron || "",
         instructions: initialData.instructions || "",
         agentOutputDemo: initialData.agentOutputDemo || "",
@@ -78,6 +78,13 @@ export function useAgentInfoStep({
     }
   }, [initialData, form]);
 
+  // Ensure agentId is set from selectedAgentId if initialData doesn't have it
+  useEffect(() => {
+    if (selectedAgentId && !agentId) {
+      setAgentId(selectedAgentId);
+    }
+  }, [selectedAgentId, agentId]);
+
   const handleImagesChange = useCallback((newImages: string[]) => {
     setImages(newImages);
   }, []);
@@ -92,6 +99,16 @@ export function useAgentInfoStep({
       return;
     }
 
+    // Validate that an agent is selected before submission
+    if (!selectedAgentId || !selectedAgentVersion) {
+      toast({
+        title: "Agent Selection Required",
+        description: "Please select an agent before submitting to the store.",
+        variant: "destructive",
+      });
+      return;
+    }
+
     const categories = data.category ? [data.category] : [];
     const filteredCategories = categories.filter(Boolean);
 
@@ -106,18 +123,14 @@ export function useAgentInfoStep({
         image_urls: images,
         video_url: data.youtubeLink || "",
         agent_output_demo_url: data.agentOutputDemo || "",
-        agent_id: selectedAgentId || "",
-        agent_version: selectedAgentVersion || 0,
+        agent_id: selectedAgentId,
+        agent_version: selectedAgentVersion,
         slug: (data.slug || "").replace(/\s+/g, "-"),
         categories: filteredCategories,
         recommended_schedule_cron: data.recommendedScheduleCron || null,
         changes_summary: data.changesSummary || null,
       } as any);
 
-      await queryClient.invalidateQueries({
-        queryKey: getGetV2ListMySubmissionsQueryKey(),
-      });
-
       onSuccess(response);
     } catch (error) {
       Sentry.captureException(error);
@@ -139,12 +152,7 @@ export function useAgentInfoStep({
     agentId,
     images,
     isSubmitting,
-    initialImages: initialData
-      ? [
-          ...(initialData?.thumbnailSrc ? [initialData.thumbnailSrc] : []),
-          ...(initialData.additionalImages || []),
-        ]
-      : [],
+    initialImages: images,
     initialSelectedImage: initialData?.thumbnailSrc || null,
     handleImagesChange,
     handleSubmit: form.handleSubmit(handleFormSubmit),
diff --git a/autogpt_platform/frontend/src/components/contextual/PublishAgentModal/components/AgentSelectStep/useAgentSelectStep.ts b/autogpt_platform/frontend/src/components/contextual/PublishAgentModal/components/AgentSelectStep/useAgentSelectStep.ts
index 1f4e5e4ed3..88ac4b478f 100644
--- a/autogpt_platform/frontend/src/components/contextual/PublishAgentModal/components/AgentSelectStep/useAgentSelectStep.ts
+++ b/autogpt_platform/frontend/src/components/contextual/PublishAgentModal/components/AgentSelectStep/useAgentSelectStep.ts
@@ -1,6 +1,7 @@
 import * as React from "react";
 import { useGetV2GetMyAgents } from "@/app/api/__generated__/endpoints/store/store";
 import { okData } from "@/app/api/helpers";
+import { useSupabase } from "@/lib/supabase/hooks/useSupabase";
 
 export interface Agent {
   name: string;
@@ -36,6 +37,7 @@ export function useAgentSelectStep({
   const [selectedAgentVersion, setSelectedAgentVersion] = React.useState<
     number | null
   >(null);
+  const { isLoggedIn } = useSupabase();
 
   const {
     data: _myAgents,
@@ -43,6 +45,7 @@ export function useAgentSelectStep({
     error,
   } = useGetV2GetMyAgents(undefined, {
     query: {
+      enabled: isLoggedIn,
       select: (res) =>
         okData(res)
           ?.agents.map(
diff --git a/autogpt_platform/frontend/src/components/contextual/PublishAgentModal/usePublishAgentModal.ts b/autogpt_platform/frontend/src/components/contextual/PublishAgentModal/usePublishAgentModal.ts
index 0f8a819c6e..c4481d65c2 100644
--- a/autogpt_platform/frontend/src/components/contextual/PublishAgentModal/usePublishAgentModal.ts
+++ b/autogpt_platform/frontend/src/components/contextual/PublishAgentModal/usePublishAgentModal.ts
@@ -6,9 +6,12 @@ import { emptyModalState } from "./helpers";
 import {
   useGetV2GetMyAgents,
   useGetV2ListMySubmissions,
+  getGetV2ListMySubmissionsQueryKey,
 } from "@/app/api/__generated__/endpoints/store/store";
 import { okData } from "@/app/api/helpers";
 import type { MyAgent } from "@/app/api/__generated__/models/myAgent";
+import { useQueryClient } from "@tanstack/react-query";
+import { useSupabase } from "@/lib/supabase/hooks/useSupabase";
 
 const defaultTargetState: PublishState = {
   isOpen: false,
@@ -65,10 +68,20 @@ export function usePublishAgentModal({
   >(preSelectedAgentVersion || null);
 
   const router = useRouter();
+  const queryClient = useQueryClient();
+  const { isLoggedIn } = useSupabase();
 
   // Fetch agent data for pre-populating form when agent is pre-selected
-  const { data: myAgents } = useGetV2GetMyAgents();
-  const { data: mySubmissions } = useGetV2ListMySubmissions();
+  const { data: myAgents } = useGetV2GetMyAgents(undefined, {
+    query: {
+      enabled: isLoggedIn,
+    },
+  });
+  const { data: mySubmissions } = useGetV2ListMySubmissions(undefined, {
+    query: {
+      enabled: isLoggedIn,
+    },
+  });
 
   // Sync currentState with targetState when it changes from outside
   useEffect(() => {
@@ -77,14 +90,18 @@ export function usePublishAgentModal({
     }
   }, [targetState]);
 
-  // Reset internal state when modal opens
+  // Reset internal state when modal opens (only on initial open, not on every targetState change)
+  const [hasOpened, setHasOpened] = useState(false);
   useEffect(() => {
     if (!targetState) return;
-    if (targetState.isOpen) {
+    if (targetState.isOpen && !hasOpened) {
       setSelectedAgent(null);
       setSelectedAgentId(preSelectedAgentId || null);
       setSelectedAgentVersion(preSelectedAgentVersion || null);
       setInitialData(emptyModalState);
+      setHasOpened(true);
+    } else if (!targetState.isOpen && hasOpened) {
+      setHasOpened(false);
     }
   }, [targetState, preSelectedAgentId, preSelectedAgentVersion]);
 
@@ -172,6 +189,11 @@ export function usePublishAgentModal({
     setSelectedAgentVersion(null);
     setInitialData(emptyModalState);
 
+    // Invalidate submissions query to refresh the data after modal closes
+    queryClient.invalidateQueries({
+      queryKey: getGetV2ListMySubmissionsQueryKey(),
+    });
+
     // Update parent with clean closed state
     const newState = {
       isOpen: false,
diff --git a/autogpt_platform/frontend/src/components/contextual/RunAgentInputs/RunAgentInputs.tsx b/autogpt_platform/frontend/src/components/contextual/RunAgentInputs/RunAgentInputs.tsx
new file mode 100644
index 0000000000..bc054e42b8
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/RunAgentInputs/RunAgentInputs.tsx
@@ -0,0 +1,389 @@
+import { format } from "date-fns";
+import React from "react";
+
+import { Input as DSInput } from "@/components/atoms/Input/Input";
+import { Select as DSSelect } from "@/components/atoms/Select/Select";
+import { MultiToggle } from "@/components/molecules/MultiToggle/MultiToggle";
+// Removed shadcn Select usage in favor of DS Select for time picker
+import { Button } from "@/components/atoms/Button/Button";
+import { FileInput } from "@/components/atoms/FileInput/FileInput";
+import { Switch } from "@/components/atoms/Switch/Switch";
+import { GoogleDrivePickerInput } from "@/components/contextual/GoogleDrivePicker/GoogleDrivePickerInput";
+import { InformationTooltip } from "@/components/molecules/InformationTooltip/InformationTooltip";
+import { TimePicker } from "@/components/molecules/TimePicker/TimePicker";
+import {
+  BlockIOObjectSubSchema,
+  BlockIOSubSchema,
+  BlockIOTableSubSchema,
+  DataType,
+  determineDataType,
+  TableRow,
+} from "@/lib/autogpt-server-api/types";
+import { PlusIcon, XIcon } from "@phosphor-icons/react";
+import { useRunAgentInputs } from "./useRunAgentInputs";
+
+/**
+ * A generic prop structure for the TypeBasedInput.
+ *
+ * onChange expects an event-like object with e.target.value so the parent
+ * can do something like setInputValues(e.target.value).
+ */
+interface Props {
+  schema: BlockIOSubSchema;
+  value?: any;
+  placeholder?: string;
+  onChange: (value: any) => void;
+  readOnly?: boolean;
+}
+
+/**
+ * A generic, data-type-based input component that uses Shadcn UI.
+ * It inspects the schema via `determineDataType` and renders
+ * the correct UI component.
+ */
+export function RunAgentInputs({
+  schema,
+  value,
+  placeholder,
+  onChange,
+  readOnly = false,
+  ...props
+}: Props & React.HTMLAttributes<HTMLElement>) {
+  const { handleUploadFile, uploadProgress } = useRunAgentInputs();
+
+  const dataType = determineDataType(schema);
+
+  const baseId = String(schema.title ?? "input")
+    .replace(/\s+/g, "-")
+    .toLowerCase();
+
+  let innerInputElement: React.ReactNode = null;
+  switch (dataType) {
+    case DataType.NUMBER:
+      innerInputElement = (
+        <DSInput
+          id={`${baseId}-number`}
+          label={schema.title ?? placeholder ?? "Number"}
+          hideLabel
+          type="number"
+          value={value ?? ""}
+          placeholder={placeholder || "Enter number"}
+          onChange={(e) => {
+            const v = (e.target as HTMLInputElement).value;
+            if (!v || v.trim() === "") {
+              onChange(undefined);
+            } else {
+              const numValue = Number(v);
+              onChange(isNaN(numValue) ? undefined : numValue);
+            }
+          }}
+          {...props}
+        />
+      );
+      break;
+
+    case DataType.LONG_TEXT:
+      innerInputElement = (
+        <DSInput
+          id={`${baseId}-textarea`}
+          label={schema.title ?? placeholder ?? "Text"}
+          hideLabel
+          type="textarea"
+          rows={3}
+          value={value ?? ""}
+          placeholder={placeholder || "Enter text"}
+          onChange={(e) => onChange((e.target as HTMLInputElement).value)}
+          {...props}
+        />
+      );
+      break;
+
+    case DataType.GOOGLE_DRIVE_PICKER: {
+      const pickerSchema = schema as any;
+      const config: import("@/lib/autogpt-server-api/types").GoogleDrivePickerConfig =
+        pickerSchema.google_drive_picker_config || {};
+
+      innerInputElement = (
+        <GoogleDrivePickerInput
+          config={config}
+          value={value}
+          onChange={onChange}
+          className="w-full"
+          showRemoveButton={!readOnly}
+        />
+      );
+      break;
+    }
+
+    case DataType.BOOLEAN:
+      innerInputElement = (
+        <>
+          <span className="text-sm text-gray-500">
+            {placeholder || (value ? "Enabled" : "Disabled")}
+          </span>
+          <Switch
+            className="ml-auto"
+            checked={!!value}
+            onCheckedChange={(checked: boolean) => onChange(checked)}
+            {...props}
+          />
+        </>
+      );
+      break;
+
+    case DataType.DATE: {
+      function normalizeDateValue(val: any): Date | null {
+        if (!val) return null;
+        if (val instanceof Date) {
+          return isNaN(val.getTime()) ? null : val;
+        }
+        if (typeof val === "string") {
+          if (/^\d{4}-\d{2}-\d{2}$/.test(val)) {
+            const [y, m, d] = val.split("-").map(Number);
+            const date = new Date(y, m - 1, d);
+            return isNaN(date.getTime()) ? null : date;
+          }
+          const date = new Date(val);
+          return isNaN(date.getTime()) ? null : date;
+        }
+        return null;
+      }
+
+      const dateValue = normalizeDateValue(value);
+      innerInputElement = (
+        <DSInput
+          id={`${baseId}-date`}
+          label={schema.title ?? placeholder ?? "Date"}
+          hideLabel
+          type="date"
+          value={dateValue ? format(dateValue, "yyyy-MM-dd") : ""}
+          onChange={(e) => {
+            const v = (e.target as HTMLInputElement).value;
+            if (!v) onChange(undefined);
+            else {
+              const [y, m, d] = v.split("-").map(Number);
+              onChange(new Date(y, m - 1, d));
+            }
+          }}
+          placeholder={placeholder || "Pick a date"}
+          {...props}
+        />
+      );
+      break;
+    }
+
+    case DataType.TIME:
+      innerInputElement = (
+        <TimePicker value={value?.toString()} onChange={onChange} />
+      );
+      break;
+
+    case DataType.DATE_TIME:
+      innerInputElement = (
+        <DSInput
+          id={`${baseId}-datetime`}
+          label={schema.title ?? placeholder ?? "Date time"}
+          hideLabel
+          type="datetime-local"
+          value={value ?? ""}
+          onChange={(e) => onChange((e.target as HTMLInputElement).value)}
+          placeholder={placeholder || "Enter date and time"}
+          {...props}
+        />
+      );
+      break;
+
+    case DataType.FILE:
+      innerInputElement = (
+        <FileInput
+          value={value}
+          placeholder={placeholder}
+          onChange={onChange}
+          onUploadFile={handleUploadFile}
+          uploadProgress={uploadProgress}
+          {...props}
+        />
+      );
+      break;
+
+    case DataType.SELECT:
+      if (
+        "enum" in schema &&
+        Array.isArray(schema.enum) &&
+        schema.enum.length > 0
+      ) {
+        innerInputElement = (
+          <DSSelect
+            id={`${baseId}-select`}
+            label={schema.title ?? placeholder ?? "Select"}
+            hideLabel
+            value={value ?? ""}
+            onValueChange={(val: string) => onChange(val)}
+            placeholder={placeholder || "Select an option"}
+            options={schema.enum
+              .filter((opt) => opt)
+              .map((opt) => ({ value: opt, label: String(opt) }))}
+          />
+        );
+        break;
+      }
+
+    case DataType.MULTI_SELECT: {
+      const _schema = schema as BlockIOObjectSubSchema;
+      const properties = _schema.properties || {};
+      const allKeys = Object.keys(properties);
+      const selectedValues = Object.entries(value || {})
+        .filter(([_, v]) => v)
+        .map(([k]) => k);
+
+      innerInputElement = (
+        <MultiToggle
+          items={allKeys.map((key) => ({
+            value: key,
+            label: properties[key]?.title ?? key,
+          }))}
+          selectedValues={selectedValues}
+          onChange={(values: string[]) =>
+            onChange(
+              Object.fromEntries(
+                allKeys.map((opt) => [opt, values.includes(opt)]),
+              ),
+            )
+          }
+          className="nodrag"
+          aria-label={schema.title}
+        />
+      );
+      break;
+    }
+
+    case DataType.TABLE: {
+      // Render a simple table UI for the run modal
+      const tableSchema = schema as BlockIOTableSubSchema;
+      const headers = tableSchema.items?.properties
+        ? Object.keys(tableSchema.items.properties)
+        : ["Column 1", "Column 2", "Column 3"];
+
+      const tableData: TableRow[] = Array.isArray(value) ? value : [];
+
+      const updateRow = (index: number, header: string, newValue: string) => {
+        const newData = [...tableData];
+        if (!newData[index]) {
+          newData[index] = {};
+        }
+        newData[index][header] = newValue;
+        onChange(newData);
+      };
+
+      const addRow = () => {
+        const newRow: TableRow = {};
+        headers.forEach((header) => {
+          newRow[header] = "";
+        });
+        onChange([...tableData, newRow]);
+      };
+
+      const removeRow = (index: number) => {
+        const newData = tableData.filter((_, i) => i !== index);
+        onChange(newData);
+      };
+
+      innerInputElement = (
+        <div className="w-full space-y-2">
+          <div className="overflow-hidden rounded-md border">
+            <table className="w-full text-sm">
+              <thead>
+                <tr className="bg-gray-50 dark:bg-gray-800">
+                  {headers.map((header) => (
+                    <th
+                      key={header}
+                      className="px-3 py-2 text-left font-medium"
+                    >
+                      {header}
+                    </th>
+                  ))}
+                  <th className="w-10 px-3 py-2"></th>
+                </tr>
+              </thead>
+              <tbody>
+                {tableData.map((row, rowIndex) => (
+                  <tr key={rowIndex} className="border-t dark:border-gray-700">
+                    {headers.map((header) => (
+                      <td key={header} className="px-3 py-1">
+                        <input
+                          type="text"
+                          value={String(row[header] || "")}
+                          onChange={(e) =>
+                            updateRow(rowIndex, header, e.target.value)
+                          }
+                          className="w-full rounded border px-2 py-1 dark:border-gray-700 dark:bg-gray-900"
+                          placeholder={`Enter ${header}`}
+                        />
+                      </td>
+                    ))}
+                    <td className="px-3 py-1">
+                      <Button
+                        type="button"
+                        variant="ghost"
+                        size="small"
+                        onClick={() => removeRow(rowIndex)}
+                        className="h-8 w-8 p-0"
+                      >
+                        <XIcon className="h-4 w-4" weight="bold" />
+                      </Button>
+                    </td>
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          </div>
+          <Button
+            type="button"
+            variant="outline"
+            size="small"
+            onClick={addRow}
+            className="w-full"
+          >
+            <PlusIcon className="mr-2 h-4 w-4" weight="bold" />
+            Add Row
+          </Button>
+        </div>
+      );
+      break;
+    }
+
+    case DataType.SHORT_TEXT:
+    default:
+      innerInputElement = (
+        <DSInput
+          id={`${baseId}-text`}
+          label={schema.title ?? placeholder ?? "Text"}
+          hideLabel
+          type="text"
+          value={value ?? ""}
+          onChange={(e) => onChange((e.target as HTMLInputElement).value)}
+          placeholder={placeholder || "Enter text"}
+          disabled={readOnly}
+          {...props}
+        />
+      );
+  }
+
+  return (
+    <div className="flex w-full flex-col gap-0 space-y-2">
+      <label className="large-medium flex items-center gap-1 font-medium">
+        {schema.title || placeholder}
+        <InformationTooltip description={schema.description} />
+      </label>
+      <div className="no-drag relative flex w-full">
+        {readOnly ? (
+          <div style={{ pointerEvents: "none", opacity: 0.7 }}>
+            {innerInputElement}
+          </div>
+        ) : (
+          innerInputElement
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/contextual/RunAgentInputs/useRunAgentInputs.ts b/autogpt_platform/frontend/src/components/contextual/RunAgentInputs/useRunAgentInputs.ts
new file mode 100644
index 0000000000..38fe30b9ea
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/RunAgentInputs/useRunAgentInputs.ts
@@ -0,0 +1,19 @@
+import BackendAPI from "@/lib/autogpt-server-api";
+import { useState } from "react";
+
+export function useRunAgentInputs() {
+  const api = new BackendAPI();
+  const [uploadProgress, setUploadProgress] = useState(0);
+
+  async function handleUploadFile(file: File) {
+    const result = await api.uploadFile(file, "gcs", 24, (progress) =>
+      setUploadProgress(progress),
+    );
+    return result;
+  }
+
+  return {
+    uploadProgress,
+    handleUploadFile,
+  };
+}
diff --git a/autogpt_platform/frontend/src/components/layout/Navbar/Navbar.tsx b/autogpt_platform/frontend/src/components/layout/Navbar/Navbar.tsx
index c5e9cabd63..f4bdecd1df 100644
--- a/autogpt_platform/frontend/src/components/layout/Navbar/Navbar.tsx
+++ b/autogpt_platform/frontend/src/components/layout/Navbar/Navbar.tsx
@@ -4,6 +4,8 @@ import { useGetV2GetUserProfile } from "@/app/api/__generated__/endpoints/store/
 import { okData } from "@/app/api/helpers";
 import { IconAutoGPTLogo, IconType } from "@/components/__legacy__/ui/icons";
 import { PreviewBanner } from "@/components/layout/Navbar/components/PreviewBanner/PreviewBanner";
+import { isLogoutInProgress } from "@/lib/autogpt-server-api/helpers";
+import { NAVBAR_HEIGHT_PX } from "@/lib/constants";
 import { useBreakpoint } from "@/lib/hooks/useBreakpoint";
 import { useSupabase } from "@/lib/supabase/hooks/useSupabase";
 import { environment } from "@/services/environment";
@@ -24,12 +26,13 @@ export function Navbar() {
   const dynamicMenuItems = getAccountMenuItems(user?.role);
   const isChatEnabled = useGetFlag(Flag.CHAT);
   const previewBranchName = environment.getPreviewStealingDev();
+  const logoutInProgress = isLogoutInProgress();
 
   const { data: profile, isLoading: isProfileLoading } = useGetV2GetUserProfile(
     {
       query: {
         select: okData,
-        enabled: isLoggedIn && !!user,
+        enabled: isLoggedIn && !!user && !logoutInProgress,
         // Include user ID in query key to ensure cache invalidation when user changes
         queryKey: ["/api/store/profile", user?.id],
       },
@@ -40,10 +43,13 @@ export function Navbar() {
 
   const shouldShowPreviewBanner = Boolean(isLoggedIn && previewBranchName);
 
-  const actualLoggedInLinks =
-    isChatEnabled === true
-      ? loggedInLinks.concat([{ name: "Chat", href: "/chat" }])
-      : loggedInLinks;
+  const homeHref = isChatEnabled === true ? "/copilot" : "/library";
+
+  const actualLoggedInLinks = [
+    { name: "Home", href: homeHref },
+    ...(isChatEnabled === true ? [{ name: "Tasks", href: "/library" }] : []),
+    ...loggedInLinks,
+  ];
 
   if (isUserLoading) {
     return <NavbarLoading />;
@@ -55,7 +61,10 @@ export function Navbar() {
         {shouldShowPreviewBanner && previewBranchName ? (
           <PreviewBanner branchName={previewBranchName} />
         ) : null}
-        <nav className="border-zinc-[#EFEFF0] inline-flex h-[60px] w-full items-center border border-[#EFEFF0] bg-[#F3F4F6]/20 p-3 backdrop-blur-[26px]">
+        <nav
+          className="border-zinc-[#EFEFF0] inline-flex w-full items-center border border-[#EFEFF0] bg-[#F3F4F6]/20 p-3 backdrop-blur-[26px]"
+          style={{ height: NAVBAR_HEIGHT_PX }}
+        >
           {/* Left section */}
           {!isSmallScreen ? (
             <div className="flex flex-1 items-center gap-5">
@@ -117,21 +126,17 @@ export function Navbar() {
                   groupName: "Navigation",
                   items: actualLoggedInLinks
                     .map((link) => {
-                      if (link.name === "Chat" && !isChatEnabled) {
-                        return null;
-                      }
-
                       return {
                         icon:
-                          link.name === "Marketplace"
+                          link.href === "/marketplace"
                             ? IconType.Marketplace
-                            : link.name === "Library"
-                              ? IconType.Library
-                              : link.name === "Build"
-                                ? IconType.Builder
-                                : link.name === "Chat"
-                                  ? IconType.Chat
-                                  : link.name === "Monitor"
+                            : link.href === "/build"
+                              ? IconType.Builder
+                              : link.href === "/copilot"
+                                ? IconType.Chat
+                                : link.href === "/library"
+                                  ? IconType.Library
+                                  : link.href === "/monitor"
                                     ? IconType.Library
                                     : IconType.LayoutDashboard,
                         text: link.name,
diff --git a/autogpt_platform/frontend/src/components/layout/Navbar/components/AccountMenu/components/AccountLogoutOption.tsx b/autogpt_platform/frontend/src/components/layout/Navbar/components/AccountMenu/components/AccountLogoutOption.tsx
index 570f05ca89..d65b07bd48 100644
--- a/autogpt_platform/frontend/src/components/layout/Navbar/components/AccountMenu/components/AccountLogoutOption.tsx
+++ b/autogpt_platform/frontend/src/components/layout/Navbar/components/AccountMenu/components/AccountLogoutOption.tsx
@@ -1,58 +1,26 @@
 "use client";
 import { IconLogOut } from "@/components/__legacy__/ui/icons";
-import { LoadingSpinner } from "@/components/__legacy__/ui/loading";
-import { useToast } from "@/components/molecules/Toast/use-toast";
-import { useSupabase } from "@/lib/supabase/hooks/useSupabase";
-import { cn } from "@/lib/utils";
-import * as Sentry from "@sentry/nextjs";
 import { useRouter } from "next/navigation";
-import { useTransition } from "react";
 
 export function AccountLogoutOption() {
-  const [isPending, startTransition] = useTransition();
-  const supabase = useSupabase();
   const router = useRouter();
-  const { toast } = useToast();
 
-  function handleLogout() {
-    startTransition(async () => {
-      try {
-        await supabase.logOut();
-        router.replace("/login");
-      } catch (e) {
-        Sentry.captureException(e);
-        toast({
-          title: "Error logging out",
-          description:
-            "Something went wrong when logging out. Please try again. If the problem persists, please contact support.",
-          variant: "destructive",
-        });
-      }
-    });
+  async function handleLogout() {
+    router.replace("/logout");
   }
 
   return (
-    <div
-      className={cn(
-        "inline-flex w-full items-center justify-start gap-2.5",
-        isPending && "justify-center opacity-50",
-      )}
+    <button
+      className="inline-flex w-full items-center justify-start gap-2.5"
       onClick={handleLogout}
-      role="button"
-      tabIndex={0}
+      type="button"
     >
-      {isPending ? (
-        <LoadingSpinner className="size-5" />
-      ) : (
-        <>
-          <div className="relative h-4 w-4">
-            <IconLogOut />
-          </div>
-          <div className="font-sans text-base font-medium leading-normal text-neutral-800 dark:text-neutral-200">
-            Log out
-          </div>
-        </>
-      )}
-    </div>
+      <div className="relative h-4 w-4">
+        <IconLogOut />
+      </div>
+      <div className="font-sans text-base font-medium leading-normal text-neutral-800 dark:text-neutral-200">
+        Log out
+      </div>
+    </button>
   );
 }
diff --git a/autogpt_platform/frontend/src/components/layout/Navbar/components/AgentActivityDropdown/components/ActivityItem.tsx b/autogpt_platform/frontend/src/components/layout/Navbar/components/AgentActivityDropdown/components/ActivityItem.tsx
index 1ebca96b05..17576e1665 100644
--- a/autogpt_platform/frontend/src/components/layout/Navbar/components/AgentActivityDropdown/components/ActivityItem.tsx
+++ b/autogpt_platform/frontend/src/components/layout/Navbar/components/AgentActivityDropdown/components/ActivityItem.tsx
@@ -50,7 +50,9 @@ export function ActivityItem({ execution }: Props) {
       execution.status === AgentExecutionStatus.QUEUED;
 
     if (isActiveStatus) {
-      const timeAgo = formatTimeAgo(execution.started_at.toString());
+      const timeAgo = execution.started_at
+        ? formatTimeAgo(execution.started_at.toString())
+        : "recently";
       const statusText =
         execution.status === AgentExecutionStatus.QUEUED ? "queued" : "running";
       return [
@@ -61,7 +63,9 @@ export function ActivityItem({ execution }: Props) {
     // Handle all other statuses with time display
     const timeAgo = execution.ended_at
       ? formatTimeAgo(execution.ended_at.toString())
-      : formatTimeAgo(execution.started_at.toString());
+      : execution.started_at
+        ? formatTimeAgo(execution.started_at.toString())
+        : "recently";
 
     let statusText = "ended";
     switch (execution.status) {
diff --git a/autogpt_platform/frontend/src/components/layout/Navbar/components/AgentActivityDropdown/useAgentActivityDropdown.ts b/autogpt_platform/frontend/src/components/layout/Navbar/components/AgentActivityDropdown/useAgentActivityDropdown.ts
index 9dbd8aaf7e..24c3e308c3 100644
--- a/autogpt_platform/frontend/src/components/layout/Navbar/components/AgentActivityDropdown/useAgentActivityDropdown.ts
+++ b/autogpt_platform/frontend/src/components/layout/Navbar/components/AgentActivityDropdown/useAgentActivityDropdown.ts
@@ -1,10 +1,10 @@
 import { useGetV1ListAllExecutions } from "@/app/api/__generated__/endpoints/graphs/graphs";
 
+import { okData } from "@/app/api/helpers";
 import { useExecutionEvents } from "@/hooks/useExecutionEvents";
 import { useLibraryAgents } from "@/hooks/useLibraryAgents/useLibraryAgents";
 import type { GraphExecution } from "@/lib/autogpt-server-api/types";
-import { useCallback, useEffect, useMemo, useState } from "react";
-import { okData } from "@/app/api/helpers";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import {
   NotificationState,
   categorizeExecutions,
@@ -47,10 +47,22 @@ export function useAgentActivityDropdown() {
   );
 
   // Process initial execution state when data loads
+  // Use a ref to track if we've already processed to avoid infinite loops
+  const processedExecutionsRef = useRef<string | null>(null);
   useEffect(() => {
-    if (executions && executionsSuccess && agentInfoMap.size > 0) {
+    const executionKey = executions
+      ? `${executions.length}-${executionsSuccess}`
+      : null;
+
+    if (
+      executions &&
+      executionsSuccess &&
+      agentInfoMap.size > 0 &&
+      processedExecutionsRef.current !== executionKey
+    ) {
       const notifications = categorizeExecutions(executions, agentInfoMap);
       setNotifications(notifications);
+      processedExecutionsRef.current = executionKey;
     }
   }, [executions, executionsSuccess, agentInfoMap]);
 
diff --git a/autogpt_platform/frontend/src/components/layout/Navbar/components/MenuIcon/MenuIcon.tsx b/autogpt_platform/frontend/src/components/layout/Navbar/components/MenuIcon/MenuIcon.tsx
new file mode 100644
index 0000000000..192ae03314
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/layout/Navbar/components/MenuIcon/MenuIcon.tsx
@@ -0,0 +1,164 @@
+export function BuilderIcon() {
+  return (
+    <svg
+      width="20"
+      height="20"
+      viewBox="0 0 20 20"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M2.47508 10.7667C2.22905 10.9145 2.02535 11.1233 1.88374 11.373C1.74212 11.6226 1.66738 11.9046 1.66675 12.1917V14.8917C1.66738 15.1787 1.74212 15.4607 1.88374 15.7103C2.02535 15.96 2.22905 16.1688 2.47508 16.3167L4.97508 17.8167C5.2343 17.9724 5.53101 18.0547 5.83341 18.0547C6.13582 18.0547 6.43253 17.9724 6.69175 17.8167L10.0001 15.8333V11.25L5.83341 8.75L2.47508 10.7667Z"
+        stroke="currentColor"
+        strokeWidth="1.5"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M5.8333 13.75L1.8833 11.375"
+        stroke="currentColor"
+        strokeWidth="1.5"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M5.83325 13.75L9.99992 11.25"
+        stroke="currentColor"
+        strokeWidth="1.5"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M5.83325 13.75V18.0583"
+        stroke="currentColor"
+        strokeWidth="1.5"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M10 11.25V15.8333L13.3083 17.8167C13.5676 17.9724 13.8643 18.0547 14.1667 18.0547C14.4691 18.0547 14.7658 17.9724 15.025 17.8167L17.525 16.3167C17.771 16.1688 17.9747 15.96 18.1163 15.7103C18.258 15.4607 18.3327 15.1787 18.3333 14.8917V12.1917C18.3327 11.9046 18.258 11.6226 18.1163 11.373C17.9747 11.1233 17.771 10.9145 17.525 10.7667L14.1667 8.75L10 11.25Z"
+        stroke="currentColor"
+        strokeWidth="1.5"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M14.1667 13.75L10 11.25"
+        stroke="currentColor"
+        strokeWidth="1.5"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M14.1667 13.75L18.1167 11.375"
+        stroke="currentColor"
+        strokeWidth="1.5"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M14.1667 13.75V18.0583"
+        stroke="currentColor"
+        strokeWidth="1.5"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M6.64159 3.68333C6.39555 3.83115 6.19186 4.04 6.05024 4.28965C5.90862 4.53931 5.83388 4.8213 5.83325 5.10833V8.75L9.99992 11.25L14.1666 8.75V5.10833C14.166 4.8213 14.0912 4.53931 13.9496 4.28965C13.808 4.04 13.6043 3.83115 13.3583 3.68333L10.8583 2.18333C10.599 2.02759 10.3023 1.94531 9.99992 1.94531C9.69751 1.94531 9.4008 2.02759 9.14159 2.18333L6.64159 3.68333Z"
+        stroke="currentColor"
+        strokeWidth="1.5"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M10 6.66669L6.05005 4.29169"
+        stroke="currentColor"
+        strokeWidth="1.5"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M10 6.66669L13.95 4.29169"
+        stroke="currentColor"
+        strokeWidth="1.5"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M10 11.25V6.66669"
+        stroke="currentColor"
+        strokeWidth="1.5"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+}
+
+export function MarketplaceIcon() {
+  return (
+    <svg
+      width="20"
+      height="20"
+      viewBox="0 0 20 20"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <g clipPath="url(#clip0_274_1265)">
+        <path
+          d="M6.66659 18.3334C7.12682 18.3334 7.49992 17.9603 7.49992 17.5C7.49992 17.0398 7.12682 16.6667 6.66659 16.6667C6.20635 16.6667 5.83325 17.0398 5.83325 17.5C5.83325 17.9603 6.20635 18.3334 6.66659 18.3334Z"
+          stroke="currentColor"
+          strokeWidth="1.5"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        <path
+          d="M15.8333 18.3334C16.2936 18.3334 16.6667 17.9603 16.6667 17.5C16.6667 17.0398 16.2936 16.6667 15.8333 16.6667C15.3731 16.6667 15 17.0398 15 17.5C15 17.9603 15.3731 18.3334 15.8333 18.3334Z"
+          stroke="currentColor"
+          strokeWidth="1.5"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        <path
+          d="M1.70825 1.70831H3.37492L5.59159 12.0583C5.6729 12.4374 5.88381 12.7762 6.18801 13.0165C6.49221 13.2568 6.87067 13.3836 7.25825 13.375H15.4083C15.7876 13.3744 16.1553 13.2444 16.4508 13.0065C16.7462 12.7686 16.9517 12.4371 17.0333 12.0666L18.4083 5.87498H4.26659"
+          stroke="currentColor"
+          strokeWidth="1.5"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+      </g>
+      <defs>
+        <clipPath id="clip0_274_1265">
+          <rect width="20" height="20" fill="white" />
+        </clipPath>
+      </defs>
+    </svg>
+  );
+}
+
+export function HomepageIcon() {
+  return (
+    <svg
+      width="20"
+      height="20"
+      viewBox="0 0 20 20"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M2.5 7.50002L10 1.66669L17.5 7.50002V16.6667C17.5 17.1087 17.3244 17.5326 17.0118 17.8452C16.6993 18.1578 16.2754 18.3334 15.8333 18.3334H4.16667C3.72464 18.3334 3.30072 18.1578 2.98816 17.8452C2.67559 17.5326 2.5 17.1087 2.5 16.6667V7.50002Z"
+        stroke="currentColor"
+        strokeWidth="1.5"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M7.5 18.3333V10H12.5V18.3333"
+        stroke="currentColor"
+        strokeWidth="1.25"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/layout/Navbar/components/MobileNavbar/MobileNavBar.tsx b/autogpt_platform/frontend/src/components/layout/Navbar/components/MobileNavbar/MobileNavBar.tsx
index b69f2f7636..b3de9a6a21 100644
--- a/autogpt_platform/frontend/src/components/layout/Navbar/components/MobileNavbar/MobileNavBar.tsx
+++ b/autogpt_platform/frontend/src/components/layout/Navbar/components/MobileNavbar/MobileNavBar.tsx
@@ -7,17 +7,18 @@ import {
   PopoverTrigger,
 } from "@/components/__legacy__/ui/popover";
 import { Separator } from "@/components/__legacy__/ui/separator";
-import { AnimatePresence, motion } from "framer-motion";
-import { usePathname } from "next/navigation";
-import * as React from "react";
-import { MenuItemGroup } from "../../helpers";
-import { MobileNavbarMenuItem } from "./components/MobileNavbarMenuItem";
-import { Button } from "@/components/atoms/Button/Button";
-import { CaretUpIcon, ListIcon } from "@phosphor-icons/react";
 import Avatar, {
   AvatarFallback,
   AvatarImage,
 } from "@/components/atoms/Avatar/Avatar";
+import { Button } from "@/components/atoms/Button/Button";
+import { CaretUpIcon, ListIcon } from "@phosphor-icons/react";
+import { AnimatePresence, motion } from "framer-motion";
+import { usePathname } from "next/navigation";
+import * as React from "react";
+import { MenuItemGroup } from "../../helpers";
+import { MobileNavbarLogoutItem } from "./components/MobileNavbarLogoutItem";
+import { MobileNavbarMenuItem } from "./components/MobileNavbarMenuItem";
 
 interface MobileNavBarProps {
   userName?: string;
@@ -96,16 +97,27 @@ export function MobileNavBar({
                 <Separator className="mb-4" />
                 {menuItemGroups.map((group, groupIndex) => (
                   <React.Fragment key={groupIndex}>
-                    {group.items.map((item, itemIndex) => (
-                      <MobileNavbarMenuItem
-                        key={itemIndex}
-                        icon={item.icon}
-                        isActive={item.href === activeLink}
-                        text={item.text}
-                        onClick={item.onClick}
-                        href={item.href}
-                      />
-                    ))}
+                    {group.items.map((item, itemIndex) => {
+                      if (item.text === "Log out") {
+                        return (
+                          <MobileNavbarLogoutItem
+                            key={itemIndex}
+                            icon={item.icon}
+                            text={item.text}
+                          />
+                        );
+                      }
+                      return (
+                        <MobileNavbarMenuItem
+                          key={itemIndex}
+                          icon={item.icon}
+                          isActive={item.href === activeLink}
+                          text={item.text}
+                          onClick={item.onClick}
+                          href={item.href}
+                        />
+                      );
+                    })}
                     {groupIndex < menuItemGroups.length - 1 && (
                       <Separator className="my-4" />
                     )}
diff --git a/autogpt_platform/frontend/src/components/layout/Navbar/components/MobileNavbar/components/MobileNavbarLogoutItem.tsx b/autogpt_platform/frontend/src/components/layout/Navbar/components/MobileNavbar/components/MobileNavbarLogoutItem.tsx
new file mode 100644
index 0000000000..d4798cc170
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/layout/Navbar/components/MobileNavbar/components/MobileNavbarLogoutItem.tsx
@@ -0,0 +1,31 @@
+"use client";
+
+import { IconType } from "@/components/__legacy__/ui/icons";
+import { useRouter } from "next/navigation";
+import { getAccountMenuOptionIcon } from "../../../helpers";
+
+interface Props {
+  icon: IconType;
+  text: string;
+}
+
+export function MobileNavbarLogoutItem({ icon, text }: Props) {
+  const router = useRouter();
+
+  async function handleLogout() {
+    router.replace("/logout");
+  }
+
+  return (
+    <button className="w-full" onClick={handleLogout} type="button">
+      <div className="inline-flex w-full items-center justify-start gap-4 py-2 hover:rounded hover:bg-[#e0e0e0]">
+        {getAccountMenuOptionIcon(icon)}
+        <div className="relative">
+          <div className="font-sans text-base font-normal leading-7 text-[#474747]">
+            {text}
+          </div>
+        </div>
+      </div>
+    </button>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/layout/Navbar/components/NavbarLink.tsx b/autogpt_platform/frontend/src/components/layout/Navbar/components/NavbarLink.tsx
index 46354143e5..dff1277384 100644
--- a/autogpt_platform/frontend/src/components/layout/Navbar/components/NavbarLink.tsx
+++ b/autogpt_platform/frontend/src/components/layout/Navbar/components/NavbarLink.tsx
@@ -3,15 +3,15 @@
 import { IconLaptop } from "@/components/__legacy__/ui/icons";
 import { cn } from "@/lib/utils";
 import { Flag, useGetFlag } from "@/services/feature-flags/use-get-flag";
-import {
-  ChatsIcon,
-  CubeIcon,
-  HouseIcon,
-  StorefrontIcon,
-} from "@phosphor-icons/react/dist/ssr";
+import { ListChecksIcon } from "@phosphor-icons/react/dist/ssr";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
 import { Text } from "../../../atoms/Text/Text";
+import {
+  BuilderIcon,
+  HomepageIcon,
+  MarketplaceIcon,
+} from "./MenuIcon/MenuIcon";
 
 const iconWidthClass = "h-5 w-5";
 
@@ -22,8 +22,13 @@ interface Props {
 
 export function NavbarLink({ name, href }: Props) {
   const pathname = usePathname();
-  const isActive = pathname.includes(href);
-  const chat_enabled = useGetFlag(Flag.CHAT);
+  const isChatEnabled = useGetFlag(Flag.CHAT);
+  const expectedHomeRoute = isChatEnabled ? "/copilot" : "/library";
+
+  const isActive =
+    href === expectedHomeRoute
+      ? pathname === "/" || pathname.startsWith(expectedHomeRoute)
+      : pathname.includes(href);
 
   return (
     <Link href={href} data-testid={`navbar-link-${name.toLowerCase()}`}>
@@ -35,20 +40,24 @@ export function NavbarLink({ name, href }: Props) {
         )}
       >
         {href === "/marketplace" && (
-          <StorefrontIcon
+          <div
             className={cn(
               iconWidthClass,
               isActive && "text-white dark:text-black",
             )}
-          />
+          >
+            <MarketplaceIcon />
+          </div>
         )}
         {href === "/build" && (
-          <CubeIcon
+          <div
             className={cn(
               iconWidthClass,
               isActive && "text-white dark:text-black",
             )}
-          />
+          >
+            <BuilderIcon />
+          </div>
         )}
         {href === "/monitor" && (
           <IconLaptop
@@ -58,22 +67,34 @@ export function NavbarLink({ name, href }: Props) {
             )}
           />
         )}
-        {href === "/library" && (
-          <HouseIcon
+        {href === "/copilot" && (
+          <div
             className={cn(
               iconWidthClass,
               isActive && "text-white dark:text-black",
             )}
-          />
-        )}
-        {chat_enabled && href === "/chat" && (
-          <ChatsIcon
-            className={cn(
-              iconWidthClass,
-              isActive && "text-white dark:text-black",
-            )}
-          />
+          >
+            <HomepageIcon />
+          </div>
         )}
+        {href === "/library" &&
+          (isChatEnabled ? (
+            <ListChecksIcon
+              className={cn(
+                iconWidthClass,
+                isActive && "text-white dark:text-black",
+              )}
+            />
+          ) : (
+            <div
+              className={cn(
+                iconWidthClass,
+                isActive && "text-white dark:text-black",
+              )}
+            >
+              <HomepageIcon />
+            </div>
+          ))}
         <Text
           variant="h5"
           className={cn(
diff --git a/autogpt_platform/frontend/src/components/layout/Navbar/components/Wallet/Wallet.tsx b/autogpt_platform/frontend/src/components/layout/Navbar/components/Wallet/Wallet.tsx
index 0a3c7de6c8..5a5bb514f3 100644
--- a/autogpt_platform/frontend/src/components/layout/Navbar/components/Wallet/Wallet.tsx
+++ b/autogpt_platform/frontend/src/components/layout/Navbar/components/Wallet/Wallet.tsx
@@ -15,7 +15,6 @@ import {
 import { cn } from "@/lib/utils";
 import { useOnboarding } from "@/providers/onboarding/onboarding-provider";
 import { Flag, useGetFlag } from "@/services/feature-flags/use-get-flag";
-import { storage, Key as StorageKey } from "@/services/storage/local-storage";
 import { WalletIcon } from "@phosphor-icons/react";
 import { PopoverClose } from "@radix-ui/react-popover";
 import { X } from "lucide-react";
@@ -175,7 +174,6 @@ export function Wallet() {
   const [prevCredits, setPrevCredits] = useState<number | null>(credits);
   const [flash, setFlash] = useState(false);
   const [walletOpen, setWalletOpen] = useState(false);
-  const [lastSeenCredits, setLastSeenCredits] = useState<number | null>(null);
 
   const totalCount = useMemo(() => {
     return groups.reduce((acc, group) => acc + group.tasks.length, 0);
@@ -200,38 +198,6 @@ export function Wallet() {
     setCompletedCount(completed);
   }, [groups, state?.completedSteps]);
 
-  // Load last seen credits from localStorage once on mount
-  useEffect(() => {
-    const stored = storage.get(StorageKey.WALLET_LAST_SEEN_CREDITS);
-    if (stored !== undefined && stored !== null) {
-      const parsed = parseFloat(stored);
-      if (!Number.isNaN(parsed)) setLastSeenCredits(parsed);
-      else setLastSeenCredits(0);
-    } else {
-      setLastSeenCredits(0);
-    }
-  }, []);
-
-  // Auto-open once if never shown, otherwise open only when credits increase beyond last seen
-  useEffect(() => {
-    if (typeof credits !== "number") return;
-    // Open once for first-time users
-    if (state && state.walletShown === false) {
-      requestAnimationFrame(() => setWalletOpen(true));
-      // Mark as shown so it won't reopen on every reload
-      updateState({ walletShown: true });
-      return;
-    }
-    // Open if user gained more credits than last acknowledged
-    if (
-      lastSeenCredits !== null &&
-      credits > lastSeenCredits &&
-      walletOpen === false
-    ) {
-      requestAnimationFrame(() => setWalletOpen(true));
-    }
-  }, [credits, lastSeenCredits, state?.walletShown, updateState, walletOpen]);
-
   const onWalletOpen = useCallback(async () => {
     if (!state?.walletShown) {
       updateState({ walletShown: true });
@@ -255,13 +221,18 @@ export function Wallet() {
     (notification: WebSocketNotification) => {
       if (
         notification.type !== "onboarding" ||
-        notification.event !== "step_completed" ||
-        !walletRef.current
+        notification.event !== "step_completed"
       ) {
         return;
       }
 
-      // Only trigger confetti for tasks that are in groups
+      // Always refresh credits when any onboarding step completes
+      fetchCredits();
+
+      // Only trigger confetti for tasks that are in displayed groups
+      if (!walletRef.current) {
+        return;
+      }
       const taskIds = groups
         .flatMap((group) => group.tasks)
         .map((task) => task.id);
@@ -274,7 +245,6 @@ export function Wallet() {
         return;
       }
 
-      fetchCredits();
       party.confetti(walletRef.current, {
         count: 30,
         spread: 120,
@@ -284,7 +254,7 @@ export function Wallet() {
         modules: [fadeOut],
       });
     },
-    [fetchCredits, fadeOut],
+    [fetchCredits, fadeOut, groups],
   );
 
   // WebSocket setup for onboarding notifications
@@ -320,19 +290,7 @@ export function Wallet() {
   if (credits === null || !state) return null;
 
   return (
-    <Popover
-      open={walletOpen}
-      onOpenChange={(open) => {
-        setWalletOpen(open);
-        if (!open) {
-          // Persist the latest acknowledged credits so we only auto-open on future gains
-          if (typeof credits === "number") {
-            storage.set(StorageKey.WALLET_LAST_SEEN_CREDITS, String(credits));
-            setLastSeenCredits(credits);
-          }
-        }
-      }}
-    >
+    <Popover open={walletOpen} onOpenChange={(open) => setWalletOpen(open)}>
       <PopoverTrigger asChild>
         <div className="relative inline-block">
           <button
diff --git a/autogpt_platform/frontend/src/components/layout/Navbar/helpers.tsx b/autogpt_platform/frontend/src/components/layout/Navbar/helpers.tsx
index 4be80a491d..a3c7a464ab 100644
--- a/autogpt_platform/frontend/src/components/layout/Navbar/helpers.tsx
+++ b/autogpt_platform/frontend/src/components/layout/Navbar/helpers.tsx
@@ -22,10 +22,6 @@ export const loggedInLinks: Link[] = [
     name: "Marketplace",
     href: "/marketplace",
   },
-  {
-    name: "Library",
-    href: "/library",
-  },
   {
     name: "Build",
     href: "/build",
diff --git a/autogpt_platform/frontend/src/components/layout/Navbar/useNavbar.ts b/autogpt_platform/frontend/src/components/layout/Navbar/useNavbar.ts
index ea1cfa8275..375155909f 100644
--- a/autogpt_platform/frontend/src/components/layout/Navbar/useNavbar.ts
+++ b/autogpt_platform/frontend/src/components/layout/Navbar/useNavbar.ts
@@ -1,8 +1,10 @@
 import { useGetV2GetUserProfile } from "@/app/api/__generated__/endpoints/store/store";
+import { isLogoutInProgress } from "@/lib/autogpt-server-api/helpers";
 import { useSupabase } from "@/lib/supabase/hooks/useSupabase";
 
 export function useNavbar() {
   const { isLoggedIn, isUserLoading } = useSupabase();
+  const logoutInProgress = isLogoutInProgress();
 
   console.log("isLoggedIn", isLoggedIn);
 
@@ -12,7 +14,7 @@ export function useNavbar() {
     error: profileError,
   } = useGetV2GetUserProfile({
     query: {
-      enabled: isLoggedIn === true,
+      enabled: isLoggedIn === true && !logoutInProgress,
     },
   });
 
diff --git a/autogpt_platform/frontend/src/components/molecules/Accordion/Accordion.stories.tsx b/autogpt_platform/frontend/src/components/molecules/Accordion/Accordion.stories.tsx
new file mode 100644
index 0000000000..d0fce53e0e
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/molecules/Accordion/Accordion.stories.tsx
@@ -0,0 +1,203 @@
+import type { Meta } from "@storybook/nextjs";
+import {
+  Accordion,
+  AccordionContent,
+  AccordionItem,
+  AccordionTrigger,
+} from "./Accordion";
+
+const meta: Meta<typeof Accordion> = {
+  title: "Molecules/Accordion",
+  component: Accordion,
+  parameters: {
+    layout: "centered",
+    docs: {
+      description: {
+        component: `
+## Accordion Component
+
+A vertically stacked set of interactive headings that each reveal an associated section of content.
+
+### ✨ Features
+
+- **Built on Radix UI** - Uses @radix-ui/react-accordion for accessibility and functionality
+- **Single or multiple** - Supports single or multiple items open at once
+- **Smooth animations** - Built-in expand/collapse animations
+- **Accessible** - Full keyboard navigation and screen reader support
+- **Customizable** - Style with Tailwind CSS classes
+
+### 🎯 Usage
+
+\`\`\`tsx
+<Accordion type="single" collapsible>
+  <AccordionItem value="item-1">
+    <AccordionTrigger>Is it accessible?</AccordionTrigger>
+    <AccordionContent>
+      Yes. It adheres to the WAI-ARIA design pattern.
+    </AccordionContent>
+  </AccordionItem>
+</Accordion>
+\`\`\`
+
+### Props
+
+**Accordion**:
+- **type**: "single" | "multiple" - Whether one or multiple items can be open
+- **collapsible**: boolean - When type is "single", allows closing all items
+- **defaultValue**: string | string[] - Default open item(s)
+- **value**: string | string[] - Controlled open item(s)
+- **onValueChange**: (value) => void - Callback when value changes
+
+**AccordionItem**:
+- **value**: string - Unique identifier for the item
+- **disabled**: boolean - Whether the item is disabled
+
+**AccordionTrigger**:
+- Standard button props
+
+**AccordionContent**:
+- Standard div props
+        `,
+      },
+    },
+  },
+  tags: ["autodocs"],
+  argTypes: {
+    type: {
+      control: "radio",
+      options: ["single", "multiple"],
+      description: "Whether one or multiple items can be open at the same time",
+      table: {
+        defaultValue: { summary: "single" },
+      },
+    },
+    collapsible: {
+      control: "boolean",
+      description:
+        'When type is "single", allows closing content when clicking on open trigger',
+      table: {
+        defaultValue: { summary: "false" },
+      },
+    },
+  },
+};
+
+export default meta;
+
+export function Default() {
+  return (
+    <Accordion type="single" collapsible className="w-96">
+      <AccordionItem value="item-1">
+        <AccordionTrigger>Is it accessible?</AccordionTrigger>
+        <AccordionContent>
+          Yes. It adheres to the WAI-ARIA design pattern.
+        </AccordionContent>
+      </AccordionItem>
+      <AccordionItem value="item-2">
+        <AccordionTrigger>Is it styled?</AccordionTrigger>
+        <AccordionContent>
+          Yes. It comes with default styles that match your design system.
+        </AccordionContent>
+      </AccordionItem>
+      <AccordionItem value="item-3">
+        <AccordionTrigger>Is it animated?</AccordionTrigger>
+        <AccordionContent>
+          Yes. It&apos;s animated by default with smooth expand/collapse
+          transitions.
+        </AccordionContent>
+      </AccordionItem>
+    </Accordion>
+  );
+}
+
+export function Multiple() {
+  return (
+    <Accordion type="multiple" className="w-96">
+      <AccordionItem value="item-1">
+        <AccordionTrigger>First section</AccordionTrigger>
+        <AccordionContent>
+          Multiple items can be open at the same time when type is set to
+          &quot;multiple&quot;.
+        </AccordionContent>
+      </AccordionItem>
+      <AccordionItem value="item-2">
+        <AccordionTrigger>Second section</AccordionTrigger>
+        <AccordionContent>
+          Try opening this one while the first is still open.
+        </AccordionContent>
+      </AccordionItem>
+      <AccordionItem value="item-3">
+        <AccordionTrigger>Third section</AccordionTrigger>
+        <AccordionContent>
+          All three can be open simultaneously.
+        </AccordionContent>
+      </AccordionItem>
+    </Accordion>
+  );
+}
+
+export function DefaultOpen() {
+  return (
+    <Accordion type="single" collapsible defaultValue="item-2" className="w-96">
+      <AccordionItem value="item-1">
+        <AccordionTrigger>Closed by default</AccordionTrigger>
+        <AccordionContent>This item starts closed.</AccordionContent>
+      </AccordionItem>
+      <AccordionItem value="item-2">
+        <AccordionTrigger>Open by default</AccordionTrigger>
+        <AccordionContent>
+          This item starts open because defaultValue is set to
+          &quot;item-2&quot;.
+        </AccordionContent>
+      </AccordionItem>
+      <AccordionItem value="item-3">
+        <AccordionTrigger>Also closed</AccordionTrigger>
+        <AccordionContent>This item also starts closed.</AccordionContent>
+      </AccordionItem>
+    </Accordion>
+  );
+}
+
+export function WithDisabledItem() {
+  return (
+    <Accordion type="single" collapsible className="w-96">
+      <AccordionItem value="item-1">
+        <AccordionTrigger>Available item</AccordionTrigger>
+        <AccordionContent>This item can be toggled.</AccordionContent>
+      </AccordionItem>
+      <AccordionItem value="item-2" disabled>
+        <AccordionTrigger>Disabled item</AccordionTrigger>
+        <AccordionContent>
+          This content cannot be accessed because the item is disabled.
+        </AccordionContent>
+      </AccordionItem>
+      <AccordionItem value="item-3">
+        <AccordionTrigger>Another available item</AccordionTrigger>
+        <AccordionContent>This item can also be toggled.</AccordionContent>
+      </AccordionItem>
+    </Accordion>
+  );
+}
+
+export function CustomStyled() {
+  return (
+    <Accordion type="single" collapsible className="w-96">
+      <AccordionItem value="item-1" className="border-none">
+        <AccordionTrigger className="rounded-lg bg-zinc-100 px-4 hover:bg-zinc-200 hover:no-underline">
+          Custom styled trigger
+        </AccordionTrigger>
+        <AccordionContent className="px-4 pt-2">
+          You can customize the styling using className props.
+        </AccordionContent>
+      </AccordionItem>
+      <AccordionItem value="item-2" className="mt-2 border-none">
+        <AccordionTrigger className="rounded-lg bg-blue-50 px-4 text-blue-700 hover:bg-blue-100 hover:no-underline">
+          Blue themed
+        </AccordionTrigger>
+        <AccordionContent className="px-4 pt-2 text-blue-600">
+          Each item can have different styles.
+        </AccordionContent>
+      </AccordionItem>
+    </Accordion>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/molecules/Accordion/Accordion.tsx b/autogpt_platform/frontend/src/components/molecules/Accordion/Accordion.tsx
new file mode 100644
index 0000000000..b071fc1d37
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/molecules/Accordion/Accordion.tsx
@@ -0,0 +1,8 @@
+"use client";
+
+export {
+  Accordion,
+  AccordionContent,
+  AccordionItem,
+  AccordionTrigger,
+} from "@/components/ui/accordion";
diff --git a/autogpt_platform/frontend/src/components/molecules/Dialog/Dialog.tsx b/autogpt_platform/frontend/src/components/molecules/Dialog/Dialog.tsx
index 7ecb99ede7..725edecb3a 100644
--- a/autogpt_platform/frontend/src/components/molecules/Dialog/Dialog.tsx
+++ b/autogpt_platform/frontend/src/components/molecules/Dialog/Dialog.tsx
@@ -57,7 +57,7 @@ function Dialog({
         <RXDialog.Root
           open={isOpen}
           onOpenChange={(open) => {
-            if (!open) {
+            if (!open && !forceOpen) {
               config.handleClose();
               onClose?.();
             }
@@ -70,7 +70,7 @@ function Dialog({
           shouldScaleBackground
           open={isOpen}
           onOpenChange={(open) => {
-            if (!open) {
+            if (!open && !forceOpen) {
               config.handleClose();
               onClose?.();
             }
diff --git a/autogpt_platform/frontend/src/components/molecules/Dialog/components/DialogWrap.tsx b/autogpt_platform/frontend/src/components/molecules/Dialog/components/DialogWrap.tsx
index de1984b449..a78aca17c4 100644
--- a/autogpt_platform/frontend/src/components/molecules/Dialog/components/DialogWrap.tsx
+++ b/autogpt_platform/frontend/src/components/molecules/Dialog/components/DialogWrap.tsx
@@ -40,29 +40,35 @@ export function DialogWrap({
   const scrollRef = useRef<HTMLDivElement | null>(null);
   const [hasVerticalScrollbar, setHasVerticalScrollbar] = useState(false);
 
-  // Prevent dialog from closing when external picker is open
+  // Prevent dialog from closing when external picker is open or when forceOpen is true
   const handleInteractOutside = useCallback(
     (event: Event) => {
-      if (isExternalPickerOpen()) {
+      if (isExternalPickerOpen() || isForceOpen) {
         event.preventDefault();
         return;
       }
       handleClose();
     },
-    [handleClose],
+    [handleClose, isForceOpen],
   );
 
-  const handlePointerDownOutside = useCallback((event: Event) => {
-    if (isExternalPickerOpen()) {
-      event.preventDefault();
-    }
-  }, []);
+  const handlePointerDownOutside = useCallback(
+    (event: Event) => {
+      if (isExternalPickerOpen() || isForceOpen) {
+        event.preventDefault();
+      }
+    },
+    [isForceOpen],
+  );
 
-  const handleFocusOutside = useCallback((event: Event) => {
-    if (isExternalPickerOpen()) {
-      event.preventDefault();
-    }
-  }, []);
+  const handleFocusOutside = useCallback(
+    (event: Event) => {
+      if (isExternalPickerOpen() || isForceOpen) {
+        event.preventDefault();
+      }
+    },
+    [isForceOpen],
+  );
 
   useEffect(() => {
     function update() {
@@ -88,7 +94,7 @@ export function DialogWrap({
         onInteractOutside={handleInteractOutside}
         onPointerDownOutside={handlePointerDownOutside}
         onFocusOutside={handleFocusOutside}
-        onEscapeKeyDown={handleClose}
+        onEscapeKeyDown={isForceOpen ? undefined : handleClose}
         aria-describedby={undefined}
         className={modalStyles.content}
         style={{
diff --git a/autogpt_platform/frontend/src/components/molecules/Dialog/components/DrawerWrap.tsx b/autogpt_platform/frontend/src/components/molecules/Dialog/components/DrawerWrap.tsx
index d00817bf59..3bfa321538 100644
--- a/autogpt_platform/frontend/src/components/molecules/Dialog/components/DrawerWrap.tsx
+++ b/autogpt_platform/frontend/src/components/molecules/Dialog/components/DrawerWrap.tsx
@@ -22,6 +22,9 @@ export function DrawerWrap({
   handleClose,
   isForceOpen,
 }: Props) {
+  const accessibleTitle = title ?? "Dialog";
+  const hasVisibleTitle = Boolean(title);
+
   const closeBtn = (
     <Button
       variant="link"
@@ -44,15 +47,19 @@ export function DrawerWrap({
       >
         <div
           className={`flex w-full shrink-0 items-center justify-between ${
-            title ? "pb-6" : "pb-0"
+            hasVisibleTitle ? "pb-6" : "pb-0"
           }`}
         >
-          {title ? (
-            <Drawer.Title className={drawerStyles.title}>{title}</Drawer.Title>
-          ) : null}
+          {hasVisibleTitle ? (
+            <Drawer.Title className={drawerStyles.title}>
+              {accessibleTitle}
+            </Drawer.Title>
+          ) : (
+            <Drawer.Title className="sr-only">{accessibleTitle}</Drawer.Title>
+          )}
 
           {!isForceOpen ? (
-            title ? (
+            hasVisibleTitle ? (
               closeBtn
             ) : (
               <div
diff --git a/autogpt_platform/frontend/src/components/molecules/Form/Form.tsx b/autogpt_platform/frontend/src/components/molecules/Form/Form.tsx
new file mode 100644
index 0000000000..686807b202
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/molecules/Form/Form.tsx
@@ -0,0 +1,209 @@
+"use client";
+
+import * as LabelPrimitive from "@radix-ui/react-label";
+import { Slot } from "@radix-ui/react-slot";
+import * as React from "react";
+import {
+  Controller,
+  ControllerProps,
+  FieldPath,
+  FieldValues,
+  FormProvider,
+  useFormContext,
+} from "react-hook-form";
+
+import { cn } from "@/lib/utils";
+import type { UseFormReturn } from "react-hook-form";
+
+type FormProps<TFieldValues extends FieldValues = FieldValues> = {
+  form: UseFormReturn<TFieldValues>;
+  onSubmit: (values: TFieldValues) => void | Promise<void>;
+  className?: string;
+} & Omit<React.FormHTMLAttributes<HTMLFormElement>, "onSubmit">;
+
+function Form<TFieldValues extends FieldValues = FieldValues>({
+  form,
+  onSubmit,
+  className,
+  children,
+  ...props
+}: FormProps<TFieldValues>) {
+  return (
+    <FormProvider {...form}>
+      <form
+        onSubmit={form.handleSubmit(onSubmit)}
+        className={cn("space-y-4", className)}
+        {...props}
+      >
+        {children}
+      </form>
+    </FormProvider>
+  );
+}
+
+type FormFieldContextValue<
+  TFieldValues extends FieldValues = FieldValues,
+  TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>,
+> = {
+  name: TName;
+};
+
+const FormFieldContext = React.createContext<FormFieldContextValue>(
+  {} as FormFieldContextValue,
+);
+
+const FormField = <
+  TFieldValues extends FieldValues = FieldValues,
+  TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>,
+>({
+  ...props
+}: ControllerProps<TFieldValues, TName>) => {
+  return (
+    <FormFieldContext.Provider value={{ name: props.name }}>
+      <Controller {...props} />
+    </FormFieldContext.Provider>
+  );
+};
+
+const useFormField = () => {
+  const fieldContext = React.useContext(FormFieldContext);
+  const itemContext = React.useContext(FormItemContext);
+  const { getFieldState, formState } = useFormContext();
+
+  const fieldState = getFieldState(fieldContext.name, formState);
+
+  if (!fieldContext) {
+    throw new Error("useFormField should be used within <FormField>");
+  }
+
+  const { id } = itemContext;
+
+  return {
+    id,
+    name: fieldContext.name,
+    formItemId: `${id}-form-item`,
+    formDescriptionId: `${id}-form-item-description`,
+    formMessageId: `${id}-form-item-message`,
+    ...fieldState,
+  };
+};
+
+type FormItemContextValue = {
+  id: string;
+};
+
+const FormItemContext = React.createContext<FormItemContextValue>(
+  {} as FormItemContextValue,
+);
+
+const FormItem = React.forwardRef<
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement>
+>(({ className, ...props }, ref) => {
+  const id = React.useId();
+
+  return (
+    <FormItemContext.Provider value={{ id }}>
+      <div ref={ref} className={cn("space-y-2", className)} {...props} />
+    </FormItemContext.Provider>
+  );
+});
+FormItem.displayName = "FormItem";
+
+const FormLabel = React.forwardRef<
+  React.ElementRef<typeof LabelPrimitive.Root>,
+  React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root>
+>(({ className, ...props }, ref) => {
+  const { error, formItemId } = useFormField();
+
+  return (
+    <LabelPrimitive.Root
+      ref={ref}
+      className={cn(error && "text-red-500 dark:text-red-900", className)}
+      htmlFor={formItemId}
+      {...props}
+    />
+  );
+});
+FormLabel.displayName = "FormLabel";
+
+const FormControl = React.forwardRef<
+  React.ElementRef<typeof Slot>,
+  React.ComponentPropsWithoutRef<typeof Slot>
+>(({ ...props }, ref) => {
+  const { error, formItemId, formDescriptionId, formMessageId } =
+    useFormField();
+
+  return (
+    <Slot
+      ref={ref}
+      id={formItemId}
+      aria-describedby={
+        !error
+          ? `${formDescriptionId}`
+          : `${formDescriptionId} ${formMessageId}`
+      }
+      aria-invalid={!!error}
+      {...props}
+    />
+  );
+});
+FormControl.displayName = "FormControl";
+
+const FormDescription = React.forwardRef<
+  HTMLParagraphElement,
+  React.HTMLAttributes<HTMLParagraphElement>
+>(({ className, ...props }, ref) => {
+  const { formDescriptionId } = useFormField();
+
+  return (
+    <p
+      ref={ref}
+      id={formDescriptionId}
+      className={cn(
+        "font-sans text-[0.75rem] font-[400] leading-[1.125rem] text-neutral-500 dark:text-neutral-400",
+        className,
+      )}
+      {...props}
+    />
+  );
+});
+FormDescription.displayName = "FormDescription";
+
+const FormMessage = React.forwardRef<
+  HTMLParagraphElement,
+  React.HTMLAttributes<HTMLParagraphElement>
+>(({ className, children, ...props }, ref) => {
+  const { error, formMessageId } = useFormField();
+  const body = error ? String(error?.message) : children;
+
+  if (!body) {
+    return null;
+  }
+
+  return (
+    <p
+      ref={ref}
+      id={formMessageId}
+      className={cn(
+        "font-sans text-[0.75rem] font-[500] leading-[1.125rem] text-red-500 dark:text-red-900",
+        className,
+      )}
+      {...props}
+    >
+      {body}
+    </p>
+  );
+});
+FormMessage.displayName = "FormMessage";
+
+export {
+  Form,
+  FormControl,
+  FormDescription,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+  useFormField,
+};
diff --git a/autogpt_platform/frontend/src/components/molecules/Popover/Popover.tsx b/autogpt_platform/frontend/src/components/molecules/Popover/Popover.tsx
new file mode 100644
index 0000000000..f6bb16d54a
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/molecules/Popover/Popover.tsx
@@ -0,0 +1,33 @@
+"use client";
+
+import * as PopoverPrimitive from "@radix-ui/react-popover";
+import * as React from "react";
+
+import { cn } from "@/lib/utils";
+
+const Popover = PopoverPrimitive.Root;
+
+const PopoverTrigger = PopoverPrimitive.Trigger;
+
+const PopoverAnchor = PopoverPrimitive.Anchor;
+
+const PopoverContent = React.forwardRef<
+  React.ElementRef<typeof PopoverPrimitive.Content>,
+  React.ComponentPropsWithoutRef<typeof PopoverPrimitive.Content>
+>(({ className, align = "center", sideOffset = 4, ...props }, ref) => (
+  <PopoverPrimitive.Portal>
+    <PopoverPrimitive.Content
+      ref={ref}
+      align={align}
+      sideOffset={sideOffset}
+      className={cn(
+        "z-50 w-72 rounded-lg border border-zinc-200 bg-white p-4 text-zinc-900 shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+        className,
+      )}
+      {...props}
+    />
+  </PopoverPrimitive.Portal>
+));
+PopoverContent.displayName = PopoverPrimitive.Content.displayName;
+
+export { Popover, PopoverAnchor, PopoverContent, PopoverTrigger };
diff --git a/autogpt_platform/frontend/src/components/molecules/SecondaryMenu/SecondaryMenu.stories.tsx b/autogpt_platform/frontend/src/components/molecules/SecondaryMenu/SecondaryMenu.stories.tsx
new file mode 100644
index 0000000000..907a552056
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/molecules/SecondaryMenu/SecondaryMenu.stories.tsx
@@ -0,0 +1,99 @@
+import { Button } from "@/components/atoms/Button/Button";
+import {
+  DropdownMenu,
+  DropdownMenuTrigger,
+} from "@/components/molecules/DropdownMenu/DropdownMenu";
+import {
+  ArrowSquareOutIcon,
+  CopyIcon,
+  DotsThreeOutlineVerticalIcon,
+  TrashIcon,
+} from "@phosphor-icons/react";
+import * as ContextMenu from "@radix-ui/react-context-menu";
+import type { Meta, StoryObj } from "@storybook/nextjs";
+import {
+  SecondaryDropdownMenuContent,
+  SecondaryDropdownMenuItem,
+  SecondaryDropdownMenuSeparator,
+  SecondaryMenuContent,
+  SecondaryMenuItem,
+  SecondaryMenuSeparator,
+} from "./SecondaryMenu";
+
+const meta: Meta = {
+  title: "Molecules/SecondaryMenu",
+  component: SecondaryMenuContent,
+};
+
+export default meta;
+type Story = StoryObj<typeof SecondaryMenuContent>;
+
+export const ContextMenuExample: Story = {
+  render: () => (
+    <div className="flex h-96 items-center justify-center">
+      <ContextMenu.Root>
+        <ContextMenu.Trigger asChild>
+          <div className="flex h-32 w-64 cursor-pointer items-center justify-center rounded-lg border border-gray-300 bg-gray-50 dark:border-gray-600 dark:bg-gray-800">
+            Right-click me
+          </div>
+        </ContextMenu.Trigger>
+        <SecondaryMenuContent>
+          <SecondaryMenuItem onSelect={() => alert("Copy")}>
+            <CopyIcon size={20} className="mr-2 dark:text-gray-100" />
+            <span className="dark:text-gray-100">Copy</span>
+          </SecondaryMenuItem>
+          <SecondaryMenuItem onSelect={() => alert("Open agent")}>
+            <ArrowSquareOutIcon size={20} className="mr-2 dark:text-gray-100" />
+            <span className="dark:text-gray-100">Open agent</span>
+          </SecondaryMenuItem>
+          <SecondaryMenuSeparator />
+          <SecondaryMenuItem
+            variant="destructive"
+            onSelect={() => alert("Delete")}
+          >
+            <TrashIcon
+              size={20}
+              className="mr-2 text-red-500 dark:text-red-400"
+            />
+            <span className="dark:text-red-400">Delete</span>
+          </SecondaryMenuItem>
+        </SecondaryMenuContent>
+      </ContextMenu.Root>
+    </div>
+  ),
+};
+
+export const DropdownMenuExample: Story = {
+  render: () => (
+    <div className="flex h-96 items-center justify-center">
+      <DropdownMenu>
+        <DropdownMenuTrigger asChild>
+          <Button variant="secondary" size="small">
+            <DotsThreeOutlineVerticalIcon size={16} weight="fill" />
+          </Button>
+        </DropdownMenuTrigger>
+        <SecondaryDropdownMenuContent side="right" align="start">
+          <SecondaryDropdownMenuItem onClick={() => alert("Copy")}>
+            <CopyIcon size={20} className="mr-2 dark:text-gray-100" />
+            <span className="dark:text-gray-100">Copy</span>
+          </SecondaryDropdownMenuItem>
+          <SecondaryDropdownMenuItem onClick={() => alert("Open agent")}>
+            <ArrowSquareOutIcon size={20} className="mr-2 dark:text-gray-100" />
+            <span className="dark:text-gray-100">Open agent</span>
+          </SecondaryDropdownMenuItem>
+          <SecondaryDropdownMenuSeparator />
+          <SecondaryDropdownMenuItem
+            variant="destructive"
+            onClick={() => alert("Delete")}
+          >
+            <TrashIcon
+              size={20}
+              className="mr-2 text-red-500 dark:text-red-400"
+            />
+            <span className="dark:text-red-400">Delete</span>
+          </SecondaryDropdownMenuItem>
+        </SecondaryDropdownMenuContent>
+      </DropdownMenu>
+    </div>
+  ),
+};
diff --git a/autogpt_platform/frontend/src/components/molecules/SecondaryMenu/SecondaryMenu.tsx b/autogpt_platform/frontend/src/components/molecules/SecondaryMenu/SecondaryMenu.tsx
new file mode 100644
index 0000000000..fd445491e7
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/molecules/SecondaryMenu/SecondaryMenu.tsx
@@ -0,0 +1,103 @@
+"use client";
+
+import { cn } from "@/lib/utils";
+import * as ContextMenu from "@radix-ui/react-context-menu";
+import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";
+import React from "react";
+
+const secondaryMenuContentClassName =
+  "z-10 rounded-xl border bg-white p-1 shadow-md dark:bg-gray-800";
+
+const secondaryMenuItemClassName =
+  "flex cursor-pointer items-center rounded-md px-3 py-2 hover:bg-gray-100 dark:hover:bg-gray-700";
+
+const secondaryMenuSeparatorClassName =
+  "my-1 h-px bg-gray-300 dark:bg-gray-600";
+
+export const SecondaryMenuContent = React.forwardRef<
+  React.ElementRef<typeof ContextMenu.Content>,
+  React.ComponentPropsWithoutRef<typeof ContextMenu.Content>
+>(({ className, ...props }, ref) => (
+  <ContextMenu.Content
+    ref={ref}
+    className={cn(secondaryMenuContentClassName, className)}
+    {...props}
+  />
+));
+SecondaryMenuContent.displayName = "SecondaryMenuContent";
+
+export const SecondaryMenuItem = React.forwardRef<
+  React.ElementRef<typeof ContextMenu.Item>,
+  React.ComponentPropsWithoutRef<typeof ContextMenu.Item> & {
+    variant?: "default" | "destructive";
+  }
+>(({ className, variant = "default", ...props }, ref) => (
+  <ContextMenu.Item
+    ref={ref}
+    className={cn(
+      secondaryMenuItemClassName,
+      variant === "destructive" &&
+        "text-red-500 hover:bg-gray-100 dark:hover:bg-gray-700",
+      className,
+    )}
+    {...props}
+  />
+));
+SecondaryMenuItem.displayName = "SecondaryMenuItem";
+
+export const SecondaryMenuSeparator = React.forwardRef<
+  React.ElementRef<typeof ContextMenu.Separator>,
+  React.ComponentPropsWithoutRef<typeof ContextMenu.Separator>
+>(({ className, ...props }, ref) => (
+  <ContextMenu.Separator
+    ref={ref}
+    className={cn(secondaryMenuSeparatorClassName, className)}
+    {...props}
+  />
+));
+SecondaryMenuSeparator.displayName = "SecondaryMenuSeparator";
+
+export const SecondaryDropdownMenuContent = React.forwardRef<
+  React.ElementRef<typeof DropdownMenuPrimitive.Content>,
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Content>
+>(({ className, ...props }, ref) => (
+  <DropdownMenuPrimitive.Portal>
+    <DropdownMenuPrimitive.Content
+      ref={ref}
+      className={cn(secondaryMenuContentClassName, className)}
+      {...props}
+    />
+  </DropdownMenuPrimitive.Portal>
+));
+SecondaryDropdownMenuContent.displayName = "SecondaryDropdownMenuContent";
+
+export const SecondaryDropdownMenuItem = React.forwardRef<
+  React.ElementRef<typeof DropdownMenuPrimitive.Item>,
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Item> & {
+    variant?: "default" | "destructive";
+  }
+>(({ className, variant = "default", ...props }, ref) => (
+  <DropdownMenuPrimitive.Item
+    ref={ref}
+    className={cn(
+      secondaryMenuItemClassName,
+      variant === "destructive" &&
+        "text-red-500 hover:bg-gray-100 dark:hover:bg-gray-700",
+      className,
+    )}
+    {...props}
+  />
+));
+SecondaryDropdownMenuItem.displayName = "SecondaryDropdownMenuItem";
+
+export const SecondaryDropdownMenuSeparator = React.forwardRef<
+  React.ElementRef<typeof DropdownMenuPrimitive.Separator>,
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Separator>
+>(({ className, ...props }, ref) => (
+  <DropdownMenuPrimitive.Separator
+    ref={ref}
+    className={cn(secondaryMenuSeparatorClassName, className)}
+    {...props}
+  />
+));
+SecondaryDropdownMenuSeparator.displayName = "SecondaryDropdownMenuSeparator";
diff --git a/autogpt_platform/frontend/src/components/molecules/Table/Table.stories.tsx b/autogpt_platform/frontend/src/components/molecules/Table/Table.stories.tsx
new file mode 100644
index 0000000000..6dfb0b378f
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/molecules/Table/Table.stories.tsx
@@ -0,0 +1,116 @@
+import type { Meta, StoryObj } from "@storybook/nextjs";
+import { TooltipProvider } from "@/components/atoms/Tooltip/BaseTooltip";
+import { Table } from "./Table";
+
+const meta = {
+  title: "Molecules/Table",
+  component: Table,
+  decorators: [
+    (Story) => (
+      <TooltipProvider>
+        <Story />
+      </TooltipProvider>
+    ),
+  ],
+  parameters: {
+    layout: "centered",
+  },
+  tags: ["autodocs"],
+  argTypes: {
+    allowAddRow: {
+      control: "boolean",
+      description: "Whether to show the Add row button",
+    },
+    allowDeleteRow: {
+      control: "boolean",
+      description: "Whether to show delete buttons for each row",
+    },
+    readOnly: {
+      control: "boolean",
+      description:
+        "Whether the table is read-only (renders text instead of inputs)",
+    },
+    addRowLabel: {
+      control: "text",
+      description: "Label for the Add row button",
+    },
+  },
+} satisfies Meta<typeof Table>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  args: {
+    columns: ["name", "email", "role"],
+    allowAddRow: true,
+    allowDeleteRow: true,
+  },
+};
+
+export const WithDefaultValues: Story = {
+  args: {
+    columns: ["name", "email", "role"],
+    defaultValues: [
+      { name: "John Doe", email: "john@example.com", role: "Admin" },
+      { name: "Jane Smith", email: "jane@example.com", role: "User" },
+      { name: "Bob Wilson", email: "bob@example.com", role: "Editor" },
+    ],
+    allowAddRow: true,
+    allowDeleteRow: true,
+  },
+};
+
+export const ReadOnly: Story = {
+  args: {
+    columns: ["name", "email"],
+    defaultValues: [
+      { name: "John Doe", email: "john@example.com" },
+      { name: "Jane Smith", email: "jane@example.com" },
+    ],
+    readOnly: true,
+  },
+};
+
+export const NoAddOrDelete: Story = {
+  args: {
+    columns: ["name", "email"],
+    defaultValues: [
+      { name: "John Doe", email: "john@example.com" },
+      { name: "Jane Smith", email: "jane@example.com" },
+    ],
+    allowAddRow: false,
+    allowDeleteRow: false,
+  },
+};
+
+export const SingleColumn: Story = {
+  args: {
+    columns: ["item"],
+    allowAddRow: true,
+    allowDeleteRow: true,
+    addRowLabel: "Add item",
+  },
+};
+
+export const CustomAddLabel: Story = {
+  args: {
+    columns: ["key", "value"],
+    allowAddRow: true,
+    allowDeleteRow: true,
+    addRowLabel: "Add new entry",
+  },
+};
+
+export const KeyValuePairs: Story = {
+  args: {
+    columns: ["key", "value"],
+    defaultValues: [
+      { key: "API_KEY", value: "sk-..." },
+      { key: "DATABASE_URL", value: "postgres://..." },
+    ],
+    allowAddRow: true,
+    allowDeleteRow: true,
+    addRowLabel: "Add variable",
+  },
+};
diff --git a/autogpt_platform/frontend/src/components/molecules/Table/Table.tsx b/autogpt_platform/frontend/src/components/molecules/Table/Table.tsx
new file mode 100644
index 0000000000..a09a8344a5
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/molecules/Table/Table.tsx
@@ -0,0 +1,133 @@
+import * as React from "react";
+import {
+  Table as BaseTable,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeader,
+  TableRow,
+} from "@/components/__legacy__/ui/table";
+import { Button } from "@/components/atoms/Button/Button";
+import { Input } from "@/components/atoms/Input/Input";
+import { Text } from "@/components/atoms/Text/Text";
+import { Plus, Trash2 } from "lucide-react";
+import { cn } from "@/lib/utils";
+import { useTable, RowData } from "./useTable";
+import { formatColumnTitle, formatPlaceholder } from "./helpers";
+
+export interface TableProps {
+  columns: string[];
+  defaultValues?: RowData[];
+  onChange?: (rows: RowData[]) => void;
+  allowAddRow?: boolean;
+  allowDeleteRow?: boolean;
+  addRowLabel?: string;
+  className?: string;
+  readOnly?: boolean;
+}
+
+export function Table({
+  columns,
+  defaultValues,
+  onChange,
+  allowAddRow = true,
+  allowDeleteRow = true,
+  addRowLabel = "Add row",
+  className,
+  readOnly = false,
+}: TableProps) {
+  const { rows, handleAddRow, handleDeleteRow, handleCellChange } = useTable({
+    columns,
+    defaultValues,
+    onChange,
+  });
+
+  const showDeleteColumn = allowDeleteRow && !readOnly;
+  const showAddButton = allowAddRow && !readOnly;
+
+  return (
+    <div className={cn("flex flex-col gap-3", className)}>
+      <div className="overflow-hidden rounded-xl border border-zinc-200 bg-white">
+        <BaseTable>
+          <TableHeader>
+            <TableRow className="border-b border-zinc-100 bg-zinc-50/50">
+              {columns.map((column) => (
+                <TableHead
+                  key={column}
+                  className="h-10 px-3 text-sm font-medium text-zinc-600"
+                >
+                  {formatColumnTitle(column)}
+                </TableHead>
+              ))}
+              {showDeleteColumn && <TableHead className="w-[50px]" />}
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            {rows.map((row, rowIndex) => (
+              <TableRow key={rowIndex} className="border-none">
+                {columns.map((column) => (
+                  <TableCell key={`${rowIndex}-${column}`} className="p-2">
+                    {readOnly ? (
+                      <Text
+                        variant="body"
+                        className="px-3 py-2 text-sm text-zinc-800"
+                      >
+                        {row[column] || "-"}
+                      </Text>
+                    ) : (
+                      <Input
+                        id={`table-${rowIndex}-${column}`}
+                        label={formatColumnTitle(column)}
+                        hideLabel
+                        value={row[column] ?? ""}
+                        onChange={(e) =>
+                          handleCellChange(rowIndex, column, e.target.value)
+                        }
+                        placeholder={formatPlaceholder(column)}
+                        size="small"
+                        wrapperClassName="mb-0"
+                      />
+                    )}
+                  </TableCell>
+                ))}
+                {showDeleteColumn && (
+                  <TableCell className="p-2">
+                    <Button
+                      variant="icon"
+                      size="icon"
+                      onClick={() => handleDeleteRow(rowIndex)}
+                      aria-label="Delete row"
+                      className="text-zinc-400 transition-colors hover:text-red-500"
+                    >
+                      <Trash2 className="h-4 w-4" />
+                    </Button>
+                  </TableCell>
+                )}
+              </TableRow>
+            ))}
+            {showAddButton && (
+              <TableRow>
+                <TableCell
+                  colSpan={columns.length + (showDeleteColumn ? 1 : 0)}
+                  className="p-2"
+                >
+                  <Button
+                    variant="outline"
+                    size="small"
+                    onClick={handleAddRow}
+                    leftIcon={<Plus className="h-4 w-4" />}
+                    className="w-fit"
+                  >
+                    {addRowLabel}
+                  </Button>
+                </TableCell>
+              </TableRow>
+            )}
+          </TableBody>
+        </BaseTable>
+      </div>
+    </div>
+  );
+}
+
+export { type RowData } from "./useTable";
diff --git a/autogpt_platform/frontend/src/components/molecules/Table/helpers.ts b/autogpt_platform/frontend/src/components/molecules/Table/helpers.ts
new file mode 100644
index 0000000000..3ea116095a
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/molecules/Table/helpers.ts
@@ -0,0 +1,7 @@
+export const formatColumnTitle = (key: string): string => {
+  return key.charAt(0).toUpperCase() + key.slice(1);
+};
+
+export const formatPlaceholder = (key: string): string => {
+  return `Enter ${key.toLowerCase()}`;
+};
diff --git a/autogpt_platform/frontend/src/components/molecules/Table/useTable.ts b/autogpt_platform/frontend/src/components/molecules/Table/useTable.ts
new file mode 100644
index 0000000000..085c18aa74
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/molecules/Table/useTable.ts
@@ -0,0 +1,81 @@
+import { useState, useEffect } from "react";
+
+export type RowData = Record<string, string>;
+
+interface UseTableOptions {
+  columns: string[];
+  defaultValues?: RowData[];
+  onChange?: (rows: RowData[]) => void;
+}
+
+export function useTable({
+  columns,
+  defaultValues,
+  onChange,
+}: UseTableOptions) {
+  const createEmptyRow = (): RowData => {
+    const emptyRow: RowData = {};
+    columns.forEach((column) => {
+      emptyRow[column] = "";
+    });
+    return emptyRow;
+  };
+
+  const [rows, setRows] = useState<RowData[]>(() => {
+    if (defaultValues && defaultValues.length > 0) {
+      return defaultValues;
+    }
+    return [];
+  });
+
+  useEffect(() => {
+    if (defaultValues !== undefined) {
+      setRows(defaultValues);
+    }
+  }, [defaultValues]);
+
+  const updateRows = (newRows: RowData[]) => {
+    setRows(newRows);
+    onChange?.(newRows);
+  };
+
+  const handleAddRow = () => {
+    const newRows = [...rows, createEmptyRow()];
+    updateRows(newRows);
+  };
+
+  const handleDeleteRow = (rowIndex: number) => {
+    const newRows = rows.filter((_, index) => index !== rowIndex);
+    updateRows(newRows);
+  };
+
+  const handleCellChange = (
+    rowIndex: number,
+    columnKey: string,
+    value: string,
+  ) => {
+    const newRows = rows.map((row, index) => {
+      if (index === rowIndex) {
+        return {
+          ...row,
+          [columnKey]: value,
+        };
+      }
+      return row;
+    });
+    updateRows(newRows);
+  };
+
+  const clearAll = () => {
+    updateRows([]);
+  };
+
+  return {
+    rows,
+    handleAddRow,
+    handleDeleteRow,
+    handleCellChange,
+    clearAll,
+    createEmptyRow,
+  };
+}
diff --git a/autogpt_platform/frontend/src/components/molecules/TallyPoup/TallyPopup.tsx b/autogpt_platform/frontend/src/components/molecules/TallyPoup/TallyPopup.tsx
index d8b7a6027d..be00982084 100644
--- a/autogpt_platform/frontend/src/components/molecules/TallyPoup/TallyPopup.tsx
+++ b/autogpt_platform/frontend/src/components/molecules/TallyPoup/TallyPopup.tsx
@@ -3,9 +3,14 @@
 import React from "react";
 import { useTallyPopup } from "./useTallyPopup";
 import { Button } from "@/components/atoms/Button/Button";
+import { usePathname, useSearchParams } from "next/navigation";
 
 export function TallyPopupSimple() {
   const { state, handlers } = useTallyPopup();
+  const searchParams = useSearchParams();
+  const pathname = usePathname();
+  const isNewBuilder =
+    pathname.includes("build") && searchParams.get("view") === "new";
 
   if (state.isFormVisible) {
     return null;
@@ -13,7 +18,7 @@ export function TallyPopupSimple() {
 
   return (
     <div className="fixed bottom-1 right-0 z-20 hidden select-none items-center gap-4 p-3 transition-all duration-300 ease-in-out md:flex">
-      {state.showTutorial && (
+      {state.showTutorial && !isNewBuilder && (
         <Button
           variant="primary"
           onClick={handlers.handleResetTutorial}
diff --git a/autogpt_platform/frontend/src/components/molecules/Toast/styles.module.css b/autogpt_platform/frontend/src/components/molecules/Toast/styles.module.css
index ec8271958f..d1daaaa88b 100644
--- a/autogpt_platform/frontend/src/components/molecules/Toast/styles.module.css
+++ b/autogpt_platform/frontend/src/components/molecules/Toast/styles.module.css
@@ -37,11 +37,3 @@ html body .toastDescription {
   font-size: 0.75rem !important;
   line-height: 1.25rem !important;
 }
-
-/* Position close button on the right */
-/* stylelint-disable-next-line selector-pseudo-class-no-unknown */
-#root [data-sonner-toast] [data-close-button="true"] {
-  left: unset !important;
-  right: -18px !important;
-  top: -3px !important;
-}
diff --git a/autogpt_platform/frontend/src/components/molecules/Toast/toaster.tsx b/autogpt_platform/frontend/src/components/molecules/Toast/toaster.tsx
index adb88831af..80b228f03b 100644
--- a/autogpt_platform/frontend/src/components/molecules/Toast/toaster.tsx
+++ b/autogpt_platform/frontend/src/components/molecules/Toast/toaster.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { CheckCircle, Info, Warning, XCircle } from "@phosphor-icons/react";
 import { Toaster as SonnerToaster } from "sonner";
 import styles from "./styles.module.css";
 
@@ -23,10 +22,10 @@ export function Toaster() {
       }}
       className="custom__toast"
       icons={{
-        success: <CheckCircle className="h-4 w-4" color="#fff" weight="fill" />,
-        error: <XCircle className="h-4 w-4" color="#fff" weight="fill" />,
-        warning: <Warning className="h-4 w-4" color="#fff" weight="fill" />,
-        info: <Info className="h-4 w-4" color="#fff" weight="fill" />,
+        success: null,
+        error: null,
+        warning: null,
+        info: null,
       }}
     />
   );
diff --git a/autogpt_platform/frontend/src/components/organisms/FloatingReviewsPanel/FloatingReviewsPanel.tsx b/autogpt_platform/frontend/src/components/organisms/FloatingReviewsPanel/FloatingReviewsPanel.tsx
index 2b04c0ed9a..4805508054 100644
--- a/autogpt_platform/frontend/src/components/organisms/FloatingReviewsPanel/FloatingReviewsPanel.tsx
+++ b/autogpt_platform/frontend/src/components/organisms/FloatingReviewsPanel/FloatingReviewsPanel.tsx
@@ -31,6 +31,29 @@ export function FloatingReviewsPanel({
       query: {
         enabled: !!(graphId && executionId),
         select: okData,
+        // Poll while execution is in progress to detect status changes
+        refetchInterval: (q) => {
+          // Note: refetchInterval callback receives raw data before select transform
+          const rawData = q.state.data as
+            | { status: number; data?: { status?: string } }
+            | undefined;
+          if (rawData?.status !== 200) return false;
+
+          const status = rawData?.data?.status;
+          if (!status) return false;
+
+          // Poll every 2 seconds while running or in review
+          if (
+            status === AgentExecutionStatus.RUNNING ||
+            status === AgentExecutionStatus.QUEUED ||
+            status === AgentExecutionStatus.INCOMPLETE ||
+            status === AgentExecutionStatus.REVIEW
+          ) {
+            return 2000;
+          }
+          return false;
+        },
+        refetchIntervalInBackground: true,
       },
     },
   );
@@ -40,28 +63,47 @@ export function FloatingReviewsPanel({
     useShallow((state) => state.graphExecutionStatus),
   );
 
+  // Determine if we should poll for pending reviews
+  const isInReviewStatus =
+    executionDetails?.status === AgentExecutionStatus.REVIEW ||
+    graphExecutionStatus === AgentExecutionStatus.REVIEW;
+
   const { pendingReviews, isLoading, refetch } = usePendingReviewsForExecution(
     executionId || "",
+    {
+      enabled: !!executionId,
+      // Poll every 2 seconds when in REVIEW status to catch new reviews
+      refetchInterval: isInReviewStatus ? 2000 : false,
+    },
   );
 
+  // Refetch pending reviews when execution status changes
   useEffect(() => {
-    if (executionId) {
+    if (executionId && executionDetails?.status) {
       refetch();
     }
   }, [executionDetails?.status, executionId, refetch]);
 
-  // Refetch when graph execution status changes to REVIEW
-  useEffect(() => {
-    if (graphExecutionStatus === AgentExecutionStatus.REVIEW && executionId) {
-      refetch();
-    }
-  }, [graphExecutionStatus, executionId, refetch]);
+  // Hide panel if:
+  // 1. No execution ID
+  // 2. No pending reviews and not in REVIEW status
+  // 3. Execution is RUNNING or QUEUED (hasn't paused for review yet)
+  if (!executionId) {
+    return null;
+  }
 
   if (
-    !executionId ||
-    (!isLoading &&
-      pendingReviews.length === 0 &&
-      executionDetails?.status !== AgentExecutionStatus.REVIEW)
+    !isLoading &&
+    pendingReviews.length === 0 &&
+    executionDetails?.status !== AgentExecutionStatus.REVIEW
+  ) {
+    return null;
+  }
+
+  // Don't show panel while execution is still running/queued (not paused for review)
+  if (
+    executionDetails?.status === AgentExecutionStatus.RUNNING ||
+    executionDetails?.status === AgentExecutionStatus.QUEUED
   ) {
     return null;
   }
diff --git a/autogpt_platform/frontend/src/components/organisms/PendingReviewCard/PendingReviewCard.tsx b/autogpt_platform/frontend/src/components/organisms/PendingReviewCard/PendingReviewCard.tsx
index 3ac636060c..bd456ce771 100644
--- a/autogpt_platform/frontend/src/components/organisms/PendingReviewCard/PendingReviewCard.tsx
+++ b/autogpt_platform/frontend/src/components/organisms/PendingReviewCard/PendingReviewCard.tsx
@@ -1,10 +1,8 @@
 import { PendingHumanReviewModel } from "@/app/api/__generated__/models/pendingHumanReviewModel";
 import { Text } from "@/components/atoms/Text/Text";
-import { Button } from "@/components/atoms/Button/Button";
 import { Input } from "@/components/atoms/Input/Input";
 import { Switch } from "@/components/atoms/Switch/Switch";
-import { TrashIcon, EyeSlashIcon } from "@phosphor-icons/react";
-import { useState } from "react";
+import { useEffect, useState } from "react";
 
 interface StructuredReviewPayload {
   data: unknown;
@@ -40,37 +38,49 @@ function extractReviewData(payload: unknown): {
 interface PendingReviewCardProps {
   review: PendingHumanReviewModel;
   onReviewDataChange: (nodeExecId: string, data: string) => void;
-  reviewMessage?: string;
-  onReviewMessageChange?: (nodeExecId: string, message: string) => void;
-  isDisabled?: boolean;
-  onToggleDisabled?: (nodeExecId: string) => void;
+  autoApproveFuture?: boolean;
+  onAutoApproveFutureChange?: (nodeExecId: string, enabled: boolean) => void;
+  externalDataValue?: string;
+  showAutoApprove?: boolean;
+  nodeId?: string;
 }
 
 export function PendingReviewCard({
   review,
   onReviewDataChange,
-  reviewMessage = "",
-  onReviewMessageChange,
-  isDisabled = false,
-  onToggleDisabled,
+  autoApproveFuture = false,
+  onAutoApproveFutureChange,
+  externalDataValue,
+  showAutoApprove = true,
+  nodeId,
 }: PendingReviewCardProps) {
   const extractedData = extractReviewData(review.payload);
   const isDataEditable = review.editable;
-  const instructions = extractedData.instructions || review.instructions;
+
+  let instructions = review.instructions;
+
+  const isHITLBlock = instructions && !instructions.includes("Block");
+
+  if (instructions && !isHITLBlock) {
+    instructions = undefined;
+  }
+
   const [currentData, setCurrentData] = useState(extractedData.data);
 
+  useEffect(() => {
+    if (externalDataValue !== undefined) {
+      try {
+        const parsedData = JSON.parse(externalDataValue);
+        setCurrentData(parsedData);
+      } catch {}
+    }
+  }, [externalDataValue]);
+
   const handleDataChange = (newValue: unknown) => {
     setCurrentData(newValue);
     onReviewDataChange(review.node_exec_id, JSON.stringify(newValue, null, 2));
   };
 
-  const handleMessageChange = (newMessage: string) => {
-    onReviewMessageChange?.(review.node_exec_id, newMessage);
-  };
-
-  // Show simplified view when no toggle functionality is provided (Screenshot 1 mode)
-  const showSimplified = !onToggleDisabled;
-
   const renderDataInput = () => {
     const data = currentData;
 
@@ -137,97 +147,59 @@ export function PendingReviewCard({
     }
   };
 
-  // Helper function to get proper field label
-  const getFieldLabel = (instructions?: string) => {
-    if (instructions)
-      return instructions.charAt(0).toUpperCase() + instructions.slice(1);
-    return "Data to Review";
+  const getShortenedNodeId = (id: string) => {
+    if (id.length <= 8) return id;
+    return `${id.slice(0, 4)}...${id.slice(-4)}`;
   };
 
-  // Use the existing HITL review interface
   return (
     <div className="space-y-4">
-      {!showSimplified && (
-        <div className="flex items-start justify-between">
-          <div className="flex-1">
-            {isDisabled && (
-              <Text variant="small" className="text-muted-foreground">
-                This item will be rejected
-              </Text>
-            )}
+      {nodeId && (
+        <Text variant="small" className="text-gray-500">
+          Node #{getShortenedNodeId(nodeId)}
+        </Text>
+      )}
+
+      <div className="space-y-3">
+        {instructions && (
+          <Text variant="body" className="font-semibold text-gray-900">
+            {instructions}
+          </Text>
+        )}
+
+        {isDataEditable && !autoApproveFuture ? (
+          renderDataInput()
+        ) : (
+          <div className="rounded-lg border border-gray-200 bg-white p-3">
+            <Text variant="small" className="text-gray-600">
+              {JSON.stringify(currentData, null, 2)}
+            </Text>
           </div>
-          <Button
-            onClick={() => onToggleDisabled!(review.node_exec_id)}
-            variant={isDisabled ? "primary" : "secondary"}
-            size="small"
-            leftIcon={
-              isDisabled ? <EyeSlashIcon size={14} /> : <TrashIcon size={14} />
-            }
-          >
-            {isDisabled ? "Include" : "Exclude"}
-          </Button>
-        </div>
-      )}
+        )}
+      </div>
 
-      {/* Show instructions as field label */}
-      {instructions && (
-        <div className="space-y-3">
-          <Text variant="body" className="font-semibold text-gray-900">
-            {getFieldLabel(instructions)}
-          </Text>
-          {isDataEditable && !isDisabled ? (
-            renderDataInput()
-          ) : (
-            <div className="rounded-lg border border-gray-200 bg-white p-3">
-              <Text variant="small" className="text-gray-600">
-                {JSON.stringify(currentData, null, 2)}
-              </Text>
-            </div>
+      {/* Auto-approve toggle for this review */}
+      {showAutoApprove && onAutoApproveFutureChange && (
+        <div className="space-y-2 pt-2">
+          <div className="flex items-center gap-3">
+            <Switch
+              checked={autoApproveFuture}
+              onCheckedChange={(enabled: boolean) =>
+                onAutoApproveFutureChange(review.node_exec_id, enabled)
+              }
+            />
+            <Text variant="small" className="text-gray-700">
+              Auto-approve future executions of this block
+            </Text>
+          </div>
+          {autoApproveFuture && (
+            <Text variant="small" className="pl-11 text-gray-500">
+              Original data will be used for this and all future reviews from
+              this block.
+            </Text>
           )}
         </div>
       )}
-
-      {/* If no instructions, show data directly */}
-      {!instructions && (
-        <div className="space-y-3">
-          <Text variant="body" className="font-semibold text-gray-900">
-            Data to Review
-            {!isDataEditable && (
-              <span className="ml-2 text-xs text-muted-foreground">
-                (Read-only)
-              </span>
-            )}
-          </Text>
-          {isDataEditable && !isDisabled ? (
-            renderDataInput()
-          ) : (
-            <div className="rounded-lg border border-gray-200 bg-white p-3">
-              <Text variant="small" className="text-gray-600">
-                {JSON.stringify(currentData, null, 2)}
-              </Text>
-            </div>
-          )}
-        </div>
-      )}
-
-      {!showSimplified && isDisabled && (
-        <div>
-          <Text variant="body" className="mb-2 font-semibold">
-            Rejection Reason (Optional):
-          </Text>
-          <Input
-            id="rejection-reason"
-            label="Rejection Reason"
-            hideLabel
-            size="small"
-            type="textarea"
-            rows={3}
-            value={reviewMessage}
-            onChange={(e) => handleMessageChange(e.target.value)}
-            placeholder="Add any notes about why you're rejecting this..."
-          />
-        </div>
-      )}
     </div>
   );
 }
diff --git a/autogpt_platform/frontend/src/components/organisms/PendingReviewsList/PendingReviewsList.tsx b/autogpt_platform/frontend/src/components/organisms/PendingReviewsList/PendingReviewsList.tsx
index 3253b0ee6d..5adb3919b6 100644
--- a/autogpt_platform/frontend/src/components/organisms/PendingReviewsList/PendingReviewsList.tsx
+++ b/autogpt_platform/frontend/src/components/organisms/PendingReviewsList/PendingReviewsList.tsx
@@ -1,10 +1,16 @@
-import { useState } from "react";
+import { useMemo, useState } from "react";
 import { PendingHumanReviewModel } from "@/app/api/__generated__/models/pendingHumanReviewModel";
 import { PendingReviewCard } from "@/components/organisms/PendingReviewCard/PendingReviewCard";
 import { Text } from "@/components/atoms/Text/Text";
 import { Button } from "@/components/atoms/Button/Button";
+import { Switch } from "@/components/atoms/Switch/Switch";
 import { useToast } from "@/components/molecules/Toast/use-toast";
-import { ClockIcon, WarningIcon } from "@phosphor-icons/react";
+import {
+  ClockIcon,
+  WarningIcon,
+  CaretDownIcon,
+  CaretRightIcon,
+} from "@phosphor-icons/react";
 import { usePostV2ProcessReviewAction } from "@/app/api/__generated__/endpoints/executions/executions";
 
 interface PendingReviewsListProps {
@@ -32,16 +38,34 @@ export function PendingReviewsList({
     },
   );
 
-  const [reviewMessageMap, setReviewMessageMap] = useState<
-    Record<string, string>
-  >({});
-
   const [pendingAction, setPendingAction] = useState<
     "approve" | "reject" | null
   >(null);
 
+  const [autoApproveFutureMap, setAutoApproveFutureMap] = useState<
+    Record<string, boolean>
+  >({});
+
+  const [collapsedGroups, setCollapsedGroups] = useState<
+    Record<string, boolean>
+  >({});
+
   const { toast } = useToast();
 
+  const groupedReviews = useMemo(() => {
+    return reviews.reduce(
+      (acc, review) => {
+        const nodeId = review.node_id || "unknown";
+        if (!acc[nodeId]) {
+          acc[nodeId] = [];
+        }
+        acc[nodeId].push(review);
+        return acc;
+      },
+      {} as Record<string, PendingHumanReviewModel[]>,
+    );
+  }, [reviews]);
+
   const reviewActionMutation = usePostV2ProcessReviewAction({
     mutation: {
       onSuccess: (res) => {
@@ -88,8 +112,33 @@ export function PendingReviewsList({
     setReviewDataMap((prev) => ({ ...prev, [nodeExecId]: data }));
   }
 
-  function handleReviewMessageChange(nodeExecId: string, message: string) {
-    setReviewMessageMap((prev) => ({ ...prev, [nodeExecId]: message }));
+  function handleAutoApproveFutureToggle(nodeId: string, enabled: boolean) {
+    setAutoApproveFutureMap((prev) => ({
+      ...prev,
+      [nodeId]: enabled,
+    }));
+
+    if (enabled) {
+      const nodeReviews = groupedReviews[nodeId] || [];
+      setReviewDataMap((prev) => {
+        const updated = { ...prev };
+        nodeReviews.forEach((review) => {
+          updated[review.node_exec_id] = JSON.stringify(
+            review.payload,
+            null,
+            2,
+          );
+        });
+        return updated;
+      });
+    }
+  }
+
+  function toggleGroupCollapse(nodeId: string) {
+    setCollapsedGroups((prev) => ({
+      ...prev,
+      [nodeId]: !prev[nodeId],
+    }));
   }
 
   function processReviews(approved: boolean) {
@@ -107,22 +156,25 @@ export function PendingReviewsList({
 
     for (const review of reviews) {
       const reviewData = reviewDataMap[review.node_exec_id];
-      const reviewMessage = reviewMessageMap[review.node_exec_id];
+      const autoApproveThisNode = autoApproveFutureMap[review.node_id || ""];
 
-      let parsedData: any = review.payload; // Default to original payload
+      let parsedData: any = undefined;
 
-      // Parse edited data if available and editable
-      if (review.editable && reviewData) {
-        try {
-          parsedData = JSON.parse(reviewData);
-        } catch (error) {
-          toast({
-            title: "Invalid JSON",
-            description: `Please fix the JSON format in review for node ${review.node_exec_id}: ${error instanceof Error ? error.message : "Invalid syntax"}`,
-            variant: "destructive",
-          });
-          setPendingAction(null);
-          return;
+      if (!autoApproveThisNode) {
+        if (review.editable && reviewData) {
+          try {
+            parsedData = JSON.parse(reviewData);
+          } catch (error) {
+            toast({
+              title: "Invalid JSON",
+              description: `Please fix the JSON format in review for node ${review.node_exec_id}: ${error instanceof Error ? error.message : "Invalid syntax"}`,
+              variant: "destructive",
+            });
+            setPendingAction(null);
+            return;
+          }
+        } else {
+          parsedData = review.payload;
         }
       }
 
@@ -130,7 +182,7 @@ export function PendingReviewsList({
         node_exec_id: review.node_exec_id,
         approved,
         reviewed_data: parsedData,
-        message: reviewMessage || undefined,
+        auto_approve_future: autoApproveThisNode && approved,
       });
     }
 
@@ -158,7 +210,6 @@ export function PendingReviewsList({
 
   return (
     <div className="space-y-7 rounded-xl border border-yellow-150 bg-yellow-25 p-6">
-      {/* Warning Box Header */}
       <div className="space-y-6">
         <div className="flex items-start gap-2">
           <WarningIcon
@@ -180,23 +231,76 @@ export function PendingReviewsList({
       </div>
 
       <div className="space-y-7">
-        {reviews.map((review) => (
-          <PendingReviewCard
-            key={review.node_exec_id}
-            review={review}
-            onReviewDataChange={handleReviewDataChange}
-            onReviewMessageChange={handleReviewMessageChange}
-            reviewMessage={reviewMessageMap[review.node_exec_id] || ""}
-          />
-        ))}
+        {Object.entries(groupedReviews).map(([nodeId, nodeReviews]) => {
+          const isCollapsed = collapsedGroups[nodeId] ?? nodeReviews.length > 1;
+          const reviewCount = nodeReviews.length;
+
+          const firstReview = nodeReviews[0];
+          const blockName = firstReview?.instructions;
+          const reviewTitle = `Review required for ${blockName}`;
+
+          const getShortenedNodeId = (id: string) => {
+            if (id.length <= 8) return id;
+            return `${id.slice(0, 4)}...${id.slice(-4)}`;
+          };
+
+          return (
+            <div key={nodeId} className="space-y-4">
+              <button
+                onClick={() => toggleGroupCollapse(nodeId)}
+                className="flex w-full items-center gap-2 text-left"
+              >
+                {isCollapsed ? (
+                  <CaretRightIcon size={20} className="text-gray-600" />
+                ) : (
+                  <CaretDownIcon size={20} className="text-gray-600" />
+                )}
+                <div className="flex-1">
+                  <Text variant="body" className="font-semibold text-gray-900">
+                    {reviewTitle}
+                  </Text>
+                  <Text variant="small" className="text-gray-500">
+                    Node #{getShortenedNodeId(nodeId)}
+                  </Text>
+                </div>
+                <span className="text-xs text-gray-600">
+                  {reviewCount} {reviewCount === 1 ? "review" : "reviews"}
+                </span>
+              </button>
+
+              {!isCollapsed && (
+                <div className="space-y-4">
+                  {nodeReviews.map((review) => (
+                    <PendingReviewCard
+                      key={review.node_exec_id}
+                      review={review}
+                      onReviewDataChange={handleReviewDataChange}
+                      autoApproveFuture={autoApproveFutureMap[nodeId] || false}
+                      externalDataValue={reviewDataMap[review.node_exec_id]}
+                      showAutoApprove={false}
+                    />
+                  ))}
+
+                  <div className="flex items-center gap-3 pt-2">
+                    <Switch
+                      checked={autoApproveFutureMap[nodeId] || false}
+                      onCheckedChange={(enabled: boolean) =>
+                        handleAutoApproveFutureToggle(nodeId, enabled)
+                      }
+                    />
+                    <Text variant="small" className="text-gray-700">
+                      Auto-approve future executions of this node
+                    </Text>
+                  </div>
+                </div>
+              )}
+            </div>
+          );
+        })}
       </div>
 
-      <div className="space-y-7">
-        <Text variant="body" className="text-textGrey">
-          Note: Changes you make here apply only to this task
-        </Text>
-
-        <div className="flex gap-2">
+      <div className="space-y-4">
+        <div className="flex flex-wrap gap-2">
           <Button
             onClick={() => processReviews(true)}
             disabled={reviewActionMutation.isPending || reviews.length === 0}
@@ -220,6 +324,11 @@ export function PendingReviewsList({
             Reject
           </Button>
         </div>
+
+        <Text variant="small" className="text-textGrey">
+          You can turn auto-approval on or off using the toggle above for each
+          node.
+        </Text>
       </div>
     </div>
   );
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/FormRenderer.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/FormRenderer.tsx
index 6bc785e212..fc388cc343 100644
--- a/autogpt_platform/frontend/src/components/renderers/InputRenderer/FormRenderer.tsx
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/FormRenderer.tsx
@@ -4,6 +4,7 @@ import { useMemo } from "react";
 import { customValidator } from "./utils/custom-validator";
 import Form from "./registry";
 import { ExtendedFormContextType } from "./types";
+import { generateUiSchemaForCustomFields } from "./utils/generate-ui-schema";
 
 type FormRendererProps = {
   jsonSchema: RJSFSchema;
@@ -24,8 +25,15 @@ export const FormRenderer = ({
     return preprocessInputSchema(jsonSchema);
   }, [jsonSchema]);
 
+  // Merge custom field ui:field settings with existing uiSchema
+  const mergedUiSchema = useMemo(() => {
+    return generateUiSchemaForCustomFields(preprocessedSchema, uiSchema);
+  }, [preprocessedSchema, uiSchema]);
+
+  console.log("preprocessedSchema", preprocessedSchema);
+
   return (
-    <div className={"mb-6 mt-4"}>
+    <div className={"mb-6 mt-4"} data-tutorial-id="input-handles">
       <Form
         formContext={formContext}
         idPrefix="agpt"
@@ -33,7 +41,7 @@ export const FormRenderer = ({
         schema={preprocessedSchema}
         validator={customValidator}
         onChange={handleChange}
-        uiSchema={uiSchema}
+        uiSchema={mergedUiSchema}
         formData={initialValues}
         liveValidate={false}
       />
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/anyof/AnyOfField.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/anyof/AnyOfField.tsx
index 3eb5b45a5e..6514ce9af0 100644
--- a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/anyof/AnyOfField.tsx
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/anyof/AnyOfField.tsx
@@ -2,22 +2,19 @@ import { FieldProps, getUiOptions, getWidget } from "@rjsf/utils";
 import { AnyOfFieldTitle } from "./components/AnyOfFieldTitle";
 import { isEmpty } from "lodash";
 import { useAnyOfField } from "./useAnyOfField";
-import { getHandleId, updateUiOption } from "../../helpers";
+import { cleanUpHandleId, getHandleId, updateUiOption } from "../../helpers";
 import { useEdgeStore } from "@/app/(platform)/build/stores/edgeStore";
 import { ANY_OF_FLAG } from "../../constants";
+import { findCustomFieldId } from "../../registry";
+import { useNodeStore } from "@/app/(platform)/build/stores/nodeStore";
+import { cn } from "@/lib/utils";
 
 export const AnyOfField = (props: FieldProps) => {
   const { registry, schema } = props;
   const { fields } = registry;
   const { SchemaField: _SchemaField } = fields;
   const { nodeId } = registry.formContext;
-
   const { isInputConnected } = useEdgeStore();
-
-  const uiOptions = getUiOptions(props.uiSchema, props.globalUiOptions);
-
-  const Widget = getWidget({ type: "string" }, "select", registry.widgets);
-
   const {
     handleOptionChange,
     enumOptions,
@@ -26,6 +23,17 @@ export const AnyOfField = (props: FieldProps) => {
     field_id,
   } = useAnyOfField(props);
 
+  const isInputBroken = useNodeStore((state) => state.isInputBroken);
+
+  const parentCustomFieldId = findCustomFieldId(schema);
+  if (parentCustomFieldId) {
+    return null;
+  }
+
+  const uiOptions = getUiOptions(props.uiSchema, props.globalUiOptions);
+
+  const Widget = getWidget({ type: "string" }, "select", registry.widgets);
+
   const handleId = getHandleId({
     uiOptions,
     id: field_id + ANY_OF_FLAG,
@@ -39,13 +47,23 @@ export const AnyOfField = (props: FieldProps) => {
   });
 
   const isHandleConnected = isInputConnected(nodeId, handleId);
+  const isAnyOfInputBroken = isInputBroken(nodeId, cleanUpHandleId(handleId));
+
+  // Now anyOf can render - custom fields if the option schema matches a custom field
+  const optionCustomFieldId = optionSchema
+    ? findCustomFieldId(optionSchema)
+    : null;
+
+  const optionUiSchema = optionCustomFieldId
+    ? { ...updatedUiSchema, "ui:field": optionCustomFieldId }
+    : updatedUiSchema;
 
   const optionsSchemaField =
     (optionSchema && optionSchema.type !== "null" && (
       <_SchemaField
         {...props}
         schema={optionSchema}
-        uiSchema={updatedUiSchema}
+        uiSchema={optionUiSchema}
       />
     )) ||
     null;
@@ -65,7 +83,11 @@ export const AnyOfField = (props: FieldProps) => {
       registry={registry}
       placeholder={props.placeholder}
       autocomplete={props.autocomplete}
-      className="-ml-1 h-[22px] w-fit gap-1 px-1 pl-2 text-xs font-medium"
+      className={cn(
+        "-ml-1 h-[22px] w-fit gap-1 px-1 pl-2 text-xs font-medium",
+        isAnyOfInputBroken &&
+          "border-red-500 bg-red-100 text-red-600 line-through",
+      )}
       autofocus={props.autofocus}
       label=""
       hideLabel={true}
@@ -80,7 +102,7 @@ export const AnyOfField = (props: FieldProps) => {
         selector={selector}
         uiSchema={updatedUiSchema}
       />
-      {!isHandleConnected && optionsSchemaField}
+      {!isHandleConnected && !isAnyOfInputBroken && optionsSchemaField}
     </div>
   );
 };
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/anyof/components/AnyOfFieldTitle.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/anyof/components/AnyOfFieldTitle.tsx
index bd8aadc6a5..48b6d83b70 100644
--- a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/anyof/components/AnyOfFieldTitle.tsx
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/anyof/components/AnyOfFieldTitle.tsx
@@ -13,6 +13,7 @@ import { Text } from "@/components/atoms/Text/Text";
 import { isOptionalType } from "../../../utils/schema-utils";
 import { getTypeDisplayInfo } from "@/app/(platform)/build/components/FlowEditor/nodes/helpers";
 import { cn } from "@/lib/utils";
+import { useNodeStore } from "@/app/(platform)/build/stores/nodeStore";
 
 interface customFieldProps extends FieldProps {
   selector: JSX.Element;
@@ -51,6 +52,13 @@ export const AnyOfFieldTitle = (props: customFieldProps) => {
     shouldShowTypeSelector(schema) && !isArrayItem && !isHandleConnected;
   const shoudlShowType = isHandleConnected || (isOptional && type);
 
+  const isInputBroken = useNodeStore((state) =>
+    state.isInputBroken(nodeId, cleanUpHandleId(uiOptions.handleId)),
+  );
+  const inputMismatch = useNodeStore((state) =>
+    state.getInputTypeMismatch(nodeId, cleanUpHandleId(uiOptions.handleId)),
+  );
+
   return (
     <div className="flex items-center gap-2">
       <TitleFieldTemplate
@@ -62,8 +70,16 @@ export const AnyOfFieldTitle = (props: customFieldProps) => {
         uiSchema={uiSchema}
       />
       {shoudlShowType && (
-        <Text variant="small" className={cn("text-zinc-700", colorClass)}>
-          {isOptional ? `(${displayType})` : "(any)"}
+        <Text
+          variant="small"
+          className={cn(
+            "text-zinc-700",
+            isInputBroken && "line-through",
+            colorClass,
+            inputMismatch && "rounded-md bg-red-100 px-1 !text-red-500",
+          )}
+        >
+          {isOptional ? `(${inputMismatch || displayType})` : "(any)"}
         </Text>
       )}
       {shouldShowSelector && selector}
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/array/ArrayFieldTemplate.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/array/ArrayFieldTemplate.tsx
index 7b3f60b5c8..2ece545339 100644
--- a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/array/ArrayFieldTemplate.tsx
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/array/ArrayFieldTemplate.tsx
@@ -4,7 +4,8 @@ import {
   getTemplate,
   getUiOptions,
 } from "@rjsf/utils";
-import { getHandleId, updateUiOption } from "../../helpers";
+import { cleanUpHandleId, getHandleId, updateUiOption } from "../../helpers";
+import { useEdgeStore } from "@/app/(platform)/build/stores/edgeStore";
 
 export default function ArrayFieldTemplate(props: ArrayFieldTemplateProps) {
   const {
@@ -23,6 +24,7 @@ export default function ArrayFieldTemplate(props: ArrayFieldTemplateProps) {
   } = props;
 
   const uiOptions = getUiOptions(uiSchema);
+  const { isInputConnected } = useEdgeStore();
 
   const ArrayFieldDescriptionTemplate = getTemplate(
     "ArrayFieldDescriptionTemplate",
@@ -51,12 +53,17 @@ export default function ArrayFieldTemplate(props: ArrayFieldTemplateProps) {
     handleId: handleId,
   });
 
+  const shouldShowChildren = !isInputConnected(
+    registry.formContext.nodeId,
+    cleanUpHandleId(handleId),
+  );
+
   return (
     <div>
       <div className="m-0 flex p-0">
         <div className="m-0 w-full space-y-4 p-0">
           {!fromAnyOf && (
-            <div className="flex items-center">
+            <div className="flex items-center gap-2">
               <ArrayFieldTitleTemplate
                 fieldPathId={fieldPathId}
                 title={uiOptions.title || title}
@@ -79,25 +86,29 @@ export default function ArrayFieldTemplate(props: ArrayFieldTemplateProps) {
               />
             </div>
           )}
-          <div
-            key={`array-item-list-${fieldPathId.$id}`}
-            className="m-0 mb-2 w-full p-0"
-          >
-            {!showOptionalDataControlInTitle ? optionalDataControl : undefined}
-            {items}
-            {canAdd && (
-              <div className="mt-4 flex justify-end">
-                <AddButton
-                  id={buttonId(fieldPathId, "add")}
-                  className="rjsf-array-item-add"
-                  onClick={onAddClick}
-                  disabled={disabled || readonly}
-                  uiSchema={updatedUiSchema}
-                  registry={registry}
-                />
-              </div>
-            )}
-          </div>
+          {shouldShowChildren && (
+            <div
+              key={`array-item-list-${fieldPathId.$id}`}
+              className="m-0 mb-2 w-full p-0"
+            >
+              {!showOptionalDataControlInTitle
+                ? optionalDataControl
+                : undefined}
+              {items}
+              {canAdd && (
+                <div className="mt-4 flex justify-end">
+                  <AddButton
+                    id={buttonId(fieldPathId, "add")}
+                    className="rjsf-array-item-add"
+                    onClick={onAddClick}
+                    disabled={disabled || readonly}
+                    uiSchema={updatedUiSchema}
+                    registry={registry}
+                  />
+                </div>
+              )}
+            </div>
+          )}
         </div>
       </div>
     </div>
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/object/ObjectFieldTemplate.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/object/ObjectFieldTemplate.tsx
index 80d7682bbc..ca105d04f4 100644
--- a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/object/ObjectFieldTemplate.tsx
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/object/ObjectFieldTemplate.tsx
@@ -8,8 +8,9 @@ import {
   ObjectFieldTemplateProps,
   titleId,
 } from "@rjsf/utils";
-import { getHandleId, updateUiOption } from "../../helpers";
+import { cleanUpHandleId, getHandleId, updateUiOption } from "../../helpers";
 import React from "react";
+import { useEdgeStore } from "@/app/(platform)/build/stores/edgeStore";
 
 export default function ObjectFieldTemplate(props: ObjectFieldTemplateProps) {
   const {
@@ -29,6 +30,8 @@ export default function ObjectFieldTemplate(props: ObjectFieldTemplateProps) {
   } = props;
   const uiOptions = getUiOptions(uiSchema);
 
+  const { isInputConnected } = useEdgeStore();
+
   const TitleFieldTemplate = getTemplate(
     "TitleFieldTemplate",
     registry,
@@ -58,6 +61,11 @@ export default function ObjectFieldTemplate(props: ObjectFieldTemplateProps) {
     handleId: handleId,
   });
 
+  const shouldShowChildren = !isInputConnected(
+    registry.formContext.nodeId,
+    cleanUpHandleId(handleId),
+  );
+
   return (
     <>
       <div className="flex items-center gap-2">
@@ -83,40 +91,42 @@ export default function ObjectFieldTemplate(props: ObjectFieldTemplateProps) {
         )}
       </div>
 
-      <div className="flex flex-col">
-        {!showOptionalDataControlInTitle ? optionalDataControl : undefined}
+      {shouldShowChildren && (
+        <div className="flex flex-col">
+          {!showOptionalDataControlInTitle ? optionalDataControl : undefined}
 
-        {/* I have cloned it - so i could pass updated uiSchema to the nested children */}
-        {properties.map((element: any, index: number) => {
-          const clonedContent = React.cloneElement(element.content, {
-            ...element.content.props,
-            uiSchema: updateUiOption(element.content.props.uiSchema, {
-              handleId: handleId,
-            }),
-          });
+          {/* I have cloned it - so i could pass updated uiSchema to the nested children */}
+          {properties.map((element: any, index: number) => {
+            const clonedContent = React.cloneElement(element.content, {
+              ...element.content.props,
+              uiSchema: updateUiOption(element.content.props.uiSchema, {
+                handleId: handleId,
+              }),
+            });
 
-          return (
-            <div
-              key={index}
-              className={`${element.hidden ? "hidden" : ""} flex`}
-            >
-              <div className="w-full">{clonedContent}</div>
+            return (
+              <div
+                key={index}
+                className={`${element.hidden ? "hidden" : ""} flex`}
+              >
+                <div className="w-full">{clonedContent}</div>
+              </div>
+            );
+          })}
+          {canExpand(schema, uiSchema, formData) ? (
+            <div className="mt-2 flex justify-end">
+              <AddButton
+                id={buttonId(fieldPathId, "add")}
+                onClick={onAddProperty}
+                disabled={disabled || readonly}
+                className="rjsf-object-property-expand"
+                uiSchema={updatedUiSchema}
+                registry={registry}
+              />
             </div>
-          );
-        })}
-        {canExpand(schema, uiSchema, formData) ? (
-          <div className="mt-2 flex justify-end">
-            <AddButton
-              id={buttonId(fieldPathId, "add")}
-              onClick={onAddProperty}
-              disabled={disabled || readonly}
-              className="rjsf-object-property-expand"
-              uiSchema={updatedUiSchema}
-              registry={registry}
-            />
-          </div>
-        ) : null}
-      </div>
+          ) : null}
+        </div>
+      )}
     </>
   );
 }
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/FieldTemplate.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/FieldTemplate.tsx
index d912d9d06e..705afbcaaa 100644
--- a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/FieldTemplate.tsx
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/FieldTemplate.tsx
@@ -17,6 +17,7 @@ import {
 import { useNodeStore } from "@/app/(platform)/build/stores/nodeStore";
 import { useEdgeStore } from "@/app/(platform)/build/stores/edgeStore";
 import { FieldError } from "./FieldError";
+import { BlockUIType } from "@/app/(platform)/build/components/types";
 
 export default function FieldTemplate(props: FieldTemplateProps) {
   const {
@@ -39,7 +40,7 @@ export default function FieldTemplate(props: FieldTemplateProps) {
     onRemoveProperty,
     readonly,
   } = props;
-  const { nodeId } = registry.formContext;
+  const { nodeId, uiType } = registry.formContext;
 
   const { isInputConnected } = useEdgeStore();
   const showAdvanced = useNodeStore(
@@ -50,6 +51,10 @@ export default function FieldTemplate(props: FieldTemplateProps) {
     return <div className="hidden">{children}</div>;
   }
 
+  if (uiType === BlockUIType.NOTE) {
+    return children;
+  }
+
   const uiOptions = getUiOptions(uiSchema);
   const TitleFieldTemplate = getTemplate(
     "TitleFieldTemplate",
@@ -78,7 +83,12 @@ export default function FieldTemplate(props: FieldTemplateProps) {
     displayLabel ||
     (schema.type === "boolean" && !isAnyOfChild(uiSchema as any));
   const shouldShowTitleSection = !isAnyOfSchema(schema) && !additional;
-  const shouldShowChildren = isAnyOfSchema(schema) || !isHandleConnected;
+
+  const shouldShowChildren =
+    schema.type === "object" ||
+    schema.type === "array" ||
+    isAnyOfSchema(schema) ||
+    !isHandleConnected;
 
   const isAdvancedField = (schema as any).advanced === true;
   if (!showAdvanced && isAdvancedField && !isHandleConnected) {
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/TitleField.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/TitleField.tsx
index 378ffa7f34..f657003463 100644
--- a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/TitleField.tsx
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/TitleField.tsx
@@ -9,8 +9,9 @@ import { Text } from "@/components/atoms/Text/Text";
 import { getTypeDisplayInfo } from "@/app/(platform)/build/components/FlowEditor/nodes/helpers";
 import { isAnyOfSchema } from "../../utils/schema-utils";
 import { cn } from "@/lib/utils";
-import { isArrayItem } from "../../helpers";
+import { cleanUpHandleId, isArrayItem } from "../../helpers";
 import { InputNodeHandle } from "@/app/(platform)/build/components/FlowEditor/handlers/NodeHandle";
+import { useNodeStore } from "@/app/(platform)/build/stores/nodeStore";
 
 export default function TitleField(props: TitleFieldProps) {
   const { id, title, required, schema, registry, uiSchema } = props;
@@ -26,15 +27,26 @@ export default function TitleField(props: TitleFieldProps) {
   const smallText = isArrayItemFlag || additional;
 
   const showHandle = uiOptions.showHandles ?? showHandles;
+
+  const fieldPath = id.replace(/^agpt_%_/, "");
+  const tutorialId = nodeId ? `label-${nodeId}-${fieldPath}` : undefined;
+  const isInputBroken = useNodeStore((state) =>
+    state.isInputBroken(nodeId, cleanUpHandleId(uiOptions.handleId)),
+  );
+
   return (
-    <div className="flex items-center">
+    <div className="flex items-center" data-tutorial-id={tutorialId}>
       {showHandle !== false && (
         <InputNodeHandle handleId={uiOptions.handleId} nodeId={nodeId} />
       )}
       <Text
         variant={isArrayItemFlag ? "small" : "body"}
         id={id}
-        className={cn("line-clamp-1", smallText && "text-sm text-zinc-700")}
+        className={cn(
+          "line-clamp-1",
+          smallText && "text-sm text-zinc-700",
+          isInputBroken && "text-red-500 line-through",
+        )}
       >
         {title}
       </Text>
@@ -44,7 +56,7 @@ export default function TitleField(props: TitleFieldProps) {
       {!isAnyOf && (
         <Text
           variant="small"
-          className={cn("ml-2", colorClass)}
+          className={cn("ml-2", isInputBroken && "line-through", colorClass)}
           id={description_id}
         >
           ({displayType})
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/TextInput/TextInputExpanderModal.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/TextInput/TextInputExpanderModal.tsx
index 5b19874bfb..a28b460ea5 100644
--- a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/TextInput/TextInputExpanderModal.tsx
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/TextInput/TextInputExpanderModal.tsx
@@ -17,6 +17,7 @@ interface InputExpanderModalProps {
   defaultValue: string;
   description?: string;
   placeholder?: string;
+  inputType?: "text" | "json";
 }
 
 export const InputExpanderModal: FC<InputExpanderModalProps> = ({
@@ -27,6 +28,7 @@ export const InputExpanderModal: FC<InputExpanderModalProps> = ({
   defaultValue,
   description,
   placeholder,
+  inputType = "text",
 }) => {
   const [tempValue, setTempValue] = useState(defaultValue);
   const [isCopied, setIsCopied] = useState(false);
@@ -78,7 +80,10 @@ export const InputExpanderModal: FC<InputExpanderModalProps> = ({
             hideLabel
             id="input-expander-modal"
             value={tempValue}
-            className="!min-h-[300px] rounded-2xlarge"
+            className={cn(
+              "!min-h-[300px] rounded-2xlarge",
+              inputType === "json" && "font-mono text-sm",
+            )}
             onChange={(e) => setTempValue(e.target.value)}
             placeholder={placeholder || "Enter text..."}
             autoFocus
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/CredentialField/CredentialField.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/CredentialField/CredentialField.tsx
index f814fba93f..7e34673125 100644
--- a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/CredentialField/CredentialField.tsx
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/CredentialField/CredentialField.tsx
@@ -1,26 +1,41 @@
-import React, { useMemo } from "react";
-import { FieldProps, getUiOptions } from "@rjsf/utils";
+import { useNodeStore } from "@/app/(platform)/build/stores/nodeStore";
+import { Switch } from "@/components/atoms/Switch/Switch";
+import { CredentialsInput } from "@/components/contextual/CredentialsInput/CredentialsInput";
 import {
   BlockIOCredentialsSubSchema,
   CredentialsMetaInput,
 } from "@/lib/autogpt-server-api";
-import { CredentialsInput } from "@/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/CredentialsInputs";
-import { useNodeStore } from "@/app/(platform)/build/stores/nodeStore";
+import { FieldProps, getUiOptions } from "@rjsf/utils";
+import { useMemo } from "react";
 import { useShallow } from "zustand/react/shallow";
 import { CredentialFieldTitle } from "./components/CredentialFieldTitle";
 
 export const CredentialsField = (props: FieldProps) => {
-  const { formData, onChange, schema, registry, fieldPathId } = props;
+  const { formData, onChange, schema, registry, fieldPathId, required } = props;
 
   const formContext = registry.formContext;
   const uiOptions = getUiOptions(props.uiSchema);
   const nodeId = formContext?.nodeId;
 
-  // Get sibling inputs (hardcoded values) from the node store
-  const hardcodedValues = useNodeStore(
-    useShallow((state) => (nodeId ? state.getHardCodedValues(nodeId) : {})),
+  // Get sibling inputs (hardcoded values) and credentials optional state from the node store
+  // Note: We select the node data directly instead of using getter functions to avoid
+  // creating new object references that would cause infinite re-render loops with useShallow
+  const { node, setCredentialsOptional } = useNodeStore(
+    useShallow((state) => ({
+      node: nodeId ? state.nodes.find((n) => n.id === nodeId) : undefined,
+      setCredentialsOptional: state.setCredentialsOptional,
+    })),
   );
 
+  const hardcodedValues = useMemo(
+    () => node?.data?.hardcodedValues || {},
+    [node?.data?.hardcodedValues],
+  );
+  const credentialsOptional = useMemo(() => {
+    const value = node?.data?.metadata?.credentials_optional;
+    return typeof value === "boolean" ? value : false;
+  }, [node?.data?.metadata?.credentials_optional]);
+
   const handleChange = (newValue: any) => {
     onChange(newValue, fieldPathId?.path);
   };
@@ -52,6 +67,10 @@ export const CredentialsField = (props: FieldProps) => {
     [formData?.id, formData?.provider, formData?.title, formData?.type],
   );
 
+  // In builder canvas (nodeId exists): show star based on credentialsOptional toggle
+  // In run dialogs (no nodeId): show star based on schema's required array
+  const isRequired = nodeId ? !credentialsOptional : required;
+
   return (
     <div className="flex flex-col gap-2">
       <CredentialFieldTitle
@@ -59,6 +78,7 @@ export const CredentialsField = (props: FieldProps) => {
         registry={registry}
         uiOptions={uiOptions}
         schema={schema}
+        required={isRequired}
       />
       <CredentialsInput
         schema={schema as BlockIOCredentialsSubSchema}
@@ -67,7 +87,31 @@ export const CredentialsField = (props: FieldProps) => {
         siblingInputs={hardcodedValues}
         showTitle={false}
         readOnly={formContext?.readOnly}
+        isOptional={!isRequired}
+        className="w-full"
+        variant="node"
       />
+
+      {/* Optional credentials toggle - only show in builder canvas, not run dialogs */}
+      {nodeId &&
+        !formContext?.readOnly &&
+        formContext?.showOptionalToggle !== false && (
+          <div className="mt-1 flex items-center gap-2">
+            <Switch
+              id={`credentials-optional-${nodeId}`}
+              checked={credentialsOptional}
+              onCheckedChange={(checked) =>
+                setCredentialsOptional(nodeId, checked)
+              }
+            />
+            <label
+              htmlFor={`credentials-optional-${nodeId}`}
+              className="cursor-pointer text-xs text-gray-500"
+            >
+              Optional - skip block if not configured
+            </label>
+          </div>
+        )}
     </div>
   );
 };
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/CredentialField/components/CredentialFieldTitle.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/CredentialField/components/CredentialFieldTitle.tsx
index ca14c8a4ce..b2f71b14ed 100644
--- a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/CredentialField/components/CredentialFieldTitle.tsx
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/CredentialField/components/CredentialFieldTitle.tsx
@@ -18,8 +18,9 @@ export const CredentialFieldTitle = (props: {
   uiOptions: UiSchema;
   schema: RJSFSchema;
   fieldPathId: FieldPathId;
+  required?: boolean;
 }) => {
-  const { registry, uiOptions, schema, fieldPathId } = props;
+  const { registry, uiOptions, schema, fieldPathId, required = false } = props;
   const { nodeId } = registry.formContext;
 
   const TitleFieldTemplate = getTemplate(
@@ -34,12 +35,13 @@ export const CredentialFieldTitle = (props: {
     uiOptions,
   );
 
-  const credentialProvider = toDisplayName(
-    getCredentialProviderFromSchema(
-      useNodeStore.getState().getHardCodedValues(nodeId),
-      schema as BlockIOCredentialsSubSchema,
-    ) ?? "",
+  const provider = getCredentialProviderFromSchema(
+    useNodeStore.getState().getHardCodedValues(nodeId),
+    schema as BlockIOCredentialsSubSchema,
   );
+  const credentialProvider = provider
+    ? `${toDisplayName(provider)} credential`
+    : "credential";
 
   const updatedUiSchema = updateUiOption(uiSchema, {
     showHandles: false,
@@ -50,7 +52,7 @@ export const CredentialFieldTitle = (props: {
       <TitleFieldTemplate
         id={titleId(fieldPathId ?? "")}
         title={credentialProvider ?? ""}
-        required={true}
+        required={required}
         schema={schema}
         registry={registry}
         uiSchema={updatedUiSchema}
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/GoogleDrivePickerField/GoogleDrivePickerField.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/GoogleDrivePickerField/GoogleDrivePickerField.tsx
index 51c5806ae5..dff6274189 100644
--- a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/GoogleDrivePickerField/GoogleDrivePickerField.tsx
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/GoogleDrivePickerField/GoogleDrivePickerField.tsx
@@ -1,12 +1,23 @@
+import { BlockUIType } from "@/app/(platform)/build/components/types";
 import { GoogleDrivePickerInput } from "@/components/contextual/GoogleDrivePicker/GoogleDrivePickerInput";
 import { GoogleDrivePickerConfig } from "@/lib/autogpt-server-api";
 import { FieldProps, getUiOptions } from "@rjsf/utils";
 
 export const GoogleDrivePickerField = (props: FieldProps) => {
-  const { schema, uiSchema, onChange, fieldPathId, formData } = props;
+  const { schema, uiSchema, onChange, fieldPathId, formData, registry } = props;
   const uiOptions = getUiOptions(uiSchema);
   const config: GoogleDrivePickerConfig = schema.google_drive_picker_config;
 
+  const uiType = registry.formContext?.uiType;
+
+  if (uiType === BlockUIType.INPUT) {
+    return (
+      <div className="rounded-3xl border border-gray-200 p-2 pl-4 text-xs text-gray-500 hover:cursor-not-allowed">
+        Select files when you run the graph
+      </div>
+    );
+  }
+
   return (
     <div>
       <GoogleDrivePickerInput
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/JsonTextField/JsonTextField.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/JsonTextField/JsonTextField.tsx
new file mode 100644
index 0000000000..dc7738320a
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/JsonTextField/JsonTextField.tsx
@@ -0,0 +1,124 @@
+"use client";
+
+import { FieldProps, getTemplate, getUiOptions } from "@rjsf/utils";
+import { Input } from "@/components/atoms/Input/Input";
+import { Button } from "@/components/atoms/Button/Button";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "@/components/atoms/Tooltip/BaseTooltip";
+import { ArrowsOutIcon } from "@phosphor-icons/react";
+import { InputExpanderModal } from "../../base/standard/widgets/TextInput/TextInputExpanderModal";
+import { getHandleId, updateUiOption } from "../../helpers";
+import { useJsonTextField } from "./useJsonTextField";
+import { getPlaceholder } from "./helpers";
+
+export const JsonTextField = (props: FieldProps) => {
+  const {
+    formData,
+    onChange,
+    schema,
+    registry,
+    uiSchema,
+    required,
+    name,
+    fieldPathId,
+  } = props;
+
+  const uiOptions = getUiOptions(uiSchema);
+
+  const TitleFieldTemplate = getTemplate(
+    "TitleFieldTemplate",
+    registry,
+    uiOptions,
+  );
+
+  const fieldId = fieldPathId?.$id ?? props.id ?? "json-field";
+
+  const handleId = getHandleId({
+    uiOptions,
+    id: fieldId,
+    schema: schema,
+  });
+
+  const updatedUiSchema = updateUiOption(uiSchema, {
+    handleId: handleId,
+  });
+
+  const {
+    textValue,
+    isModalOpen,
+    handleChange,
+    handleModalOpen,
+    handleModalClose,
+    handleModalSave,
+  } = useJsonTextField({
+    formData,
+    onChange,
+    path: fieldPathId?.path,
+  });
+
+  const placeholder = getPlaceholder(schema);
+  const title = schema.title || name || "JSON Value";
+
+  return (
+    <div className="flex flex-col gap-2">
+      <TitleFieldTemplate
+        id={fieldId}
+        title={title}
+        required={required}
+        schema={schema}
+        uiSchema={updatedUiSchema}
+        registry={registry}
+      />
+      <div className="nodrag relative flex items-center gap-2">
+        <Input
+          id={fieldId}
+          hideLabel={true}
+          type="textarea"
+          label=""
+          size="small"
+          wrapperClassName="mb-0 flex-1 "
+          value={textValue}
+          onChange={handleChange}
+          placeholder={placeholder}
+          required={required}
+          disabled={props.disabled}
+          className="min-h-[60px] pr-8 font-mono text-xs"
+        />
+
+        <Tooltip delayDuration={0}>
+          <TooltipTrigger asChild>
+            <Button
+              variant="ghost"
+              size="icon"
+              onClick={handleModalOpen}
+              type="button"
+              className="p-1"
+            >
+              <ArrowsOutIcon className="size-4" />
+            </Button>
+          </TooltipTrigger>
+          <TooltipContent>Expand input</TooltipContent>
+        </Tooltip>
+      </div>
+      {schema.description && (
+        <span className="text-xs text-gray-500">{schema.description}</span>
+      )}
+
+      <InputExpanderModal
+        isOpen={isModalOpen}
+        onClose={handleModalClose}
+        onSave={handleModalSave}
+        title={`Edit ${title}`}
+        description={schema.description || "Enter valid JSON"}
+        defaultValue={textValue}
+        placeholder={placeholder}
+        inputType="json"
+      />
+    </div>
+  );
+};
+
+export default JsonTextField;
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/JsonTextField/helpers.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/JsonTextField/helpers.ts
new file mode 100644
index 0000000000..fea0f20dbc
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/JsonTextField/helpers.ts
@@ -0,0 +1,67 @@
+import { RJSFSchema } from "@rjsf/utils";
+
+/**
+ * Converts form data to a JSON string for display
+ * @param formData - The data to stringify
+ * @returns JSON string or empty string if data is null/undefined
+ */
+export function stringifyFormData(formData: unknown): string {
+  if (formData === undefined || formData === null) {
+    return "";
+  }
+  try {
+    return JSON.stringify(formData, null, 2);
+  } catch {
+    return "";
+  }
+}
+
+/**
+ * Parses a JSON string into an object/array
+ * @param value - The JSON string to parse
+ * @returns Parsed value or undefined if parsing fails or empty
+ */
+export function parseJsonValue(value: string): unknown | undefined {
+  const trimmed = value.trim();
+  if (trimmed === "") {
+    return undefined;
+  }
+
+  try {
+    return JSON.parse(trimmed);
+  } catch {
+    return undefined;
+  }
+}
+
+/**
+ * Gets the appropriate placeholder text based on schema type
+ * @param schema - The JSON schema
+ * @returns Placeholder string
+ */
+export function getPlaceholder(schema: RJSFSchema): string {
+  if (schema.type === "array") {
+    return '["item1", "item2"] or [{"key": "value"}]';
+  }
+  if (schema.type === "object") {
+    return '{"key": "value"}';
+  }
+  return "Enter JSON value...";
+}
+
+/**
+ * Checks if a JSON string is valid
+ * @param value - The JSON string to validate
+ * @returns true if valid JSON, false otherwise
+ */
+export function isValidJson(value: string): boolean {
+  if (value.trim() === "") {
+    return true; // Empty is considered valid (will be undefined)
+  }
+  try {
+    JSON.parse(value);
+    return true;
+  } catch {
+    return false;
+  }
+}
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/JsonTextField/useJsonTextField.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/JsonTextField/useJsonTextField.ts
new file mode 100644
index 0000000000..85dc69cfd3
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/JsonTextField/useJsonTextField.ts
@@ -0,0 +1,107 @@
+import { useState, useEffect, useCallback } from "react";
+import { FieldProps } from "@rjsf/utils";
+import { stringifyFormData, parseJsonValue, isValidJson } from "./helpers";
+
+type FieldOnChange = FieldProps["onChange"];
+type FieldPathId = FieldProps["fieldPathId"];
+
+interface UseJsonTextFieldOptions {
+  formData: unknown;
+  onChange: FieldOnChange;
+  path?: FieldPathId["path"];
+}
+
+interface UseJsonTextFieldReturn {
+  textValue: string;
+  isModalOpen: boolean;
+  hasError: boolean;
+  handleChange: (
+    e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>,
+  ) => void;
+  handleModalOpen: () => void;
+  handleModalClose: () => void;
+  handleModalSave: (value: string) => void;
+}
+
+/**
+ * Custom hook for managing JSON text field state and handlers
+ */
+export function useJsonTextField({
+  formData,
+  onChange,
+  path,
+}: UseJsonTextFieldOptions): UseJsonTextFieldReturn {
+  const [textValue, setTextValue] = useState(() => stringifyFormData(formData));
+  const [isModalOpen, setIsModalOpen] = useState(false);
+  const [hasError, setHasError] = useState(false);
+
+  // Update text value when formData changes externally
+  useEffect(() => {
+    const newValue = stringifyFormData(formData);
+    setTextValue(newValue);
+    setHasError(false);
+  }, [formData]);
+
+  const handleChange = useCallback(
+    (e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => {
+      const value = e.target.value;
+      setTextValue(value);
+
+      // Validate JSON and update error state
+      const valid = isValidJson(value);
+      setHasError(!valid);
+
+      // Try to parse and update formData
+      if (value.trim() === "") {
+        onChange(undefined, path ?? []);
+        return;
+      }
+
+      const parsed = parseJsonValue(value);
+      if (parsed !== undefined) {
+        onChange(parsed, path ?? []);
+      }
+    },
+    [onChange, path],
+  );
+
+  const handleModalOpen = useCallback(() => {
+    setIsModalOpen(true);
+  }, []);
+
+  const handleModalClose = useCallback(() => {
+    setIsModalOpen(false);
+  }, []);
+
+  const handleModalSave = useCallback(
+    (value: string) => {
+      setTextValue(value);
+      setIsModalOpen(false);
+
+      // Validate and update
+      const valid = isValidJson(value);
+      setHasError(!valid);
+
+      if (value.trim() === "") {
+        onChange(undefined, path ?? []);
+        return;
+      }
+
+      const parsed = parseJsonValue(value);
+      if (parsed !== undefined) {
+        onChange(parsed, path ?? []);
+      }
+    },
+    [onChange, path],
+  );
+
+  return {
+    textValue,
+    isModalOpen,
+    hasError,
+    handleChange,
+    handleModalOpen,
+    handleModalClose,
+    handleModalSave,
+  };
+}
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/LlmModelField/LlmModelField.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/LlmModelField/LlmModelField.tsx
new file mode 100644
index 0000000000..c2057fdad0
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/LlmModelField/LlmModelField.tsx
@@ -0,0 +1,92 @@
+"use client";
+
+import {
+  descriptionId,
+  FieldProps,
+  getTemplate,
+  RJSFSchema,
+  titleId,
+} from "@rjsf/utils";
+import { useMemo } from "react";
+import { LlmModelPicker } from "./components/LlmModelPicker";
+import { LlmModelMetadataMap } from "./types";
+import { updateUiOption } from "../../helpers";
+
+type LlmModelSchema = RJSFSchema & {
+  llm_model_metadata?: LlmModelMetadataMap;
+};
+
+export function LlmModelField(props: FieldProps) {
+  const { schema, formData, onChange, disabled, readonly, fieldPathId } = props;
+
+  const metadata = useMemo(() => {
+    return (schema as LlmModelSchema)?.llm_model_metadata ?? {};
+  }, [schema]);
+
+  const models = useMemo(() => {
+    return Object.values(metadata);
+  }, [metadata]);
+
+  const selectedName =
+    typeof formData === "string"
+      ? formData
+      : typeof schema.default === "string"
+        ? schema.default
+        : "";
+
+  const selectedModel = selectedName
+    ? (metadata[selectedName] ??
+      models.find((model) => model.name === selectedName))
+    : undefined;
+
+  const recommendedName =
+    typeof schema.default === "string" ? schema.default : models[0]?.name;
+
+  const recommendedModel =
+    recommendedName && metadata[recommendedName]
+      ? metadata[recommendedName]
+      : undefined;
+
+  if (models.length === 0) {
+    return null;
+  }
+
+  const TitleFieldTemplate = getTemplate("TitleFieldTemplate", props.registry);
+  const DescriptionFieldTemplate = getTemplate(
+    "DescriptionFieldTemplate",
+    props.registry,
+  );
+
+  const updatedUiSchema = updateUiOption(props.uiSchema, {
+    showHandles: false,
+  });
+
+  return (
+    <>
+      <div className="flex items-center gap-2">
+        <TitleFieldTemplate
+          id={titleId(fieldPathId)}
+          title={schema.title || ""}
+          required={true}
+          schema={schema}
+          uiSchema={updatedUiSchema}
+          registry={props.registry}
+        />
+        <DescriptionFieldTemplate
+          id={descriptionId(fieldPathId)}
+          description={schema.description || ""}
+          schema={schema}
+          registry={props.registry}
+        />
+      </div>
+
+      <LlmModelPicker
+        models={models}
+        selectedModel={selectedModel}
+        recommendedModel={recommendedModel}
+        onSelect={(value) => onChange(value, fieldPathId?.path)}
+        disabled={disabled || readonly}
+      />
+    </>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/LlmModelField/components/LlmIcon.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/LlmModelField/components/LlmIcon.tsx
new file mode 100644
index 0000000000..cad91a3dde
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/LlmModelField/components/LlmIcon.tsx
@@ -0,0 +1,66 @@
+"use client";
+
+import Image from "next/image";
+import { Text } from "@/components/atoms/Text/Text";
+
+const creatorIconMap: Record<string, string> = {
+  anthropic: "/integrations/anthropic-color.png",
+  openai: "/integrations/openai.png",
+  google: "/integrations/gemini.png",
+  nvidia: "/integrations/nvidia.png",
+  groq: "/integrations/groq.png",
+  ollama: "/integrations/ollama.png",
+  openrouter: "/integrations/open_router.png",
+  v0: "/integrations/v0.png",
+  xai: "/integrations/xai.webp",
+  meta: "/integrations/llama_api.png",
+  amazon: "/integrations/amazon.png",
+  cohere: "/integrations/cohere.png",
+  deepseek: "/integrations/deepseek.png",
+  gryphe: "/integrations/gryphe.png",
+  microsoft: "/integrations/microsoft.webp",
+  moonshotai: "/integrations/moonshot.png",
+  mistral: "/integrations/mistral.png",
+  mistralai: "/integrations/mistral.png",
+  nousresearch: "/integrations/nousresearch.avif",
+  perplexity: "/integrations/perplexity.webp",
+  qwen: "/integrations/qwen.png",
+};
+
+type Props = {
+  value: string;
+  size?: number;
+};
+
+export function LlmIcon({ value, size = 20 }: Props) {
+  const normalized = value.trim().toLowerCase().replace(/\s+/g, "");
+  const src = creatorIconMap[normalized];
+  if (src) {
+    return (
+      <div
+        className="flex items-center justify-center overflow-hidden rounded-xsmall"
+        style={{ width: size, height: size }}
+      >
+        <Image
+          src={src}
+          alt={value}
+          width={size}
+          height={size}
+          className="h-full w-full object-cover"
+        />
+      </div>
+    );
+  }
+
+  const fallback = value?.trim().slice(0, 1).toUpperCase() || "?";
+  return (
+    <div
+      className="flex items-center justify-center rounded-xsmall bg-zinc-100"
+      style={{ width: size, height: size }}
+    >
+      <Text variant="small" className="text-zinc-500">
+        {fallback}
+      </Text>
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/LlmModelField/components/LlmMenuHeader.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/LlmModelField/components/LlmMenuHeader.tsx
new file mode 100644
index 0000000000..40bce8dafc
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/LlmModelField/components/LlmMenuHeader.tsx
@@ -0,0 +1,24 @@
+"use client";
+
+import { ArrowLeftIcon } from "@phosphor-icons/react";
+import { Text } from "@/components/atoms/Text/Text";
+
+type Props = {
+  label: string;
+  onBack: () => void;
+};
+
+export function LlmMenuHeader({ label, onBack }: Props) {
+  return (
+    <button
+      type="button"
+      onClick={onBack}
+      className="flex w-full items-center gap-2 px-2 py-2 text-left hover:bg-zinc-100"
+    >
+      <ArrowLeftIcon className="h-4 w-4 text-zinc-800" weight="bold" />
+      <Text variant="body" className="text-zinc-900">
+        {label}
+      </Text>
+    </button>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/LlmModelField/components/LlmMenuItem.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/LlmModelField/components/LlmMenuItem.tsx
new file mode 100644
index 0000000000..02f8eb968d
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/LlmModelField/components/LlmMenuItem.tsx
@@ -0,0 +1,61 @@
+"use client";
+
+import { CaretRightIcon, CheckIcon } from "@phosphor-icons/react";
+import { Text } from "@/components/atoms/Text/Text";
+import { cn } from "@/lib/utils";
+
+type Props = {
+  title: string;
+  subtitle?: string;
+  icon?: React.ReactNode;
+  showChevron?: boolean;
+  rightSlot?: React.ReactNode;
+  onClick: () => void;
+  isActive?: boolean;
+};
+
+export function LlmMenuItem({
+  title,
+  subtitle,
+  icon,
+  showChevron,
+  rightSlot,
+  onClick,
+  isActive,
+}: Props) {
+  const hasIcon = Boolean(icon);
+
+  return (
+    <button
+      type="button"
+      onClick={onClick}
+      className={cn("w-full py-1 pl-2 pr-4 text-left hover:bg-zinc-100")}
+    >
+      <div className="flex items-center justify-between gap-3">
+        <div className="flex items-center gap-2">
+          {icon}
+          <Text variant="body" className="text-zinc-900">
+            {title}
+          </Text>
+        </div>
+        <div className="flex items-center gap-2">
+          {isActive && (
+            <CheckIcon className="h-4 w-4 text-emerald-600" weight="bold" />
+          )}
+          {rightSlot}
+          {showChevron && (
+            <CaretRightIcon className="h-4 w-4 text-zinc-900" weight="bold" />
+          )}
+        </div>
+      </div>
+      {subtitle && (
+        <Text
+          variant="small"
+          className={cn("mb-1 text-zinc-500", hasIcon && "pl-0")}
+        >
+          {subtitle}
+        </Text>
+      )}
+    </button>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/LlmModelField/components/LlmModelPicker.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/LlmModelField/components/LlmModelPicker.tsx
new file mode 100644
index 0000000000..c107120f01
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/LlmModelField/components/LlmModelPicker.tsx
@@ -0,0 +1,235 @@
+"use client";
+
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { CaretDownIcon } from "@phosphor-icons/react";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/molecules/Popover/Popover";
+import { Text } from "@/components/atoms/Text/Text";
+import { cn } from "@/lib/utils";
+import {
+  getCreatorDisplayName,
+  getModelDisplayName,
+  getProviderDisplayName,
+  groupByCreator,
+  groupByTitle,
+} from "../helpers";
+import { LlmModelMetadata } from "../types";
+import { LlmIcon } from "./LlmIcon";
+import { LlmMenuHeader } from "./LlmMenuHeader";
+import { LlmMenuItem } from "./LlmMenuItem";
+import { LlmPriceTier } from "./LlmPriceTier";
+
+type MenuView = "creator" | "model" | "provider";
+
+type Props = {
+  models: LlmModelMetadata[];
+  selectedModel?: LlmModelMetadata;
+  recommendedModel?: LlmModelMetadata;
+  onSelect: (value: string) => void;
+  disabled?: boolean;
+};
+
+export function LlmModelPicker({
+  models,
+  selectedModel,
+  recommendedModel,
+  onSelect,
+  disabled,
+}: Props) {
+  const [open, setOpen] = useState(false);
+  const [view, setView] = useState<MenuView>("creator");
+  const [activeCreator, setActiveCreator] = useState<string | null>(null);
+  const [activeTitle, setActiveTitle] = useState<string | null>(null);
+
+  const modelsByCreator = useMemo(() => groupByCreator(models), [models]);
+
+  const creators = useMemo(() => {
+    return Array.from(modelsByCreator.keys()).sort((a, b) =>
+      a.localeCompare(b),
+    );
+  }, [modelsByCreator]);
+
+  const creatorIconValues = useMemo(() => {
+    const map = new Map<string, string>();
+    for (const [creator, entries] of modelsByCreator.entries()) {
+      map.set(creator, entries[0]?.creator ?? creator);
+    }
+    return map;
+  }, [modelsByCreator]);
+
+  useEffect(() => {
+    if (!open) {
+      return;
+    }
+    setView("creator");
+    setActiveCreator(
+      selectedModel
+        ? getCreatorDisplayName(selectedModel)
+        : (creators[0] ?? null),
+    );
+    setActiveTitle(selectedModel ? getModelDisplayName(selectedModel) : null);
+  }, [open, selectedModel, creators]);
+
+  const currentCreator = activeCreator ?? creators[0] ?? null;
+
+  const currentModels = useMemo(() => {
+    return currentCreator ? (modelsByCreator.get(currentCreator) ?? []) : [];
+  }, [currentCreator, modelsByCreator]);
+
+  const currentCreatorIcon = useMemo(() => {
+    return currentModels[0]?.creator ?? currentCreator;
+  }, [currentModels, currentCreator]);
+
+  const modelsByTitle = useMemo(
+    () => groupByTitle(currentModels),
+    [currentModels],
+  );
+
+  const modelEntries = useMemo(() => {
+    return Array.from(modelsByTitle.entries())
+      .map(([title, entries]) => {
+        const providers = new Set(entries.map((entry) => entry.provider));
+        return {
+          title,
+          entries,
+          providerCount: providers.size,
+        };
+      })
+      .sort((a, b) => a.title.localeCompare(b.title));
+  }, [modelsByTitle]);
+
+  const providerEntries = useMemo(() => {
+    if (!activeTitle) {
+      return [];
+    }
+    return modelsByTitle.get(activeTitle) ?? [];
+  }, [activeTitle, modelsByTitle]);
+
+  const handleSelectModel = useCallback(
+    (modelName: string) => {
+      onSelect(modelName);
+      setOpen(false);
+    },
+    [onSelect],
+  );
+
+  const triggerModel = selectedModel ?? recommendedModel ?? models[0];
+  const triggerTitle = triggerModel
+    ? getModelDisplayName(triggerModel)
+    : "Select model";
+  const triggerCreator = triggerModel?.creator ?? "";
+
+  return (
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger asChild>
+        <button
+          type="button"
+          disabled={disabled}
+          className={cn(
+            "flex w-full min-w-[15rem] items-center rounded-lg border border-zinc-200 bg-white px-3 py-2 text-left",
+            "hover:border-zinc-300 focus:outline-none focus:ring-2 focus:ring-zinc-200",
+            disabled && "cursor-not-allowed opacity-60",
+          )}
+        >
+          <LlmIcon value={triggerCreator} />
+          <Text variant="body" className="ml-1 flex-1 text-zinc-900">
+            {triggerTitle}
+          </Text>
+          <CaretDownIcon className="h-3 w-3 text-zinc-900" weight="bold" />
+        </button>
+      </PopoverTrigger>
+      <PopoverContent
+        align="start"
+        sideOffset={4}
+        className="max-h-[45vh] w-[--radix-popover-trigger-width] min-w-[16rem] overflow-y-auto rounded-md border border-zinc-200 bg-white p-0 shadow-[0px_1px_4px_rgba(12,12,13,0.12)]"
+      >
+        {view === "creator" && (
+          <div className="flex flex-col">
+            {recommendedModel && (
+              <>
+                <LlmMenuItem
+                  title={getModelDisplayName(recommendedModel)}
+                  subtitle="Recommended"
+                  icon={<LlmIcon value={recommendedModel.creator} />}
+                  onClick={() => handleSelectModel(recommendedModel.name)}
+                />
+                <div className="border-b border-zinc-200" />
+              </>
+            )}
+            {creators.map((creator) => (
+              <LlmMenuItem
+                key={creator}
+                title={creator}
+                icon={
+                  <LlmIcon value={creatorIconValues.get(creator) ?? creator} />
+                }
+                showChevron={true}
+                isActive={
+                  selectedModel
+                    ? getCreatorDisplayName(selectedModel) === creator
+                    : false
+                }
+                onClick={() => {
+                  setActiveCreator(creator);
+                  setView("model");
+                }}
+              />
+            ))}
+          </div>
+        )}
+        {view === "model" && currentCreator && (
+          <div className="flex flex-col">
+            <LlmMenuHeader
+              label={currentCreator}
+              onBack={() => setView("creator")}
+            />
+            <div className="border-b border-zinc-200" />
+            {modelEntries.map((entry) => (
+              <LlmMenuItem
+                key={entry.title}
+                title={entry.title}
+                icon={<LlmIcon value={currentCreatorIcon} />}
+                rightSlot={<LlmPriceTier tier={entry.entries[0]?.price_tier} />}
+                showChevron={entry.providerCount > 1}
+                isActive={
+                  selectedModel
+                    ? getModelDisplayName(selectedModel) === entry.title
+                    : false
+                }
+                onClick={() => {
+                  if (entry.providerCount > 1) {
+                    setActiveTitle(entry.title);
+                    setView("provider");
+                    return;
+                  }
+                  handleSelectModel(entry.entries[0].name);
+                }}
+              />
+            ))}
+          </div>
+        )}
+        {view === "provider" && activeTitle && (
+          <div className="flex flex-col">
+            <LlmMenuHeader
+              label={activeTitle}
+              onBack={() => setView("model")}
+            />
+            <div className="border-b border-zinc-200" />
+            {providerEntries.map((entry) => (
+              <LlmMenuItem
+                key={`${entry.title}-${entry.provider}`}
+                title={getProviderDisplayName(entry)}
+                icon={<LlmIcon value={entry.provider} />}
+                isActive={selectedModel?.provider === entry.provider}
+                onClick={() => handleSelectModel(entry.name)}
+              />
+            ))}
+          </div>
+        )}
+      </PopoverContent>
+    </Popover>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/LlmModelField/components/LlmPriceTier.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/LlmModelField/components/LlmPriceTier.tsx
new file mode 100644
index 0000000000..2913c5dff0
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/LlmModelField/components/LlmPriceTier.tsx
@@ -0,0 +1,25 @@
+"use client";
+
+import { CurrencyDollarSimpleIcon } from "@phosphor-icons/react";
+
+type Props = {
+  tier?: number;
+};
+
+export function LlmPriceTier({ tier }: Props) {
+  if (!tier || tier <= 0) {
+    return null;
+  }
+  const clamped = Math.min(3, Math.max(1, tier));
+  return (
+    <div className="flex items-center text-zinc-900">
+      {Array.from({ length: clamped }).map((_, index) => (
+        <CurrencyDollarSimpleIcon
+          key={`price-${index}`}
+          className="-mr-0.5 h-3 w-3"
+          weight="bold"
+        />
+      ))}
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/LlmModelField/helpers.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/LlmModelField/helpers.ts
new file mode 100644
index 0000000000..bb8619c25f
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/LlmModelField/helpers.ts
@@ -0,0 +1,35 @@
+import { LlmModelMetadata } from "./types";
+
+export function groupByCreator(models: LlmModelMetadata[]) {
+  const map = new Map<string, LlmModelMetadata[]>();
+  for (const model of models) {
+    const key = getCreatorDisplayName(model);
+    const existing = map.get(key) ?? [];
+    existing.push(model);
+    map.set(key, existing);
+  }
+  return map;
+}
+
+export function groupByTitle(models: LlmModelMetadata[]) {
+  const map = new Map<string, LlmModelMetadata[]>();
+  for (const model of models) {
+    const displayName = getModelDisplayName(model);
+    const existing = map.get(displayName) ?? [];
+    existing.push(model);
+    map.set(displayName, existing);
+  }
+  return map;
+}
+
+export function getCreatorDisplayName(model: LlmModelMetadata): string {
+  return model.creator_name || model.creator || "";
+}
+
+export function getModelDisplayName(model: LlmModelMetadata): string {
+  return model.title || model.name || "";
+}
+
+export function getProviderDisplayName(model: LlmModelMetadata): string {
+  return model.provider_name || model.provider || "";
+}
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/LlmModelField/types.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/LlmModelField/types.ts
new file mode 100644
index 0000000000..39389b2535
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/LlmModelField/types.ts
@@ -0,0 +1,11 @@
+export type LlmModelMetadata = {
+  creator: string;
+  creator_name: string;
+  title: string;
+  provider: string;
+  provider_name: string;
+  name: string;
+  price_tier?: number;
+};
+
+export type LlmModelMetadataMap = Record<string, LlmModelMetadata>;
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/MultiSelectField/MultiSelectField.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/MultiSelectField/MultiSelectField.tsx
new file mode 100644
index 0000000000..dcae2f3bed
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/MultiSelectField/MultiSelectField.tsx
@@ -0,0 +1,57 @@
+import React from "react";
+import { FieldProps, getUiOptions } from "@rjsf/utils";
+import { BlockIOObjectSubSchema } from "@/lib/autogpt-server-api/types";
+import {
+  MultiSelector,
+  MultiSelectorContent,
+  MultiSelectorInput,
+  MultiSelectorItem,
+  MultiSelectorList,
+  MultiSelectorTrigger,
+} from "@/components/__legacy__/ui/multiselect";
+import { cn } from "@/lib/utils";
+import { useMultiSelectField } from "./useMultiSelectField";
+
+export const MultiSelectField = (props: FieldProps) => {
+  const { schema, formData, onChange, fieldPathId } = props;
+  const uiOptions = getUiOptions(props.uiSchema);
+
+  const { optionSchema, options, selection, createChangeHandler } =
+    useMultiSelectField({
+      schema: schema as BlockIOObjectSubSchema,
+      formData,
+    });
+
+  const handleValuesChange = createChangeHandler(onChange, fieldPathId);
+
+  const displayName = schema.title || "options";
+
+  return (
+    <div className={cn("flex flex-col", uiOptions.className)}>
+      <MultiSelector
+        className="nodrag"
+        values={selection}
+        onValuesChange={handleValuesChange}
+      >
+        <MultiSelectorTrigger className="rounded-3xl border border-zinc-200 bg-white px-2 shadow-none">
+          <MultiSelectorInput
+            placeholder={
+              (schema as any).placeholder ?? `Select ${displayName}...`
+            }
+          />
+        </MultiSelectorTrigger>
+        <MultiSelectorContent className="nowheel">
+          <MultiSelectorList>
+            {options
+              .map((key) => ({ ...optionSchema[key], key }))
+              .map(({ key, title, description }) => (
+                <MultiSelectorItem key={key} value={key} title={description}>
+                  {title ?? key}
+                </MultiSelectorItem>
+              ))}
+          </MultiSelectorList>
+        </MultiSelectorContent>
+      </MultiSelector>
+    </div>
+  );
+};
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/MultiSelectField/index.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/MultiSelectField/index.ts
new file mode 100644
index 0000000000..4d49ec7dbb
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/MultiSelectField/index.ts
@@ -0,0 +1 @@
+export { MultiSelectField } from "./MultiSelectField";
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/MultiSelectField/useMultiSelectField.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/MultiSelectField/useMultiSelectField.ts
new file mode 100644
index 0000000000..c04173dcfe
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/MultiSelectField/useMultiSelectField.ts
@@ -0,0 +1,65 @@
+import { FieldProps } from "@rjsf/utils";
+import { BlockIOObjectSubSchema } from "@/lib/autogpt-server-api/types";
+
+type FormData = Record<string, boolean> | null | undefined;
+
+interface UseMultiSelectFieldOptions {
+  schema: BlockIOObjectSubSchema;
+  formData: FormData;
+}
+
+export function useMultiSelectField({
+  schema,
+  formData,
+}: UseMultiSelectFieldOptions) {
+  const getOptionSchema = (): Record<string, BlockIOObjectSubSchema> => {
+    if (schema.properties) {
+      return schema.properties as Record<string, BlockIOObjectSubSchema>;
+    }
+    if (
+      "anyOf" in schema &&
+      Array.isArray(schema.anyOf) &&
+      schema.anyOf.length > 0 &&
+      "properties" in schema.anyOf[0]
+    ) {
+      return (schema.anyOf[0] as BlockIOObjectSubSchema).properties as Record<
+        string,
+        BlockIOObjectSubSchema
+      >;
+    }
+    return {};
+  };
+
+  const optionSchema = getOptionSchema();
+  const options = Object.keys(optionSchema);
+
+  const getSelection = (): string[] => {
+    if (!formData || typeof formData !== "object") {
+      return [];
+    }
+    return Object.entries(formData)
+      .filter(([_, value]) => value === true)
+      .map(([key]) => key);
+  };
+
+  const selection = getSelection();
+
+  const createChangeHandler =
+    (
+      onChange: FieldProps["onChange"],
+      fieldPathId: FieldProps["fieldPathId"],
+    ) =>
+    (values: string[]) => {
+      const newValue = Object.fromEntries(
+        options.map((opt) => [opt, values.includes(opt)]),
+      );
+      onChange(newValue, fieldPathId?.path);
+    };
+
+  return {
+    optionSchema,
+    options,
+    selection,
+    createChangeHandler,
+  };
+}
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/TableField/TableField.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/TableField/TableField.tsx
new file mode 100644
index 0000000000..b48eca3238
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/TableField/TableField.tsx
@@ -0,0 +1,52 @@
+import { descriptionId, FieldProps, getTemplate, titleId } from "@rjsf/utils";
+import { Table, RowData } from "@/components/molecules/Table/Table";
+import { useMemo } from "react";
+
+export const TableField = (props: FieldProps) => {
+  const { schema, formData, onChange, fieldPathId, registry, uiSchema } = props;
+
+  const itemSchema = schema.items as any;
+  const properties = itemSchema?.properties || {};
+
+  const columns: string[] = useMemo(() => {
+    return Object.keys(properties);
+  }, [properties]);
+
+  const handleChange = (rows: RowData[]) => {
+    onChange(rows, fieldPathId?.path.slice(0, -1));
+  };
+
+  const TitleFieldTemplate = getTemplate("TitleFieldTemplate", registry);
+  const DescriptionFieldTemplate = getTemplate(
+    "DescriptionFieldTemplate",
+    registry,
+  );
+
+  return (
+    <div className="flex flex-col gap-2">
+      <TitleFieldTemplate
+        id={titleId(fieldPathId)}
+        title={schema.title || ""}
+        required={true}
+        schema={schema}
+        uiSchema={uiSchema}
+        registry={registry}
+      />
+      <DescriptionFieldTemplate
+        id={descriptionId(fieldPathId)}
+        description={schema.description || ""}
+        schema={schema}
+        registry={registry}
+      />
+
+      <Table
+        columns={columns}
+        defaultValues={formData}
+        onChange={handleChange}
+        allowAddRow={true}
+        allowDeleteRow={true}
+        addRowLabel="Add row"
+      />
+    </div>
+  );
+};
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/custom-registry.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/custom-registry.ts
index 91850e3f10..74000ec60e 100644
--- a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/custom-registry.ts
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/custom-registry.ts
@@ -1,6 +1,14 @@
 import { FieldProps, RJSFSchema, RegistryFieldsType } from "@rjsf/utils";
 import { CredentialsField } from "./CredentialField/CredentialField";
 import { GoogleDrivePickerField } from "./GoogleDrivePickerField/GoogleDrivePickerField";
+import { JsonTextField } from "./JsonTextField/JsonTextField";
+import { MultiSelectField } from "./MultiSelectField/MultiSelectField";
+import {
+  isGoogleDrivePickerSchema,
+  isMultiSelectSchema,
+} from "../utils/schema-utils";
+import { TableField } from "./TableField/TableField";
+import { LlmModelField } from "./LlmModelField/LlmModelField";
 
 export interface CustomFieldDefinition {
   id: string;
@@ -8,6 +16,9 @@ export interface CustomFieldDefinition {
   component: (props: FieldProps<any, RJSFSchema, any>) => JSX.Element | null;
 }
 
+/** Field ID for JsonTextField - used to render nested complex types as text input */
+export const JSON_TEXT_FIELD_ID = "custom/json_text_field";
+
 export const CUSTOM_FIELDS: CustomFieldDefinition[] = [
   {
     id: "custom/credential_field",
@@ -22,13 +33,39 @@ export const CUSTOM_FIELDS: CustomFieldDefinition[] = [
   },
   {
     id: "custom/google_drive_picker_field",
+    matcher: isGoogleDrivePickerSchema,
+    component: GoogleDrivePickerField,
+  },
+  {
+    id: "custom/json_text_field",
+    // Not matched by schema - assigned via uiSchema for nested complex types
+    matcher: () => false,
+    component: JsonTextField,
+  },
+  {
+    id: "custom/multi_select_field",
+    matcher: isMultiSelectSchema,
+    component: MultiSelectField,
+  },
+  {
+    id: "custom/table_field",
     matcher: (schema: any) => {
       return (
-        "google_drive_picker_config" in schema ||
-        ("format" in schema && schema.format === "google-drive-picker")
+        schema.type === "array" &&
+        "format" in schema &&
+        schema.format === "table"
       );
     },
-    component: GoogleDrivePickerField,
+    component: TableField,
+  },
+  {
+    id: "custom/llm_model_field",
+    matcher: (schema: any) => {
+      return (
+        typeof schema === "object" && schema !== null && "llm_model" in schema
+      );
+    },
+    component: LlmModelField,
   },
 ];
 
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/helpers.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/helpers.ts
index f3302fcb85..1a0b52c0b4 100644
--- a/autogpt_platform/frontend/src/components/renderers/InputRenderer/helpers.ts
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/helpers.ts
@@ -30,6 +30,8 @@ export function updateUiOption<T extends Record<string, any>>(
 }
 
 export const cleanUpHandleId = (handleId: string) => {
+  if (!handleId) return "";
+
   let newHandleId = handleId;
   if (handleId.includes(ANY_OF_FLAG)) {
     newHandleId = newHandleId.replace(ANY_OF_FLAG, "");
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/types.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/types.ts
index af2e8b7866..e667e27e2d 100644
--- a/autogpt_platform/frontend/src/components/renderers/InputRenderer/types.ts
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/types.ts
@@ -6,6 +6,7 @@ export interface ExtendedFormContextType extends FormContextType {
   uiType?: BlockUIType;
   showHandles?: boolean;
   size?: "small" | "medium" | "large";
+  showOptionalToggle?: boolean;
 }
 
 export type PathSegment = {
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/generate-ui-schema.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/generate-ui-schema.ts
new file mode 100644
index 0000000000..4012c39068
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/generate-ui-schema.ts
@@ -0,0 +1,199 @@
+import { RJSFSchema, UiSchema } from "@rjsf/utils";
+import {
+  findCustomFieldId,
+  JSON_TEXT_FIELD_ID,
+} from "../custom/custom-registry";
+
+function isComplexType(schema: RJSFSchema): boolean {
+  return schema.type === "object" || schema.type === "array";
+}
+
+function hasComplexAnyOfOptions(schema: RJSFSchema): boolean {
+  const options = schema.anyOf || schema.oneOf;
+  if (!Array.isArray(options)) return false;
+  return options.some(
+    (opt: any) =>
+      opt &&
+      typeof opt === "object" &&
+      (opt.type === "object" || opt.type === "array"),
+  );
+}
+
+/**
+ * Generates uiSchema with ui:field settings for custom fields based on schema matchers.
+ * This is the standard RJSF way to route fields to custom components.
+ *
+ * Nested complex types (arrays/objects inside arrays/objects) are rendered as JsonTextField
+ * to avoid deeply nested form UIs. Users can enter raw JSON for these fields.
+ *
+ * @param schema - The JSON schema
+ * @param existingUiSchema - Existing uiSchema to merge with
+ * @param insideComplexType - Whether we're already inside a complex type (object/array)
+ */
+export function generateUiSchemaForCustomFields(
+  schema: RJSFSchema,
+  existingUiSchema: UiSchema = {},
+  insideComplexType: boolean = false,
+): UiSchema {
+  const uiSchema: UiSchema = { ...existingUiSchema };
+
+  if (schema.properties) {
+    for (const [key, propSchema] of Object.entries(schema.properties)) {
+      if (propSchema && typeof propSchema === "object") {
+        // First check for custom field matchers (credentials, google drive, etc.)
+        const customFieldId = findCustomFieldId(propSchema);
+
+        if (customFieldId) {
+          uiSchema[key] = {
+            ...(uiSchema[key] as object),
+            "ui:field": customFieldId,
+          };
+          // Skip further processing for custom fields
+          continue;
+        }
+
+        // Handle nested complex types - render as JsonTextField
+        if (insideComplexType && isComplexType(propSchema as RJSFSchema)) {
+          uiSchema[key] = {
+            ...(uiSchema[key] as object),
+            "ui:field": JSON_TEXT_FIELD_ID,
+          };
+          // Don't recurse further - this field is now a text input
+          continue;
+        }
+
+        // Handle anyOf/oneOf inside complex types
+        if (
+          insideComplexType &&
+          hasComplexAnyOfOptions(propSchema as RJSFSchema)
+        ) {
+          uiSchema[key] = {
+            ...(uiSchema[key] as object),
+            "ui:field": JSON_TEXT_FIELD_ID,
+          };
+          continue;
+        }
+
+        // Recurse into object properties
+        if (
+          propSchema.type === "object" &&
+          propSchema.properties &&
+          typeof propSchema.properties === "object"
+        ) {
+          const nestedUiSchema = generateUiSchemaForCustomFields(
+            propSchema as RJSFSchema,
+            (uiSchema[key] as UiSchema) || {},
+            true, // Now inside a complex type
+          );
+          uiSchema[key] = {
+            ...(uiSchema[key] as object),
+            ...nestedUiSchema,
+          };
+        }
+
+        // Handle arrays
+        if (propSchema.type === "array" && propSchema.items) {
+          const itemsSchema = propSchema.items as RJSFSchema;
+          if (itemsSchema && typeof itemsSchema === "object") {
+            // Check for custom field on array items
+            const itemsCustomFieldId = findCustomFieldId(itemsSchema);
+            if (itemsCustomFieldId) {
+              uiSchema[key] = {
+                ...(uiSchema[key] as object),
+                items: {
+                  "ui:field": itemsCustomFieldId,
+                },
+              };
+            } else if (isComplexType(itemsSchema)) {
+              // Array items that are complex types become JsonTextField
+              uiSchema[key] = {
+                ...(uiSchema[key] as object),
+                items: {
+                  "ui:field": JSON_TEXT_FIELD_ID,
+                },
+              };
+            } else if (hasComplexAnyOfOptions(itemsSchema)) {
+              // Array items with anyOf containing complex types become JsonTextField
+              uiSchema[key] = {
+                ...(uiSchema[key] as object),
+                items: {
+                  "ui:field": JSON_TEXT_FIELD_ID,
+                },
+              };
+            } else if (itemsSchema.properties) {
+              // Recurse into object items (but they're now inside a complex type)
+              const itemsUiSchema = generateUiSchemaForCustomFields(
+                itemsSchema,
+                ((uiSchema[key] as UiSchema)?.items as UiSchema) || {},
+                true, // Inside complex type (array)
+              );
+              if (Object.keys(itemsUiSchema).length > 0) {
+                uiSchema[key] = {
+                  ...(uiSchema[key] as object),
+                  items: itemsUiSchema,
+                };
+              }
+            }
+          }
+        }
+
+        // Handle anyOf/oneOf at root level - process complex options
+        if (!insideComplexType) {
+          const anyOfOptions = propSchema.anyOf || propSchema.oneOf;
+
+          if (Array.isArray(anyOfOptions)) {
+            for (let i = 0; i < anyOfOptions.length; i++) {
+              const option = anyOfOptions[i] as RJSFSchema;
+              if (option && typeof option === "object") {
+                // Handle anyOf array options with complex items
+                if (option.type === "array" && option.items) {
+                  const itemsSchema = option.items as RJSFSchema;
+                  if (itemsSchema && typeof itemsSchema === "object") {
+                    // Array items that are complex types become JsonTextField
+                    if (isComplexType(itemsSchema)) {
+                      uiSchema[key] = {
+                        ...(uiSchema[key] as object),
+                        items: {
+                          "ui:field": JSON_TEXT_FIELD_ID,
+                        },
+                      };
+                    } else if (hasComplexAnyOfOptions(itemsSchema)) {
+                      uiSchema[key] = {
+                        ...(uiSchema[key] as object),
+                        items: {
+                          "ui:field": JSON_TEXT_FIELD_ID,
+                        },
+                      };
+                    }
+                  }
+                }
+
+                // Recurse into anyOf object options with properties
+                if (
+                  option.type === "object" &&
+                  option.properties &&
+                  typeof option.properties === "object"
+                ) {
+                  const optionUiSchema = generateUiSchemaForCustomFields(
+                    option,
+                    {},
+                    true, // Inside complex type (anyOf object option)
+                  );
+                  if (Object.keys(optionUiSchema).length > 0) {
+                    // Store under the property key - RJSF will apply it
+                    uiSchema[key] = {
+                      ...(uiSchema[key] as object),
+                      ...optionUiSchema,
+                    };
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  return uiSchema;
+}
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/input-schema-pre-processor.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/input-schema-pre-processor.ts
index dad95251ed..9d1aa2c60c 100644
--- a/autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/input-schema-pre-processor.ts
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/input-schema-pre-processor.ts
@@ -1,5 +1,4 @@
 import { RJSFSchema } from "@rjsf/utils";
-import { findCustomFieldId } from "../custom/custom-registry";
 
 /**
  * Pre-processes the input schema to ensure all properties have a type defined.
@@ -21,12 +20,6 @@ export function preprocessInputSchema(schema: RJSFSchema): RJSFSchema {
       if (property && typeof property === "object") {
         const processedProperty = { ...property };
 
-        // adding $id for custom field
-        const customFieldId = findCustomFieldId(processedProperty);
-        if (customFieldId) {
-          processedProperty.$id = customFieldId;
-        }
-
         // Only add type if no type is defined AND no anyOf/oneOf/allOf is present
         if (
           !processedProperty.type &&
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/schema-utils.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/schema-utils.ts
index b1cfd37967..c7dd9680d7 100644
--- a/autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/schema-utils.ts
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/schema-utils.ts
@@ -1,7 +1,11 @@
 import { getUiOptions, RJSFSchema, UiSchema } from "@rjsf/utils";
 
 export function isAnyOfSchema(schema: RJSFSchema | undefined): boolean {
-  return Array.isArray(schema?.anyOf) && schema!.anyOf.length > 0;
+  return (
+    Array.isArray(schema?.anyOf) &&
+    schema!.anyOf.length > 0 &&
+    schema?.enum === undefined
+  );
 }
 
 export const isAnyOfChild = (
@@ -33,3 +37,56 @@ export function isOptionalType(schema: RJSFSchema | undefined): {
 export function isAnyOfSelector(name: string) {
   return name.includes("anyof_select");
 }
+
+export function isMultiSelectSchema(schema: RJSFSchema | undefined): boolean {
+  if (typeof schema !== "object" || schema === null) {
+    return false;
+  }
+
+  if ("anyOf" in schema || "oneOf" in schema) {
+    return false;
+  }
+
+  return !!(
+    schema.type === "object" &&
+    schema.properties &&
+    Object.values(schema.properties).every(
+      (prop: any) => prop.type === "boolean",
+    )
+  );
+}
+
+const isGoogleDriveFileObject = (obj: RJSFSchema): boolean => {
+  if (obj.type !== "object" || !obj.properties) {
+    return false;
+  }
+  const props = obj.properties;
+  const hasId = "id" in props;
+  const hasMimeType = "mimeType" in props || "mime_type" in props;
+  const hasIconUrl = "iconUrl" in props || "icon_url" in props;
+  const hasIsFolder = "isFolder" in props || "is_folder" in props;
+  return hasId && hasMimeType && (hasIconUrl || hasIsFolder);
+};
+
+export const isGoogleDrivePickerSchema = (
+  schema: RJSFSchema | undefined,
+): boolean => {
+  if (!schema) {
+    return false;
+  }
+
+  // highest priority
+  if (
+    "google_drive_picker_config" in schema ||
+    ("format" in schema && schema.format === "google-drive-picker")
+  ) {
+    return true;
+  }
+
+  // In the Input type block, we do not add the format for the GoogleFile field, so we need to include this extra check.
+  if (isGoogleDriveFileObject(schema)) {
+    return true;
+  }
+
+  return false;
+};
diff --git a/autogpt_platform/frontend/src/components/styles/colors.ts b/autogpt_platform/frontend/src/components/styles/colors.ts
index cfb25ac107..149586560a 100644
--- a/autogpt_platform/frontend/src/components/styles/colors.ts
+++ b/autogpt_platform/frontend/src/components/styles/colors.ts
@@ -75,7 +75,7 @@ export const colors = {
   },
   purple: {
     50: "#f1ebfe",
-    100: "#d5c0fc",
+    100: "#efe8fe",
     200: "#c0a1fa",
     300: "#a476f8",
     400: "#925cf7",
diff --git a/autogpt_platform/frontend/src/components/ui/accordion.tsx b/autogpt_platform/frontend/src/components/ui/accordion.tsx
new file mode 100644
index 0000000000..47216c6d9e
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/ui/accordion.tsx
@@ -0,0 +1,57 @@
+"use client";
+
+import * as AccordionPrimitive from "@radix-ui/react-accordion";
+import { ChevronDown } from "lucide-react";
+import * as React from "react";
+
+import { cn } from "@/lib/utils";
+
+const Accordion = AccordionPrimitive.Root;
+
+const AccordionItem = React.forwardRef<
+  React.ElementRef<typeof AccordionPrimitive.Item>,
+  React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Item>
+>(({ className, ...props }, ref) => (
+  <AccordionPrimitive.Item
+    ref={ref}
+    className={cn("border-b", className)}
+    {...props}
+  />
+));
+AccordionItem.displayName = "AccordionItem";
+
+const AccordionTrigger = React.forwardRef<
+  React.ElementRef<typeof AccordionPrimitive.Trigger>,
+  React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Trigger>
+>(({ className, children, ...props }, ref) => (
+  <AccordionPrimitive.Header className="flex">
+    <AccordionPrimitive.Trigger
+      ref={ref}
+      className={cn(
+        "flex flex-1 items-center justify-between py-4 text-left text-sm font-medium transition-all hover:underline [&[data-state=open]>svg]:rotate-180",
+        className,
+      )}
+      {...props}
+    >
+      {children}
+      <ChevronDown className="h-4 w-4 shrink-0 text-neutral-500 transition-transform duration-200 dark:text-neutral-400" />
+    </AccordionPrimitive.Trigger>
+  </AccordionPrimitive.Header>
+));
+AccordionTrigger.displayName = AccordionPrimitive.Trigger.displayName;
+
+const AccordionContent = React.forwardRef<
+  React.ElementRef<typeof AccordionPrimitive.Content>,
+  React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Content>
+>(({ className, children, ...props }, ref) => (
+  <AccordionPrimitive.Content
+    ref={ref}
+    className="overflow-hidden text-sm data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down"
+    {...props}
+  >
+    <div className={cn("pb-4 pt-0", className)}>{children}</div>
+  </AccordionPrimitive.Content>
+));
+AccordionContent.displayName = AccordionPrimitive.Content.displayName;
+
+export { Accordion, AccordionContent, AccordionItem, AccordionTrigger };
diff --git a/autogpt_platform/frontend/src/hooks/useAgentGraph.tsx b/autogpt_platform/frontend/src/hooks/useAgentGraph.tsx
index 16304e509c..d422e389dd 100644
--- a/autogpt_platform/frontend/src/hooks/useAgentGraph.tsx
+++ b/autogpt_platform/frontend/src/hooks/useAgentGraph.tsx
@@ -66,7 +66,7 @@ export default function useAgentGraph(
   >(null);
   const [xyNodes, setXYNodes] = useState<CustomNode[]>([]);
   const [xyEdges, setXYEdges] = useState<CustomEdge[]>([]);
-  const betaBlocks = useGetFlag(Flag.BETA_BLOCKS);
+  const betaBlocks = useGetFlag(Flag.BETA_BLOCKS) as string[];
 
   // Filter blocks based on beta flags
   const availableBlocks = useMemo(() => {
@@ -233,13 +233,14 @@ export default function useAgentGraph(
         title: `${block.name} ${node.id}`,
         inputSchema: block.inputSchema,
         outputSchema: block.outputSchema,
+        isOutputStatic: block.staticOutput,
         hardcodedValues: node.input_default,
         uiType: block.uiType,
         metadata: metadata,
         connections: graph.links
           .filter((l) => [l.source_id, l.sink_id].includes(node.id))
           .map((link) => ({
-            edge_id: formatEdgeID(link),
+            id: formatEdgeID(link),
             source: link.source_id,
             sourceHandle: link.source_name,
             target: link.sink_id,
diff --git a/autogpt_platform/frontend/src/hooks/useAgentSafeMode.ts b/autogpt_platform/frontend/src/hooks/useAgentSafeMode.ts
index 07a2b33674..8e5560ce8f 100644
--- a/autogpt_platform/frontend/src/hooks/useAgentSafeMode.ts
+++ b/autogpt_platform/frontend/src/hooks/useAgentSafeMode.ts
@@ -20,11 +20,15 @@ function hasHITLBlocks(graph: GraphModel | LibraryAgent | Graph): boolean {
   if ("has_human_in_the_loop" in graph) {
     return !!graph.has_human_in_the_loop;
   }
+  return false;
+}
 
-  if (isLibraryAgent(graph)) {
-    return graph.settings?.human_in_the_loop_safe_mode !== null;
+function hasSensitiveActionBlocks(
+  graph: GraphModel | LibraryAgent | Graph,
+): boolean {
+  if ("has_sensitive_action" in graph) {
+    return !!graph.has_sensitive_action;
   }
-
   return false;
 }
 
@@ -40,7 +44,9 @@ export function useAgentSafeMode(graph: GraphModel | LibraryAgent | Graph) {
 
   const graphId = getGraphId(graph);
   const isAgent = isLibraryAgent(graph);
-  const shouldShowToggle = hasHITLBlocks(graph);
+  const showHITLToggle = hasHITLBlocks(graph);
+  const showSensitiveActionToggle = hasSensitiveActionBlocks(graph);
+  const shouldShowToggle = showHITLToggle || showSensitiveActionToggle;
 
   const { mutateAsync: updateGraphSettings, isPending } =
     usePatchV1UpdateGraphSettings();
@@ -56,27 +62,37 @@ export function useAgentSafeMode(graph: GraphModel | LibraryAgent | Graph) {
     },
   );
 
-  const [localSafeMode, setLocalSafeMode] = useState<boolean | null>(null);
+  const [localHITLSafeMode, setLocalHITLSafeMode] = useState<boolean>(true);
+  const [localSensitiveActionSafeMode, setLocalSensitiveActionSafeMode] =
+    useState<boolean>(false);
+  const [isLocalStateLoaded, setIsLocalStateLoaded] = useState<boolean>(false);
 
   useEffect(() => {
     if (!isAgent && libraryAgent) {
-      const backendValue = libraryAgent.settings?.human_in_the_loop_safe_mode;
-      if (backendValue !== undefined) {
-        setLocalSafeMode(backendValue);
-      }
+      setLocalHITLSafeMode(
+        libraryAgent.settings?.human_in_the_loop_safe_mode ?? true,
+      );
+      setLocalSensitiveActionSafeMode(
+        libraryAgent.settings?.sensitive_action_safe_mode ?? false,
+      );
+      setIsLocalStateLoaded(true);
     }
   }, [isAgent, libraryAgent]);
 
-  const currentSafeMode = isAgent
-    ? graph.settings?.human_in_the_loop_safe_mode
-    : localSafeMode;
+  const currentHITLSafeMode = isAgent
+    ? (graph.settings?.human_in_the_loop_safe_mode ?? true)
+    : localHITLSafeMode;
 
-  const isStateUndetermined = isAgent
-    ? graph.settings?.human_in_the_loop_safe_mode == null
-    : isLoading || localSafeMode === null;
+  const currentSensitiveActionSafeMode = isAgent
+    ? (graph.settings?.sensitive_action_safe_mode ?? false)
+    : localSensitiveActionSafeMode;
 
-  const handleToggle = useCallback(async () => {
-    const newSafeMode = !currentSafeMode;
+  const isHITLStateUndetermined = isAgent
+    ? false
+    : isLoading || !isLocalStateLoaded;
+
+  const handleHITLToggle = useCallback(async () => {
+    const newSafeMode = !currentHITLSafeMode;
 
     try {
       await updateGraphSettings({
@@ -85,7 +101,7 @@ export function useAgentSafeMode(graph: GraphModel | LibraryAgent | Graph) {
       });
 
       if (!isAgent) {
-        setLocalSafeMode(newSafeMode);
+        setLocalHITLSafeMode(newSafeMode);
       }
 
       if (isAgent) {
@@ -101,37 +117,62 @@ export function useAgentSafeMode(graph: GraphModel | LibraryAgent | Graph) {
       queryClient.invalidateQueries({ queryKey: ["v2", "executions"] });
 
       toast({
-        title: `Safe mode ${newSafeMode ? "enabled" : "disabled"}`,
+        title: `HITL safe mode ${newSafeMode ? "enabled" : "disabled"}`,
         description: newSafeMode
           ? "Human-in-the-loop blocks will require manual review"
           : "Human-in-the-loop blocks will proceed automatically",
         duration: 2000,
       });
     } catch (error) {
-      const isNotFoundError =
-        error instanceof Error &&
-        (error.message.includes("404") || error.message.includes("not found"));
-
-      if (!isAgent && isNotFoundError) {
-        toast({
-          title: "Safe mode not available",
-          description:
-            "To configure safe mode, please save this graph to your library first.",
-          variant: "destructive",
-        });
-      } else {
-        toast({
-          title: "Failed to update safe mode",
-          description:
-            error instanceof Error
-              ? error.message
-              : "An unexpected error occurred.",
-          variant: "destructive",
-        });
-      }
+      handleToggleError(error, isAgent, toast);
     }
   }, [
-    currentSafeMode,
+    currentHITLSafeMode,
+    graphId,
+    isAgent,
+    graph.id,
+    updateGraphSettings,
+    queryClient,
+    toast,
+  ]);
+
+  const handleSensitiveActionToggle = useCallback(async () => {
+    const newSafeMode = !currentSensitiveActionSafeMode;
+
+    try {
+      await updateGraphSettings({
+        graphId,
+        data: { sensitive_action_safe_mode: newSafeMode },
+      });
+
+      if (!isAgent) {
+        setLocalSensitiveActionSafeMode(newSafeMode);
+      }
+
+      if (isAgent) {
+        queryClient.invalidateQueries({
+          queryKey: getGetV2GetLibraryAgentQueryOptions(graph.id.toString())
+            .queryKey,
+        });
+      }
+
+      queryClient.invalidateQueries({
+        queryKey: ["v1", "graphs", graphId, "executions"],
+      });
+      queryClient.invalidateQueries({ queryKey: ["v2", "executions"] });
+
+      toast({
+        title: `Sensitive action safe mode ${newSafeMode ? "enabled" : "disabled"}`,
+        description: newSafeMode
+          ? "Sensitive action blocks will require manual review"
+          : "Sensitive action blocks will proceed automatically",
+        duration: 2000,
+      });
+    } catch (error) {
+      handleToggleError(error, isAgent, toast);
+    }
+  }, [
+    currentSensitiveActionSafeMode,
     graphId,
     isAgent,
     graph.id,
@@ -141,11 +182,53 @@ export function useAgentSafeMode(graph: GraphModel | LibraryAgent | Graph) {
   ]);
 
   return {
-    currentSafeMode,
+    // HITL safe mode
+    currentHITLSafeMode,
+    showHITLToggle,
+    isHITLStateUndetermined,
+    handleHITLToggle,
+
+    // Sensitive action safe mode
+    currentSensitiveActionSafeMode,
+    showSensitiveActionToggle,
+    handleSensitiveActionToggle,
+
+    // General
     isPending,
     shouldShowToggle,
-    isStateUndetermined,
-    handleToggle,
-    hasHITLBlocks: shouldShowToggle,
+
+    // Backwards compatibility
+    currentSafeMode: currentHITLSafeMode,
+    isStateUndetermined: isHITLStateUndetermined,
+    handleToggle: handleHITLToggle,
+    hasHITLBlocks: showHITLToggle,
   };
 }
+
+function handleToggleError(
+  error: unknown,
+  isAgent: boolean,
+  toast: ReturnType<typeof useToast>["toast"],
+) {
+  const isNotFoundError =
+    error instanceof Error &&
+    (error.message.includes("404") || error.message.includes("not found"));
+
+  if (!isAgent && isNotFoundError) {
+    toast({
+      title: "Safe mode not available",
+      description:
+        "To configure safe mode, please save this graph to your library first.",
+      variant: "destructive",
+    });
+  } else {
+    toast({
+      title: "Failed to update safe mode",
+      description:
+        error instanceof Error
+          ? error.message
+          : "An unexpected error occurred.",
+      variant: "destructive",
+    });
+  }
+}
diff --git a/autogpt_platform/frontend/src/hooks/useLibraryAgents/store.ts b/autogpt_platform/frontend/src/hooks/useLibraryAgents/store.ts
index 4a6e08d717..e84d997dd0 100644
--- a/autogpt_platform/frontend/src/hooks/useLibraryAgents/store.ts
+++ b/autogpt_platform/frontend/src/hooks/useLibraryAgents/store.ts
@@ -1,114 +1,7 @@
-import { create } from "zustand";
-import * as Sentry from "@sentry/nextjs";
-import { storage, Key } from "@/services/storage/local-storage";
-import {
-  getV2ListLibraryAgents,
-  type getV2ListLibraryAgentsResponse,
-} from "@/app/api/__generated__/endpoints/library/library";
 import type { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";
 
 export type AgentInfo = LibraryAgent;
 
-type AgentStore = {
-  agents: AgentInfo[];
-  lastUpdatedAt?: number;
-  isRefreshing: boolean;
-  error?: unknown;
-  loadFromCache: () => void;
-  refreshAll: () => Promise<void>;
-};
-
-type CachedAgents = {
-  agents: LibraryAgent[];
-  lastUpdatedAt: number;
-};
-
-async function fetchAllLibraryAgents() {
-  const pageSize = 100;
-  let page = 1;
-  const all: LibraryAgent[] = [];
-
-  let res: getV2ListLibraryAgentsResponse | undefined;
-  try {
-    res = await getV2ListLibraryAgents({ page, page_size: pageSize });
-  } catch (err) {
-    Sentry.captureException(err, { tags: { context: "library_agents_fetch" } });
-    throw err;
-  }
-
-  if (!res || res.status !== 200) return all;
-
-  const { agents, pagination } = res.data;
-  all.push(...agents);
-
-  const totalPages = pagination?.total_pages ?? 1;
-
-  for (page = 2; page <= totalPages; page += 1) {
-    try {
-      const next = await getV2ListLibraryAgents({ page, page_size: pageSize });
-      if (next.status === 200) {
-        all.push(...next.data.agents);
-      }
-    } catch (err) {
-      Sentry.captureException(err, {
-        tags: { context: "library_agents_fetch" },
-      });
-    }
-  }
-
-  return all;
-}
-
-function persistCache(cached: CachedAgents) {
-  try {
-    storage.set(Key.LIBRARY_AGENTS_CACHE, JSON.stringify(cached));
-  } catch (error) {
-    // Ignore cache failures
-    // eslint-disable-next-line no-console
-    console.error("Failed to persist library agents cache", error);
-    Sentry.captureException(error, {
-      tags: { context: "library_agents_cache_persist" },
-    });
-  }
-}
-
-function readCache(): CachedAgents | undefined {
-  try {
-    const raw = storage.get(Key.LIBRARY_AGENTS_CACHE);
-    if (!raw) return;
-    return JSON.parse(raw) as CachedAgents;
-  } catch {
-    return;
-  }
-}
-
-export const useLibraryAgentsStore = create<AgentStore>((set, get) => ({
-  agents: [],
-  lastUpdatedAt: undefined,
-  isRefreshing: false,
-  error: undefined,
-  loadFromCache: () => {
-    const cached = readCache();
-    if (cached?.agents?.length) {
-      set({ agents: cached.agents, lastUpdatedAt: cached.lastUpdatedAt });
-    }
-  },
-  refreshAll: async () => {
-    if (get().isRefreshing) return;
-    set({ isRefreshing: true, error: undefined });
-    try {
-      const agents = await fetchAllLibraryAgents();
-      const snapshot: CachedAgents = { agents, lastUpdatedAt: Date.now() };
-      persistCache(snapshot);
-      set({ agents, lastUpdatedAt: snapshot.lastUpdatedAt });
-    } catch (error) {
-      set({ error });
-    } finally {
-      set({ isRefreshing: false });
-    }
-  },
-}));
-
 export function buildAgentInfoMap(agents: AgentInfo[]) {
   const map = new Map<
     string,
diff --git a/autogpt_platform/frontend/src/hooks/useLibraryAgents/useLibraryAgents.ts b/autogpt_platform/frontend/src/hooks/useLibraryAgents/useLibraryAgents.ts
index 906b822794..8f0fc51405 100644
--- a/autogpt_platform/frontend/src/hooks/useLibraryAgents/useLibraryAgents.ts
+++ b/autogpt_platform/frontend/src/hooks/useLibraryAgents/useLibraryAgents.ts
@@ -1,21 +1,34 @@
-import { useEffect, useMemo } from "react";
-import { buildAgentInfoMap, useLibraryAgentsStore } from "./store";
-
-let initialized = false;
+import { useGetV2ListLibraryAgentsInfinite } from "@/app/api/__generated__/endpoints/library/library";
+import { getPaginationNextPageNumber, unpaginate } from "@/app/api/helpers";
+import { useMemo } from "react";
+import { buildAgentInfoMap } from "./store";
 
 export function useLibraryAgents() {
-  const { agents, isRefreshing, lastUpdatedAt, loadFromCache, refreshAll } =
-    useLibraryAgentsStore();
+  const { data: agentsQueryData, isLoading: isRefreshing } =
+    useGetV2ListLibraryAgentsInfinite(
+      {
+        page: 1,
+        page_size: 100,
+      },
+      {
+        query: {
+          getNextPageParam: getPaginationNextPageNumber,
+          // Don't block rendering - fetch in background
+          refetchOnMount: false,
+          refetchOnWindowFocus: false,
+          staleTime: 5 * 60 * 1000, // 5 minutes
+        },
+      },
+    );
 
-  useEffect(() => {
-    if (!initialized) {
-      loadFromCache();
-      void refreshAll();
-      initialized = true;
-    }
-  }, [loadFromCache, refreshAll]);
+  const agents = agentsQueryData ? unpaginate(agentsQueryData, "agents") : [];
 
-  const agentInfoMap = useMemo(() => buildAgentInfoMap(agents), [agents]);
+  // Use agents.length as dependency to avoid recreating map unnecessarily
+  const agentInfoMap = useMemo(
+    () => buildAgentInfoMap(agents),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [agents.length, agents.map((a) => a.id).join(",")],
+  );
 
-  return { agents, agentInfoMap, isRefreshing, lastUpdatedAt };
+  return { agents, agentInfoMap, isRefreshing, lastUpdatedAt: undefined };
 }
diff --git a/autogpt_platform/frontend/src/hooks/usePendingReviews.ts b/autogpt_platform/frontend/src/hooks/usePendingReviews.ts
index 8257814fcf..b9d7d711a1 100644
--- a/autogpt_platform/frontend/src/hooks/usePendingReviews.ts
+++ b/autogpt_platform/frontend/src/hooks/usePendingReviews.ts
@@ -15,8 +15,22 @@ export function usePendingReviews() {
   };
 }
 
-export function usePendingReviewsForExecution(graphExecId: string) {
-  const query = useGetV2GetPendingReviewsForExecution(graphExecId);
+interface UsePendingReviewsForExecutionOptions {
+  enabled?: boolean;
+  refetchInterval?: number | false;
+}
+
+export function usePendingReviewsForExecution(
+  graphExecId: string,
+  options?: UsePendingReviewsForExecutionOptions,
+) {
+  const query = useGetV2GetPendingReviewsForExecution(graphExecId, {
+    query: {
+      enabled: options?.enabled ?? !!graphExecId,
+      refetchInterval: options?.refetchInterval,
+      refetchIntervalInBackground: !!options?.refetchInterval,
+    },
+  });
 
   return {
     pendingReviews: okData(query.data) || [],
diff --git a/autogpt_platform/frontend/src/lib/autogpt-server-api/client.ts b/autogpt_platform/frontend/src/lib/autogpt-server-api/client.ts
index 682fc14108..e58b5f6020 100644
--- a/autogpt_platform/frontend/src/lib/autogpt-server-api/client.ts
+++ b/autogpt_platform/frontend/src/lib/autogpt-server-api/client.ts
@@ -352,6 +352,10 @@ export default class BackendAPI {
     return this._get("/integrations/providers");
   }
 
+  listSystemProviders(): Promise<string[]> {
+    return this._get("/integrations/providers/system");
+  }
+
   listCredentials(provider?: string): Promise<CredentialsMetaResponse[]> {
     return this._get(
       provider
diff --git a/autogpt_platform/frontend/src/lib/autogpt-server-api/types.ts b/autogpt_platform/frontend/src/lib/autogpt-server-api/types.ts
index 2f27ef126d..74855f5e28 100644
--- a/autogpt_platform/frontend/src/lib/autogpt-server-api/types.ts
+++ b/autogpt_platform/frontend/src/lib/autogpt-server-api/types.ts
@@ -245,8 +245,8 @@ export type BlockIONullSubSchema = BlockIOSubSchemaMeta & {
 // At the time of writing, combined schemas only occur on the first nested level in a
 // block schema. It is typed this way to make the use of these objects less tedious.
 type BlockIOCombinedTypeSubSchema = BlockIOSubSchemaMeta & {
-  type: never;
-  const: never;
+  type?: never;
+  const?: never;
 } & (
     | {
         allOf: [BlockIOSimpleTypeSubSchema];
@@ -327,8 +327,8 @@ export type GraphExecutionMeta = {
     | "FAILED"
     | "INCOMPLETE"
     | "REVIEW";
-  started_at: Date;
-  ended_at: Date;
+  started_at: Date | null;
+  ended_at: Date | null;
   stats: {
     error: string | null;
     cost: number;
@@ -368,8 +368,8 @@ export type GraphMeta = {
   recommended_schedule_cron: string | null;
   forked_from_id?: GraphID | null;
   forked_from_version?: number | null;
-  input_schema: GraphIOSchema;
-  output_schema: GraphIOSchema;
+  input_schema: GraphInputSchema;
+  output_schema: GraphOutputSchema;
   credentials_input_schema: CredentialsInputSchema;
 } & (
   | {
@@ -385,19 +385,51 @@ export type GraphMeta = {
 export type GraphID = Brand<string, "GraphID">;
 
 /* Derived from backend/data/graph.py:Graph._generate_schema() */
-export type GraphIOSchema = {
+export type GraphInputSchema = {
   type: "object";
-  properties: Record<string, GraphIOSubSchema>;
-  required: (keyof BlockIORootSchema["properties"])[];
+  properties: Record<string, GraphInputSubSchema>;
+  required: (keyof GraphInputSchema["properties"])[];
 };
-export type GraphIOSubSchema = Omit<
-  BlockIOSubSchemaMeta,
-  "placeholder" | "depends_on" | "hidden"
-> & {
-  type: never; // bodge to avoid type checking hell; doesn't exist at runtime
-  default?: string;
+export type GraphInputSubSchema = GraphOutputSubSchema &
+  (
+    | { type?: never; default: any | null } // AgentInputBlock (generic Any type)
+    | { type: "string"; format: "short-text"; default: string | null } // AgentShortTextInputBlock
+    | { type: "string"; format: "long-text"; default: string | null } // AgentLongTextInputBlock
+    | { type: "integer"; default: number | null } // AgentNumberInputBlock
+    | { type: "string"; format: "date"; default: string | null } // AgentDateInputBlock
+    | { type: "string"; format: "time"; default: string | null } // AgentTimeInputBlock
+    | { type: "string"; format: "file"; default: string | null } // AgentFileInputBlock
+    | { type: "string"; enum: string[]; default: string | null } // AgentDropdownInputBlock
+    | { type: "boolean"; default: boolean } // AgentToggleInputBlock
+    | {
+        // AgentTableInputBlock
+        type: "array";
+        format: "table";
+        items: {
+          type: "object";
+          properties: Record<string, { type: "string" }>;
+        };
+        default: Array<Record<string, string>> | null;
+      }
+    | {
+        // AgentGoogleDriveFileInputBlock
+        type: "object";
+        format: "google-drive-picker";
+        google_drive_picker_config?: GoogleDrivePickerConfig;
+        default: GoogleDriveFile | null;
+      }
+  );
+export type GraphOutputSchema = {
+  type: "object";
+  properties: Record<string, GraphOutputSubSchema>;
+  required: (keyof GraphOutputSchema["properties"])[];
+};
+export type GraphOutputSubSchema = {
+  // TODO: typed outputs based on the incoming edges?
+  title: string;
+  description?: string;
+  advanced: boolean;
   secret: boolean;
-  metadata?: any;
 };
 
 export type CredentialsInputSchema = {
@@ -440,8 +472,8 @@ export type GraphUpdateable = Omit<
   is_active?: boolean;
   nodes: NodeCreatable[];
   links: LinkCreatable[];
-  input_schema?: GraphIOSchema;
-  output_schema?: GraphIOSchema;
+  input_schema?: GraphInputSchema;
+  output_schema?: GraphOutputSchema;
 };
 
 export type GraphCreatable = _GraphCreatableInner & {
@@ -484,7 +516,7 @@ export type GraphValidationErrorResponse = {
 
 /* *** LIBRARY *** */
 
-/* Mirror of backend/server/v2/library/model.py:LibraryAgent */
+/* Mirror of backend/api/features/library/model.py:LibraryAgent */
 export type LibraryAgent = {
   id: LibraryAgentID;
   graph_id: GraphID;
@@ -497,8 +529,8 @@ export type LibraryAgent = {
   name: string;
   description: string;
   instructions?: string | null;
-  input_schema: GraphIOSchema;
-  output_schema: GraphIOSchema;
+  input_schema: GraphInputSchema;
+  output_schema: GraphOutputSchema;
   credentials_input_schema: CredentialsInputSchema;
   new_output: boolean;
   can_access_graph: boolean;
@@ -584,7 +616,7 @@ export enum LibraryAgentSortEnum {
 
 /* *** CREDENTIALS *** */
 
-/* Mirror of backend/server/integrations/router.py:CredentialsMetaResponse */
+/* Mirror of backend/api/features/integrations/router.py:CredentialsMetaResponse */
 export type CredentialsMetaResponse = {
   id: string;
   provider: CredentialsProviderName;
@@ -593,15 +625,16 @@ export type CredentialsMetaResponse = {
   scopes?: Array<string>;
   username?: string;
   host?: string;
+  is_system?: boolean;
 };
 
-/* Mirror of backend/server/integrations/router.py:CredentialsDeletionResponse */
+/* Mirror of backend/api/features/integrations/router.py:CredentialsDeletionResponse */
 export type CredentialsDeleteResponse = {
   deleted: true;
   revoked: boolean | null;
 };
 
-/* Mirror of backend/server/integrations/router.py:CredentialsDeletionNeedsConfirmationResponse */
+/* Mirror of backend/api/features/integrations/router.py:CredentialsDeletionNeedsConfirmationResponse */
 export type CredentialsDeleteNeedConfirmationResponse = {
   deleted: false;
   need_confirmation: true;
@@ -855,7 +888,7 @@ export type Schedule = {
 
 export type ScheduleID = Brand<string, "ScheduleID">;
 
-/* Mirror of backend/server/routers/v1.py:ScheduleCreationRequest */
+/* Mirror of backend/api/features/v1.py:ScheduleCreationRequest */
 export type ScheduleCreatable = {
   graph_id: GraphID;
   graph_version: number;
@@ -970,6 +1003,7 @@ export type OnboardingStep =
   | "AGENT_INPUT"
   | "CONGRATS"
   // First Wins
+  | "VISIT_COPILOT"
   | "GET_RESULTS"
   | "MARKETPLACE_VISIT"
   | "MARKETPLACE_ADD_AGENT"
diff --git a/autogpt_platform/frontend/src/lib/constants.ts b/autogpt_platform/frontend/src/lib/constants.ts
index 433a37b00e..19365a56ac 100644
--- a/autogpt_platform/frontend/src/lib/constants.ts
+++ b/autogpt_platform/frontend/src/lib/constants.ts
@@ -8,3 +8,6 @@ export const IMPERSONATION_STORAGE_KEY = "admin-impersonate-user-id";
 
 // API key authentication
 export const API_KEY_HEADER_NAME = "X-API-Key";
+
+// Layout
+export const NAVBAR_HEIGHT_PX = 60;
diff --git a/autogpt_platform/frontend/src/lib/dexie/draft-utils.ts b/autogpt_platform/frontend/src/lib/dexie/draft-utils.ts
index 03232ede30..2a212a3f35 100644
--- a/autogpt_platform/frontend/src/lib/dexie/draft-utils.ts
+++ b/autogpt_platform/frontend/src/lib/dexie/draft-utils.ts
@@ -5,7 +5,7 @@ import isEqual from "lodash/isEqual";
 export function cleanNode(node: CustomNode) {
   return {
     id: node.id,
-    position: node.position,
+    // Note: position is intentionally excluded to prevent draft saves when dragging nodes
     data: {
       hardcodedValues: node.data.hardcodedValues,
       title: node.data.title,
diff --git a/autogpt_platform/frontend/src/lib/supabase/helpers.ts b/autogpt_platform/frontend/src/lib/supabase/helpers.ts
index f41c8c2f0f..26f7711bde 100644
--- a/autogpt_platform/frontend/src/lib/supabase/helpers.ts
+++ b/autogpt_platform/frontend/src/lib/supabase/helpers.ts
@@ -70,7 +70,7 @@ export function getRedirectPath(
   }
 
   if (isAdminPage(path) && userRole !== "admin") {
-    return "/marketplace";
+    return "/";
   }
 
   return null;
diff --git a/autogpt_platform/frontend/src/lib/supabase/middleware.ts b/autogpt_platform/frontend/src/lib/supabase/middleware.ts
index 5e4bd01e83..cd1f4a240e 100644
--- a/autogpt_platform/frontend/src/lib/supabase/middleware.ts
+++ b/autogpt_platform/frontend/src/lib/supabase/middleware.ts
@@ -66,7 +66,7 @@ export async function updateSession(request: NextRequest) {
 
     // 2. Check if user is authenticated but lacks admin role when accessing admin pages
     if (user && userRole !== "admin" && isAdminPage(pathname)) {
-      url.pathname = "/marketplace";
+      url.pathname = "/";
       return NextResponse.redirect(url);
     }
 
diff --git a/autogpt_platform/frontend/src/lib/timezone-utils.ts b/autogpt_platform/frontend/src/lib/timezone-utils.ts
index d2b0c55102..b6cb6b2a10 100644
--- a/autogpt_platform/frontend/src/lib/timezone-utils.ts
+++ b/autogpt_platform/frontend/src/lib/timezone-utils.ts
@@ -106,9 +106,14 @@ export function getTimezoneDisplayName(timezone: string): string {
     const parts = timezone.split("/");
     const city = parts[parts.length - 1].replace(/_/g, " ");
     const abbr = getTimezoneAbbreviation(timezone);
-    return abbr ? `${city} (${abbr})` : city;
+    if (abbr && abbr !== timezone) {
+      return `${city} (${abbr})`;
+    }
+    // If abbreviation is same as timezone or not found, show timezone with underscores replaced
+    const timezoneDisplay = timezone.replace(/_/g, " ");
+    return `${city} (${timezoneDisplay})`;
   } catch {
-    return timezone;
+    return timezone.replace(/_/g, " ");
   }
 }
 
diff --git a/autogpt_platform/frontend/src/lib/utils.ts b/autogpt_platform/frontend/src/lib/utils.ts
index 71f38aeb33..d3abc56b6c 100644
--- a/autogpt_platform/frontend/src/lib/utils.ts
+++ b/autogpt_platform/frontend/src/lib/utils.ts
@@ -6,7 +6,10 @@ import { NodeDimension } from "@/app/(platform)/build/components/legacy-builder/
 import {
   BlockIOObjectSubSchema,
   BlockIORootSchema,
+  BlockIOSubSchema,
   Category,
+  GraphInputSubSchema,
+  GraphOutputSubSchema,
 } from "@/lib/autogpt-server-api/types";
 
 export function cn(...inputs: ClassValue[]) {
@@ -76,8 +79,8 @@ export function getTypeBgColor(type: string | null): string {
   );
 }
 
-export function getTypeColor(type: string | null): string {
-  if (type === null) return "#6b7280";
+export function getTypeColor(type: string | undefined): string {
+  if (!type) return "#6b7280";
   return (
     {
       string: "#22c55e",
@@ -88,11 +91,59 @@ export function getTypeColor(type: string | null): string {
       array: "#6366f1",
       null: "#6b7280",
       any: "#6b7280",
-      "": "#6b7280",
     }[type] || "#6b7280"
   );
 }
 
+/**
+ * Extracts the effective type from a JSON schema, handling anyOf/oneOf/allOf wrappers.
+ * Returns the first non-null type found in the schema structure.
+ */
+export function getEffectiveType(
+  schema:
+    | BlockIOSubSchema
+    | GraphInputSubSchema
+    | GraphOutputSubSchema
+    | null
+    | undefined,
+): string | undefined {
+  if (!schema) return undefined;
+
+  // Direct type property
+  if ("type" in schema && schema.type) {
+    return String(schema.type);
+  }
+
+  // Handle allOf - typically a single-item wrapper
+  if (
+    "allOf" in schema &&
+    Array.isArray(schema.allOf) &&
+    schema.allOf.length > 0
+  ) {
+    return getEffectiveType(schema.allOf[0]);
+  }
+
+  // Handle anyOf - e.g. [{ type: "string" }, { type: "null" }]
+  if ("anyOf" in schema && Array.isArray(schema.anyOf)) {
+    for (const item of schema.anyOf) {
+      if ("type" in item && item.type !== "null") {
+        return String(item.type);
+      }
+    }
+  }
+
+  // Handle oneOf
+  if ("oneOf" in schema && Array.isArray(schema.oneOf)) {
+    for (const item of schema.oneOf) {
+      if ("type" in item && item.type !== "null") {
+        return String(item.type);
+      }
+    }
+  }
+
+  return undefined;
+}
+
 export function beautifyString(name: string): string {
   // Regular expression to identify places to split, considering acronyms
   const result = name
@@ -445,3 +496,9 @@ export function validateYouTubeUrl(val: string): boolean {
     return false;
   }
 }
+
+export function isValidUUID(value: string): boolean {
+  const uuidRegex =
+    /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+  return uuidRegex.test(value);
+}
diff --git a/autogpt_platform/frontend/src/mocks/index.ts b/autogpt_platform/frontend/src/mocks/index.ts
new file mode 100644
index 0000000000..f11c1fb398
--- /dev/null
+++ b/autogpt_platform/frontend/src/mocks/index.ts
@@ -0,0 +1,13 @@
+// We are not using this for tests because Vitest runs our tests in a Node.js environment.
+// However, we can use it for development purposes to test our UI in the browser with fake data.
+export async function initMocks() {
+  if (typeof window === "undefined") {
+    const { server } = await import("./mock-server");
+    server.listen({ onUnhandledRequest: "bypass" });
+    console.log("[MSW] Server mock initialized");
+  } else {
+    const { worker } = await import("./mock-browser");
+    await worker.start({ onUnhandledRequest: "bypass" });
+    console.log("[MSW] Browser mock initialized");
+  }
+}
diff --git a/autogpt_platform/frontend/src/mocks/mock-browser.ts b/autogpt_platform/frontend/src/mocks/mock-browser.ts
new file mode 100644
index 0000000000..61f1b6452b
--- /dev/null
+++ b/autogpt_platform/frontend/src/mocks/mock-browser.ts
@@ -0,0 +1,4 @@
+import { setupWorker } from "msw/browser";
+import { mockHandlers } from "./mock-handlers";
+
+export const worker = setupWorker(...mockHandlers);
diff --git a/autogpt_platform/frontend/src/mocks/mock-handlers.ts b/autogpt_platform/frontend/src/mocks/mock-handlers.ts
new file mode 100644
index 0000000000..4b173c5ff6
--- /dev/null
+++ b/autogpt_platform/frontend/src/mocks/mock-handlers.ts
@@ -0,0 +1,48 @@
+import { getAdminMock } from "@/app/api/__generated__/endpoints/admin/admin.msw";
+import { getAnalyticsMock } from "@/app/api/__generated__/endpoints/analytics/analytics.msw";
+import { getApiKeysMock } from "@/app/api/__generated__/endpoints/api-keys/api-keys.msw";
+import { getAuthMock } from "@/app/api/__generated__/endpoints/auth/auth.msw";
+import { getBlocksMock } from "@/app/api/__generated__/endpoints/blocks/blocks.msw";
+import { getChatMock } from "@/app/api/__generated__/endpoints/chat/chat.msw";
+import { getCreditsMock } from "@/app/api/__generated__/endpoints/credits/credits.msw";
+import { getDefaultMock } from "@/app/api/__generated__/endpoints/default/default.msw";
+import { getEmailMock } from "@/app/api/__generated__/endpoints/email/email.msw";
+import { getExecutionsMock } from "@/app/api/__generated__/endpoints/executions/executions.msw";
+import { getFilesMock } from "@/app/api/__generated__/endpoints/files/files.msw";
+import { getGraphsMock } from "@/app/api/__generated__/endpoints/graphs/graphs.msw";
+import { getHealthMock } from "@/app/api/__generated__/endpoints/health/health.msw";
+import { getIntegrationsMock } from "@/app/api/__generated__/endpoints/integrations/integrations.msw";
+import { getLibraryMock } from "@/app/api/__generated__/endpoints/library/library.msw";
+import { getMetricsMock } from "@/app/api/__generated__/endpoints/metrics/metrics.msw";
+import { getOauthMock } from "@/app/api/__generated__/endpoints/oauth/oauth.msw";
+import { getOnboardingMock } from "@/app/api/__generated__/endpoints/onboarding/onboarding.msw";
+import { getOttoMock } from "@/app/api/__generated__/endpoints/otto/otto.msw";
+import { getPresetsMock } from "@/app/api/__generated__/endpoints/presets/presets.msw";
+import { getSchedulesMock } from "@/app/api/__generated__/endpoints/schedules/schedules.msw";
+import { getStoreMock } from "@/app/api/__generated__/endpoints/store/store.msw";
+
+// Pass hard-coded data to individual handler functions to override faker-generated data.
+export const mockHandlers = [
+  ...getAdminMock(),
+  ...getAnalyticsMock(),
+  ...getApiKeysMock(),
+  ...getAuthMock(),
+  ...getBlocksMock(),
+  ...getChatMock(),
+  ...getCreditsMock(),
+  ...getDefaultMock(),
+  ...getEmailMock(),
+  ...getExecutionsMock(),
+  ...getFilesMock(),
+  ...getGraphsMock(),
+  ...getHealthMock(),
+  ...getIntegrationsMock(),
+  ...getLibraryMock(),
+  ...getMetricsMock(),
+  ...getOauthMock(),
+  ...getOnboardingMock(),
+  ...getOttoMock(),
+  ...getPresetsMock(),
+  ...getSchedulesMock(),
+  ...getStoreMock(),
+];
diff --git a/autogpt_platform/frontend/src/mocks/mock-server.ts b/autogpt_platform/frontend/src/mocks/mock-server.ts
new file mode 100644
index 0000000000..792c8d9b83
--- /dev/null
+++ b/autogpt_platform/frontend/src/mocks/mock-server.ts
@@ -0,0 +1,4 @@
+import { setupServer } from "msw/node";
+import { mockHandlers } from "./mock-handlers";
+
+export const server = setupServer(...mockHandlers);
diff --git a/autogpt_platform/frontend/src/providers/agent-credentials/credentials-provider.tsx b/autogpt_platform/frontend/src/providers/agent-credentials/credentials-provider.tsx
index bf6b91205d..e47cc65e13 100644
--- a/autogpt_platform/frontend/src/providers/agent-credentials/credentials-provider.tsx
+++ b/autogpt_platform/frontend/src/providers/agent-credentials/credentials-provider.tsx
@@ -1,5 +1,4 @@
-import { createContext, useCallback, useEffect, useState } from "react";
-import { useSupabase } from "@/lib/supabase/hooks/useSupabase";
+import { useToastOnFail } from "@/components/molecules/Toast/use-toast";
 import {
   APIKeyCredentials,
   CredentialsDeleteNeedConfirmationResponse,
@@ -10,8 +9,9 @@ import {
   UserPasswordCredentials,
 } from "@/lib/autogpt-server-api";
 import { useBackendAPI } from "@/lib/autogpt-server-api/context";
-import { useToastOnFail } from "@/components/molecules/Toast/use-toast";
+import { useSupabase } from "@/lib/supabase/hooks/useSupabase";
 import { toDisplayName } from "@/providers/agent-credentials/helper";
+import { createContext, useCallback, useEffect, useState } from "react";
 
 type APIKeyCredentialsCreatable = Omit<
   APIKeyCredentials,
@@ -32,6 +32,8 @@ export type CredentialsProviderData = {
   provider: CredentialsProviderName;
   providerName: string;
   savedCredentials: CredentialsMetaResponse[];
+  /** Whether this provider has platform credits available (system credentials) */
+  isSystemProvider: boolean;
   oAuthCallback: (
     code: string,
     state_token: string,
@@ -68,6 +70,9 @@ export default function CredentialsProvider({
   const [providers, setProviders] =
     useState<CredentialsProvidersContextType | null>(null);
   const [providerNames, setProviderNames] = useState<string[]>([]);
+  const [systemProviders, setSystemProviders] = useState<Set<string>>(
+    new Set(),
+  );
   const { isLoggedIn } = useSupabase();
   const api = useBackendAPI();
   const onFailToast = useToastOnFail();
@@ -218,17 +223,7 @@ export default function CredentialsProvider({
     [api, onFailToast],
   );
 
-  // Fetch provider names on mount
-  useEffect(() => {
-    api
-      .listProviders()
-      .then((names) => {
-        setProviderNames(names);
-      })
-      .catch(onFailToast("load provider names"));
-  }, [api, onFailToast]);
-
-  useEffect(() => {
+  const loadCredentials = useCallback(() => {
     if (!isLoggedIn || providerNames.length === 0) {
       if (isLoggedIn == false) setProviders({});
       return;
@@ -251,27 +246,32 @@ export default function CredentialsProvider({
         setProviders((prev) => ({
           ...prev,
           ...Object.fromEntries(
-            providerNames.map((provider) => [
-              provider,
-              {
+            providerNames.map((provider) => {
+              const providerCredentials = credentialsByProvider[provider] ?? [];
+
+              return [
                 provider,
-                providerName: toDisplayName(provider as string),
-                savedCredentials: credentialsByProvider[provider] ?? [],
-                oAuthCallback: (code: string, state_token: string) =>
-                  oAuthCallback(provider, code, state_token),
-                createAPIKeyCredentials: (
-                  credentials: APIKeyCredentialsCreatable,
-                ) => createAPIKeyCredentials(provider, credentials),
-                createUserPasswordCredentials: (
-                  credentials: UserPasswordCredentialsCreatable,
-                ) => createUserPasswordCredentials(provider, credentials),
-                createHostScopedCredentials: (
-                  credentials: HostScopedCredentialsCreatable,
-                ) => createHostScopedCredentials(provider, credentials),
-                deleteCredentials: (id: string, force: boolean = false) =>
-                  deleteCredentials(provider, id, force),
-              } satisfies CredentialsProviderData,
-            ]),
+                {
+                  provider,
+                  providerName: toDisplayName(provider as string),
+                  savedCredentials: providerCredentials,
+                  isSystemProvider: systemProviders.has(provider),
+                  oAuthCallback: (code: string, state_token: string) =>
+                    oAuthCallback(provider, code, state_token),
+                  createAPIKeyCredentials: (
+                    credentials: APIKeyCredentialsCreatable,
+                  ) => createAPIKeyCredentials(provider, credentials),
+                  createUserPasswordCredentials: (
+                    credentials: UserPasswordCredentialsCreatable,
+                  ) => createUserPasswordCredentials(provider, credentials),
+                  createHostScopedCredentials: (
+                    credentials: HostScopedCredentialsCreatable,
+                  ) => createHostScopedCredentials(provider, credentials),
+                  deleteCredentials: (id: string, force: boolean = false) =>
+                    deleteCredentials(provider, id, force),
+                } satisfies CredentialsProviderData,
+              ];
+            }),
           ),
         }));
       })
@@ -280,6 +280,7 @@ export default function CredentialsProvider({
     api,
     isLoggedIn,
     providerNames,
+    systemProviders,
     createAPIKeyCredentials,
     createUserPasswordCredentials,
     createHostScopedCredentials,
@@ -288,6 +289,20 @@ export default function CredentialsProvider({
     onFailToast,
   ]);
 
+  // Fetch provider names and system providers on mount
+  useEffect(() => {
+    Promise.all([api.listProviders(), api.listSystemProviders()])
+      .then(([names, systemList]) => {
+        setProviderNames(names);
+        setSystemProviders(new Set(systemList));
+      })
+      .catch(onFailToast("Load provider names"));
+  }, [api, onFailToast]);
+
+  useEffect(() => {
+    loadCredentials();
+  }, [loadCredentials]);
+
   return (
     <CredentialsProvidersContext.Provider value={providers}>
       {children}
diff --git a/autogpt_platform/frontend/src/providers/onboarding/onboarding-provider.tsx b/autogpt_platform/frontend/src/providers/onboarding/onboarding-provider.tsx
index ebd972d1bd..42cb99f187 100644
--- a/autogpt_platform/frontend/src/providers/onboarding/onboarding-provider.tsx
+++ b/autogpt_platform/frontend/src/providers/onboarding/onboarding-provider.tsx
@@ -1,4 +1,12 @@
 "use client";
+import {
+  getV1IsOnboardingEnabled,
+  getV1OnboardingState,
+  patchV1UpdateOnboardingState,
+  postV1CompleteOnboardingStep,
+} from "@/app/api/__generated__/endpoints/onboarding/onboarding";
+import { PostV1CompleteOnboardingStepStep } from "@/app/api/__generated__/models/postV1CompleteOnboardingStepStep";
+import { resolveResponse } from "@/app/api/helpers";
 import { Button } from "@/components/__legacy__/ui/button";
 import {
   Dialog,
@@ -28,19 +36,11 @@ import {
   useState,
 } from "react";
 import {
-  updateOnboardingState,
   fromBackendUserOnboarding,
-  shouldRedirectFromOnboarding,
   LocalOnboardingStateUpdate,
+  shouldRedirectFromOnboarding,
+  updateOnboardingState,
 } from "./helpers";
-import { resolveResponse } from "@/app/api/helpers";
-import {
-  getV1IsOnboardingEnabled,
-  getV1OnboardingState,
-  patchV1UpdateOnboardingState,
-  postV1CompleteOnboardingStep,
-} from "@/app/api/__generated__/endpoints/onboarding/onboarding";
-import { PostV1CompleteOnboardingStepStep } from "@/app/api/__generated__/models/postV1CompleteOnboardingStepStep";
 
 type FrontendOnboardingStep = PostV1CompleteOnboardingStepStep;
 
@@ -146,7 +146,7 @@ export default function OnboardingProvider({
         if (isOnOnboardingRoute) {
           const enabled = await resolveResponse(getV1IsOnboardingEnabled());
           if (!enabled) {
-            router.push("/marketplace");
+            router.push("/");
             return;
           }
         }
@@ -158,7 +158,7 @@ export default function OnboardingProvider({
           isOnOnboardingRoute &&
           shouldRedirectFromOnboarding(onboarding.completedSteps, pathname)
         ) {
-          router.push("/marketplace");
+          router.push("/");
         }
       } catch (error) {
         console.error("Failed to initialize onboarding:", error);
diff --git a/autogpt_platform/frontend/src/providers/posthog/posthog-provider.tsx b/autogpt_platform/frontend/src/providers/posthog/posthog-provider.tsx
new file mode 100644
index 0000000000..674f6c55eb
--- /dev/null
+++ b/autogpt_platform/frontend/src/providers/posthog/posthog-provider.tsx
@@ -0,0 +1,72 @@
+"use client";
+
+import { useSupabase } from "@/lib/supabase/hooks/useSupabase";
+import { environment } from "@/services/environment";
+import { PostHogProvider as PHProvider } from "@posthog/react";
+import { usePathname, useSearchParams } from "next/navigation";
+import posthog from "posthog-js";
+import { ReactNode, useEffect, useRef } from "react";
+
+export function PostHogProvider({ children }: { children: ReactNode }) {
+  const isPostHogEnabled = environment.isPostHogEnabled();
+  const postHogCredentials = environment.getPostHogCredentials();
+
+  useEffect(() => {
+    if (postHogCredentials.key) {
+      posthog.init(postHogCredentials.key, {
+        api_host: postHogCredentials.host,
+        defaults: "2025-11-30",
+        capture_pageview: false,
+        capture_pageleave: true,
+        autocapture: true,
+      });
+    }
+  }, []);
+
+  if (!isPostHogEnabled) return <>{children}</>;
+
+  return <PHProvider client={posthog}>{children}</PHProvider>;
+}
+
+export function PostHogUserTracker() {
+  const { user, isUserLoading } = useSupabase();
+  const previousUserIdRef = useRef<string | null>(null);
+  const isPostHogEnabled = environment.isPostHogEnabled();
+
+  useEffect(() => {
+    if (isUserLoading || !isPostHogEnabled) return;
+
+    if (user) {
+      if (previousUserIdRef.current !== user.id) {
+        posthog.identify(user.id, {
+          email: user.email,
+          ...(user.user_metadata?.name && { name: user.user_metadata.name }),
+        });
+        previousUserIdRef.current = user.id;
+      }
+    } else if (previousUserIdRef.current !== null) {
+      posthog.reset();
+      previousUserIdRef.current = null;
+    }
+  }, [user, isUserLoading, isPostHogEnabled]);
+
+  return null;
+}
+
+export function PostHogPageViewTracker() {
+  const pathname = usePathname();
+  const searchParams = useSearchParams();
+  const isPostHogEnabled = environment.isPostHogEnabled();
+
+  useEffect(() => {
+    if (pathname && isPostHogEnabled) {
+      let url = window.origin + pathname;
+      if (searchParams && searchParams.toString()) {
+        url = url + `?${searchParams.toString()}`;
+      }
+      posthog.capture("$pageview", { $current_url: url });
+    }
+  }, [pathname, searchParams, isPostHogEnabled]);
+
+  return null;
+}
diff --git a/autogpt_platform/frontend/src/services/environment/index.ts b/autogpt_platform/frontend/src/services/environment/index.ts
index cdd5b421b5..0214dcb3c8 100644
--- a/autogpt_platform/frontend/src/services/environment/index.ts
+++ b/autogpt_platform/frontend/src/services/environment/index.ts
@@ -76,6 +76,17 @@ function getPreviewStealingDev() {
   return branch;
 }
 
+function getPostHogCredentials() {
+  return {
+    key: process.env.NEXT_PUBLIC_POSTHOG_KEY,
+    host: process.env.NEXT_PUBLIC_POSTHOG_HOST,
+  };
+}
+
+function getLaunchDarklyClientId() {
+  return process.env.NEXT_PUBLIC_LAUNCHDARKLY_CLIENT_ID;
+}
+
 function isProductionBuild() {
   return process.env.NODE_ENV === "production";
 }
@@ -113,7 +124,17 @@ function isVercelPreview() {
 }
 
 function areFeatureFlagsEnabled() {
-  return process.env.NEXT_PUBLIC_LAUNCHDARKLY_ENABLED === "enabled";
+  return (
+    process.env.NEXT_PUBLIC_LAUNCHDARKLY_ENABLED === "true" &&
+    Boolean(process.env.NEXT_PUBLIC_LAUNCHDARKLY_CLIENT_ID)
+  );
+}
+
+function isPostHogEnabled() {
+  const inCloud = isCloud();
+  const key = process.env.NEXT_PUBLIC_POSTHOG_KEY;
+  const host = process.env.NEXT_PUBLIC_POSTHOG_HOST;
+  return inCloud && key && host;
 }
 
 export const environment = {
@@ -128,6 +149,8 @@ export const environment = {
   getSupabaseUrl,
   getSupabaseAnonKey,
   getPreviewStealingDev,
+  getPostHogCredentials,
+  getLaunchDarklyClientId,
   // Assertions
   isServerSide,
   isClientSide,
@@ -138,5 +161,6 @@ export const environment = {
   isCloud,
   isLocal,
   isVercelPreview,
+  isPostHogEnabled,
   areFeatureFlagsEnabled,
 };
diff --git a/autogpt_platform/frontend/src/services/feature-flags/FeatureFlagPage.tsx b/autogpt_platform/frontend/src/services/feature-flags/FeatureFlagPage.tsx
new file mode 100644
index 0000000000..eef0691de2
--- /dev/null
+++ b/autogpt_platform/frontend/src/services/feature-flags/FeatureFlagPage.tsx
@@ -0,0 +1,59 @@
+"use client";
+
+import { LoadingSpinner } from "@/components/atoms/LoadingSpinner/LoadingSpinner";
+import { useLDClient } from "launchdarkly-react-client-sdk";
+import { useRouter } from "next/navigation";
+import { ReactNode, useEffect, useState } from "react";
+import { environment } from "../environment";
+import { Flag, useGetFlag } from "./use-get-flag";
+
+interface FeatureFlagRedirectProps {
+  flag: Flag;
+  whenDisabled: string;
+  children: ReactNode;
+}
+
+export function FeatureFlagPage({
+  flag,
+  whenDisabled,
+  children,
+}: FeatureFlagRedirectProps) {
+  const [isLoading, setIsLoading] = useState(true);
+  const router = useRouter();
+  const flagValue = useGetFlag(flag);
+  const ldClient = useLDClient();
+  const ldEnabled = environment.areFeatureFlagsEnabled();
+  const ldReady = Boolean(ldClient);
+  const flagEnabled = Boolean(flagValue);
+
+  useEffect(() => {
+    const initialize = async () => {
+      if (!ldEnabled) {
+        router.replace(whenDisabled);
+        setIsLoading(false);
+        return;
+      }
+
+      // Wait for LaunchDarkly to initialize when enabled to prevent race conditions
+      if (ldEnabled && !ldReady) return;
+
+      try {
+        await ldClient?.waitForInitialization();
+        if (!flagEnabled) router.replace(whenDisabled);
+      } catch (error) {
+        console.error(error);
+        router.replace(whenDisabled);
+      } finally {
+        setIsLoading(false);
+      }
+    };
+
+    initialize();
+  }, [ldReady, flagEnabled]);
+
+  return isLoading || !flagEnabled ? (
+    <LoadingSpinner size="large" cover />
+  ) : (
+    <>{children}</>
+  );
+}
diff --git a/autogpt_platform/frontend/src/services/feature-flags/FeatureFlagRedirect.tsx b/autogpt_platform/frontend/src/services/feature-flags/FeatureFlagRedirect.tsx
new file mode 100644
index 0000000000..b843b5567c
--- /dev/null
+++ b/autogpt_platform/frontend/src/services/feature-flags/FeatureFlagRedirect.tsx
@@ -0,0 +1,51 @@
+"use client";
+
+import { LoadingSpinner } from "@/components/atoms/LoadingSpinner/LoadingSpinner";
+import { useLDClient } from "launchdarkly-react-client-sdk";
+import { useRouter } from "next/navigation";
+import { useEffect } from "react";
+import { environment } from "../environment";
+import { Flag, useGetFlag } from "./use-get-flag";
+
+interface FeatureFlagRedirectProps {
+  flag: Flag;
+  whenEnabled: string;
+  whenDisabled: string;
+}
+
+export function FeatureFlagRedirect({
+  flag,
+  whenEnabled,
+  whenDisabled,
+}: FeatureFlagRedirectProps) {
+  const router = useRouter();
+  const flagValue = useGetFlag(flag);
+  const ldEnabled = environment.areFeatureFlagsEnabled();
+  const ldClient = useLDClient();
+  const ldReady = Boolean(ldClient);
+  const flagEnabled = Boolean(flagValue);
+
+  useEffect(() => {
+    const initialize = async () => {
+      if (!ldEnabled) {
+        router.replace(whenDisabled);
+        return;
+      }
+
+      // Wait for LaunchDarkly to initialize when enabled to prevent race conditions
+      if (ldEnabled && !ldReady) return;
+
+      try {
+        await ldClient?.waitForInitialization();
+        router.replace(flagEnabled ? whenEnabled : whenDisabled);
+      } catch (error) {
+        console.error(error);
+        router.replace(whenDisabled);
+      }
+    };
+
+    initialize();
+  }, [ldReady, flagEnabled]);
+
+  return <LoadingSpinner size="large" cover />;
+}
diff --git a/autogpt_platform/frontend/src/services/feature-flags/feature-flag-provider.tsx b/autogpt_platform/frontend/src/services/feature-flags/feature-flag-provider.tsx
index a7bdb16dfc..da073816ac 100644
--- a/autogpt_platform/frontend/src/services/feature-flags/feature-flag-provider.tsx
+++ b/autogpt_platform/frontend/src/services/feature-flags/feature-flag-provider.tsx
@@ -1,22 +1,24 @@
 "use client";
 
+import { LoadingSpinner } from "@/components/atoms/LoadingSpinner/LoadingSpinner";
+import { useSupabase } from "@/lib/supabase/hooks/useSupabase";
+import * as Sentry from "@sentry/nextjs";
 import { LDProvider } from "launchdarkly-react-client-sdk";
 import type { ReactNode } from "react";
 import { useMemo } from "react";
-import { useSupabase } from "@/lib/supabase/hooks/useSupabase";
-import * as Sentry from "@sentry/nextjs";
 import { environment } from "../environment";
 
-const clientId = process.env.NEXT_PUBLIC_LAUNCHDARKLY_CLIENT_ID;
-const envEnabled = process.env.NEXT_PUBLIC_LAUNCHDARKLY_ENABLED === "true";
+const LAUNCHDARKLY_INIT_TIMEOUT_MS = 5000;
 
 export function LaunchDarklyProvider({ children }: { children: ReactNode }) {
   const { user, isUserLoading } = useSupabase();
-  const isCloud = environment.isCloud();
-  const isLaunchDarklyConfigured = isCloud && envEnabled && clientId;
+  const envEnabled = environment.areFeatureFlagsEnabled();
+  const clientId = environment.getLaunchDarklyClientId();
 
   const context = useMemo(() => {
-    if (isUserLoading || !user) {
+    if (isUserLoading) return;
+
+    if (!user) {
       return {
         kind: "user" as const,
         key: "anonymous",
@@ -35,16 +37,19 @@ export function LaunchDarklyProvider({ children }: { children: ReactNode }) {
     };
   }, [user, isUserLoading]);
 
-  if (!isLaunchDarklyConfigured) {
+  if (!envEnabled) {
     return <>{children}</>;
   }
 
+  if (isUserLoading) {
+    return <LoadingSpinner size="large" cover />;
+  }
+
   return (
     <LDProvider
-      // Add this key prop. It will be 'anonymous' when logged out,
-      key={context.key}
-      clientSideID={clientId}
+      clientSideID={clientId ?? ""}
       context={context}
+      timeout={LAUNCHDARKLY_INIT_TIMEOUT_MS}
       reactOptions={{ useCamelCaseFlagKeys: false }}
       options={{
         bootstrap: "localStorage",
diff --git a/autogpt_platform/frontend/src/services/feature-flags/use-get-flag.ts b/autogpt_platform/frontend/src/services/feature-flags/use-get-flag.ts
index 64b69895f3..c61fc9749d 100644
--- a/autogpt_platform/frontend/src/services/feature-flags/use-get-flag.ts
+++ b/autogpt_platform/frontend/src/services/feature-flags/use-get-flag.ts
@@ -1,6 +1,7 @@
 "use client";
 
 import { DEFAULT_SEARCH_TERMS } from "@/app/(platform)/marketplace/components/HeroSection/helpers";
+import { environment } from "@/services/environment";
 import { useFlags } from "launchdarkly-react-client-sdk";
 
 export enum Flag {
@@ -18,24 +19,9 @@ export enum Flag {
   CHAT = "chat",
 }
 
-export type FlagValues = {
-  [Flag.BETA_BLOCKS]: string[];
-  [Flag.NEW_BLOCK_MENU]: boolean;
-  [Flag.NEW_AGENT_RUNS]: boolean;
-  [Flag.GRAPH_SEARCH]: boolean;
-  [Flag.ENABLE_ENHANCED_OUTPUT_HANDLING]: boolean;
-  [Flag.NEW_FLOW_EDITOR]: boolean;
-  [Flag.BUILDER_VIEW_SWITCH]: boolean;
-  [Flag.SHARE_EXECUTION_RESULTS]: boolean;
-  [Flag.AGENT_FAVORITING]: boolean;
-  [Flag.MARKETPLACE_SEARCH_TERMS]: string[];
-  [Flag.ENABLE_PLATFORM_PAYMENT]: boolean;
-  [Flag.CHAT]: boolean;
-};
-
 const isPwMockEnabled = process.env.NEXT_PUBLIC_PW_TEST === "true";
 
-const mockFlags = {
+const defaultFlags = {
   [Flag.BETA_BLOCKS]: [],
   [Flag.NEW_BLOCK_MENU]: false,
   [Flag.NEW_AGENT_RUNS]: false,
@@ -50,17 +36,16 @@ const mockFlags = {
   [Flag.CHAT]: false,
 };
 
-export function useGetFlag<T extends Flag>(flag: T): FlagValues[T] | null {
+type FlagValues = typeof defaultFlags;
+
+export function useGetFlag<T extends Flag>(flag: T): FlagValues[T] {
   const currentFlags = useFlags<FlagValues>();
   const flagValue = currentFlags[flag];
+  const areFlagsEnabled = environment.areFeatureFlagsEnabled();
 
-  const envEnabled = process.env.NEXT_PUBLIC_LAUNCHDARKLY_ENABLED === "true";
-  const clientId = process.env.NEXT_PUBLIC_LAUNCHDARKLY_CLIENT_ID;
-  const isLaunchDarklyConfigured = envEnabled && Boolean(clientId);
-
-  if (!isLaunchDarklyConfigured || isPwMockEnabled) {
-    return mockFlags[flag];
+  if (!areFlagsEnabled || isPwMockEnabled) {
+    return defaultFlags[flag];
   }
 
-  return flagValue ?? mockFlags[flag];
+  return flagValue ?? defaultFlags[flag];
 }
diff --git a/autogpt_platform/frontend/src/services/network-status/NetworkStatusMonitor.tsx b/autogpt_platform/frontend/src/services/network-status/NetworkStatusMonitor.tsx
new file mode 100644
index 0000000000..7552bbf78c
--- /dev/null
+++ b/autogpt_platform/frontend/src/services/network-status/NetworkStatusMonitor.tsx
@@ -0,0 +1,8 @@
+"use client";
+
+import { useNetworkStatus } from "./useNetworkStatus";
+
+export function NetworkStatusMonitor() {
+  useNetworkStatus();
+  return null;
+}
diff --git a/autogpt_platform/frontend/src/services/network-status/useNetworkStatus.ts b/autogpt_platform/frontend/src/services/network-status/useNetworkStatus.ts
new file mode 100644
index 0000000000..472a6e0e90
--- /dev/null
+++ b/autogpt_platform/frontend/src/services/network-status/useNetworkStatus.ts
@@ -0,0 +1,28 @@
+"use client";
+
+import { useEffect } from "react";
+import { toast } from "sonner";
+
+export function useNetworkStatus() {
+  useEffect(function monitorNetworkStatus() {
+    function handleOnline() {
+      toast.success("Connection restored", {
+        description: "You're back online",
+      });
+    }
+
+    function handleOffline() {
+      toast.error("You're offline", {
+        description: "Check your internet connection",
+      });
+    }
+
+    window.addEventListener("online", handleOnline);
+    window.addEventListener("offline", handleOffline);
+
+    return function cleanup() {
+      window.removeEventListener("online", handleOnline);
+      window.removeEventListener("offline", handleOffline);
+    };
+  }, []);
+}
diff --git a/autogpt_platform/frontend/src/services/storage/local-storage.ts b/autogpt_platform/frontend/src/services/storage/local-storage.ts
index 494ddc3ccc..a1aa63741a 100644
--- a/autogpt_platform/frontend/src/services/storage/local-storage.ts
+++ b/autogpt_platform/frontend/src/services/storage/local-storage.ts
@@ -10,6 +10,7 @@ export enum Key {
   LIBRARY_AGENTS_CACHE = "library-agents-cache",
   CHAT_SESSION_ID = "chat_session_id",
   COOKIE_CONSENT = "autogpt_cookie_consent",
+  AI_AGENT_SAFETY_POPUP_SHOWN = "ai-agent-safety-popup-shown",
 }
 
 function get(key: Key) {
diff --git a/autogpt_platform/frontend/src/services/storage/session-storage.ts b/autogpt_platform/frontend/src/services/storage/session-storage.ts
new file mode 100644
index 0000000000..1be82c98fb
--- /dev/null
+++ b/autogpt_platform/frontend/src/services/storage/session-storage.ts
@@ -0,0 +1,41 @@
+import * as Sentry from "@sentry/nextjs";
+import { environment } from "../environment";
+
+export enum SessionKey {
+  CHAT_SENT_INITIAL_PROMPTS = "chat_sent_initial_prompts",
+  CHAT_INITIAL_PROMPTS = "chat_initial_prompts",
+}
+
+function get(key: SessionKey) {
+  if (environment.isServerSide()) {
+    Sentry.captureException(new Error("Session storage is not available"));
+    return;
+  }
+  try {
+    return window.sessionStorage.getItem(key);
+  } catch {
+    return;
+  }
+}
+
+function set(key: SessionKey, value: string) {
+  if (environment.isServerSide()) {
+    Sentry.captureException(new Error("Session storage is not available"));
+    return;
+  }
+  return window.sessionStorage.setItem(key, value);
+}
+
+function clean(key: SessionKey) {
+  if (environment.isServerSide()) {
+    Sentry.captureException(new Error("Session storage is not available"));
+    return;
+  }
+  return window.sessionStorage.removeItem(key);
+}
+
+export const sessionStorage = {
+  clean,
+  get,
+  set,
+};
diff --git a/autogpt_platform/frontend/src/tests/CLAUDE.md b/autogpt_platform/frontend/src/tests/CLAUDE.md
new file mode 100644
index 0000000000..f6cc3dca7e
--- /dev/null
+++ b/autogpt_platform/frontend/src/tests/CLAUDE.md
@@ -0,0 +1,220 @@
+# Frontend Testing Rules 🧪
+
+## Testing Types Overview
+
+| Type            | Tool                  | Speed           | Purpose                          |
+| --------------- | --------------------- | --------------- | -------------------------------- |
+| **E2E**         | Playwright            | Slow (~5s/test) | Real browser, full user journeys |
+| **Integration** | Vitest + RTL          | Fast (~100ms)   | Component + mocked API           |
+| **Unit**        | Vitest + RTL          | Fastest (~10ms) | Individual functions/components  |
+| **Visual**      | Storybook + Chromatic | N/A             | UI appearance, design system     |
+
+---
+
+## When to Use Each
+
+### ✅ E2E Tests (Playwright)
+
+**Use for:** Critical user journeys that MUST work in a real browser.
+
+- Authentication flows (login, signup, logout)
+- Payment or sensitive transactions
+- Flows requiring real browser APIs (clipboard, downloads)
+- Cross-page navigation that must work end-to-end
+
+**Location:** `src/tests/*.spec.ts` (centralized, as there will be fewer of them)
+
+### ✅ Integration Tests (Vitest + RTL)
+
+**Use for:** Testing components with their dependencies (API calls, state).
+
+- Page-level behavior with mocked API responses
+- Components that fetch data
+- User interactions that trigger API calls
+- Feature flows within a single page
+
+**Location:** Place tests in a `__tests__` folder next to the component:
+
+```
+ComponentName/
+  __tests__/
+    main.test.tsx
+    some-flow.test.tsx
+  ComponentName.tsx
+  useComponentName.ts
+```
+
+**Start at page level:** Initially write integration tests at the "page" level. No need to write them for every small component.
+
+```
+/library/
+  __tests__/
+    main.test.tsx
+    searching-agents.test.tsx
+    agents-pagination.test.tsx
+  page.tsx
+  useLibraryPage.ts
+```
+
+Start with a `main.test.tsx` file and split into smaller files as it grows.
+
+**What integration tests should do:**
+
+1. Render a page or complex modal (e.g., `AgentPublishModal`)
+2. Mock API requests via MSW
+3. Assert UI scenarios via Testing Library
+
+```tsx
+// Example: Test page renders data from API
+import { server } from "@/mocks/mock-server";
+import { getDeleteV2DeleteStoreSubmissionMockHandler422 } from "@/app/api/__generated__/endpoints/store/store.msw";
+
+test("shows error when submission fails", async () => {
+  // Override default handler to return error status
+  server.use(getDeleteV2DeleteStoreSubmissionMockHandler422());
+
+  render(<MarketplacePage />);
+  await screen.findByText("Featured Agents");
+  // ... assert error UI
+});
+```
+
+**Tip:** Use `findBy...` methods most of the time—they wait for elements to appear, so async code won't cause flaky tests. The regular `getBy...` methods don't wait and error immediately.
+
+### ✅ Unit Tests (Vitest + RTL)
+
+**Use for:** Testing isolated components and utility functions.
+
+- Pure utility functions (`lib/utils.ts`)
+- Component rendering with various props
+- Component state changes
+- Custom hooks
+
+**Location:** Co-located with the file: `Component.test.tsx` next to `Component.tsx`
+
+```tsx
+// Example: Test component renders correctly
+render(<AgentCard title="My Agent" />);
+expect(screen.getByText("My Agent")).toBeInTheDocument();
+```
+
+### ✅ Storybook Tests (Visual)
+
+**Use for:** Design system, visual appearance, component documentation.
+
+- Atoms (Button, Input, Badge)
+- Molecules (Dialog, Card)
+- Visual states (hover, disabled, loading)
+- Responsive layouts
+
+**Location:** Co-located: `Component.stories.tsx` next to `Component.tsx`
+
+---
+
+## Decision Flowchart
+
+```
+Does it need a REAL browser/backend?
+├─ YES → E2E (Playwright)
+└─ NO
+   └─ Does it involve API calls or complex state?
+      ├─ YES → Integration (Vitest + RTL)
+      └─ NO
+         └─ Is it about visual appearance?
+            ├─ YES → Storybook
+            └─ NO → Unit (Vitest + RTL)
+```
+
+---
+
+## What NOT to Test
+
+❌ Third-party library internals (Radix UI, React Query)  
+❌ CSS styling details (use Storybook)  
+❌ Simple prop-passing components with no logic  
+❌ TypeScript types
+
+---
+
+## File Organization
+
+```
+src/
+├── components/
+│   └── atoms/
+│       └── Button/
+│           ├── Button.tsx
+│           ├── Button.test.tsx      # Unit test
+│           └── Button.stories.tsx   # Visual test
+├── app/
+│   └── (platform)/
+│       └── marketplace/
+│           └── components/
+│               └── MainMarketplacePage/
+│                   ├── __tests__/
+│                   │   ├── main.test.tsx           # Integration test
+│                   │   └── search-agents.test.tsx  # Integration test
+│                   ├── MainMarketplacePage.tsx
+│                   └── useMainMarketplacePage.ts
+├── lib/
+│   ├── utils.ts
+│   └── utils.test.ts                # Unit test
+├── mocks/
+│   ├── mock-handlers.ts             # MSW handlers (auto-generated via Orval)
+│   └── mock-server.ts               # MSW server setup
+└── tests/
+    ├── integrations/
+    │   ├── test-utils.tsx           # Testing utilities
+    │   └── vitest.setup.tsx         # Integration test setup
+    └── *.spec.ts                    # E2E tests (Playwright) - centralized
+```
+
+---
+
+## Priority Matrix
+
+| Component Type      | Test Priority | Recommended Test |
+| ------------------- | ------------- | ---------------- |
+| Pages/Features      | **Highest**   | Integration      |
+| Custom Hooks        | High          | Unit             |
+| Utility Functions   | High          | Unit             |
+| Organisms (complex) | High          | Integration      |
+| Molecules           | Medium        | Unit + Storybook |
+| Atoms               | Medium        | Storybook only\* |
+
+\*Atoms are typically simple enough that Storybook visual tests suffice.
+
+---
+
+## MSW Mocking
+
+API mocking is handled via MSW (Mock Service Worker). Handlers are auto-generated by Orval from the OpenAPI schema.
+
+**Default behavior:** All client-side requests are intercepted and return 200 status with faker-generated data.
+
+**Override for specific tests:** Use generated error handlers to test non-OK status scenarios:
+
+```tsx
+import { server } from "@/mocks/mock-server";
+import { getDeleteV2DeleteStoreSubmissionMockHandler422 } from "@/app/api/__generated__/endpoints/store/store.msw";
+
+test("shows error when deletion fails", async () => {
+  server.use(getDeleteV2DeleteStoreSubmissionMockHandler422());
+
+  render(<MyComponent />);
+  // ... assert error UI
+});
+```
+
+**Generated handlers location:** `src/app/api/__generated__/endpoints/*/` - each endpoint has handlers for different status codes.
+
+---
+
+## Golden Rules
+
+1. **Test behavior, not implementation** - Query by role/text, not class names
+2. **One assertion per concept** - Tests should be focused
+3. **Mock at boundaries** - Mock API calls, not internal functions
+4. **Co-locate integration tests** - Keep `__tests__/` folder next to the component
+5. **E2E is expensive** - Only for critical happy paths; prefer integration tests
+6. **AI agents are good at writing integration tests** - Start with these when adding test coverage
diff --git a/autogpt_platform/frontend/src/tests/agent-activity.spec.ts b/autogpt_platform/frontend/src/tests/agent-activity.spec.ts
index 02956fe4e9..96c19a8020 100644
--- a/autogpt_platform/frontend/src/tests/agent-activity.spec.ts
+++ b/autogpt_platform/frontend/src/tests/agent-activity.spec.ts
@@ -1,17 +1,17 @@
 import test, { expect } from "@playwright/test";
-import { hasTextContent, hasUrl, isVisible } from "./utils/assertion";
-import { getSelectors } from "./utils/selectors";
-import { getTestUser } from "./utils/auth";
-import { LoginPage } from "./pages/login.page";
 import { BuildPage } from "./pages/build.page";
 import * as LibraryPage from "./pages/library.page";
+import { LoginPage } from "./pages/login.page";
+import { hasTextContent, hasUrl, isVisible } from "./utils/assertion";
+import { getTestUser } from "./utils/auth";
+import { getSelectors } from "./utils/selectors";
 
 test.beforeEach(async ({ page }) => {
   const loginPage = new LoginPage(page);
   const buildPage = new BuildPage(page);
   const testUser = await getTestUser();
 
-  const { getId, getText } = getSelectors(page);
+  const { getId } = getSelectors(page);
 
   await page.goto("/login");
   await loginPage.login(testUser.email, testUser.password);
@@ -39,9 +39,9 @@ test.beforeEach(async ({ page }) => {
   await page.waitForTimeout(1000);
 
   await page.goto("/library");
-  await LibraryPage.clickFirstAgent(page);
+  // Navigate to the specific agent we just created, not just the first one
+  await LibraryPage.navigateToAgentByName(page, "Test Agent");
   await LibraryPage.waitForAgentPageLoad(page);
-  await isVisible(getText("Test Agent"), 8000);
 });
 
 test("shows badge with count when agent is running", async ({ page }) => {
diff --git a/autogpt_platform/frontend/src/tests/agent-dashboard.spec.ts b/autogpt_platform/frontend/src/tests/agent-dashboard.spec.ts
index 87dfff10ca..fe93e7c258 100644
--- a/autogpt_platform/frontend/src/tests/agent-dashboard.spec.ts
+++ b/autogpt_platform/frontend/src/tests/agent-dashboard.spec.ts
@@ -1,13 +1,14 @@
-import { LoginPage } from "./pages/login.page";
 import test, { expect } from "@playwright/test";
-import { TEST_CREDENTIALS } from "./credentials";
-import { getSelectors } from "./utils/selectors";
+import { getTestUserWithLibraryAgents } from "./credentials";
+import { LoginPage } from "./pages/login.page";
 import { hasUrl, isHidden } from "./utils/assertion";
+import { getSelectors } from "./utils/selectors";
 
 test.beforeEach(async ({ page }) => {
   const loginPage = new LoginPage(page);
   await page.goto("/login");
-  await loginPage.login(TEST_CREDENTIALS.email, TEST_CREDENTIALS.password);
+  const richUser = getTestUserWithLibraryAgents();
+  await loginPage.login(richUser.email, richUser.password);
   await hasUrl(page, "/marketplace");
 });
 
@@ -83,7 +84,7 @@ test("agent table delete action works correctly", async ({ page }) => {
 
   const rows = agentTable.getByTestId("agent-table-row");
 
-  // Delete button testing — delete the first agent in the list
+  // Delete button testing — only works for PENDING submissions
   const beforeCount = await rows.count();
 
   if (beforeCount === 0) {
@@ -91,11 +92,18 @@ test("agent table delete action works correctly", async ({ page }) => {
     return;
   }
 
-  const firstRow = rows.first();
-  const deletedSubmissionId = await firstRow.getAttribute("data-submission-id");
-  await firstRow.scrollIntoViewIfNeeded();
+  // Find a PENDING submission to delete
+  const pendingRow = rows.filter({ hasText: "Pending" }).first();
+  if (!(await pendingRow.count())) {
+    console.log("No pending agents available; skipping delete flow.");
+    return;
+  }
 
-  const delActionsButton = firstRow.getByTestId("agent-table-row-actions");
+  const deletedSubmissionId =
+    await pendingRow.getAttribute("data-submission-id");
+  await pendingRow.scrollIntoViewIfNeeded();
+
+  const delActionsButton = pendingRow.getByTestId("agent-table-row-actions");
   await delActionsButton.waitFor({ state: "visible", timeout: 10000 });
   await delActionsButton.scrollIntoViewIfNeeded();
   await delActionsButton.click();
@@ -108,7 +116,7 @@ test("agent table delete action works correctly", async ({ page }) => {
   await isHidden(page.locator(`[data-submission-id="${deletedSubmissionId}"]`));
 });
 
-test("edit action is unavailable for rejected agents (view only)", async ({
+test("edit and delete actions are unavailable for non-pending submissions", async ({
   page,
 }) => {
   await page.goto("/profile/dashboard");
@@ -118,27 +126,39 @@ test("edit action is unavailable for rejected agents (view only)", async ({
 
   const rows = agentTable.getByTestId("agent-table-row");
 
+  // Test with rejected submissions (view only)
   const rejectedRow = rows.filter({ hasText: "Rejected" }).first();
-  if (!(await rejectedRow.count())) {
-    console.log("No rejected agents available; skipping rejected edit test.");
-    return;
+  if (await rejectedRow.count()) {
+    await rejectedRow.scrollIntoViewIfNeeded();
+    const actionsButton = rejectedRow.getByTestId("agent-table-row-actions");
+    await actionsButton.waitFor({ state: "visible", timeout: 10000 });
+    await actionsButton.scrollIntoViewIfNeeded();
+    await actionsButton.click();
+
+    await expect(page.getByRole("menuitem", { name: "View" })).toBeVisible();
+    await expect(page.getByRole("menuitem", { name: "Edit" })).toHaveCount(0);
+    await expect(page.getByRole("menuitem", { name: "Delete" })).toHaveCount(0);
+
+    // Close the menu
+    await page.keyboard.press("Escape");
   }
 
-  await rejectedRow.scrollIntoViewIfNeeded();
+  // Test with approved submissions (view only)
+  const approvedRow = rows.filter({ hasText: "Approved" }).first();
+  if (await approvedRow.count()) {
+    await approvedRow.scrollIntoViewIfNeeded();
+    const actionsButton = approvedRow.getByTestId("agent-table-row-actions");
+    await actionsButton.waitFor({ state: "visible", timeout: 10000 });
+    await actionsButton.scrollIntoViewIfNeeded();
+    await actionsButton.click();
 
-  const actionsButton = rejectedRow.getByTestId("agent-table-row-actions");
-  await actionsButton.waitFor({ state: "visible", timeout: 10000 });
-  await actionsButton.scrollIntoViewIfNeeded();
-  await actionsButton.click();
-
-  // Rejected should not show Edit, only View
-  await expect(page.getByRole("menuitem", { name: "View" })).toBeVisible();
-  await expect(page.getByRole("menuitem", { name: "Edit" })).toHaveCount(0);
+    await expect(page.getByRole("menuitem", { name: "View" })).toBeVisible();
+    await expect(page.getByRole("menuitem", { name: "Edit" })).toHaveCount(0);
+    await expect(page.getByRole("menuitem", { name: "Delete" })).toHaveCount(0);
+  }
 });
 
-test("editing an approved agent creates a new pending submission", async ({
-  page,
-}) => {
+test("editing a pending submission works correctly", async ({ page }) => {
   await page.goto("/profile/dashboard");
 
   const agentTable = page.getByTestId("agent-table");
@@ -146,16 +166,17 @@ test("editing an approved agent creates a new pending submission", async ({
 
   const rows = agentTable.getByTestId("agent-table-row");
 
-  const approvedRow = rows.filter({ hasText: "Approved" }).first();
-  if (!(await approvedRow.count())) {
-    console.log("No approved agents available; skipping approved edit test.");
+  // Find a PENDING submission to edit (only PENDING submissions can be edited)
+  const pendingRow = rows.filter({ hasText: "Pending" }).first();
+  if (!(await pendingRow.count())) {
+    console.log("No pending agents available; skipping edit test.");
     return;
   }
 
   const beforeCount = await rows.count();
 
-  await approvedRow.scrollIntoViewIfNeeded();
-  const actionsButton = approvedRow.getByTestId("agent-table-row-actions");
+  await pendingRow.scrollIntoViewIfNeeded();
+  const actionsButton = pendingRow.getByTestId("agent-table-row-actions");
   await actionsButton.waitFor({ state: "visible", timeout: 10000 });
   await actionsButton.scrollIntoViewIfNeeded();
   await actionsButton.click();
@@ -167,11 +188,11 @@ test("editing an approved agent creates a new pending submission", async ({
   const editModal = page.getByTestId("edit-agent-modal");
   await expect(editModal).toBeVisible();
 
-  const newTitle = `E2E Edit Approved ${Date.now()}`;
+  const newTitle = `E2E Edit Pending ${Date.now()}`;
   await page.getByRole("textbox", { name: "Title" }).fill(newTitle);
   await page
     .getByRole("textbox", { name: "Changes Summary" })
-    .fill("E2E change - approved -> new pending submission");
+    .fill("E2E change - updating pending submission");
 
   await page.getByRole("button", { name: "Update submission" }).click();
   await expect(editModal).not.toBeVisible();
diff --git a/autogpt_platform/frontend/src/tests/api-keys.spec.ts b/autogpt_platform/frontend/src/tests/api-keys.spec.ts
index e2a5575aed..813272ce5e 100644
--- a/autogpt_platform/frontend/src/tests/api-keys.spec.ts
+++ b/autogpt_platform/frontend/src/tests/api-keys.spec.ts
@@ -1,6 +1,6 @@
 import { expect, test } from "@playwright/test";
+import { getTestUserWithLibraryAgents } from "./credentials";
 import { LoginPage } from "./pages/login.page";
-import { TEST_CREDENTIALS } from "./credentials";
 import { hasUrl } from "./utils/assertion";
 import { getSelectors } from "./utils/selectors";
 
@@ -8,7 +8,8 @@ test.describe("API Keys Page", () => {
   test.beforeEach(async ({ page }) => {
     const loginPage = new LoginPage(page);
     await page.goto("/login");
-    await loginPage.login(TEST_CREDENTIALS.email, TEST_CREDENTIALS.password);
+    const richUser = getTestUserWithLibraryAgents();
+    await loginPage.login(richUser.email, richUser.password);
     await hasUrl(page, "/marketplace");
   });
 
diff --git a/autogpt_platform/frontend/src/tests/build.spec.ts b/autogpt_platform/frontend/src/tests/build.spec.ts
index 1d534d3f7a..abdd3ea63b 100644
--- a/autogpt_platform/frontend/src/tests/build.spec.ts
+++ b/autogpt_platform/frontend/src/tests/build.spec.ts
@@ -18,6 +18,7 @@ test.describe("Build", () => { //(1)!
   // Reason Ignore: admonishment is in the wrong place visually with correct prettier rules
   // prettier-ignore
   test.beforeEach(async ({ page }) => { //(3)! ts-ignore
+    test.setTimeout(25000);
     const loginPage = new LoginPage(page);
     const testUser = await getTestUser();
 
diff --git a/autogpt_platform/frontend/src/tests/credentials/index.ts b/autogpt_platform/frontend/src/tests/credentials/index.ts
index ebf7528b63..bc4663a045 100644
--- a/autogpt_platform/frontend/src/tests/credentials/index.ts
+++ b/autogpt_platform/frontend/src/tests/credentials/index.ts
@@ -4,6 +4,10 @@ export const TEST_CREDENTIALS = {
   password: "testpassword123",
 } as const;
 
+export function getTestUserWithLibraryAgents() {
+  return TEST_CREDENTIALS;
+}
+
 // Dummy constant to help developers identify agents that don't need input
 export const DummyInput = "DummyInput";
 
diff --git a/autogpt_platform/frontend/src/tests/integrations/mock-supabase-request.tsx b/autogpt_platform/frontend/src/tests/integrations/mock-supabase-request.tsx
new file mode 100644
index 0000000000..f7064c53f9
--- /dev/null
+++ b/autogpt_platform/frontend/src/tests/integrations/mock-supabase-request.tsx
@@ -0,0 +1,25 @@
+import { vi } from "vitest";
+
+const mockSupabaseClient = {
+  auth: {
+    getUser: vi.fn().mockResolvedValue({
+      data: { user: null },
+      error: null,
+    }),
+    getSession: vi.fn().mockResolvedValue({
+      data: { session: null },
+      error: null,
+    }),
+    signOut: vi.fn().mockResolvedValue({ error: null }),
+    refreshSession: vi.fn().mockResolvedValue({
+      data: { session: null, user: null },
+      error: null,
+    }),
+  },
+};
+
+export const mockSupabaseRequest = () => {
+  vi.mock("@/lib/supabase/server/getServerSupabase", () => ({
+    getServerSupabase: vi.fn().mockResolvedValue(mockSupabaseClient),
+  }));
+};
diff --git a/autogpt_platform/frontend/src/tests/integrations/setup-nextjs-mocks.tsx b/autogpt_platform/frontend/src/tests/integrations/setup-nextjs-mocks.tsx
new file mode 100644
index 0000000000..cb6b9ac650
--- /dev/null
+++ b/autogpt_platform/frontend/src/tests/integrations/setup-nextjs-mocks.tsx
@@ -0,0 +1,63 @@
+import { vi } from "vitest";
+
+export const mockNextjsModules = () => {
+  vi.mock("next/image", () => ({
+    __esModule: true,
+    default: ({
+      fill: _fill,
+      priority: _priority,
+      quality: _quality,
+      placeholder: _placeholder,
+      blurDataURL: _blurDataURL,
+      loader: _loader,
+      ...props
+    }: any) => {
+      // eslint-disable-next-line jsx-a11y/alt-text, @next/next/no-img-element
+      return <img {...props} />;
+    },
+  }));
+
+  vi.mock("next/headers", () => ({
+    cookies: vi.fn(() => ({
+      get: vi.fn(() => undefined),
+      getAll: vi.fn(() => []),
+      set: vi.fn(),
+      delete: vi.fn(),
+      has: vi.fn(() => false),
+    })),
+    headers: vi.fn(() => new Headers()),
+  }));
+
+  vi.mock("next/dist/server/request/cookies", () => ({
+    cookies: vi.fn(() => ({
+      get: vi.fn(() => undefined),
+      getAll: vi.fn(() => []),
+      set: vi.fn(),
+      delete: vi.fn(),
+      has: vi.fn(() => false),
+    })),
+  }));
+
+  vi.mock("next/navigation", () => ({
+    useRouter: () => ({
+      push: vi.fn(),
+      replace: vi.fn(),
+      prefetch: vi.fn(),
+      back: vi.fn(),
+      forward: vi.fn(),
+      refresh: vi.fn(),
+    }),
+    usePathname: () => "/marketplace",
+    useSearchParams: () => new URLSearchParams(),
+    useParams: () => ({}),
+  }));
+
+  vi.mock("next/link", () => ({
+    __esModule: true,
+    default: ({ children, href, ...props }: any) => (
+      <a href={href} {...props}>
+        {children}
+      </a>
+    ),
+  }));
+};
diff --git a/autogpt_platform/frontend/src/tests/integrations/test-utils.tsx b/autogpt_platform/frontend/src/tests/integrations/test-utils.tsx
new file mode 100644
index 0000000000..dbe424a88b
--- /dev/null
+++ b/autogpt_platform/frontend/src/tests/integrations/test-utils.tsx
@@ -0,0 +1,36 @@
+import { BackendAPIProvider } from "@/lib/autogpt-server-api/context";
+import OnboardingProvider from "@/providers/onboarding/onboarding-provider";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { render, RenderOptions } from "@testing-library/react";
+import { ReactElement, ReactNode } from "react";
+
+function createTestQueryClient() {
+  return new QueryClient({
+    defaultOptions: {
+      queries: {
+        retry: false,
+      },
+    },
+  });
+}
+
+function TestProviders({ children }: { children: ReactNode }) {
+  const queryClient = createTestQueryClient();
+  return (
+    <QueryClientProvider client={queryClient}>
+      <BackendAPIProvider>
+        <OnboardingProvider>{children}</OnboardingProvider>
+      </BackendAPIProvider>
+    </QueryClientProvider>
+  );
+}
+
+function customRender(
+  ui: ReactElement,
+  options?: Omit<RenderOptions, "wrapper">,
+) {
+  return render(ui, { wrapper: TestProviders, ...options });
+}
+
+export * from "@testing-library/react";
+export { customRender as render };
diff --git a/autogpt_platform/frontend/src/tests/integrations/vitest.setup.tsx b/autogpt_platform/frontend/src/tests/integrations/vitest.setup.tsx
new file mode 100644
index 0000000000..bda6a2679d
--- /dev/null
+++ b/autogpt_platform/frontend/src/tests/integrations/vitest.setup.tsx
@@ -0,0 +1,12 @@
+import { beforeAll, afterAll, afterEach } from "vitest";
+import { server } from "@/mocks/mock-server";
+import { mockNextjsModules } from "./setup-nextjs-mocks";
+import { mockSupabaseRequest } from "./mock-supabase-request";
+
+beforeAll(() => {
+  mockNextjsModules();
+  mockSupabaseRequest(); // If you need user's data - please mock supabase actions in your specific test - it sends null user [It's only to avoid cookies() call]
+  return server.listen({ onUnhandledRequest: "error" });
+});
+afterEach(() => server.resetHandlers());
+afterAll(() => server.close());
diff --git a/autogpt_platform/frontend/src/tests/library.spec.ts b/autogpt_platform/frontend/src/tests/library.spec.ts
index 20dcf62975..52941785e3 100644
--- a/autogpt_platform/frontend/src/tests/library.spec.ts
+++ b/autogpt_platform/frontend/src/tests/library.spec.ts
@@ -1,10 +1,10 @@
-import { LibraryPage } from "./pages/library.page";
-import path from "path";
 import test, { expect } from "@playwright/test";
-import { TEST_CREDENTIALS } from "./credentials";
+import path from "path";
+import { getTestUserWithLibraryAgents } from "./credentials";
+import { LibraryPage } from "./pages/library.page";
 import { LoginPage } from "./pages/login.page";
-import { getSelectors } from "./utils/selectors";
 import { hasUrl } from "./utils/assertion";
+import { getSelectors } from "./utils/selectors";
 
 test.describe("Library", () => {
   let libraryPage: LibraryPage;
@@ -14,7 +14,8 @@ test.describe("Library", () => {
 
     await page.goto("/login");
     const loginPage = new LoginPage(page);
-    await loginPage.login(TEST_CREDENTIALS.email, TEST_CREDENTIALS.password);
+    const richUser = getTestUserWithLibraryAgents();
+    await loginPage.login(richUser.email, richUser.password);
     await hasUrl(page, "/marketplace");
   });
 
@@ -47,18 +48,24 @@ test.describe("Library", () => {
     );
 
     if (agentWithBuilder) {
-      await libraryPage.clickOpenInBuilder(agentWithBuilder);
-      await page.waitForURL("**/build**");
-      test.expect(page.url()).toContain(`/build`);
+      const [newPage] = await Promise.all([
+        page.context().waitForEvent("page"),
+        libraryPage.clickOpenInBuilder(agentWithBuilder),
+      ]);
+      await newPage.waitForLoadState();
+      test.expect(newPage.url()).toContain(`/build`);
+      await newPage.close();
     }
   });
 
-  test("pagination works correctly", async ({ page }) => {
+  test("pagination works correctly", async ({ page }, testInfo) => {
+    test.setTimeout(testInfo.timeout * 3);
     await page.goto("/library");
 
+    const PAGE_SIZE = 20;
     const paginationResult = await libraryPage.testPagination();
 
-    if (paginationResult.initialCount >= 10) {
+    if (paginationResult.initialCount >= PAGE_SIZE) {
       expect(paginationResult.finalCount).toBeGreaterThanOrEqual(
         paginationResult.initialCount,
       );
@@ -80,6 +87,9 @@ test.describe("Library", () => {
     const allAgents = await libraryPage.getAgents();
     expect(allAgents.length).toBeGreaterThan(0);
 
+    const initialAgentCount = await libraryPage.getAgentCount();
+    expect(initialAgentCount).toBeGreaterThan(0);
+
     const firstAgent = allAgents[0];
     await libraryPage.searchAgents(firstAgent.name);
     await libraryPage.waitForAgentsToLoad();
@@ -117,14 +127,17 @@ test.describe("Library", () => {
     await libraryPage.clearSearch();
     await libraryPage.waitForAgentsToLoad();
 
-    const clearedSearchResults = await libraryPage.getAgents();
-    test.expect(clearedSearchResults.length).toEqual(allAgents.length);
+    const clearedSearchCount = await libraryPage.getAgentCount();
+    test.expect(clearedSearchCount).toEqual(initialAgentCount);
 
     const clearedSearchValue = await libraryPage.getSearchValue();
     test.expect(clearedSearchValue).toBe("");
   });
 
-  test("pagination while searching works correctly", async ({ page }) => {
+  test("pagination while searching works correctly", async ({
+    page,
+  }, testInfo) => {
+    test.setTimeout(testInfo.timeout * 3);
     await page.goto("/library");
 
     const allAgents = await libraryPage.getAgents();
@@ -143,9 +156,10 @@ test.describe("Library", () => {
     );
     expect(matchingResults.length).toEqual(initialSearchResults.length);
 
+    const PAGE_SIZE = 20;
     const searchPaginationResult = await libraryPage.testPagination();
 
-    if (searchPaginationResult.initialCount >= 10) {
+    if (searchPaginationResult.initialCount >= PAGE_SIZE) {
       expect(searchPaginationResult.finalCount).toBeGreaterThanOrEqual(
         searchPaginationResult.initialCount,
       );
@@ -200,11 +214,14 @@ test.describe("Library", () => {
     );
     await fileInput.setInputFiles(testAgentPath);
 
-    await page.waitForTimeout(1000);
+    // Wait for file to be processed and upload button to be enabled
+    const uploadButton = page.getByRole("button", { name: "Upload" });
+    await uploadButton.waitFor({ state: "visible", timeout: 10000 });
+    await expect(uploadButton).toBeEnabled({ timeout: 10000 });
 
     expect(await libraryPage.isUploadButtonEnabled()).toBeTruthy();
 
-    await page.getByRole("button", { name: "Upload Agent" }).click();
+    await page.getByRole("button", { name: "Upload" }).click();
 
     await page.waitForURL("**/build**", { timeout: 10000 });
     expect(page.url()).toContain("/build");
@@ -224,28 +241,10 @@ test.describe("Library", () => {
 
     if (uploadedAgent) {
       test.expect(uploadedAgent.name).toContain(testAgentName);
-      test.expect(uploadedAgent.description).toContain(testAgentDescription);
       test.expect(uploadedAgent.seeRunsUrl).toBeTruthy();
       test.expect(uploadedAgent.openInBuilderUrl).toBeTruthy();
-
-      await libraryPage.clickAgent(uploadedAgent);
-      await page.waitForURL(`**/library/agents/${uploadedAgent.id}**`, {
-        timeout: 10000,
-      });
-
-      await page.getByRole("button", { name: "Delete agent" }).click();
-      await page.waitForTimeout(500);
-      await page.getByRole("button", { name: "Delete" }).click();
-
-      await page.waitForTimeout(1000);
-      await libraryPage.navigateToLibrary();
-      await libraryPage.waitForAgentsToLoad();
-
-      await libraryPage.searchAgents(testAgentName);
-      await libraryPage.waitForAgentsToLoad();
-      const deletedSearchResults = await libraryPage.getAgentCount();
-      expect(deletedSearchResults).toBe(0);
     }
+
     await libraryPage.clearSearch();
     await libraryPage.waitForAgentsToLoad();
   });
diff --git a/autogpt_platform/frontend/src/tests/marketplace-agent.spec.ts b/autogpt_platform/frontend/src/tests/marketplace-agent.spec.ts
index 9964d58e60..75efb134d5 100644
--- a/autogpt_platform/frontend/src/tests/marketplace-agent.spec.ts
+++ b/autogpt_platform/frontend/src/tests/marketplace-agent.spec.ts
@@ -1,10 +1,14 @@
-import { test, expect } from "@playwright/test";
-import { MarketplacePage } from "./pages/marketplace.page";
+import { expect, test } from "@playwright/test";
+import { getTestUserWithLibraryAgents } from "./credentials";
 import { LoginPage } from "./pages/login.page";
-import { isVisible, hasUrl, matchesUrl } from "./utils/assertion";
-import { TEST_CREDENTIALS } from "./credentials";
+import { MarketplacePage } from "./pages/marketplace.page";
+import { hasUrl, isVisible, matchesUrl } from "./utils/assertion";
 import { getSelectors } from "./utils/selectors";
 
+function escapeRegExp(value: string) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
 test.describe("Marketplace Agent Page - Basic Functionality", () => {
   test("User can access agent page when logged out", async ({ page }) => {
     const marketplacePage = new MarketplacePage(page);
@@ -24,7 +28,8 @@ test.describe("Marketplace Agent Page - Basic Functionality", () => {
     const marketplacePage = new MarketplacePage(page);
 
     await loginPage.goto();
-    await loginPage.login(TEST_CREDENTIALS.email, TEST_CREDENTIALS.password);
+    const richUser = getTestUserWithLibraryAgents();
+    await loginPage.login(richUser.email, richUser.password);
     await hasUrl(page, "/marketplace");
     await marketplacePage.goto(page);
     await hasUrl(page, "/marketplace");
@@ -85,7 +90,8 @@ test.describe("Marketplace Agent Page - Basic Functionality", () => {
     const marketplacePage = new MarketplacePage(page);
 
     await loginPage.goto();
-    await loginPage.login(TEST_CREDENTIALS.email, TEST_CREDENTIALS.password);
+    const richUser = getTestUserWithLibraryAgents();
+    await loginPage.login(richUser.email, richUser.password);
     await hasUrl(page, "/marketplace");
     await marketplacePage.goto(page);
 
@@ -93,6 +99,12 @@ test.describe("Marketplace Agent Page - Basic Functionality", () => {
     await firstStoreCard.click();
     await page.waitForURL("**/marketplace/agent/**");
 
+    const agentTitle = await getId("agent-title").textContent();
+    if (!agentTitle || !agentTitle.trim()) {
+      throw new Error("Agent title not found on marketplace agent page");
+    }
+    const agentName = agentTitle.trim();
+
     const addToLibraryButton = getId("agent-add-library-button");
     await isVisible(addToLibraryButton);
     await addToLibraryButton.click();
@@ -101,9 +113,8 @@ test.describe("Marketplace Agent Page - Basic Functionality", () => {
     await isVisible(addSuccessMessage);
 
     await page.waitForURL("**/library/agents/**");
-    const agentNameOnLibrary = await getId("agent-title").textContent();
-    expect(
-      agentNameOnLibrary && agentNameOnLibrary.trim().length,
-    ).toBeGreaterThan(0);
+    await expect(page).toHaveTitle(
+      new RegExp(`${escapeRegExp(agentName)} - Library - AutoGPT Platform`),
+    );
   });
 });
diff --git a/autogpt_platform/frontend/src/tests/marketplace-creator.spec.ts b/autogpt_platform/frontend/src/tests/marketplace-creator.spec.ts
index 8b3e2e1e64..a41b652afb 100644
--- a/autogpt_platform/frontend/src/tests/marketplace-creator.spec.ts
+++ b/autogpt_platform/frontend/src/tests/marketplace-creator.spec.ts
@@ -1,8 +1,8 @@
 import { test } from "@playwright/test";
-import { MarketplacePage } from "./pages/marketplace.page";
+import { getTestUserWithLibraryAgents } from "./credentials";
 import { LoginPage } from "./pages/login.page";
-import { isVisible, hasUrl, matchesUrl } from "./utils/assertion";
-import { TEST_CREDENTIALS } from "./credentials";
+import { MarketplacePage } from "./pages/marketplace.page";
+import { hasUrl, isVisible, matchesUrl } from "./utils/assertion";
 import { getSelectors } from "./utils/selectors";
 
 test.describe("Marketplace Creator Page – Basic Functionality", () => {
@@ -25,7 +25,8 @@ test.describe("Marketplace Creator Page – Basic Functionality", () => {
     const marketplacePage = new MarketplacePage(page);
 
     await loginPage.goto();
-    await loginPage.login(TEST_CREDENTIALS.email, TEST_CREDENTIALS.password);
+    const richUser = getTestUserWithLibraryAgents();
+    await loginPage.login(richUser.email, richUser.password);
     await hasUrl(page, "/marketplace");
 
     await marketplacePage.goto(page);
@@ -68,9 +69,12 @@ test.describe("Marketplace Creator Page – Basic Functionality", () => {
       await marketplacePage.getFirstCreatorProfile(page);
     await firstCreatorProfile.click();
     await page.waitForURL("**/marketplace/creator/**");
+    await page.waitForLoadState("networkidle").catch(() => {});
+
     const firstAgent = page
       .locator('[data-testid="store-card"]:visible')
       .first();
+    await firstAgent.waitFor({ state: "visible", timeout: 30000 });
 
     await firstAgent.click();
     await page.waitForURL("**/marketplace/agent/**");
diff --git a/autogpt_platform/frontend/src/tests/marketplace.spec.ts b/autogpt_platform/frontend/src/tests/marketplace.spec.ts
index 8bbc1cef90..44d89bf351 100644
--- a/autogpt_platform/frontend/src/tests/marketplace.spec.ts
+++ b/autogpt_platform/frontend/src/tests/marketplace.spec.ts
@@ -1,9 +1,10 @@
-import { test, expect } from "@playwright/test";
-import { MarketplacePage } from "./pages/marketplace.page";
+import { expect, test } from "@playwright/test";
+import { getTestUserWithLibraryAgents } from "./credentials";
 import { LoginPage } from "./pages/login.page";
-import { isVisible, hasUrl, hasMinCount, matchesUrl } from "./utils/assertion";
-import { TEST_CREDENTIALS } from "./credentials";
+import { MarketplacePage } from "./pages/marketplace.page";
+import { hasMinCount, hasUrl, isVisible, matchesUrl } from "./utils/assertion";
 
+// Marketplace tests for store agent search functionality
 test.describe("Marketplace – Basic Functionality", () => {
   test("User can access marketplace page when logged out", async ({ page }) => {
     const marketplacePage = new MarketplacePage(page);
@@ -24,7 +25,8 @@ test.describe("Marketplace – Basic Functionality", () => {
     const marketplacePage = new MarketplacePage(page);
 
     await loginPage.goto();
-    await loginPage.login(TEST_CREDENTIALS.email, TEST_CREDENTIALS.password);
+    const richUser = getTestUserWithLibraryAgents();
+    await loginPage.login(richUser.email, richUser.password);
     await hasUrl(page, "/marketplace");
 
     await marketplacePage.goto(page);
@@ -75,7 +77,6 @@ test.describe("Marketplace – Basic Functionality", () => {
 
     const firstFeaturedAgent =
       await marketplacePage.getFirstFeaturedAgent(page);
-    await firstFeaturedAgent.waitFor({ state: "visible" });
     await firstFeaturedAgent.click();
     await page.waitForURL("**/marketplace/agent/**");
     await matchesUrl(page, /\/marketplace\/agent\/.+/);
@@ -114,7 +115,15 @@ test.describe("Marketplace – Basic Functionality", () => {
     const searchTerm = page.getByText("DummyInput").first();
     await isVisible(searchTerm);
 
-    await page.waitForTimeout(10000);
+    await page.waitForLoadState("networkidle").catch(() => {});
+
+    await page
+      .waitForFunction(
+        () =>
+          document.querySelectorAll('[data-testid="store-card"]').length > 0,
+        { timeout: 15000 },
+      )
+      .catch(() => console.log("No search results appeared within timeout"));
 
     const results = await marketplacePage.getSearchResultsCount(page);
     expect(results).toBeGreaterThan(0);
diff --git a/autogpt_platform/frontend/src/tests/pages/library.page.ts b/autogpt_platform/frontend/src/tests/pages/library.page.ts
index c75fc51c93..03e98598b4 100644
--- a/autogpt_platform/frontend/src/tests/pages/library.page.ts
+++ b/autogpt_platform/frontend/src/tests/pages/library.page.ts
@@ -1,6 +1,6 @@
-import { BasePage } from "./base.page";
 import { Locator, Page } from "@playwright/test";
 import { getSelectors } from "../utils/selectors";
+import { BasePage } from "./base.page";
 
 export interface Agent {
   id: string;
@@ -109,7 +109,7 @@ export class LibraryPage extends BasePage {
 
   async openUploadDialog(): Promise<void> {
     console.log(`opening upload dialog`);
-    await this.page.getByRole("button", { name: "Upload an agent" }).click();
+    await this.page.getByRole("button", { name: "Upload agent" }).click();
 
     // Wait for dialog to appear
     await this.page.getByRole("dialog", { name: "Upload Agent" }).waitFor({
@@ -149,7 +149,7 @@ export class LibraryPage extends BasePage {
 
     // Fill description
     await this.page
-      .getByRole("textbox", { name: "Description" })
+      .getByRole("textbox", { name: "Agent description" })
       .fill(description);
   }
 
@@ -157,7 +157,7 @@ export class LibraryPage extends BasePage {
     console.log(`checking if upload button is enabled`);
     try {
       const uploadButton = this.page.getByRole("button", {
-        name: "Upload Agent",
+        name: "Upload",
       });
       return await uploadButton.isEnabled();
     } catch {
@@ -175,26 +175,32 @@ export class LibraryPage extends BasePage {
     const agentCards = await getId("library-agent-card").all();
 
     for (const card of agentCards) {
-      const name = await card.locator("h3").textContent();
-      const description = await card.locator("p").textContent();
-      const seeRunsLink = card.locator("a", { hasText: "See runs" });
-      const openInBuilderLink = card.locator("a", {
-        hasText: "Open in builder",
-      });
+      const name = await getId("library-agent-card-name", card).textContent();
+      const seeRunsLink = getId("library-agent-card-see-runs-link", card);
+      const openInBuilderLink = getId(
+        "library-agent-card-open-in-builder-link",
+        card,
+      );
 
       const seeRunsUrl = await seeRunsLink.getAttribute("href");
-      const openInBuilderUrl = await openInBuilderLink.getAttribute("href");
 
-      if (name && description && seeRunsUrl && openInBuilderUrl) {
+      // Check if the "Open in builder" link exists before getting its href
+      const openInBuilderLinkCount = await openInBuilderLink.count();
+      const openInBuilderUrl =
+        openInBuilderLinkCount > 0
+          ? await openInBuilderLink.getAttribute("href")
+          : null;
+
+      if (name && seeRunsUrl) {
         const idMatch = seeRunsUrl.match(/\/library\/agents\/([^\/]+)/);
         const id = idMatch ? idMatch[1] : "";
 
         agents.push({
           id,
           name: name.trim(),
-          description: description.trim(),
+          description: "", // Description is not currently rendered in the card
           seeRunsUrl,
-          openInBuilderUrl,
+          openInBuilderUrl: openInBuilderUrl || "",
         });
       }
     }
@@ -204,28 +210,36 @@ export class LibraryPage extends BasePage {
   }
 
   async clickAgent(agent: Agent): Promise<void> {
-    await this.page
-      .getByRole("heading", { name: agent.name, level: 3 })
-      .first()
-      .click();
+    const { getId } = getSelectors(this.page);
+    const nameElement = getId("library-agent-card-name").filter({
+      hasText: agent.name,
+    });
+    await nameElement.first().click();
   }
 
   async clickSeeRuns(agent: Agent): Promise<void> {
     console.log(`clicking see runs for agent: ${agent.name}`);
 
-    // Find the "See runs" link for this specific agent
-    const agentCard = this.page.locator(`[href="${agent.seeRunsUrl}"]`).first();
-    await agentCard.click();
+    const { getId } = getSelectors(this.page);
+    const agentCard = getId("library-agent-card").filter({
+      hasText: agent.name,
+    });
+    const seeRunsLink = getId("library-agent-card-see-runs-link", agentCard);
+    await seeRunsLink.first().click();
   }
 
   async clickOpenInBuilder(agent: Agent): Promise<void> {
     console.log(`clicking open in builder for agent: ${agent.name}`);
 
-    // Find the "Open in builder" link for this specific agent
-    const builderLink = this.page
-      .locator(`[href="${agent.openInBuilderUrl}"]`)
-      .first();
-    await builderLink.click();
+    const { getId } = getSelectors(this.page);
+    const agentCard = getId("library-agent-card").filter({
+      hasText: agent.name,
+    });
+    const builderLink = getId(
+      "library-agent-card-open-in-builder-link",
+      agentCard,
+    );
+    await builderLink.first().click();
   }
 
   async waitForAgentsToLoad(): Promise<void> {
@@ -286,21 +300,27 @@ export class LibraryPage extends BasePage {
   async scrollToLoadMore(): Promise<void> {
     console.log(`scrolling to load more agents`);
 
-    // Get initial agent count
-    const initialCount = await this.getAgentCount();
-    console.log(`Initial agent count: ${initialCount}`);
+    const initialCount = await this.getAgentCountByListLength();
+    console.log(`Initial agent count (DOM cards): ${initialCount}`);
 
-    // Scroll down to trigger pagination
     await this.scrollToBottom();
 
-    // Wait for potential new agents to load
-    await this.page.waitForTimeout(2000);
+    await this.page
+      .waitForLoadState("networkidle", { timeout: 10000 })
+      .catch(() => console.log("Network idle timeout, continuing..."));
 
-    // Check if more agents loaded
-    const newCount = await this.getAgentCount();
-    console.log(`New agent count after scroll: ${newCount}`);
+    await this.page
+      .waitForFunction(
+        (prevCount) =>
+          document.querySelectorAll('[data-testid="library-agent-card"]')
+            .length > prevCount,
+        initialCount,
+        { timeout: 5000 },
+      )
+      .catch(() => {});
 
-    return;
+    const newCount = await this.getAgentCountByListLength();
+    console.log(`New agent count after scroll (DOM cards): ${newCount}`);
   }
 
   async testPagination(): Promise<{
@@ -359,9 +379,9 @@ export class LibraryPage extends BasePage {
     let previousCount = 0;
     let currentCount = 0;
     let stableChecks = 0;
-    const maxChecks = 10;
+    const maxChecks = 5; // Reduced from 10 to prevent excessive waiting
 
-    while (stableChecks < 3 && stableChecks < maxChecks) {
+    while (stableChecks < 2 && stableChecks < maxChecks) {
       currentCount = await this.getAgentCount();
 
       if (currentCount === previousCount) {
@@ -371,7 +391,10 @@ export class LibraryPage extends BasePage {
       }
 
       previousCount = currentCount;
-      await this.page.waitForTimeout(500);
+      if (stableChecks < 2) {
+        // Only wait if we haven't stabilized yet
+        await this.page.waitForTimeout(500);
+      }
     }
 
     console.log(`Pagination load stabilized with ${currentCount} agents`);
@@ -433,21 +456,72 @@ export async function navigateToAgentByName(
   agentName: string,
 ): Promise<void> {
   const agentCard = getAgentCards(page).filter({ hasText: agentName }).first();
+  // Wait for the agent card to be visible before clicking
+  // This handles async loading of agents after page navigation
+  await agentCard.waitFor({ state: "visible", timeout: 15000 });
   await agentCard.click();
 }
 
 export async function clickRunButton(page: Page): Promise<void> {
   const { getId } = getSelectors(page);
+
+  // Wait for page to stabilize and buttons to render
+  // The NewAgentLibraryView shows either "Setup your task" (empty state)
+  // or "New task" (with items) button
+  const setupTaskButton = page.getByRole("button", {
+    name: /Setup your task/i,
+  });
+  const newTaskButton = page.getByRole("button", { name: /New task/i });
   const runButton = getId("agent-run-button");
   const runAgainButton = getId("run-again-button");
 
+  // Use Promise.race with waitFor to wait for any of the buttons to appear
+  // This handles the async rendering in CI environments
+  try {
+    await Promise.race([
+      setupTaskButton.waitFor({ state: "visible", timeout: 15000 }),
+      newTaskButton.waitFor({ state: "visible", timeout: 15000 }),
+      runButton.waitFor({ state: "visible", timeout: 15000 }),
+      runAgainButton.waitFor({ state: "visible", timeout: 15000 }),
+    ]);
+  } catch {
+    throw new Error(
+      "Could not find run/start task button - none of the expected buttons appeared",
+    );
+  }
+
+  // Now check which button is visible and click it
+  if (await setupTaskButton.isVisible()) {
+    await setupTaskButton.click();
+    const startTaskButton = page
+      .getByRole("button", { name: /Start Task/i })
+      .first();
+    await startTaskButton.waitFor({ state: "visible", timeout: 10000 });
+    await startTaskButton.click();
+    return;
+  }
+
+  if (await newTaskButton.isVisible()) {
+    await newTaskButton.click();
+    const startTaskButton = page
+      .getByRole("button", { name: /Start Task/i })
+      .first();
+    await startTaskButton.waitFor({ state: "visible", timeout: 10000 });
+    await startTaskButton.click();
+    return;
+  }
+
   if (await runButton.isVisible()) {
     await runButton.click();
-  } else if (await runAgainButton.isVisible()) {
-    await runAgainButton.click();
-  } else {
-    throw new Error("Neither run button nor run again button is visible");
+    return;
   }
+
+  if (await runAgainButton.isVisible()) {
+    await runAgainButton.click();
+    return;
+  }
+
+  throw new Error("Could not find run/start task button");
 }
 
 export async function clickNewRunButton(page: Page): Promise<void> {
diff --git a/autogpt_platform/frontend/src/tests/pages/login.page.ts b/autogpt_platform/frontend/src/tests/pages/login.page.ts
index 9082cc6219..adcb8d908b 100644
--- a/autogpt_platform/frontend/src/tests/pages/login.page.ts
+++ b/autogpt_platform/frontend/src/tests/pages/login.page.ts
@@ -37,9 +37,13 @@ export class LoginPage {
     this.page.on("load", (page) => console.log(`ℹ️ Now at URL: ${page.url()}`));
 
     // Start waiting for navigation before clicking
+    // Wait for redirect to marketplace, onboarding, library, or copilot (new landing pages)
     const leaveLoginPage = this.page
       .waitForURL(
-        (url) => /^\/(marketplace|onboarding(\/.*)?)?$/.test(url.pathname),
+        (url: URL) =>
+          /^\/(marketplace|onboarding(\/.*)?|library|copilot)?$/.test(
+            url.pathname,
+          ),
         { timeout: 10_000 },
       )
       .catch((reason) => {
diff --git a/autogpt_platform/frontend/src/tests/pages/marketplace.page.ts b/autogpt_platform/frontend/src/tests/pages/marketplace.page.ts
index 20f60c371a..115a7b2f12 100644
--- a/autogpt_platform/frontend/src/tests/pages/marketplace.page.ts
+++ b/autogpt_platform/frontend/src/tests/pages/marketplace.page.ts
@@ -9,6 +9,7 @@ export class MarketplacePage extends BasePage {
 
   async goto(page: Page) {
     await page.goto("/marketplace");
+    await page.waitForLoadState("networkidle").catch(() => {});
   }
 
   async getMarketplaceTitle(page: Page) {
@@ -109,16 +110,24 @@ export class MarketplacePage extends BasePage {
 
   async getFirstFeaturedAgent(page: Page) {
     const { getId } = getSelectors(page);
-    return getId("featured-store-card").first();
+    const card = getId("featured-store-card").first();
+    await card.waitFor({ state: "visible", timeout: 30000 });
+    return card;
   }
 
   async getFirstTopAgent() {
-    return this.page.locator('[data-testid="store-card"]:visible').first();
+    const card = this.page
+      .locator('[data-testid="store-card"]:visible')
+      .first();
+    await card.waitFor({ state: "visible", timeout: 30000 });
+    return card;
   }
 
   async getFirstCreatorProfile(page: Page) {
     const { getId } = getSelectors(page);
-    return getId("creator-card").first();
+    const card = getId("creator-card").first();
+    await card.waitFor({ state: "visible", timeout: 30000 });
+    return card;
   }
 
   async getSearchResultsCount(page: Page) {
diff --git a/autogpt_platform/frontend/src/tests/profile-form.spec.ts b/autogpt_platform/frontend/src/tests/profile-form.spec.ts
index 1fc1008e9c..e9b018858f 100644
--- a/autogpt_platform/frontend/src/tests/profile-form.spec.ts
+++ b/autogpt_platform/frontend/src/tests/profile-form.spec.ts
@@ -1,8 +1,8 @@
 import test, { expect } from "@playwright/test";
-import { ProfileFormPage } from "./pages/profile-form.page";
+import { getTestUserWithLibraryAgents } from "./credentials";
 import { LoginPage } from "./pages/login.page";
+import { ProfileFormPage } from "./pages/profile-form.page";
 import { hasUrl } from "./utils/assertion";
-import { TEST_CREDENTIALS } from "./credentials";
 
 test.describe("Profile Form", () => {
   let profileFormPage: ProfileFormPage;
@@ -12,7 +12,8 @@ test.describe("Profile Form", () => {
 
     const loginPage = new LoginPage(page);
     await loginPage.goto();
-    await loginPage.login(TEST_CREDENTIALS.email, TEST_CREDENTIALS.password);
+    const richUser = getTestUserWithLibraryAgents();
+    await loginPage.login(richUser.email, richUser.password);
     await hasUrl(page, "/marketplace");
   });
 
diff --git a/autogpt_platform/frontend/src/tests/publish-agent.spec.ts b/autogpt_platform/frontend/src/tests/publish-agent.spec.ts
index 42cdee5536..6e1811e25d 100644
--- a/autogpt_platform/frontend/src/tests/publish-agent.spec.ts
+++ b/autogpt_platform/frontend/src/tests/publish-agent.spec.ts
@@ -1,7 +1,6 @@
 import test from "@playwright/test";
+import { getTestUserWithLibraryAgents } from "./credentials";
 import { LoginPage } from "./pages/login.page";
-import { TEST_CREDENTIALS } from "./credentials";
-import { getSelectors } from "./utils/selectors";
 import {
   hasUrl,
   isDisabled,
@@ -9,6 +8,7 @@ import {
   isHidden,
   isVisible,
 } from "./utils/assertion";
+import { getSelectors } from "./utils/selectors";
 
 test("user can publish an agent through the complete flow", async ({
   page,
@@ -17,7 +17,8 @@ test("user can publish an agent through the complete flow", async ({
 
   const loginPage = new LoginPage(page);
   await page.goto("/login");
-  await loginPage.login(TEST_CREDENTIALS.email, TEST_CREDENTIALS.password);
+  const richUser = getTestUserWithLibraryAgents();
+  await loginPage.login(richUser.email, richUser.password);
   await hasUrl(page, "/marketplace");
 
   await page.goto("/marketplace");
@@ -95,7 +96,8 @@ test("should validate all form fields in publish agent form", async ({
 
   const loginPage = new LoginPage(page);
   await page.goto("/login");
-  await loginPage.login(TEST_CREDENTIALS.email, TEST_CREDENTIALS.password);
+  const richUser = getTestUserWithLibraryAgents();
+  await loginPage.login(richUser.email, richUser.password);
   await hasUrl(page, "/marketplace");
 
   await page.goto("/marketplace");
diff --git a/autogpt_platform/frontend/src/tests/signin.spec.ts b/autogpt_platform/frontend/src/tests/signin.spec.ts
index 0f36006c4d..8582ce8b3a 100644
--- a/autogpt_platform/frontend/src/tests/signin.spec.ts
+++ b/autogpt_platform/frontend/src/tests/signin.spec.ts
@@ -172,7 +172,7 @@ test("multi-tab logout with WebSocket cleanup", async ({ context }) => {
   await page2.close();
 });
 
-test("logged in user is redirected from /login to /marketplace", async ({
+test("logged in user is redirected from /login to /library", async ({
   page,
 }) => {
   const testUser = await getTestUser();
@@ -182,10 +182,10 @@ test("logged in user is redirected from /login to /marketplace", async ({
   await hasUrl(page, "/marketplace");
 
   await page.goto("/login");
-  await hasUrl(page, "/marketplace");
+  await hasUrl(page, "/library?sort=updatedAt");
 });
 
-test("logged in user is redirected from /signup to /marketplace", async ({
+test("logged in user is redirected from /signup to /library", async ({
   page,
 }) => {
   const testUser = await getTestUser();
@@ -195,5 +195,5 @@ test("logged in user is redirected from /signup to /marketplace", async ({
   await hasUrl(page, "/marketplace");
 
   await page.goto("/signup");
-  await hasUrl(page, "/marketplace");
+  await hasUrl(page, "/library?sort=updatedAt");
 });
diff --git a/autogpt_platform/frontend/src/tests/utils/signup.ts b/autogpt_platform/frontend/src/tests/utils/signup.ts
index 7c8fdbe01b..192a9129b9 100644
--- a/autogpt_platform/frontend/src/tests/utils/signup.ts
+++ b/autogpt_platform/frontend/src/tests/utils/signup.ts
@@ -36,14 +36,16 @@ export async function signupTestUser(
     const signupButton = getButton("Sign up");
     await signupButton.click();
 
-    // Wait for successful signup - could redirect to onboarding or marketplace
+    // Wait for successful signup - could redirect to various pages depending on onboarding state
 
     try {
-      // Wait for either onboarding or marketplace redirect
-      await Promise.race([
-        page.waitForURL(/\/onboarding/, { timeout: 15000 }),
-        page.waitForURL(/\/marketplace/, { timeout: 15000 }),
-      ]);
+      // Wait for redirect to onboarding, marketplace, copilot, or library
+      // Use a single waitForURL with a callback to avoid Promise.race race conditions
+      await page.waitForURL(
+        (url: URL) =>
+          /\/(onboarding|marketplace|copilot|library)/.test(url.pathname),
+        { timeout: 15000 },
+      );
     } catch (error) {
       console.error(
         "❌ Timeout waiting for redirect, current URL:",
@@ -54,14 +56,19 @@ export async function signupTestUser(
 
     const currentUrl = page.url();
 
-    // Handle onboarding or marketplace redirect
+    // Handle onboarding redirect if needed
     if (currentUrl.includes("/onboarding") && ignoreOnboarding) {
       await page.goto("http://localhost:3000/marketplace");
       await page.waitForLoadState("domcontentloaded", { timeout: 10000 });
     }
 
-    // Verify we're on the expected final page
-    if (ignoreOnboarding || currentUrl.includes("/marketplace")) {
+    // Verify we're on an expected final page and user is authenticated
+    if (currentUrl.includes("/copilot") || currentUrl.includes("/library")) {
+      // For copilot/library landing pages, just verify user is authenticated
+      await page
+        .getByTestId("profile-popout-menu-trigger")
+        .waitFor({ state: "visible", timeout: 10000 });
+    } else if (ignoreOnboarding || currentUrl.includes("/marketplace")) {
       // Verify we're on marketplace
       await page
         .getByText(
diff --git a/autogpt_platform/frontend/tailwind.config.ts b/autogpt_platform/frontend/tailwind.config.ts
index ab3ea9bc74..1adc53bdc4 100644
--- a/autogpt_platform/frontend/tailwind.config.ts
+++ b/autogpt_platform/frontend/tailwind.config.ts
@@ -22,13 +22,7 @@ const config = {
         poppins: ["var(--font-poppins)"],
       },
       colors: {
-        // *** APPROVED DESIGN SYSTEM COLORS ***
-        // These are the ONLY colors that should be used in our app
         ...colors,
-
-        // Legacy colors - DO NOT USE THESE IN NEW CODE
-        // These are kept only to prevent breaking existing styles
-        // Use the approved design system colors above instead
         border: "hsl(var(--border))",
         input: "hsl(var(--input))",
         ring: "hsl(var(--ring))",
@@ -63,70 +57,66 @@ const config = {
           foreground: "hsl(var(--card-foreground))",
         },
         customGray: {
-          100: "#d9d9d9",
-          200: "#a8a8a8",
-          300: "#878787",
-          400: "#646464",
-          500: "#474747",
-          600: "#282828",
-          700: "#272727",
+          "100": "#d9d9d9",
+          "200": "#a8a8a8",
+          "300": "#878787",
+          "400": "#646464",
+          "500": "#474747",
+          "600": "#282828",
+          "700": "#272727",
         },
       },
       spacing: {
-        // Tailwind spacing + custom sizes
-        0: "0rem", // 0px
-        0.5: "0.125rem", // 2px
-        1: "0.25rem", // 4px
-        1.5: "0.375rem", // 6px
-        2: "0.5rem", // 8px
-        2.5: "0.625rem", // 10px
-        3: "0.75rem", // 12px
-        3.5: "0.875rem", // 14px
-        4: "1rem", // 16px
-        5: "1.25rem", // 20px
-        6: "1.5rem", // 24px
-        7: "1.75rem", // 28px
-        7.5: "1.875rem", // 30px
-        8: "2rem", // 32px
-        8.5: "2.125rem", // 34px
-        9: "2.25rem", // 36px
-        10: "2.5rem", // 40px
-        11: "2.75rem", // 44px
-        12: "3rem", // 48px
-        14: "3.5rem", // 56px
-        16: "4rem", // 64px
-        18: "4.5rem", // 72px
-        20: "5rem", // 80px
-        24: "6rem", // 96px
-        28: "7rem", // 112px
-        32: "8rem", // 128px
-        36: "9rem", // 144px
-        40: "10rem", // 160px
-        44: "11rem", // 176px
-        48: "12rem", // 192px
-        52: "13rem", // 208px
-        56: "14rem", // 224px
-        60: "15rem", // 240px
-        64: "16rem", // 256px
-        68: "17rem", // 272px
-        70: "17.5rem", // 280px
-        71: "17.75rem", // 284px
-        72: "18rem", // 288px
-        76: "19rem", // 304px
-        80: "20rem", // 320px
-        96: "24rem", // 384px
+        "0": "0rem",
+        "1": "0.25rem",
+        "2": "0.5rem",
+        "3": "0.75rem",
+        "4": "1rem",
+        "5": "1.25rem",
+        "6": "1.5rem",
+        "7": "1.75rem",
+        "8": "2rem",
+        "9": "2.25rem",
+        "10": "2.5rem",
+        "11": "2.75rem",
+        "12": "3rem",
+        "14": "3.5rem",
+        "16": "4rem",
+        "18": "4.5rem",
+        "20": "5rem",
+        "24": "6rem",
+        "28": "7rem",
+        "32": "8rem",
+        "36": "9rem",
+        "40": "10rem",
+        "44": "11rem",
+        "48": "12rem",
+        "52": "13rem",
+        "56": "14rem",
+        "60": "15rem",
+        "64": "16rem",
+        "68": "17rem",
+        "70": "17.5rem",
+        "71": "17.75rem",
+        "72": "18rem",
+        "76": "19rem",
+        "80": "20rem",
+        "96": "24rem",
+        "0.5": "0.125rem",
+        "1.5": "0.375rem",
+        "2.5": "0.625rem",
+        "3.5": "0.875rem",
+        "7.5": "1.875rem",
+        "8.5": "2.125rem",
       },
       borderRadius: {
-        // Design system border radius tokens from Figma
-        xsmall: "0.25rem", // 4px
-        small: "0.5rem", // 8px
-        medium: "0.75rem", // 12px
-        large: "1rem", // 16px
-        xlarge: "1.25rem", // 20px
-        "2xlarge": "1.5rem", // 24px
-        full: "9999px", // For pill buttons
-
-        // Legacy values - kept for backward compatibility
+        xsmall: "0.25rem",
+        small: "0.5rem",
+        medium: "0.75rem",
+        large: "1rem",
+        xlarge: "1.25rem",
+        "2xlarge": "1.5rem",
+        full: "9999px",
         lg: "var(--radius)",
         md: "calc(var(--radius) - 2px)",
         sm: "calc(var(--radius) - 4px)",
@@ -136,22 +126,52 @@ const config = {
       },
       keyframes: {
         "accordion-down": {
-          from: { height: "0" },
-          to: { height: "var(--radix-accordion-content-height)" },
+          from: {
+            height: "0",
+          },
+          to: {
+            height: "var(--radix-accordion-content-height)",
+          },
         },
         "accordion-up": {
-          from: { height: "var(--radix-accordion-content-height)" },
-          to: { height: "0" },
+          from: {
+            height: "var(--radix-accordion-content-height)",
+          },
+          to: {
+            height: "0",
+          },
         },
         "fade-in": {
-          "0%": { opacity: "0" }, // Start with opacity 0
-          "100%": { opacity: "1" }, // End with opacity 1
+          "0%": {
+            opacity: "0",
+          },
+          "100%": {
+            opacity: "1",
+          },
+        },
+        shimmer: {
+          "0%": {
+            backgroundPosition: "200% 0",
+          },
+          "100%": {
+            backgroundPosition: "-200% 0",
+          },
+        },
+        loader: {
+          "0%": {
+            boxShadow: "0 0 0 0 rgba(0, 0, 0, 0.25)",
+          },
+          "100%": {
+            boxShadow: "0 0 0 30px rgba(0, 0, 0, 0)",
+          },
         },
       },
       animation: {
         "accordion-down": "accordion-down 0.2s ease-out",
         "accordion-up": "accordion-up 0.2s ease-out",
         "fade-in": "fade-in 0.2s ease-out",
+        shimmer: "shimmer 2s ease-in-out infinite",
+        loader: "loader 1s infinite",
       },
       transitionDuration: {
         "2000": "2000ms",
diff --git a/autogpt_platform/frontend/vitest.config.mts b/autogpt_platform/frontend/vitest.config.mts
new file mode 100644
index 0000000000..50049874fc
--- /dev/null
+++ b/autogpt_platform/frontend/vitest.config.mts
@@ -0,0 +1,12 @@
+import { defineConfig } from "vitest/config";
+import react from "@vitejs/plugin-react";
+import tsconfigPaths from "vite-tsconfig-paths";
+
+export default defineConfig({
+  plugins: [tsconfigPaths(), react()],
+  test: {
+    environment: "happy-dom",
+    include: ["src/**/*.test.tsx"],
+    setupFiles: ["./src/tests/integrations/vitest.setup.tsx"],
+  },
+});
diff --git a/classic/frontend/.gitignore b/classic/frontend/.gitignore
index 036283f834..eb060615c5 100644
--- a/classic/frontend/.gitignore
+++ b/classic/frontend/.gitignore
@@ -8,6 +8,7 @@
 .buildlog/
 .history
 .svn/
+.next/
 migrate_working_dir/
 
 # IntelliJ related
diff --git a/docs/CLAUDE.md b/docs/CLAUDE.md
new file mode 100644
index 0000000000..67cb1fc4f3
--- /dev/null
+++ b/docs/CLAUDE.md
@@ -0,0 +1,44 @@
+# Documentation Guidelines
+
+## Block Documentation Manual Sections
+
+When updating manual sections (`<!-- MANUAL: ... -->`) in block documentation files (e.g., `docs/integrations/basic.md`), follow these formats:
+
+### How It Works Section
+
+Provide a technical explanation of how the block functions:
+- Describe the processing logic in 1-2 paragraphs
+- Mention any validation, error handling, or edge cases
+- Use code examples with backticks when helpful (e.g., `[[1, 2], [3, 4]]` becomes `[1, 2, 3, 4]`)
+
+Example:
+```markdown
+<!-- MANUAL: how_it_works -->
+The block iterates through each list in the input and extends a result list with all elements from each one. It processes lists in order, so `[[1, 2], [3, 4]]` becomes `[1, 2, 3, 4]`.
+
+The block includes validation to ensure each item is actually a list. If a non-list value is encountered, the block outputs an error message instead of proceeding.
+<!-- END MANUAL -->
+```
+
+### Use Case Section
+
+Provide 3 practical use cases in this format:
+- **Bold Heading**: Short one-sentence description
+
+Example:
+```markdown
+<!-- MANUAL: use_case -->
+**Paginated API Merging**: Combine results from multiple API pages into a single list for batch processing or display.
+
+**Parallel Task Aggregation**: Merge outputs from parallel workflow branches that each produce a list of results.
+
+**Multi-Source Data Collection**: Combine data collected from different sources (like multiple RSS feeds or API endpoints) into one unified list.
+<!-- END MANUAL -->
+```
+
+### Style Guidelines
+
+- Keep descriptions concise and action-oriented
+- Focus on practical, real-world scenarios
+- Use consistent terminology with other blocks
+- Avoid overly technical jargon unless necessary
diff --git a/docs/_javascript/mathjax.js b/docs/_javascript/mathjax.js
deleted file mode 100644
index a80ddbff75..0000000000
--- a/docs/_javascript/mathjax.js
+++ /dev/null
@@ -1,16 +0,0 @@
-window.MathJax = {
-    tex: {
-        inlineMath: [["\\(", "\\)"]],
-        displayMath: [["\\[", "\\]"]],
-        processEscapes: true,
-        processEnvironments: true
-    },
-    options: {
-        ignoreHtmlClass: ".*|",
-        processHtmlClass: "arithmatex"
-    }
-};
-
-document$.subscribe(() => {
-    MathJax.typesetPromise()
-})
\ No newline at end of file
diff --git a/docs/_javascript/tablesort.js b/docs/_javascript/tablesort.js
deleted file mode 100644
index ee04e90082..0000000000
--- a/docs/_javascript/tablesort.js
+++ /dev/null
@@ -1,6 +0,0 @@
-document$.subscribe(function () {
-    var tables = document.querySelectorAll("article table:not([class])")
-    tables.forEach(function (table) {
-        new Tablesort(table)
-    })
-})
\ No newline at end of file
diff --git a/docs/content/contribute/index.md b/docs/content/contribute/index.md
index 4cce72aacf..3b458a04df 100644
--- a/docs/content/contribute/index.md
+++ b/docs/content/contribute/index.md
@@ -1,48 +1,35 @@
 # Contributing to the Docs
 
-We welcome contributions to our documentation! If you would like to contribute, please follow the steps below.
+We welcome contributions to our documentation! Our docs are hosted on GitBook and synced with GitHub.
 
-## Setting up the Docs
+## How It Works
 
-1. Clone the repository:
+- Documentation lives in the `docs/` directory on the `gitbook` branch
+- GitBook automatically syncs changes from GitHub
+- You can edit docs directly on GitHub or locally
+
+## Editing Docs Locally
+
+1. Clone the repository and switch to the gitbook branch:
 
     ```shell
-    git clone github.com/Significant-Gravitas/AutoGPT.git
+    git clone https://github.com/Significant-Gravitas/AutoGPT.git
+    cd AutoGPT
+    git checkout gitbook
     ```
 
-1. Install the dependencies:
+2. Make your changes to markdown files in `docs/`
 
-    ```shell
-    python -m pip install -r docs/requirements.txt
-    ```
+3. Preview changes:
+   - Push to a branch and create a PR - GitBook will generate a preview
+   - Or use any markdown preview tool locally
 
-    or
+## Adding a New Page
 
-    ```shell
-    python3 -m pip install -r docs/requirements.txt
-    ```
-
-1. Start iterating using mkdocs' live server:
-
-    ```shell
-    mkdocs serve
-    ```
-
-1. Open your browser and navigate to `http://127.0.0.1:8000`.
-
-1. The server will automatically reload the docs when you save your changes.
-
-## Adding a new page
-
-1. Create a new markdown file in the `docs/content` directory.
-1. Add the new page to the `nav` section in the `mkdocs.yml` file.
-1. Add the content to the new markdown file.
-1. Run `mkdocs serve` to see your changes.
-
-## Checking links
-
-To check for broken links in the documentation, run `mkdocs build` and look for warnings in the console output.
+1. Create a new markdown file in the appropriate `docs/` subdirectory
+2. Add the new page to the relevant `SUMMARY.md` file to include it in the navigation
+3. Submit a pull request to the `gitbook` branch
 
 ## Submitting a Pull Request
 
-When you're ready to submit your changes, please create a pull request. We will review your changes and merge them if they are appropriate.
+When you're ready to submit your changes, create a pull request targeting the `gitbook` branch. We will review your changes and merge them if appropriate.
diff --git a/docs/content/platform/blocks/basic.md b/docs/content/platform/blocks/basic.md
deleted file mode 100644
index a2df3badc1..0000000000
--- a/docs/content/platform/blocks/basic.md
+++ /dev/null
@@ -1,223 +0,0 @@
-# Basic Operations Blocks
-
-## Store Value
-
-### What it is
-A basic block that stores and forwards a value.
-
-### What it does
-This block takes an input value and stores it, allowing it to be reused without changes.
-
-### How it works
-It accepts an input value and optionally a data value. If a data value is provided, it is used as the output. Otherwise, the input value is used as the output.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Input | The value to be stored or forwarded |
-| Data | An optional constant value to be stored instead of the input |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Output | The stored value (either the input or the data) |
-
-### Possible use case
-Storing a user's name at the beginning of a workflow to use it in multiple subsequent blocks without asking for it again.
-
----
-
-## Print to Console
-
-### What it is
-A basic block that prints text to the console for debugging purposes.
-
-### What it does
-This block takes a text input and prints it to the console, then outputs a status message.
-
-### How it works
-It receives a text input, prints it to the console with a "Print: " prefix, and then yields a "printed" status.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Text | The text to be printed to the console |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Status | A message indicating that the text was printed ("printed") |
-
-### Possible use case
-Debugging a workflow by printing intermediate results or messages at various stages.
-
----
-
-## Find in Dictionary
-
-### What it is
-A basic block that looks up a value in a dictionary, object, or list using a given key.
-
-### What it does
-This block searches for a specified key in the input data structure and returns the corresponding value if found.
-
-### How it works
-It accepts an input (dictionary, object, or list) and a key. It then attempts to find the key in the input and return the corresponding value. If the key is not found, it returns the entire input as "missing".
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Input | The dictionary, object, or list to search in |
-| Key | The key to look up in the input |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Output | The value found for the given key |
-| Missing | The entire input if the key was not found |
-
-### Possible use case
-Extracting specific information from a complex data structure, such as finding a user's email address in a user profile dictionary.
-
----
-
-## Agent Input
-
-### What it is
-An input block that provides a way to accept user input in a workflow.
-
-### What it does
-This block allows users to input values into the workflow, with options for naming, describing, and setting placeholder values.
-
-### How it works
-It accepts a value from the user, along with metadata such as name, description, and optional placeholder values. The block then outputs the provided value.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Value | The actual input value provided by the user |
-| Name | A name for the input field |
-| Description | An optional description of the input |
-| Placeholder Values | Optional list of suggested values |
-| Limit to Placeholder Values | Option to restrict input to placeholder values only |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Result | The value provided as input |
-
-### Possible use case
-Collecting user preferences at the start of a personalized recommendation workflow.
-
----
-
-## Agent Output
-
-### What it is
-An output block that records and formats the final results of a workflow.
-
-### What it does
-This block takes a value and associated metadata, optionally formats it, and presents it as the output of the workflow.
-
-### How it works
-It accepts an input value along with a name, description, and optional format string. If a format string is provided, it attempts to apply the formatting to the input value before outputting it.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Value | The value to be recorded as output |
-| Name | A name for the output |
-| Description | An optional description of the output |
-| Format | An optional format string to apply to the value |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Output | The formatted (if applicable) output value |
-
-### Possible use case
-Presenting the final results of a data analysis workflow in a specific format.
-
----
-
-## Add to Dictionary
-
-### What it is
-A basic block that adds a new key-value pair to a dictionary.
-
-### What it does
-This block takes an existing dictionary (or creates a new one), a key, and a value, and adds the key-value pair to the dictionary.
-
-### How it works
-It accepts an optional input dictionary, a key, and a value. If no dictionary is provided, it creates a new one. It then adds the key-value pair to the dictionary and returns the updated dictionary.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Dictionary | An optional existing dictionary to add to |
-| Key | The key for the new entry |
-| Value | The value for the new entry |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Updated Dictionary | The dictionary with the new entry added |
-| Error | An error message if the operation fails |
-
-### Possible use case
-Building a user profile by gradually adding new information as it's collected throughout a workflow.
-
----
-
-## Add to List
-
-### What it is
-A basic block that adds a new entry to a list.
-
-### What it does
-This block takes an existing list (or creates a new one) and adds a new entry to it, optionally at a specified position.
-
-### How it works
-It accepts an optional input list, an entry to add, and an optional position. If no list is provided, it creates a new one. It then adds the entry to the list at the specified position (or at the end if no position is given) and returns the updated list.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| List | An optional existing list to add to |
-| Entry | The new item to add to the list |
-| Position | An optional position to insert the new entry |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Updated List | The list with the new entry added |
-| Error | An error message if the operation fails |
-
-### Possible use case
-Maintaining a to-do list in a task management workflow, where new tasks can be added at specific priorities (positions).
-
----
-
-## Note
-
-### What it is
-A basic block that displays a sticky note with custom text.
-
-### What it does
-This block takes a text input and displays it as a sticky note in the workflow interface.
-
-### How it works
-It simply accepts a text input and passes it through as an output to be displayed as a note.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Text | The text to display in the sticky note |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Output | The text to display in the sticky note |
-
-### Possible use case
-Adding explanatory notes or reminders within a complex workflow to help users understand different stages or provide additional context.
\ No newline at end of file
diff --git a/docs/content/platform/blocks/blocks.md b/docs/content/platform/blocks/blocks.md
deleted file mode 100644
index 146454f143..0000000000
--- a/docs/content/platform/blocks/blocks.md
+++ /dev/null
@@ -1,206 +0,0 @@
-# AutoGPT Blocks Overview
-
-AutoGPT uses a modular approach with various "blocks" to handle different tasks. These blocks are the building blocks of AutoGPT workflows, allowing users to create complex automations by combining simple, specialized components.
-
-!!! info "Creating Your Own Blocks"
-    Want to create your own custom blocks? Check out our guides:
-    
-    - [Build your own Blocks](../new_blocks.md) - Step-by-step tutorial with examples
-    - [Block SDK Guide](../block-sdk-guide.md) - Advanced SDK patterns with OAuth, webhooks, and provider configuration
-
-Below is a comprehensive list of all available blocks, categorized by their primary function. Click on any block name to view its detailed documentation.
-
-## Basic Operations
-| Block Name | Description |
-|------------|-------------|
-| [Store Value](basic.md#store-value) | Stores and forwards a value |
-| [Print to Console](basic.md#print-to-console) | Outputs text to the console for debugging |
-| [Find in Dictionary](basic.md#find-in-dictionary) | Looks up a value in a dictionary or list |
-| [Agent Input](basic.md#agent-input) | Accepts user input in a workflow |
-| [Agent Output](basic.md#agent-output) | Records and formats workflow results |
-| [Add to Dictionary](basic.md#add-to-dictionary) | Adds a new key-value pair to a dictionary |
-| [Add to List](basic.md#add-to-list) | Adds a new entry to a list |
-| [Note](basic.md#note) | Displays a sticky note in the workflow |
-
-## Data Processing
-| Block Name | Description |
-|------------|-------------|
-| [Read CSV](csv.md#read-csv) | Processes and extracts data from CSV files |
-| [Data Sampling](sampling.md#data-sampling) | Selects a subset of data using various sampling methods |
-
-## Text Processing
-| Block Name | Description |
-|------------|-------------|
-| [Match Text Pattern](text.md#match-text-pattern) | Checks if text matches a specified pattern |
-| [Extract Text Information](text.md#extract-text-information) | Extracts specific information from text using patterns |
-| [Fill Text Template](text.md#fill-text-template) | Populates a template with provided values |
-| [Combine Texts](text.md#combine-texts) | Merges multiple text inputs into one |
-| [Text Decoder](decoder_block.md#text-decoder) | Converts encoded text into readable format |
-
-## AI and Language Models
-| Block Name | Description |
-|------------|-------------|
-| [AI Structured Response Generator](llm.md#ai-structured-response-generator) | Generates structured responses using LLMs |
-| [AI Text Generator](llm.md#ai-text-generator) | Produces text responses using LLMs |
-| [AI Text Summarizer](llm.md#ai-text-summarizer) | Summarizes long texts using LLMs |
-| [AI Conversation](llm.md#ai-conversation) | Facilitates multi-turn conversations with LLMs |
-| [AI List Generator](llm.md#ai-list-generator) | Creates lists based on prompts using LLMs |
-
-## Web and API Interactions
-| Block Name | Description |
-|------------|-------------|
-| [Send Web Request](http.md#send-web-request) | Makes HTTP requests to specified web addresses |
-| [Read RSS Feed](rss.md#read-rss-feed) | Retrieves and processes entries from RSS feeds |
-| [Get Weather Information](search.md#get-weather-information) | Fetches current weather data for a location |
-| [Google Maps Search](google_maps.md#google-maps-search) | Searches for local businesses using Google Maps API |
-
-## Social Media and Content
-| Block Name | Description |
-|------------|-------------|
-| [Get Reddit Posts](reddit.md#get-reddit-posts) | Retrieves posts from specified subreddits |
-| [Post Reddit Comment](reddit.md#post-reddit-comment) | Posts comments on Reddit |
-| [Publish to Medium](medium.md#publish-to-medium) | Publishes content directly to Medium |
-| [Read Discord Messages](discord.md#read-discord-messages) | Retrieves messages from Discord channels |
-| [Send Discord Message](discord.md#send-discord-message) | Sends messages to Discord channels |
-
-## Search and Information Retrieval
-| Block Name | Description |
-|------------|-------------|
-| [Get Wikipedia Summary](search.md#get-wikipedia-summary) | Fetches summaries of topics from Wikipedia |
-| [Search The Web](search.md#search-the-web) | Performs web searches and returns results |
-| [Extract Website Content](search.md#extract-website-content) | Retrieves and extracts content from websites |
-
-## Time and Date
-| Block Name | Description |
-|------------|-------------|
-| [Get Current Time](time_blocks.md#get-current-time) | Provides the current time |
-| [Get Current Date](time_blocks.md#get-current-date) | Provides the current date |
-| [Get Current Date and Time](time_blocks.md#get-current-date-and-time) | Provides both current date and time |
-| [Countdown Timer](time_blocks.md#countdown-timer) | Acts as a countdown timer |
-
-## Math and Calculations
-| Block Name | Description |
-|------------|-------------|
-| [Calculator](maths.md#calculator) | Performs basic mathematical operations |
-| [Count Items](maths.md#count-items) | Counts items in a collection |
-
-## Media Generation
-| Block Name | Description |
-|------------|-------------|
-| [Ideogram Model](ideogram.md#ideogram-model) | Generates images based on text prompts |
-| [Create Talking Avatar Video](talking_head.md#create-talking-avatar-video) | Creates videos with talking avatars |
-| [Unreal Text to Speech](text_to_speech_block.md#unreal-text-to-speech) | Converts text to speech using Unreal Speech API |
-| [AI Shortform Video Creator](ai_shortform_video_block.md#ai-shortform-video-creator) | Generates short-form videos using AI |
-| [Replicate Flux Advanced Model](replicate_flux_advanced.md#replicate-flux-advanced-model) | Creates images using Replicate's Flux models |
-| [Flux Kontext](flux_kontext.md#flux-kontext) | Text-based image editing using Flux Kontext |
-
-## Miscellaneous
-| Block Name | Description |
-|------------|-------------|
-| [Transcribe YouTube Video](youtube.md#transcribe-youtube-video) | Transcribes audio from YouTube videos |
-| [Send Email](email_block.md#send-email) | Sends emails using SMTP |
-| [Condition Block](branching.md#condition-block) | Evaluates conditions for workflow branching |
-| [Step Through Items](iteration.md#step-through-items) | Iterates through lists or dictionaries |
-
-## Google Services
-| Block Name | Description |
-|------------|-------------|
-| [Gmail Read](google/gmail.md#gmail-read) | Retrieves and reads emails from a Gmail account |
-| [Gmail Get Thread](google/gmail.md#gmail-get-thread) | Returns every message in a Gmail thread |
-| [Gmail Reply](google/gmail.md#gmail-reply) | Sends a reply that stays in the same thread |
-| [Gmail Send](google/gmail.md#gmail-send) | Sends emails using a Gmail account |
-| [Gmail List Labels](google/gmail.md#gmail-list-labels) | Retrieves all labels from a Gmail account |
-| [Gmail Add Label](google/gmail.md#gmail-add-label) | Adds a label to a specific email in a Gmail account |
-| [Gmail Remove Label](google/gmail.md#gmail-remove-label) | Removes a label from a specific email in a Gmail account |
-| [Google Sheets Read](google/sheet.md#google-sheets-read) | Reads data from a Google Sheets spreadsheet |
-| [Google Sheets Write](google/sheet.md#google-sheets-write) | Writes data to a Google Sheets spreadsheet |
-| [Google Maps Search](google_maps.md#google-maps-search) | Searches for local businesses using the Google Maps API |
-
-## GitHub Integration
-| Block Name | Description |
-|------------|-------------|
-| [GitHub Comment](github/issues.md#github-comment) | Posts comments on GitHub issues or pull requests |
-| [GitHub Make Issue](github/issues.md#github-make-issue) | Creates new issues on GitHub repositories |
-| [GitHub Read Issue](github/issues.md#github-read-issue) | Retrieves information about a specific GitHub issue |
-| [GitHub List Issues](github/issues.md#github-list-issues) | Retrieves a list of issues from a GitHub repository |
-| [GitHub Add Label](github/issues.md#github-add-label) | Adds a label to a GitHub issue or pull request |
-| [GitHub Remove Label](github/issues.md#github-remove-label) | Removes a label from a GitHub issue or pull request |
-| [GitHub Assign Issue](github/issues.md#github-assign-issue) | Assigns a user to a GitHub issue |
-| [GitHub List Tags](github/repo.md#github-list-tags) | Retrieves and lists all tags for a specified GitHub repository |
-| [GitHub List Branches](github/repo.md#github-list-branches) | Retrieves and lists all branches for a specified GitHub repository |
-| [GitHub List Discussions](github/repo.md#github-list-discussions) | Retrieves and lists recent discussions for a specified GitHub repository |
-| [GitHub Make Branch](github/repo.md#github-make-branch) | Creates a new branch in a GitHub repository |
-| [GitHub Delete Branch](github/repo.md#github-delete-branch) | Deletes a specified branch from a GitHub repository |
-| [GitHub List Pull Requests](github/pull_requests.md#github-list-pull-requests) | Retrieves a list of pull requests from a specified GitHub repository |
-| [GitHub Make Pull Request](github/pull_requests.md#github-make-pull-request) | Creates a new pull request in a specified GitHub repository |
-| [GitHub Read Pull Request](github/pull_requests.md#github-read-pull-request) | Retrieves detailed information about a specific GitHub pull request |
-| [GitHub Assign PR Reviewer](github/pull_requests.md#github-assign-pr-reviewer) | Assigns a reviewer to a specific GitHub pull request |
-| [GitHub Unassign PR Reviewer](github/pull_requests.md#github-unassign-pr-reviewer) | Removes an assigned reviewer from a specific GitHub pull request |
-| [GitHub List PR Reviewers](github/pull_requests.md#github-list-pr-reviewers) | Retrieves a list of all assigned reviewers for a specific GitHub pull request |
-
-## Twitter Integration
-| Block Name | Description |
-|------------|-------------|
-| [Twitter Post Tweet](twitter/twitter.md#twitter-post-tweet-block) | Creates a tweet on Twitter with text content and optional attachments including media, polls, quotes, or deep links |
-| [Twitter Delete Tweet](twitter/twitter.md#twitter-delete-tweet-block) | Deletes a specified tweet using its tweet ID |
-| [Twitter Search Recent Tweets](twitter/twitter.md#twitter-search-recent-tweets-block) | Searches for tweets matching specified criteria with options for filtering and pagination |
-| [Twitter Get Quote Tweets](twitter/twitter.md#twitter-get-quote-tweets-block) | Gets tweets that quote a specified tweet ID with options for pagination and filtering |
-| [Twitter Retweet](twitter/twitter.md#twitter-retweet-block) | Creates a retweet of a specified tweet using its tweet ID |
-| [Twitter Remove Retweet](twitter/twitter.md#twitter-remove-retweet-block) | Removes an existing retweet of a specified tweet |
-| [Twitter Get Retweeters](twitter/twitter.md#twitter-get-retweeters-block) | Gets list of users who have retweeted a specified tweet with pagination and filtering options |
-| [Twitter Get User Mentions](twitter/twitter.md#twitter-get-user-mentions-block) | Gets tweets where a specific user is mentioned using their user ID |
-| [Twitter Get Home Timeline](twitter/twitter.md#twitter-get-home-timeline-block) | Gets recent tweets and retweets from authenticated user and followed accounts |
-| [Twitter Get User](twitter/twitter.md#twitter-get-user-block) | Gets detailed profile information for a single Twitter user |
-| [Twitter Get Users](twitter/twitter.md#twitter-get-users-block) | Gets profile information for multiple Twitter users (up to 100) |
-| [Twitter Search Spaces](twitter/twitter.md#twitter-search-spaces-block) | Searches for Twitter Spaces matching title keywords with state filtering |
-| [Twitter Get Spaces](twitter/twitter.md#twitter-get-spaces-block) | Gets information about multiple Twitter Spaces by Space IDs or creator IDs |
-| [Twitter Get Space By Id](twitter/twitter.md#twitter-get-space-by-id-block) | Gets detailed information about a single Twitter Space |
-| [Twitter Get Space Tweets](twitter/twitter.md#twitter-get-space-tweets-block) | Gets tweets that were shared during a Twitter Space session |
-| [Twitter Follow List](twitter/twitter.md#twitter-follow-list-block) | Follows a Twitter List using its List ID |
-| [Twitter Unfollow List](twitter/twitter.md#twitter-unfollow-list-block) | Unfollows a previously followed Twitter List |
-| [Twitter Get List](twitter/twitter.md#twitter-get-list-block) | Gets detailed information about a specific Twitter List |
-| [Twitter Get Owned Lists](twitter/twitter.md#twitter-get-owned-lists-block) | Gets all Twitter Lists owned by a specified user |
-| [Twitter Get List Members](twitter/twitter.md#twitter-get-list-members-block) | Gets information about members of a specified Twitter List |
-| [Twitter Add List Member](twitter/twitter.md#twitter-add-list-member-block) | Adds a specified user as a member to a Twitter List |
-| [Twitter Remove List Member](twitter/twitter.md#twitter-remove-list-member-block) | Removes a specified user from a Twitter List |
-| [Twitter Get List Tweets](twitter/twitter.md#twitter-get-list-tweets-block) | Gets tweets posted within a specified Twitter List |
-| [Twitter Create List](twitter/twitter.md#twitter-create-list-block) | Creates a new Twitter List with specified name and settings |
-| [Twitter Update List](twitter/twitter.md#twitter-update-list-block) | Updates name and/or description of an existing Twitter List |
-| [Twitter Delete List](twitter/twitter.md#twitter-delete-list-block) | Deletes a specified Twitter List |
-| [Twitter Pin List](twitter/twitter.md#twitter-pin-list-block) | Pins a Twitter List to appear at top of Lists |
-| [Twitter Unpin List](twitter/twitter.md#twitter-unpin-list-block) | Removes a Twitter List from pinned Lists |
-| [Twitter Get Pinned Lists](twitter/twitter.md#twitter-get-pinned-lists-block) | Gets all Twitter Lists that are currently pinned |
-| Twitter List Get Followers | Working... Gets all followers of a specified Twitter List |
-| Twitter Get Followed Lists | Working... Gets all Lists that a user follows |
-| Twitter Get DM Events | Working... Retrieves direct message events for a user |
-| Twitter Send Direct Message | Working... Sends a direct message to a specified user |
-| Twitter Create DM Conversation | Working... Creates a new direct message conversation |
-
-## Todoist Integration
-| Block Name | Description |
-|------------|-------------|
-| [Todoist Create Label](todoist.md#todoist-create-label) | Creates a new label in Todoist |
-| [Todoist List Labels](todoist.md#todoist-list-labels) | Retrieves all personal labels from Todoist |
-| [Todoist Get Label](todoist.md#todoist-get-label) | Retrieves a specific label by ID |
-| [Todoist Create Task](todoist.md#todoist-create-task) | Creates a new task in Todoist |
-| [Todoist Get Tasks](todoist.md#todoist-get-tasks) | Retrieves active tasks from Todoist |
-| [Todoist Update Task](todoist.md#todoist-update-task) | Updates an existing task |
-| [Todoist Close Task](todoist.md#todoist-close-task) | Completes/closes a task |
-| [Todoist Reopen Task](todoist.md#todoist-reopen-task) | Reopens a completed task |
-| [Todoist Delete Task](todoist.md#todoist-delete-task) | Permanently deletes a task |
-| [Todoist List Projects](todoist.md#todoist-list-projects) | Retrieves all projects from Todoist |
-| [Todoist Create Project](todoist.md#todoist-create-project) | Creates a new project in Todoist |
-| [Todoist Get Project](todoist.md#todoist-get-project) | Retrieves details for a specific project |
-| [Todoist Update Project](todoist.md#todoist-update-project) | Updates an existing project |
-| [Todoist Delete Project](todoist.md#todoist-delete-project) | Deletes a project and its contents |
-| [Todoist List Collaborators](todoist.md#todoist-list-collaborators) | Retrieves collaborators on a project |
-| [Todoist List Sections](todoist.md#todoist-list-sections) | Retrieves sections from Todoist |
-| [Todoist Get Section](todoist.md#todoist-get-section) | Retrieves details for a specific section |
-| [Todoist Delete Section](todoist.md#todoist-delete-section) | Deletes a section and its tasks |
-| [Todoist Create Comment](todoist.md#todoist-create-comment) | Creates a new comment on a task or project |
-| [Todoist Get Comments](todoist.md#todoist-get-comments) | Retrieves all comments for a task or project |
-| [Todoist Get Comment](todoist.md#todoist-get-comment) | Retrieves a specific comment by ID |
-| [Todoist Update Comment](todoist.md#todoist-update-comment) | Updates an existing comment |
-| [Todoist Delete Comment](todoist.md#todoist-delete-comment) | Deletes a comment |
-
-This comprehensive list covers all the blocks available in AutoGPT. Each block is designed to perform a specific task, and they can be combined to create powerful, automated workflows. For more detailed information on each block, click on its name to view the full documentation.
diff --git a/docs/content/platform/blocks/github/issues.md b/docs/content/platform/blocks/github/issues.md
deleted file mode 100644
index 2727e10acb..0000000000
--- a/docs/content/platform/blocks/github/issues.md
+++ /dev/null
@@ -1,236 +0,0 @@
-# GitHub Issues
-
-## Github Comment
-
-### What it is
-A block that posts comments on GitHub issues or pull requests.
-
-### What it does
-This block allows users to add comments to existing GitHub issues or pull requests using the GitHub API.
-
-### How it works
-The block takes the GitHub credentials, the URL of the issue or pull request, and the comment text as inputs. It then sends a request to the GitHub API to post the comment on the specified issue or pull request.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | GitHub authentication information |
-| Issue URL | The URL of the GitHub issue or pull request where the comment will be posted |
-| Comment | The text content of the comment to be posted |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| ID | The unique identifier of the created comment |
-| URL | The direct link to the posted comment on GitHub |
-| Error | Any error message if the comment posting fails |
-
-### Possible use case
-Automating responses to issues in a GitHub repository, such as thanking contributors for their submissions or providing status updates on reported bugs.
-
----
-
-## Github Make Issue
-
-### What it is
-A block that creates new issues on GitHub repositories.
-
-### What it does
-This block allows users to create new issues in a specified GitHub repository with a title and body content.
-
-### How it works
-The block takes the GitHub credentials, repository URL, issue title, and issue body as inputs. It then sends a request to the GitHub API to create a new issue with the provided information.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | GitHub authentication information |
-| Repo URL | The URL of the GitHub repository where the issue will be created |
-| Title | The title of the new issue |
-| Body | The main content or description of the new issue |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Number | The issue number assigned by GitHub |
-| URL | The direct link to the newly created issue on GitHub |
-| Error | Any error message if the issue creation fails |
-
-### Possible use case
-Automatically creating issues for bug reports or feature requests submitted through an external system or form.
-
----
-
-## Github Read Issue
-
-### What it is
-A block that retrieves information about a specific GitHub issue.
-
-### What it does
-This block fetches the details of a given GitHub issue, including its title, body content, and the user who created it.
-
-### How it works
-The block takes the GitHub credentials and the issue URL as inputs. It then sends a request to the GitHub API to fetch the issue's details and returns the relevant information.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | GitHub authentication information |
-| Issue URL | The URL of the GitHub issue to be read |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Title | The title of the issue |
-| Body | The main content or description of the issue |
-| User | The username of the person who created the issue |
-| Error | Any error message if reading the issue fails |
-
-### Possible use case
-Gathering information about reported issues for analysis or to display on a dashboard.
-
----
-
-## Github List Issues
-
-### What it is
-A block that retrieves a list of issues from a GitHub repository.
-
-### What it does
-This block fetches all open issues from a specified GitHub repository and provides their titles and URLs.
-
-### How it works
-The block takes the GitHub credentials and repository URL as inputs. It then sends a request to the GitHub API to fetch the list of issues and returns their details.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | GitHub authentication information |
-| Repo URL | The URL of the GitHub repository to list issues from |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Issue | A list of issues, each containing: |
-| - Title | The title of the issue |
-| - URL | The direct link to the issue on GitHub |
-| Error | Any error message if listing the issues fails |
-
-### Possible use case
-Creating a summary of open issues for a project status report or displaying them on a project management dashboard.
-
----
-
-## Github Add Label
-
-### What it is
-A block that adds a label to a GitHub issue or pull request.
-
-### What it does
-This block allows users to add a specified label to an existing GitHub issue or pull request.
-
-### How it works
-The block takes the GitHub credentials, the URL of the issue or pull request, and the label to be added as inputs. It then sends a request to the GitHub API to add the label to the specified issue or pull request.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | GitHub authentication information |
-| Issue URL | The URL of the GitHub issue or pull request to add the label to |
-| Label | The name of the label to be added |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Status | A message indicating whether the label was successfully added |
-| Error | Any error message if adding the label fails |
-
-### Possible use case
-Automatically categorizing issues based on their content or assigning priority labels to newly created issues.
-
----
-
-## Github Remove Label
-
-### What it is
-A block that removes a label from a GitHub issue or pull request.
-
-### What it does
-This block allows users to remove a specified label from an existing GitHub issue or pull request.
-
-### How it works
-The block takes the GitHub credentials, the URL of the issue or pull request, and the label to be removed as inputs. It then sends a request to the GitHub API to remove the label from the specified issue or pull request.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | GitHub authentication information |
-| Issue URL | The URL of the GitHub issue or pull request to remove the label from |
-| Label | The name of the label to be removed |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Status | A message indicating whether the label was successfully removed |
-| Error | Any error message if removing the label fails |
-
-### Possible use case
-Updating the status of issues as they progress through a workflow, such as removing a "In Progress" label when an issue is completed.
-
----
-
-## Github Assign Issue
-
-### What it is
-A block that assigns a user to a GitHub issue.
-
-### What it does
-This block allows users to assign a specific GitHub user to an existing issue.
-
-### How it works
-The block takes the GitHub credentials, the URL of the issue, and the username of the person to be assigned as inputs. It then sends a request to the GitHub API to assign the specified user to the issue.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | GitHub authentication information |
-| Issue URL | The URL of the GitHub issue to assign |
-| Assignee | The username of the person to be assigned to the issue |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Status | A message indicating whether the issue was successfully assigned |
-| Error | Any error message if assigning the issue fails |
-
-### Possible use case
-Automatically assigning new issues to team members based on their expertise or workload.
-
----
-
-## Github Unassign Issue
-
-### What it is
-A block that unassigns a user from a GitHub issue.
-
-### What it does
-This block allows users to remove a specific GitHub user's assignment from an existing issue.
-
-### How it works
-The block takes the GitHub credentials, the URL of the issue, and the username of the person to be unassigned as inputs. It then sends a request to the GitHub API to remove the specified user's assignment from the issue.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | GitHub authentication information |
-| Issue URL | The URL of the GitHub issue to unassign |
-| Assignee | The username of the person to be unassigned from the issue |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Status | A message indicating whether the issue was successfully unassigned |
-| Error | Any error message if unassigning the issue fails |
-
-### Possible use case
-Automatically unassigning issues that have been inactive for a certain period or when reassigning workload among team members.
\ No newline at end of file
diff --git a/docs/content/platform/blocks/github/pull_requests.md b/docs/content/platform/blocks/github/pull_requests.md
deleted file mode 100644
index ef72e4de5c..0000000000
--- a/docs/content/platform/blocks/github/pull_requests.md
+++ /dev/null
@@ -1,182 +0,0 @@
-# Pull Requests
-
-## GitHub List Pull Requests
-
-### What it is
-A block that retrieves a list of pull requests from a specified GitHub repository.
-
-### What it does
-This block fetches all open pull requests for a given GitHub repository and provides their titles and URLs.
-
-### How it works
-It connects to the GitHub API using the provided credentials and repository URL, then retrieves the list of pull requests and formats the information for easy viewing.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | GitHub authentication details to access the repository |
-| Repository URL | The URL of the GitHub repository to fetch pull requests from |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Pull Request | A list of pull requests, each containing: |
-| - Title | The title of the pull request |
-| - URL | The web address of the pull request |
-| Error | An error message if the operation fails |
-
-### Possible use case
-A development team leader wants to quickly review all open pull requests in their project repository to prioritize code reviews.
-
----
-
-## GitHub Make Pull Request
-
-### What it is
-A block that creates a new pull request in a specified GitHub repository.
-
-### What it does
-This block allows users to create a new pull request by providing details such as title, body, and branch information.
-
-### How it works
-It uses the GitHub API to create a new pull request with the given information, including the source and target branches for the changes.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | GitHub authentication details to access the repository |
-| Repository URL | The URL of the GitHub repository where the pull request will be created |
-| Title | The title of the new pull request |
-| Body | The description or content of the pull request |
-| Head | The name of the branch containing the changes |
-| Base | The name of the branch you want to merge the changes into |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Number | The unique identifier of the created pull request |
-| URL | The web address of the newly created pull request |
-| Error | An error message if the pull request creation fails |
-
-### Possible use case
-A developer has finished working on a new feature in a separate branch and wants to create a pull request to merge their changes into the main branch for review.
-
----
-
-## GitHub Read Pull Request
-
-### What it is
-A block that retrieves detailed information about a specific GitHub pull request.
-
-### What it does
-This block fetches and provides comprehensive information about a given pull request, including its title, body, author, and optionally, the changes made.
-
-### How it works
-It connects to the GitHub API using the provided credentials and pull request URL, then retrieves and formats the requested information.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | GitHub authentication details to access the repository |
-| Pull Request URL | The URL of the specific GitHub pull request to read |
-| Include PR Changes | An option to include the actual changes made in the pull request |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Title | The title of the pull request |
-| Body | The description or content of the pull request |
-| Author | The username of the person who created the pull request |
-| Changes | A list of changes made in the pull request (if requested) |
-| Error | An error message if reading the pull request fails |
-
-### Possible use case
-A code reviewer wants to get a comprehensive overview of a pull request, including its description and changes, before starting the review process.
-
----
-
-## GitHub Assign PR Reviewer
-
-### What it is
-A block that assigns a reviewer to a specific GitHub pull request.
-
-### What it does
-This block allows users to assign a designated reviewer to a given pull request in a GitHub repository.
-
-### How it works
-It uses the GitHub API to add the specified user as a reviewer for the given pull request.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | GitHub authentication details to access the repository |
-| Pull Request URL | The URL of the specific GitHub pull request to assign a reviewer to |
-| Reviewer | The username of the GitHub user to be assigned as a reviewer |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Status | A message indicating whether the reviewer was successfully assigned |
-| Error | An error message if the reviewer assignment fails |
-
-### Possible use case
-A project manager wants to assign a specific team member to review a newly created pull request for a critical feature.
-
----
-
-## GitHub Unassign PR Reviewer
-
-### What it is
-A block that removes an assigned reviewer from a specific GitHub pull request.
-
-### What it does
-This block allows users to unassign a previously designated reviewer from a given pull request in a GitHub repository.
-
-### How it works
-It uses the GitHub API to remove the specified user from the list of reviewers for the given pull request.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | GitHub authentication details to access the repository |
-| Pull Request URL | The URL of the specific GitHub pull request to unassign a reviewer from |
-| Reviewer | The username of the GitHub user to be unassigned as a reviewer |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Status | A message indicating whether the reviewer was successfully unassigned |
-| Error | An error message if the reviewer unassignment fails |
-
-### Possible use case
-A team lead realizes that an assigned reviewer is unavailable and wants to remove them from a pull request to reassign it to another team member.
-
----
-
-## GitHub List PR Reviewers
-
-### What it is
-A block that retrieves a list of all assigned reviewers for a specific GitHub pull request.
-
-### What it does
-This block fetches and provides information about all the reviewers currently assigned to a given pull request in a GitHub repository.
-
-### How it works
-It connects to the GitHub API using the provided credentials and pull request URL, then retrieves and formats the list of assigned reviewers.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | GitHub authentication details to access the repository |
-| Pull Request URL | The URL of the specific GitHub pull request to list reviewers for |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Reviewer | A list of assigned reviewers, each containing: |
-| - Username | The GitHub username of the reviewer |
-| - URL | The profile URL of the reviewer |
-| Error | An error message if listing the reviewers fails |
-
-### Possible use case
-A project coordinator wants to check who is currently assigned to review a specific pull request to ensure all necessary team members are involved in the code review process.
\ No newline at end of file
diff --git a/docs/content/platform/blocks/github/repo.md b/docs/content/platform/blocks/github/repo.md
deleted file mode 100644
index 26e680c97b..0000000000
--- a/docs/content/platform/blocks/github/repo.md
+++ /dev/null
@@ -1,234 +0,0 @@
-# Repository
-
-## GitHub List Tags
-
-### What it is
-A block that retrieves and lists all tags for a specified GitHub repository.
-
-### What it does
-This block fetches all tags associated with a given GitHub repository and provides their names and URLs.
-
-### How it works
-The block connects to the GitHub API using provided credentials, sends a request to retrieve tag information for the specified repository, and then processes the response to extract tag names and URLs.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | GitHub authentication credentials required to access the repository |
-| Repository URL | The URL of the GitHub repository to fetch tags from |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Tag | Information about each tag, including its name and URL |
-| Error | Any error message if the tag listing process fails |
-
-### Possible use case
-A developer wants to quickly view all release tags for a project to identify the latest version or track the project's release history.
-
----
-
-## GitHub List Branches
-
-### What it is
-A block that retrieves and lists all branches for a specified GitHub repository.
-
-### What it does
-This block fetches all branches associated with a given GitHub repository and provides their names and URLs.
-
-### How it works
-The block authenticates with the GitHub API, sends a request to get branch information for the specified repository, and then processes the response to extract branch names and URLs.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | GitHub authentication credentials required to access the repository |
-| Repository URL | The URL of the GitHub repository to fetch branches from |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Branch | Information about each branch, including its name and URL |
-| Error | Any error message if the branch listing process fails |
-
-### Possible use case
-A project manager wants to review all active branches in a repository to track ongoing development efforts and feature implementations.
-
----
-
-## GitHub List Discussions
-
-### What it is
-A block that retrieves and lists recent discussions for a specified GitHub repository.
-
-### What it does
-This block fetches a specified number of recent discussions from a given GitHub repository and provides their titles and URLs.
-
-### How it works
-The block uses the GitHub GraphQL API to request discussion data for the specified repository, processes the response, and extracts discussion titles and URLs.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | GitHub authentication credentials required to access the repository |
-| Repository URL | The URL of the GitHub repository to fetch discussions from |
-| Number of Discussions | The number of recent discussions to retrieve (default is 5) |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Discussion | Information about each discussion, including its title and URL |
-| Error | Any error message if the discussion listing process fails |
-
-### Possible use case
-A community manager wants to monitor recent discussions in a project's repository to identify trending topics or issues that need attention.
-
----
-
-## GitHub List Releases
-
-### What it is
-A block that retrieves and lists all releases for a specified GitHub repository.
-
-### What it does
-This block fetches all releases associated with a given GitHub repository and provides their names and URLs.
-
-### How it works
-The block connects to the GitHub API, sends a request to get release information for the specified repository, and then processes the response to extract release names and URLs.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | GitHub authentication credentials required to access the repository |
-| Repository URL | The URL of the GitHub repository to fetch releases from |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Release | Information about each release, including its name and URL |
-| Error | Any error message if the release listing process fails |
-
-### Possible use case
-A user wants to view all official releases of a software project to choose the appropriate version for installation or to track the project's release history.
-
----
-
-## GitHub Read File
-
-### What it is
-A block that reads the content of a specified file from a GitHub repository.
-
-### What it does
-This block retrieves the content of a specified file from a given GitHub repository, providing both the raw and decoded text content along with the file size.
-
-### How it works
-The block authenticates with the GitHub API, sends a request to fetch the specified file's content, and then processes the response to provide the file's raw content, decoded text content, and size.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | GitHub authentication credentials required to access the repository |
-| Repository URL | The URL of the GitHub repository containing the file |
-| File Path | The path to the file within the repository |
-| Branch | The branch name to read from (defaults to "master") |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Text Content | The content of the file decoded as UTF-8 text |
-| Raw Content | The raw base64-encoded content of the file |
-| Size | The size of the file in bytes |
-| Error | Any error message if the file reading process fails |
-
-### Possible use case
-A developer wants to quickly view the contents of a configuration file or source code file in a GitHub repository without having to clone the entire repository.
-
----
-
-## GitHub Read Folder
-
-### What it is
-A block that reads the content of a specified folder from a GitHub repository.
-
-### What it does
-This block retrieves the list of files and directories within a specified folder from a given GitHub repository.
-
-### How it works
-The block connects to the GitHub API, sends a request to fetch the contents of the specified folder, and then processes the response to provide information about files and directories within that folder.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | GitHub authentication credentials required to access the repository |
-| Repository URL | The URL of the GitHub repository containing the folder |
-| Folder Path | The path to the folder within the repository |
-| Branch | The branch name to read from (defaults to "master") |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| File | Information about each file in the folder, including its name, path, and size |
-| Directory | Information about each directory in the folder, including its name and path |
-| Error | Any error message if the folder reading process fails |
-
-### Possible use case
-A project manager wants to explore the structure of a repository or specific folder to understand the organization of files and directories without cloning the entire repository.
-
----
-
-## GitHub Make Branch
-
-### What it is
-A block that creates a new branch in a GitHub repository.
-
-### What it does
-This block creates a new branch in a specified GitHub repository, based on an existing source branch.
-
-### How it works
-The block authenticates with the GitHub API, retrieves the latest commit SHA of the source branch, and then creates a new branch pointing to that commit.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | GitHub authentication credentials required to access the repository |
-| Repository URL | The URL of the GitHub repository where the new branch will be created |
-| New Branch | The name of the new branch to create |
-| Source Branch | The name of the existing branch to use as the starting point for the new branch |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Status | A message indicating the success of the branch creation operation |
-| Error | Any error message if the branch creation process fails |
-
-### Possible use case
-A developer wants to start working on a new feature and needs to create a new branch based on the current state of the main development branch.
-
----
-
-## GitHub Delete Branch
-
-### What it is
-A block that deletes a specified branch from a GitHub repository.
-
-### What it does
-This block removes a specified branch from a given GitHub repository.
-
-### How it works
-The block authenticates with the GitHub API and sends a delete request for the specified branch.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | GitHub authentication credentials required to access the repository |
-| Repository URL | The URL of the GitHub repository containing the branch to be deleted |
-| Branch | The name of the branch to delete |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Status | A message indicating the success of the branch deletion operation |
-| Error | Any error message if the branch deletion process fails |
-
-### Possible use case
-After merging a feature branch into the main development branch, a developer wants to clean up the repository by removing the now-obsolete feature branch.
\ No newline at end of file
diff --git a/docs/content/platform/blocks/google/gmail.md b/docs/content/platform/blocks/google/gmail.md
deleted file mode 100644
index f5c8a9e571..0000000000
--- a/docs/content/platform/blocks/google/gmail.md
+++ /dev/null
@@ -1,203 +0,0 @@
-# Gmail
-
-## Gmail Read
-
-### What it is
-A block that retrieves and reads emails from a Gmail account.
-
-### What it does
-This block searches for and retrieves emails from a specified Gmail account based on given search criteria. It can fetch multiple emails and provide detailed information about each email, including subject, sender, recipient, date, body content, and attachments.
-
-### How it works
-The block connects to the user's Gmail account using their credentials, performs a search based on the provided query, and retrieves the specified number of email messages. It then processes each email to extract relevant information and returns the results.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | The user's Gmail account credentials for authentication |
-| Query | A search query to filter emails (e.g., "is:unread" for unread emails). Ignored if using only the `gmail.metadata` scope. |
-| Max Results | The maximum number of emails to retrieve |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Email | Detailed information about a single email (now includes `threadId`) |
-| Emails | A list of email data for multiple emails |
-| Error | An error message if something goes wrong during the process |
-
-### Possible use case
-Automatically checking for new customer inquiries in a support email inbox and organizing them for quick response.
-
----
-
-## Gmail Send
-
-### What it is
-A block that sends emails using a Gmail account.
-
-### What it does
-This block allows users to compose and send emails through their Gmail account. It handles the creation of the email message and sends it to the specified recipient.
-
-### How it works
-The block authenticates with the user's Gmail account, creates an email message with the provided details (recipient, subject, and body), and then sends the email using Gmail's API.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | The user's Gmail account credentials for authentication |
-| To | The recipient's email address |
-| Subject | The subject line of the email |
-| Body | The main content of the email |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Result | Confirmation of the sent email, including a message ID |
-| Error | An error message if something goes wrong during the process |
-
-### Possible use case
-Automatically sending confirmation emails to customers after they make a purchase on an e-commerce website.
-
----
-
-## Gmail List Labels
-
-### What it is
-A block that retrieves all labels (categories) from a Gmail account.
-
-### What it does
-This block fetches and lists all the labels or categories that are set up in the user's Gmail account. These labels are used to organize and categorize emails.
-
-### How it works
-The block connects to the user's Gmail account and requests a list of all labels. It then processes this information and returns a simplified list of label names and their corresponding IDs.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | The user's Gmail account credentials for authentication |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Result | A list of labels, including their names and IDs |
-| Error | An error message if something goes wrong during the process |
-
-### Possible use case
-Creating a dashboard that shows an overview of how many emails are in each category or label in a business email account.
-
----
-
-## Gmail Add Label
-
-### What it is
-A block that adds a label to a specific email in a Gmail account.
-
-### What it does
-This block allows users to add a label (category) to a particular email message in their Gmail account. If the label doesn't exist, it creates a new one.
-
-### How it works
-The block first checks if the specified label exists in the user's Gmail account. If it doesn't, it creates the label. Then, it adds the label to the specified email message using the message ID.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | The user's Gmail account credentials for authentication |
-| Message ID | The unique identifier of the email message to be labeled |
-| Label Name | The name of the label to add to the email |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Result | Confirmation of the label addition, including the label ID |
-| Error | An error message if something goes wrong during the process |
-
-### Possible use case
-Automatically categorizing incoming customer emails based on their content, adding labels like "Urgent," "Feedback," or "Invoice" for easier processing.
-
----
-
-## Gmail Remove Label
-
-### What it is
-A block that removes a label from a specific email in a Gmail account.
-
-### What it does
-This block allows users to remove a label (category) from a particular email message in their Gmail account.
-
-### How it works
-The block first finds the ID of the specified label in the user's Gmail account. If the label exists, it removes it from the specified email message using the message ID.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | The user's Gmail account credentials for authentication |
-| Message ID | The unique identifier of the email message to remove the label from |
-| Label Name | The name of the label to remove from the email |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Result | Confirmation of the label removal, including the label ID |
-| Error | An error message if something goes wrong during the process |
-
-### Possible use case
-Automatically removing the "Unread" label from emails after they have been processed by a customer service representative.
-
----
-
-## Gmail Get Thread
-
-### What it is
-A block that retrieves an entire Gmail thread.
-
-### What it does
-Given a `threadId`, this block fetches all messages in that thread and decodes the text bodies.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | The user's Gmail account credentials for authentication |
-| threadId | The ID of the thread to fetch |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Thread | Gmail thread with decoded messages |
-| Error | An error message if something goes wrong |
-
-### Possible use case
-Checking if a recipient replied in an existing conversation.
-
----
-
-## Gmail Reply
-
-### What it is
-A block that sends a reply within an existing Gmail thread.
-
-### What it does
-This block builds a properly formatted reply email and sends it so Gmail keeps it in the same conversation.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Credentials | The user's Gmail account credentials for authentication |
-| threadId | The thread to reply in |
-| parentMessageId | The ID of the message you are replying to |
-| To | List of recipients |
-| Cc | List of CC recipients |
-| Bcc | List of BCC recipients |
-| Subject | Optional subject (defaults to `Re:` prefix) |
-| Body | The email body |
-| Attachments | Optional files to include |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| MessageId | The ID of the sent message |
-| ThreadId | The thread the reply belongs to |
-| Message | Full Gmail message object |
-| Error | Error message if something goes wrong |
-
-### Possible use case
-Automatically respond "Thanks, see you then" to a scheduling email while keeping the conversation tidy.
diff --git a/docs/content/platform/blocks/llm.md b/docs/content/platform/blocks/llm.md
deleted file mode 100644
index 4eafa62bee..0000000000
--- a/docs/content/platform/blocks/llm.md
+++ /dev/null
@@ -1,173 +0,0 @@
-# Large Language Model (LLM) Blocks
-
-## AI Structured Response Generator
-
-### What it is
-A block that generates structured responses using a Large Language Model (LLM).
-
-### What it does
-It takes a prompt and other parameters, sends them to an LLM, and returns a structured response in a specified format.
-
-### How it works
-The block sends the input prompt to a chosen LLM, along with any system prompts and expected response format. It then processes the LLM's response, ensuring it matches the expected format, and returns the structured data.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Prompt | The main text prompt to send to the LLM |
-| Expected Format | A dictionary specifying the structure of the desired response |
-| Model | The specific LLM to use (e.g., GPT-4 Turbo, Claude 3) |
-| API Key | The secret key for accessing the LLM service |
-| System Prompt | An optional prompt to guide the LLM's behavior |
-| Retry | Number of attempts to generate a valid response |
-| Prompt Values | Dictionary of values to fill in the prompt template |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Response | The structured response from the LLM |
-| Error | Any error message if the process fails |
-
-### Possible use case
-Extracting specific information from unstructured text, such as generating a product description with predefined fields (name, features, price) from a lengthy product review.
-
----
-
-## AI Text Generator
-
-### What it is
-A block that generates text responses using a Large Language Model (LLM).
-
-### What it does
-It takes a prompt and other parameters, sends them to an LLM, and returns a text response.
-
-### How it works
-The block sends the input prompt to a chosen LLM, processes the response, and returns the generated text.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Prompt | The main text prompt to send to the LLM |
-| Model | The specific LLM to use (e.g., GPT-4 Turbo, Claude 3) |
-| API Key | The secret key for accessing the LLM service |
-| System Prompt | An optional prompt to guide the LLM's behavior |
-| Retry | Number of attempts to generate a valid response |
-| Prompt Values | Dictionary of values to fill in the prompt template |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Response | The text response from the LLM |
-| Error | Any error message if the process fails |
-
-### Possible use case
-Generating creative writing, such as short stories or poetry, based on a given theme or starting sentence.
-
----
-
-## AI Text Summarizer
-
-### What it is
-A block that summarizes long texts using a Large Language Model (LLM).
-
-### What it does
-It takes a long text, breaks it into manageable chunks, summarizes each chunk, and then combines these summaries into a final summary.
-
-### How it works
-The block splits the input text into smaller chunks, sends each chunk to an LLM for summarization, and then combines these summaries. If the combined summary is still too long, it repeats the process until a concise summary is achieved.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Text | The long text to be summarized |
-| Model | The specific LLM to use for summarization |
-| Focus | The main topic or aspect to focus on in the summary |
-| Style | The desired style of the summary (e.g., concise, detailed, bullet points) |
-| API Key | The secret key for accessing the LLM service |
-| Max Tokens | The maximum number of tokens for each chunk |
-| Chunk Overlap | The number of overlapping tokens between chunks |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Summary | The final summarized text |
-| Error | Any error message if the process fails |
-
-### Possible use case
-Summarizing lengthy research papers or articles to quickly grasp the main points and key findings.
-
----
-
-## AI Conversation
-
-### What it is
-A block that facilitates multi-turn conversations using a Large Language Model (LLM).
-
-### What it does
-It takes a list of conversation messages, sends them to an LLM, and returns the model's response to continue the conversation.
-
-### How it works
-The block sends the entire conversation history to the chosen LLM, including system messages, user inputs, and previous responses. It then returns the LLM's response as the next part of the conversation.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Messages | A list of previous messages in the conversation |
-| Model | The specific LLM to use for the conversation |
-| API Key | The secret key for accessing the LLM service |
-| Max Tokens | The maximum number of tokens to generate in the response |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Response | The LLM's response to continue the conversation |
-| Error | Any error message if the process fails |
-
-### Possible use case
-Creating an interactive chatbot that can maintain context over multiple exchanges, such as a customer service assistant or a language learning companion.
-
----
-
-## AI List Generator
-
-### What it is
-A block that generates lists based on given prompts or source data using a Large Language Model (LLM).
-
-### What it does
-It takes a focus or source data, sends it to an LLM, and returns a generated list based on the input.
-
-### How it works
-The block formulates a prompt based on the given focus or source data, sends it to the chosen LLM, and then processes the response to ensure it's a valid Python list. It can retry multiple times if the initial attempts fail.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Focus | The main topic or theme for the list to be generated |
-| Source Data | Optional data to use as a basis for list generation |
-| Model | The specific LLM to use for list generation |
-| API Key | The secret key for accessing the LLM service |
-| Max Retries | The maximum number of attempts to generate a valid list |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Generated List | The full list generated by the LLM |
-| List Item | Each individual item in the generated list |
-| Error | Any error message if the process fails |
-
-### Possible use case
-Automatically generating a list of key points or action items from a long meeting transcript or summarizing the main topics discussed in a series of documents.
-
-# Providers
-There are severals providers that AutoGPT users can use for running inference with LLM models.
-
-## Llama API
-Llama API is a Meta-hosted API service that helps you integrate Llama models quickly and efficiently. Using OpenAI comptability endpoints, you can easily access the power of Llama models without the need for complex setup or configuration!
-
-Join the [waitlist](https://llama.developer.meta.com?utm_source=partner-autogpt&utm_medium=readme) to get access!
-
-Try the Llama API provider by selecting any of the following LLM Model names from the AI blocks mentioned above:
-- Llama-4-Scout-17B-16E-Instruct-FP8
-- Llama-4-Maverick-17B-128E-Instruct-FP8
-- Llama-3.3-8B-Instruct
-- Llama-3-70B-Instruct
diff --git a/docs/content/platform/blocks/search.md b/docs/content/platform/blocks/search.md
deleted file mode 100644
index bd10cef264..0000000000
--- a/docs/content/platform/blocks/search.md
+++ /dev/null
@@ -1,111 +0,0 @@
-## Get Wikipedia Summary
-
-### What it is
-A block that retrieves a summary of a given topic from Wikipedia.
-
-### What it does
-This block takes a topic as input and fetches a concise summary about that topic from Wikipedia's API.
-
-### How it works
-The block sends a request to Wikipedia's API with the provided topic. It then extracts the summary from the response and returns it. If there's an error during this process, it will return an error message instead.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Topic | The subject you want to get a summary about from Wikipedia |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Summary | A brief overview of the requested topic from Wikipedia |
-| Error | An error message if the summary retrieval fails |
-
-### Possible use case
-A student researching for a project could use this block to quickly get overviews of various topics, helping them decide which areas to focus on for more in-depth study.
-
----
-
-## Search The Web
-
-### What it is
-A block that performs web searches and returns the results.
-
-### What it does
-This block takes a search query and returns a list of relevant web pages, including their titles, URLs, and brief descriptions.
-
-### How it works
-The block sends the search query to a search engine API, processes the results, and returns them in a structured format.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Query | The search term or phrase to look up on the web |
-| Number of Results | How many search results to return (optional, default may vary) |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Results | A list of search results, each containing a title, URL, and description |
-| Error | An error message if the search fails |
-
-### Possible use case
-A content creator could use this block to research trending topics in their field, gathering ideas for new articles or videos.
-
----
-
-## Extract Website Content
-
-### What it is
-A block that retrieves and extracts content from specified websites.
-
-### What it does
-This block takes a URL as input, visits the webpage, and extracts the main content, removing navigation elements, ads, and other non-essential parts.
-
-### How it works
-The block sends a request to the given URL, downloads the HTML content, and uses content extraction algorithms to identify and extract the main text content of the page.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| URL | The web address of the page to extract content from |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Content | The main text content extracted from the webpage |
-| Title | The title of the webpage |
-| Error | An error message if the content extraction fails |
-
-### Possible use case
-A data analyst could use this block to automatically extract article content from news websites for sentiment analysis or topic modeling.
-
----
-
-## Get Weather Information
-
-### What it is
-A block that fetches current weather data for a specified location.
-
-### What it does
-This block takes a location name as input and returns current weather information such as temperature, humidity, and weather conditions.
-
-### How it works
-The block sends a request to a weather API (like OpenWeatherMap) with the provided location. It then processes the response to extract relevant weather data.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Location | The city or area you want to get weather information for |
-| API Key | Your personal OpenWeatherMap API key (this is kept secret) |
-| Use Celsius | An option to choose between Celsius (true) or Fahrenheit (false) for temperature |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Temperature | The current temperature in the specified location |
-| Humidity | The current humidity percentage in the specified location |
-| Condition | A description of the current weather condition (e.g., "overcast clouds") |
-| Error | A message explaining what went wrong if the weather data retrieval fails |
-
-### Possible use case
-A travel planning application could use this block to provide users with current weather information for their destination cities.
\ No newline at end of file
diff --git a/docs/content/platform/blocks/text.md b/docs/content/platform/blocks/text.md
deleted file mode 100644
index 20a55690f9..0000000000
--- a/docs/content/platform/blocks/text.md
+++ /dev/null
@@ -1,113 +0,0 @@
-## Match Text Pattern
-
-### What it is
-A block that matches text against a specified pattern.
-
-### What it does
-This block takes input text and a pattern, then checks if the text matches the pattern. It forwards the data to either a positive or negative output based on whether a match is found.
-
-### How it works
-The block uses regular expressions to search for the specified pattern within the input text. It considers options like case sensitivity and whether the dot should match all characters.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Text | The text to be matched against the pattern |
-| Match | The pattern (regular expression) to search for in the text |
-| Data | Additional information to be forwarded to the output |
-| Case sensitive | Option to make the match case-sensitive or not |
-| Dot all | Option to make the dot character match all characters, including newlines |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Positive | The output data if a match is found |
-| Negative | The output data if no match is found |
-
-### Possible use case
-Filtering customer feedback messages based on specific keywords or phrases to categorize them as positive or negative reviews.
-
----
-
-## Extract Text Information
-
-### What it is
-A block that extracts specific information from text using a pattern.
-
-### What it does
-This block searches for a pattern within the input text and extracts a portion of the text based on that pattern.
-
-### How it works
-The block uses regular expressions to find the specified pattern in the text. It then extracts a particular group from the match, which can be the entire match or a specific captured group.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Text | The text from which to extract information |
-| Pattern | The pattern (regular expression) used to find the desired information |
-| Group | The group number to extract from the match (0 for the entire match) |
-| Case sensitive | Option to make the match case-sensitive or not |
-| Dot all | Option to make the dot character match all characters, including newlines |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Positive | The extracted text if a match is found |
-| Negative | The original text if no match is found |
-
-### Possible use case
-Extracting phone numbers or email addresses from a large body of text, such as a customer database.
-
----
-
-## Fill Text Template
-
-### What it is
-A block that fills a text template with provided values.
-
-### What it does
-This block takes a template string and a dictionary of values, then replaces placeholders in the template with the corresponding values.
-
-### How it works
-The block uses a template engine to replace placeholders in the format string with the provided values. It supports both simple placeholder replacement and more complex operations like loops.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Values | A dictionary containing the values to be inserted into the template |
-| Format | The template string with placeholders for the values |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Output | The formatted text with placeholders replaced by actual values |
-
-### Possible use case
-Generating personalized email messages by filling a template with customer-specific information like name, order details, or account status.
-
----
-
-## Combine Texts
-
-### What it is
-A block that combines multiple text inputs into a single output.
-
-### What it does
-This block takes a list of text inputs and joins them together, optionally using a specified delimiter.
-
-### How it works
-The block concatenates all the input texts in the order they are provided, inserting the specified delimiter (if any) between each text.
-
-### Inputs
-| Input | Description |
-|-------|-------------|
-| Input | A list of text strings to be combined |
-| Delimiter | An optional string to be inserted between each text input (default is an empty string) |
-
-### Outputs
-| Output | Description |
-|--------|-------------|
-| Output | The combined text |
-
-### Possible use case
-Merging multiple parts of an address (street, city, state, zip code) into a single, formatted address string.
\ No newline at end of file
diff --git a/docs/.gitbook/assets/AGPT_Platform.png b/docs/home/.gitbook/assets/AGPT_Platform.png
similarity index 100%
rename from docs/.gitbook/assets/AGPT_Platform.png
rename to docs/home/.gitbook/assets/AGPT_Platform.png
diff --git a/docs/.gitbook/assets/Banner_image.png b/docs/home/.gitbook/assets/Banner_image.png
similarity index 100%
rename from docs/.gitbook/assets/Banner_image.png
rename to docs/home/.gitbook/assets/Banner_image.png
diff --git a/docs/.gitbook/assets/Contribute.png b/docs/home/.gitbook/assets/Contribute.png
similarity index 100%
rename from docs/.gitbook/assets/Contribute.png
rename to docs/home/.gitbook/assets/Contribute.png
diff --git a/docs/.gitbook/assets/Integrations.png b/docs/home/.gitbook/assets/Integrations.png
similarity index 100%
rename from docs/.gitbook/assets/Integrations.png
rename to docs/home/.gitbook/assets/Integrations.png
diff --git a/docs/.gitbook/assets/Screenshot 2025-08-11 at 12.21.17 PM.png b/docs/home/.gitbook/assets/Screenshot 2025-08-11 at 12.21.17 PM.png
similarity index 100%
rename from docs/.gitbook/assets/Screenshot 2025-08-11 at 12.21.17 PM.png
rename to docs/home/.gitbook/assets/Screenshot 2025-08-11 at 12.21.17 PM.png
diff --git a/docs/.gitbook/assets/api-reference.jpg b/docs/home/.gitbook/assets/api-reference.jpg
similarity index 100%
rename from docs/.gitbook/assets/api-reference.jpg
rename to docs/home/.gitbook/assets/api-reference.jpg
diff --git a/docs/.gitbook/assets/hosted.jpg b/docs/home/.gitbook/assets/hosted.jpg
similarity index 100%
rename from docs/.gitbook/assets/hosted.jpg
rename to docs/home/.gitbook/assets/hosted.jpg
diff --git a/docs/.gitbook/assets/no-code.jpg b/docs/home/.gitbook/assets/no-code.jpg
similarity index 100%
rename from docs/.gitbook/assets/no-code.jpg
rename to docs/home/.gitbook/assets/no-code.jpg
diff --git a/docs/.gitbook/assets/replicate-prediction-yt6p2d3gjhrma0ctdsv8vp1t70.jpeg b/docs/home/.gitbook/assets/replicate-prediction-yt6p2d3gjhrma0ctdsv8vp1t70.jpeg
similarity index 100%
rename from docs/.gitbook/assets/replicate-prediction-yt6p2d3gjhrma0ctdsv8vp1t70.jpeg
rename to docs/home/.gitbook/assets/replicate-prediction-yt6p2d3gjhrma0ctdsv8vp1t70.jpeg
diff --git a/docs/README.md b/docs/home/README.md
similarity index 100%
rename from docs/README.md
rename to docs/home/README.md
diff --git a/docs/SUMMARY.md b/docs/home/SUMMARY.md
similarity index 100%
rename from docs/SUMMARY.md
rename to docs/home/SUMMARY.md
diff --git a/docs/integrations/.gitbook/assets/Ollama-Add-Prompts.png b/docs/integrations/.gitbook/assets/Ollama-Add-Prompts.png
new file mode 100644
index 0000000000..deeddc7cc8
Binary files /dev/null and b/docs/integrations/.gitbook/assets/Ollama-Add-Prompts.png differ
diff --git a/docs/integrations/.gitbook/assets/Ollama-Output.png b/docs/integrations/.gitbook/assets/Ollama-Output.png
new file mode 100644
index 0000000000..06cb9f7a8a
Binary files /dev/null and b/docs/integrations/.gitbook/assets/Ollama-Output.png differ
diff --git a/docs/integrations/.gitbook/assets/Ollama-Remote-Host.png b/docs/integrations/.gitbook/assets/Ollama-Remote-Host.png
new file mode 100644
index 0000000000..25a57b9adf
Binary files /dev/null and b/docs/integrations/.gitbook/assets/Ollama-Remote-Host.png differ
diff --git a/docs/integrations/.gitbook/assets/Ollama-Select-Llama32.png b/docs/integrations/.gitbook/assets/Ollama-Select-Llama32.png
new file mode 100644
index 0000000000..cd39e1b4e6
Binary files /dev/null and b/docs/integrations/.gitbook/assets/Ollama-Select-Llama32.png differ
diff --git a/docs/integrations/.gitbook/assets/Select-AI-block.png b/docs/integrations/.gitbook/assets/Select-AI-block.png
new file mode 100644
index 0000000000..d9c41db4a5
Binary files /dev/null and b/docs/integrations/.gitbook/assets/Select-AI-block.png differ
diff --git a/docs/integrations/.gitbook/assets/e2b-dashboard.png b/docs/integrations/.gitbook/assets/e2b-dashboard.png
new file mode 100644
index 0000000000..456f1490cc
Binary files /dev/null and b/docs/integrations/.gitbook/assets/e2b-dashboard.png differ
diff --git a/docs/integrations/.gitbook/assets/e2b-log-url.png b/docs/integrations/.gitbook/assets/e2b-log-url.png
new file mode 100644
index 0000000000..3f1c189ee5
Binary files /dev/null and b/docs/integrations/.gitbook/assets/e2b-log-url.png differ
diff --git a/docs/integrations/.gitbook/assets/e2b-new-tag.png b/docs/integrations/.gitbook/assets/e2b-new-tag.png
new file mode 100644
index 0000000000..65a0a767cd
Binary files /dev/null and b/docs/integrations/.gitbook/assets/e2b-new-tag.png differ
diff --git a/docs/integrations/.gitbook/assets/e2b-tag-button.png b/docs/integrations/.gitbook/assets/e2b-tag-button.png
new file mode 100644
index 0000000000..741a6bac1a
Binary files /dev/null and b/docs/integrations/.gitbook/assets/e2b-tag-button.png differ
diff --git a/docs/integrations/.gitbook/assets/get-repo-dialog.png b/docs/integrations/.gitbook/assets/get-repo-dialog.png
new file mode 100644
index 0000000000..813160e45c
Binary files /dev/null and b/docs/integrations/.gitbook/assets/get-repo-dialog.png differ
diff --git a/docs/integrations/README.md b/docs/integrations/README.md
new file mode 100644
index 0000000000..7f2ea19721
--- /dev/null
+++ b/docs/integrations/README.md
@@ -0,0 +1,580 @@
+---
+layout:
+  width: default
+  title:
+    visible: true
+  description:
+    visible: true
+  tableOfContents:
+    visible: false
+  outline:
+    visible: true
+  pagination:
+    visible: true
+  metadata:
+    visible: true
+---
+
+# AutoGPT Blocks Overview
+
+AutoGPT uses a modular approach with various "blocks" to handle different tasks. These blocks are the building blocks of AutoGPT workflows, allowing users to create complex automations by combining simple, specialized components.
+
+{% hint style="info" %}
+**Creating Your Own Blocks**
+
+Want to create your own custom blocks? Check out our guides:
+
+* [Build your own Blocks](https://docs.agpt.co/platform/new_blocks/) - Step-by-step tutorial with examples
+* [Block SDK Guide](https://docs.agpt.co/platform/block-sdk-guide/) - Advanced SDK patterns with OAuth, webhooks, and provider configuration
+{% endhint %}
+
+Below is a comprehensive list of all available blocks, categorized by their primary function. Click on any block name to view its detailed documentation.
+
+## Basic Operations
+
+| Block Name | Description |
+|------------|-------------|
+| [Add Memory](block-integrations/basic.md#add-memory) | Add new memories to Mem0 with user segmentation |
+| [Add To Dictionary](block-integrations/basic.md#add-to-dictionary) | Adds a new key-value pair to a dictionary |
+| [Add To Library From Store](block-integrations/system/library_operations.md#add-to-library-from-store) | Add an agent from the store to your personal library |
+| [Add To List](block-integrations/basic.md#add-to-list) | Adds a new entry to a list |
+| [Agent Date Input](block-integrations/basic.md#agent-date-input) | Block for date input |
+| [Agent Dropdown Input](block-integrations/basic.md#agent-dropdown-input) | Block for dropdown text selection |
+| [Agent File Input](block-integrations/basic.md#agent-file-input) | Block for file upload input (string path for example) |
+| [Agent Google Drive File Input](block-integrations/basic.md#agent-google-drive-file-input) | Block for selecting a file from Google Drive |
+| [Agent Input](block-integrations/basic.md#agent-input) | A block that accepts and processes user input values within a workflow, supporting various input types and validation |
+| [Agent Long Text Input](block-integrations/basic.md#agent-long-text-input) | Block for long text input (multi-line) |
+| [Agent Number Input](block-integrations/basic.md#agent-number-input) | Block for number input |
+| [Agent Output](block-integrations/basic.md#agent-output) | A block that records and formats workflow results for display to users, with optional Jinja2 template formatting support |
+| [Agent Short Text Input](block-integrations/basic.md#agent-short-text-input) | Block for short text input (single-line) |
+| [Agent Table Input](block-integrations/basic.md#agent-table-input) | Block for table data input with customizable headers |
+| [Agent Time Input](block-integrations/basic.md#agent-time-input) | Block for time input |
+| [Agent Toggle Input](block-integrations/basic.md#agent-toggle-input) | Block for boolean toggle input |
+| [Block Installation](block-integrations/basic.md#block-installation) | Given a code string, this block allows the verification and installation of a block code into the system |
+| [Concatenate Lists](block-integrations/basic.md#concatenate-lists) | Concatenates multiple lists into a single list |
+| [Dictionary Is Empty](block-integrations/basic.md#dictionary-is-empty) | Checks if a dictionary is empty |
+| [File Store](block-integrations/basic.md#file-store) | Downloads and stores a file from a URL, data URI, or local path |
+| [Find In Dictionary](block-integrations/basic.md#find-in-dictionary) | A block that looks up a value in a dictionary, list, or object by key or index and returns the corresponding value |
+| [Find In List](block-integrations/basic.md#find-in-list) | Finds the index of the value in the list |
+| [Get All Memories](block-integrations/basic.md#get-all-memories) | Retrieve all memories from Mem0 with optional conversation filtering |
+| [Get Latest Memory](block-integrations/basic.md#get-latest-memory) | Retrieve the latest memory from Mem0 with optional key filtering |
+| [Get List Item](block-integrations/basic.md#get-list-item) | Returns the element at the given index |
+| [Get Store Agent Details](block-integrations/system/store_operations.md#get-store-agent-details) | Get detailed information about an agent from the store |
+| [Get Weather Information](block-integrations/basic.md#get-weather-information) | Retrieves weather information for a specified location using OpenWeatherMap API |
+| [Human In The Loop](block-integrations/basic.md#human-in-the-loop) | Pause execution and wait for human approval or modification of data |
+| [List Is Empty](block-integrations/basic.md#list-is-empty) | Checks if a list is empty |
+| [List Library Agents](block-integrations/system/library_operations.md#list-library-agents) | List all agents in your personal library |
+| [Note](block-integrations/basic.md#note) | A visual annotation block that displays a sticky note in the workflow editor for documentation and organization purposes |
+| [Print To Console](block-integrations/basic.md#print-to-console) | A debugging block that outputs text to the console for monitoring and troubleshooting workflow execution |
+| [Remove From Dictionary](block-integrations/basic.md#remove-from-dictionary) | Removes a key-value pair from a dictionary |
+| [Remove From List](block-integrations/basic.md#remove-from-list) | Removes an item from a list by value or index |
+| [Replace Dictionary Value](block-integrations/basic.md#replace-dictionary-value) | Replaces the value for a specified key in a dictionary |
+| [Replace List Item](block-integrations/basic.md#replace-list-item) | Replaces an item at the specified index |
+| [Reverse List Order](block-integrations/basic.md#reverse-list-order) | Reverses the order of elements in a list |
+| [Search Memory](block-integrations/basic.md#search-memory) | Search memories in Mem0 by user |
+| [Search Store Agents](block-integrations/system/store_operations.md#search-store-agents) | Search for agents in the store |
+| [Slant3D Cancel Order](block-integrations/slant3d/order.md#slant3d-cancel-order) | Cancel an existing order |
+| [Slant3D Create Order](block-integrations/slant3d/order.md#slant3d-create-order) | Create a new print order |
+| [Slant3D Estimate Order](block-integrations/slant3d/order.md#slant3d-estimate-order) | Get order cost estimate |
+| [Slant3D Estimate Shipping](block-integrations/slant3d/order.md#slant3d-estimate-shipping) | Get shipping cost estimate |
+| [Slant3D Filament](block-integrations/slant3d/filament.md#slant3d-filament) | Get list of available filaments |
+| [Slant3D Get Orders](block-integrations/slant3d/order.md#slant3d-get-orders) | Get all orders for the account |
+| [Slant3D Slicer](block-integrations/slant3d/slicing.md#slant3d-slicer) | Slice a 3D model file and get pricing information |
+| [Slant3D Tracking](block-integrations/slant3d/order.md#slant3d-tracking) | Track order status and shipping |
+| [Store Value](block-integrations/basic.md#store-value) | A basic block that stores and forwards a value throughout workflows, allowing it to be reused without changes across multiple blocks |
+| [Universal Type Converter](block-integrations/basic.md#universal-type-converter) | This block is used to convert a value to a universal type |
+| [XML Parser](block-integrations/basic.md#xml-parser) | Parses XML using gravitasml to tokenize and coverts it to dict |
+
+## Data Processing
+
+| Block Name | Description |
+|------------|-------------|
+| [Airtable Create Base](block-integrations/airtable/bases.md#airtable-create-base) | Create or find a base in Airtable |
+| [Airtable Create Field](block-integrations/airtable/schema.md#airtable-create-field) | Add a new field to an Airtable table |
+| [Airtable Create Records](block-integrations/airtable/records.md#airtable-create-records) | Create records in an Airtable table |
+| [Airtable Create Table](block-integrations/airtable/schema.md#airtable-create-table) | Create a new table in an Airtable base |
+| [Airtable Delete Records](block-integrations/airtable/records.md#airtable-delete-records) | Delete records from an Airtable table |
+| [Airtable Get Record](block-integrations/airtable/records.md#airtable-get-record) | Get a single record from Airtable |
+| [Airtable List Bases](block-integrations/airtable/bases.md#airtable-list-bases) | List all bases in Airtable |
+| [Airtable List Records](block-integrations/airtable/records.md#airtable-list-records) | List records from an Airtable table |
+| [Airtable List Schema](block-integrations/airtable/schema.md#airtable-list-schema) | Get the complete schema of an Airtable base |
+| [Airtable Update Field](block-integrations/airtable/schema.md#airtable-update-field) | Update field properties in an Airtable table |
+| [Airtable Update Records](block-integrations/airtable/records.md#airtable-update-records) | Update records in an Airtable table |
+| [Airtable Update Table](block-integrations/airtable/schema.md#airtable-update-table) | Update table properties |
+| [Airtable Webhook Trigger](block-integrations/airtable/triggers.md#airtable-webhook-trigger) | Starts a flow whenever Airtable emits a webhook event |
+| [Baas Bot Delete Recording](block-integrations/baas/bots.md#baas-bot-delete-recording) | Permanently delete a meeting's recorded data |
+| [Baas Bot Fetch Meeting Data](block-integrations/baas/bots.md#baas-bot-fetch-meeting-data) | Retrieve recorded meeting data |
+| [Create Dictionary](block-integrations/data.md#create-dictionary) | Creates a dictionary with the specified key-value pairs |
+| [Create List](block-integrations/data.md#create-list) | Creates a list with the specified values |
+| [Data For Seo Keyword Suggestions](block-integrations/dataforseo/keyword_suggestions.md#data-for-seo-keyword-suggestions) | Get keyword suggestions from DataForSEO Labs Google API |
+| [Data For Seo Related Keywords](block-integrations/dataforseo/related_keywords.md#data-for-seo-related-keywords) | Get related keywords from DataForSEO Labs Google API |
+| [Exa Create Import](block-integrations/exa/websets_import_export.md#exa-create-import) | Import CSV data to use with websets for targeted searches |
+| [Exa Delete Import](block-integrations/exa/websets_import_export.md#exa-delete-import) | Delete an import |
+| [Exa Export Webset](block-integrations/exa/websets_import_export.md#exa-export-webset) | Export webset data in JSON, CSV, or JSON Lines format |
+| [Exa Get Import](block-integrations/exa/websets_import_export.md#exa-get-import) | Get the status and details of an import |
+| [Exa Get New Items](block-integrations/exa/websets_items.md#exa-get-new-items) | Get items added since a cursor - enables incremental processing without reprocessing |
+| [Exa List Imports](block-integrations/exa/websets_import_export.md#exa-list-imports) | List all imports with pagination support |
+| [File Read](block-integrations/data.md#file-read) | Reads a file and returns its content as a string, with optional chunking by delimiter and size limits |
+| [Google Calendar Read Events](block-integrations/google/calendar.md#google-calendar-read-events) | Retrieves upcoming events from a Google Calendar with filtering options |
+| [Google Docs Append Markdown](block-integrations/google/docs.md#google-docs-append-markdown) | Append Markdown content to the end of a Google Doc with full formatting - ideal for LLM/AI output |
+| [Google Docs Append Plain Text](block-integrations/google/docs.md#google-docs-append-plain-text) | Append plain text to the end of a Google Doc (no formatting applied) |
+| [Google Docs Create](block-integrations/google/docs.md#google-docs-create) | Create a new Google Doc |
+| [Google Docs Delete Content](block-integrations/google/docs.md#google-docs-delete-content) | Delete a range of content from a Google Doc |
+| [Google Docs Export](block-integrations/google/docs.md#google-docs-export) | Export a Google Doc to PDF, Word, text, or other formats |
+| [Google Docs Find Replace Plain Text](block-integrations/google/docs.md#google-docs-find-replace-plain-text) | Find and replace plain text in a Google Doc (no formatting applied to replacement) |
+| [Google Docs Format Text](block-integrations/google/docs.md#google-docs-format-text) | Apply formatting (bold, italic, color, etc |
+| [Google Docs Get Metadata](block-integrations/google/docs.md#google-docs-get-metadata) | Get metadata about a Google Doc |
+| [Google Docs Get Structure](block-integrations/google/docs.md#google-docs-get-structure) | Get document structure with index positions for precise editing operations |
+| [Google Docs Insert Markdown At](block-integrations/google/docs.md#google-docs-insert-markdown-at) | Insert formatted Markdown at a specific position in a Google Doc - ideal for LLM/AI output |
+| [Google Docs Insert Page Break](block-integrations/google/docs.md#google-docs-insert-page-break) | Insert a page break into a Google Doc |
+| [Google Docs Insert Plain Text](block-integrations/google/docs.md#google-docs-insert-plain-text) | Insert plain text at a specific position in a Google Doc (no formatting applied) |
+| [Google Docs Insert Table](block-integrations/google/docs.md#google-docs-insert-table) | Insert a table into a Google Doc, optionally with content and Markdown formatting |
+| [Google Docs Read](block-integrations/google/docs.md#google-docs-read) | Read text content from a Google Doc |
+| [Google Docs Replace All With Markdown](block-integrations/google/docs.md#google-docs-replace-all-with-markdown) | Replace entire Google Doc content with formatted Markdown - ideal for LLM/AI output |
+| [Google Docs Replace Content With Markdown](block-integrations/google/docs.md#google-docs-replace-content-with-markdown) | Find text and replace it with formatted Markdown - ideal for LLM/AI output and templates |
+| [Google Docs Replace Range With Markdown](block-integrations/google/docs.md#google-docs-replace-range-with-markdown) | Replace a specific index range in a Google Doc with formatted Markdown - ideal for LLM/AI output |
+| [Google Docs Set Public Access](block-integrations/google/docs.md#google-docs-set-public-access) | Make a Google Doc public or private |
+| [Google Docs Share](block-integrations/google/docs.md#google-docs-share) | Share a Google Doc with specific users |
+| [Google Sheets Add Column](block-integrations/google/sheets.md#google-sheets-add-column) | Add a new column with a header |
+| [Google Sheets Add Dropdown](block-integrations/google/sheets.md#google-sheets-add-dropdown) | Add a dropdown list (data validation) to cells |
+| [Google Sheets Add Note](block-integrations/google/sheets.md#google-sheets-add-note) | Add a note to a cell in a Google Sheet |
+| [Google Sheets Append Row](block-integrations/google/sheets.md#google-sheets-append-row) | Append or Add a single row to the end of a Google Sheet |
+| [Google Sheets Batch Operations](block-integrations/google/sheets.md#google-sheets-batch-operations) | This block performs multiple operations on a Google Sheets spreadsheet in a single batch request |
+| [Google Sheets Clear](block-integrations/google/sheets.md#google-sheets-clear) | This block clears data from a specified range in a Google Sheets spreadsheet |
+| [Google Sheets Copy To Spreadsheet](block-integrations/google/sheets.md#google-sheets-copy-to-spreadsheet) | Copy a sheet from one spreadsheet to another |
+| [Google Sheets Create Named Range](block-integrations/google/sheets.md#google-sheets-create-named-range) | Create a named range to reference cells by name instead of A1 notation |
+| [Google Sheets Create Spreadsheet](block-integrations/google/sheets.md#google-sheets-create-spreadsheet) | This block creates a new Google Sheets spreadsheet with specified sheets |
+| [Google Sheets Delete Column](block-integrations/google/sheets.md#google-sheets-delete-column) | Delete a column by header name or column letter |
+| [Google Sheets Delete Rows](block-integrations/google/sheets.md#google-sheets-delete-rows) | Delete specific rows from a Google Sheet by their row indices |
+| [Google Sheets Export Csv](block-integrations/google/sheets.md#google-sheets-export-csv) | Export a Google Sheet as CSV data |
+| [Google Sheets Filter Rows](block-integrations/google/sheets.md#google-sheets-filter-rows) | Filter rows in a Google Sheet based on a column condition |
+| [Google Sheets Find](block-integrations/google/sheets.md#google-sheets-find) | Find text in a Google Sheets spreadsheet |
+| [Google Sheets Find Replace](block-integrations/google/sheets.md#google-sheets-find-replace) | This block finds and replaces text in a Google Sheets spreadsheet |
+| [Google Sheets Format](block-integrations/google/sheets.md#google-sheets-format) | Format a range in a Google Sheet (sheet optional) |
+| [Google Sheets Get Column](block-integrations/google/sheets.md#google-sheets-get-column) | Extract all values from a specific column |
+| [Google Sheets Get Notes](block-integrations/google/sheets.md#google-sheets-get-notes) | Get notes from cells in a Google Sheet |
+| [Google Sheets Get Row](block-integrations/google/sheets.md#google-sheets-get-row) | Get a specific row by its index |
+| [Google Sheets Get Row Count](block-integrations/google/sheets.md#google-sheets-get-row-count) | Get row count and dimensions of a Google Sheet |
+| [Google Sheets Get Unique Values](block-integrations/google/sheets.md#google-sheets-get-unique-values) | Get unique values from a column |
+| [Google Sheets Import Csv](block-integrations/google/sheets.md#google-sheets-import-csv) | Import CSV data into a Google Sheet |
+| [Google Sheets Insert Row](block-integrations/google/sheets.md#google-sheets-insert-row) | Insert a single row at a specific position |
+| [Google Sheets List Named Ranges](block-integrations/google/sheets.md#google-sheets-list-named-ranges) | List all named ranges in a spreadsheet |
+| [Google Sheets Lookup Row](block-integrations/google/sheets.md#google-sheets-lookup-row) | Look up a row by finding a value in a specific column |
+| [Google Sheets Manage Sheet](block-integrations/google/sheets.md#google-sheets-manage-sheet) | Create, delete, or copy sheets (sheet optional) |
+| [Google Sheets Metadata](block-integrations/google/sheets.md#google-sheets-metadata) | This block retrieves metadata about a Google Sheets spreadsheet including sheet names and properties |
+| [Google Sheets Protect Range](block-integrations/google/sheets.md#google-sheets-protect-range) | Protect a cell range or entire sheet from editing |
+| [Google Sheets Read](block-integrations/google/sheets.md#google-sheets-read) | A block that reads data from a Google Sheets spreadsheet using A1 notation range selection |
+| [Google Sheets Remove Duplicates](block-integrations/google/sheets.md#google-sheets-remove-duplicates) | Remove duplicate rows based on specified columns |
+| [Google Sheets Set Public Access](block-integrations/google/sheets.md#google-sheets-set-public-access) | Make a Google Spreadsheet public or private |
+| [Google Sheets Share Spreadsheet](block-integrations/google/sheets.md#google-sheets-share-spreadsheet) | Share a Google Spreadsheet with users or get shareable link |
+| [Google Sheets Sort](block-integrations/google/sheets.md#google-sheets-sort) | Sort a Google Sheet by one or two columns |
+| [Google Sheets Update Cell](block-integrations/google/sheets.md#google-sheets-update-cell) | Update a single cell in a Google Sheets spreadsheet |
+| [Google Sheets Update Row](block-integrations/google/sheets.md#google-sheets-update-row) | Update a specific row by its index |
+| [Google Sheets Write](block-integrations/google/sheets.md#google-sheets-write) | A block that writes data to a Google Sheets spreadsheet at a specified A1 notation range |
+| [Keyword Suggestion Extractor](block-integrations/dataforseo/keyword_suggestions.md#keyword-suggestion-extractor) | Extract individual fields from a KeywordSuggestion object |
+| [Persist Information](block-integrations/data.md#persist-information) | Persist key-value information for the current user |
+| [Read Spreadsheet](block-integrations/data.md#read-spreadsheet) | Reads CSV and Excel files and outputs the data as a list of dictionaries and individual rows |
+| [Related Keyword Extractor](block-integrations/dataforseo/related_keywords.md#related-keyword-extractor) | Extract individual fields from a RelatedKeyword object |
+| [Retrieve Information](block-integrations/data.md#retrieve-information) | Retrieve key-value information for the current user |
+| [Screenshot Web Page](block-integrations/data.md#screenshot-web-page) | Takes a screenshot of a specified website using ScreenshotOne API |
+
+## Text Processing
+
+| Block Name | Description |
+|------------|-------------|
+| [Code Extraction](block-integrations/text.md#code-extraction) | Extracts code blocks from text and identifies their programming languages |
+| [Combine Texts](block-integrations/text.md#combine-texts) | This block combines multiple input texts into a single output text |
+| [Countdown Timer](block-integrations/text.md#countdown-timer) | This block triggers after a specified duration |
+| [Extract Text Information](block-integrations/text.md#extract-text-information) | This block extracts the text from the given text using the pattern (regex) |
+| [Fill Text Template](block-integrations/text.md#fill-text-template) | This block formats the given texts using the format template |
+| [Get Current Date](block-integrations/text.md#get-current-date) | This block outputs the current date with an optional offset |
+| [Get Current Date And Time](block-integrations/text.md#get-current-date-and-time) | This block outputs the current date and time |
+| [Get Current Time](block-integrations/text.md#get-current-time) | This block outputs the current time |
+| [Match Text Pattern](block-integrations/text.md#match-text-pattern) | Matches text against a regex pattern and forwards data to positive or negative output based on the match |
+| [Text Decoder](block-integrations/text.md#text-decoder) | Decodes a string containing escape sequences into actual text |
+| [Text Replace](block-integrations/text.md#text-replace) | This block is used to replace a text with a new text |
+| [Text Split](block-integrations/text.md#text-split) | This block is used to split a text into a list of strings |
+| [Word Character Count](block-integrations/text.md#word-character-count) | Counts the number of words and characters in a given text |
+
+## AI and Language Models
+
+| Block Name | Description |
+|------------|-------------|
+| [AI Ad Maker Video Creator](block-integrations/llm.md#ai-ad-maker-video-creator) | Creates an AI‑generated 30‑second advert (text + images) |
+| [AI Condition](block-integrations/llm.md#ai-condition) | Uses AI to evaluate natural language conditions and provide conditional outputs |
+| [AI Conversation](block-integrations/llm.md#ai-conversation) | A block that facilitates multi-turn conversations with a Large Language Model (LLM), maintaining context across message exchanges |
+| [AI Image Customizer](block-integrations/llm.md#ai-image-customizer) | Generate and edit custom images using Google's Nano-Banana model from Gemini 2 |
+| [AI Image Editor](block-integrations/llm.md#ai-image-editor) | Edit images using BlackForest Labs' Flux Kontext models |
+| [AI Image Generator](block-integrations/llm.md#ai-image-generator) | Generate images using various AI models through a unified interface |
+| [AI List Generator](block-integrations/llm.md#ai-list-generator) | A block that creates lists of items based on prompts using a Large Language Model (LLM), with optional source data for context |
+| [AI Music Generator](block-integrations/llm.md#ai-music-generator) | This block generates music using Meta's MusicGen model on Replicate |
+| [AI Screenshot To Video Ad](block-integrations/llm.md#ai-screenshot-to-video-ad) | Turns a screenshot into an engaging, avatar‑narrated video advert |
+| [AI Shortform Video Creator](block-integrations/llm.md#ai-shortform-video-creator) | Creates a shortform video using revid |
+| [AI Structured Response Generator](block-integrations/llm.md#ai-structured-response-generator) | A block that generates structured JSON responses using a Large Language Model (LLM), with schema validation and format enforcement |
+| [AI Text Generator](block-integrations/llm.md#ai-text-generator) | A block that produces text responses using a Large Language Model (LLM) based on customizable prompts and system instructions |
+| [AI Text Summarizer](block-integrations/llm.md#ai-text-summarizer) | A block that summarizes long texts using a Large Language Model (LLM), with configurable focus topics and summary styles |
+| [AI Video Generator](block-integrations/fal/ai_video_generator.md#ai-video-generator) | Generate videos using FAL AI models |
+| [Bannerbear Text Overlay](block-integrations/bannerbear/text_overlay.md#bannerbear-text-overlay) | Add text overlay to images using Bannerbear templates |
+| [Claude Code](block-integrations/llm.md#claude-code) | Execute tasks using Claude Code in an E2B sandbox |
+| [Code Generation](block-integrations/llm.md#code-generation) | Generate or refactor code using OpenAI's Codex (Responses API) |
+| [Create Talking Avatar Video](block-integrations/llm.md#create-talking-avatar-video) | This block integrates with D-ID to create video clips and retrieve their URLs |
+| [Exa Answer](block-integrations/exa/answers.md#exa-answer) | Get an LLM answer to a question informed by Exa search results |
+| [Exa Create Enrichment](block-integrations/exa/websets_enrichment.md#exa-create-enrichment) | Create enrichments to extract additional structured data from webset items |
+| [Exa Create Research](block-integrations/exa/research.md#exa-create-research) | Create research task with optional waiting - explores web and synthesizes findings with citations |
+| [Ideogram Model](block-integrations/llm.md#ideogram-model) | This block runs Ideogram models with both simple and advanced settings |
+| [Jina Chunking](block-integrations/jina/chunking.md#jina-chunking) | Chunks texts using Jina AI's segmentation service |
+| [Jina Embedding](block-integrations/jina/embeddings.md#jina-embedding) | Generates embeddings using Jina AI |
+| [Perplexity](block-integrations/llm.md#perplexity) | Query Perplexity's sonar models with real-time web search capabilities and receive annotated responses with source citations |
+| [Replicate Flux Advanced Model](block-integrations/replicate/flux_advanced.md#replicate-flux-advanced-model) | This block runs Flux models on Replicate with advanced settings |
+| [Replicate Model](block-integrations/replicate/replicate_block.md#replicate-model) | Run Replicate models synchronously |
+| [Smart Decision Maker](block-integrations/llm.md#smart-decision-maker) | Uses AI to intelligently decide what tool to use |
+| [Stagehand Act](block-integrations/stagehand/blocks.md#stagehand-act) | Interact with a web page by performing actions on a web page |
+| [Stagehand Extract](block-integrations/stagehand/blocks.md#stagehand-extract) | Extract structured data from a webpage |
+| [Stagehand Observe](block-integrations/stagehand/blocks.md#stagehand-observe) | Find suggested actions for your workflows |
+| [Unreal Text To Speech](block-integrations/llm.md#unreal-text-to-speech) | Converts text to speech using the Unreal Speech API |
+
+## Search and Information Retrieval
+
+| Block Name | Description |
+|------------|-------------|
+| [Ask Wolfram](block-integrations/wolfram/llm_api.md#ask-wolfram) | Ask Wolfram Alpha a question |
+| [Exa Bulk Webset Items](block-integrations/exa/websets_items.md#exa-bulk-webset-items) | Get all items from a webset in bulk (with configurable limits) |
+| [Exa Cancel Enrichment](block-integrations/exa/websets_enrichment.md#exa-cancel-enrichment) | Cancel a running enrichment operation |
+| [Exa Cancel Webset](block-integrations/exa/websets.md#exa-cancel-webset) | Cancel all operations being performed on a Webset |
+| [Exa Cancel Webset Search](block-integrations/exa/websets_search.md#exa-cancel-webset-search) | Cancel a running webset search |
+| [Exa Contents](block-integrations/exa/contents.md#exa-contents) | Retrieves document contents using Exa's contents API |
+| [Exa Create Monitor](block-integrations/exa/websets_monitor.md#exa-create-monitor) | Create automated monitors to keep websets updated with fresh data on a schedule |
+| [Exa Create Or Find Webset](block-integrations/exa/websets.md#exa-create-or-find-webset) | Create a new webset or return existing one by external_id (idempotent operation) |
+| [Exa Create Webset](block-integrations/exa/websets.md#exa-create-webset) | Create a new Exa Webset for persistent web search collections with optional waiting for initial results |
+| [Exa Create Webset Search](block-integrations/exa/websets_search.md#exa-create-webset-search) | Add a new search to an existing webset to find more items |
+| [Exa Delete Enrichment](block-integrations/exa/websets_enrichment.md#exa-delete-enrichment) | Delete an enrichment from a webset |
+| [Exa Delete Monitor](block-integrations/exa/websets_monitor.md#exa-delete-monitor) | Delete a monitor from a webset |
+| [Exa Delete Webset](block-integrations/exa/websets.md#exa-delete-webset) | Delete a Webset and all its items |
+| [Exa Delete Webset Item](block-integrations/exa/websets_items.md#exa-delete-webset-item) | Delete a specific item from a webset |
+| [Exa Find Or Create Search](block-integrations/exa/websets_search.md#exa-find-or-create-search) | Find existing search by query or create new - prevents duplicate searches in workflows |
+| [Exa Find Similar](block-integrations/exa/similar.md#exa-find-similar) | Finds similar links using Exa's findSimilar API |
+| [Exa Get Enrichment](block-integrations/exa/websets_enrichment.md#exa-get-enrichment) | Get the status and details of a webset enrichment |
+| [Exa Get Monitor](block-integrations/exa/websets_monitor.md#exa-get-monitor) | Get the details and status of a webset monitor |
+| [Exa Get Research](block-integrations/exa/research.md#exa-get-research) | Get status and results of a research task |
+| [Exa Get Webset](block-integrations/exa/websets.md#exa-get-webset) | Retrieve a Webset by ID or external ID |
+| [Exa Get Webset Item](block-integrations/exa/websets_items.md#exa-get-webset-item) | Get a specific item from a webset by its ID |
+| [Exa Get Webset Search](block-integrations/exa/websets_search.md#exa-get-webset-search) | Get the status and details of a webset search |
+| [Exa List Monitors](block-integrations/exa/websets_monitor.md#exa-list-monitors) | List all monitors with optional webset filtering |
+| [Exa List Research](block-integrations/exa/research.md#exa-list-research) | List all research tasks with pagination support |
+| [Exa List Webset Items](block-integrations/exa/websets_items.md#exa-list-webset-items) | List items in a webset with pagination support |
+| [Exa List Websets](block-integrations/exa/websets.md#exa-list-websets) | List all Websets with pagination support |
+| [Exa Preview Webset](block-integrations/exa/websets.md#exa-preview-webset) | Preview how a search query will be interpreted before creating a webset |
+| [Exa Search](block-integrations/exa/search.md#exa-search) | Searches the web using Exa's advanced search API |
+| [Exa Update Enrichment](block-integrations/exa/websets_enrichment.md#exa-update-enrichment) | Update an existing enrichment configuration |
+| [Exa Update Monitor](block-integrations/exa/websets_monitor.md#exa-update-monitor) | Update a monitor's status, schedule, or metadata |
+| [Exa Update Webset](block-integrations/exa/websets.md#exa-update-webset) | Update metadata for an existing Webset |
+| [Exa Wait For Enrichment](block-integrations/exa/websets_polling.md#exa-wait-for-enrichment) | Wait for a webset enrichment to complete with progress tracking |
+| [Exa Wait For Research](block-integrations/exa/research.md#exa-wait-for-research) | Wait for a research task to complete with configurable timeout |
+| [Exa Wait For Search](block-integrations/exa/websets_polling.md#exa-wait-for-search) | Wait for a specific webset search to complete with progress tracking |
+| [Exa Wait For Webset](block-integrations/exa/websets_polling.md#exa-wait-for-webset) | Wait for a webset to reach a specific status with progress tracking |
+| [Exa Webset Items Summary](block-integrations/exa/websets_items.md#exa-webset-items-summary) | Get a summary of webset items without retrieving all data |
+| [Exa Webset Status](block-integrations/exa/websets.md#exa-webset-status) | Get a quick status overview of a webset |
+| [Exa Webset Summary](block-integrations/exa/websets.md#exa-webset-summary) | Get a comprehensive summary of a webset with samples and statistics |
+| [Extract Website Content](block-integrations/jina/search.md#extract-website-content) | This block scrapes the content from the given web URL |
+| [Fact Checker](block-integrations/jina/fact_checker.md#fact-checker) | This block checks the factuality of a given statement using Jina AI's Grounding API |
+| [Firecrawl Crawl](block-integrations/firecrawl/crawl.md#firecrawl-crawl) | Firecrawl crawls websites to extract comprehensive data while bypassing blockers |
+| [Firecrawl Extract](block-integrations/firecrawl/extract.md#firecrawl-extract) | Firecrawl crawls websites to extract comprehensive data while bypassing blockers |
+| [Firecrawl Map Website](block-integrations/firecrawl/map.md#firecrawl-map-website) | Firecrawl maps a website to extract all the links |
+| [Firecrawl Scrape](block-integrations/firecrawl/scrape.md#firecrawl-scrape) | Firecrawl scrapes a website to extract comprehensive data while bypassing blockers |
+| [Firecrawl Search](block-integrations/firecrawl/search.md#firecrawl-search) | Firecrawl searches the web for the given query |
+| [Get Person Detail](block-integrations/apollo/person.md#get-person-detail) | Get detailed person data with Apollo API, including email reveal |
+| [Get Wikipedia Summary](block-integrations/search.md#get-wikipedia-summary) | This block fetches the summary of a given topic from Wikipedia |
+| [Google Maps Search](block-integrations/search.md#google-maps-search) | This block searches for local businesses using Google Maps API |
+| [Search Organizations](block-integrations/apollo/organization.md#search-organizations) | Search for organizations in Apollo |
+| [Search People](block-integrations/apollo/people.md#search-people) | Search for people in Apollo |
+| [Search The Web](block-integrations/jina/search.md#search-the-web) | This block searches the internet for the given search query |
+| [Validate Emails](block-integrations/zerobounce/validate_emails.md#validate-emails) | Validate emails |
+
+## Social Media and Content
+
+| Block Name | Description |
+|------------|-------------|
+| [Create Discord Thread](block-integrations/discord/bot_blocks.md#create-discord-thread) | Creates a new thread in a Discord channel |
+| [Create Reddit Post](block-integrations/misc.md#create-reddit-post) | Create a new post on a subreddit |
+| [Delete Reddit Comment](block-integrations/misc.md#delete-reddit-comment) | Delete a Reddit comment that you own |
+| [Delete Reddit Post](block-integrations/misc.md#delete-reddit-post) | Delete a Reddit post that you own |
+| [Discord Channel Info](block-integrations/discord/bot_blocks.md#discord-channel-info) | Resolves Discord channel names to IDs and vice versa |
+| [Discord Get Current User](block-integrations/discord/oauth_blocks.md#discord-get-current-user) | Gets information about the currently authenticated Discord user using OAuth2 credentials |
+| [Discord User Info](block-integrations/discord/bot_blocks.md#discord-user-info) | Gets information about a Discord user by their ID |
+| [Edit Reddit Post](block-integrations/misc.md#edit-reddit-post) | Edit the body text of an existing Reddit post that you own |
+| [Get Linkedin Profile](block-integrations/enrichlayer/linkedin.md#get-linkedin-profile) | Fetch LinkedIn profile data using Enrichlayer |
+| [Get Linkedin Profile Picture](block-integrations/enrichlayer/linkedin.md#get-linkedin-profile-picture) | Get LinkedIn profile pictures using Enrichlayer |
+| [Get Reddit Comment](block-integrations/misc.md#get-reddit-comment) | Get details about a specific Reddit comment by its ID |
+| [Get Reddit Comment Replies](block-integrations/misc.md#get-reddit-comment-replies) | Get replies to a specific Reddit comment |
+| [Get Reddit Inbox](block-integrations/misc.md#get-reddit-inbox) | Get messages, mentions, and comment replies from your Reddit inbox |
+| [Get Reddit Post](block-integrations/misc.md#get-reddit-post) | Get detailed information about a specific Reddit post by its ID |
+| [Get Reddit Post Comments](block-integrations/misc.md#get-reddit-post-comments) | Get top-level comments on a Reddit post |
+| [Get Reddit Posts](block-integrations/misc.md#get-reddit-posts) | This block fetches Reddit posts from a defined subreddit name |
+| [Get Reddit User Info](block-integrations/misc.md#get-reddit-user-info) | Get information about a Reddit user including karma, account age, and verification status |
+| [Get Subreddit Flairs](block-integrations/misc.md#get-subreddit-flairs) | Get available link flair options for a subreddit |
+| [Get Subreddit Info](block-integrations/misc.md#get-subreddit-info) | Get information about a subreddit including subscriber count, description, and rules |
+| [Get Subreddit Rules](block-integrations/misc.md#get-subreddit-rules) | Get the rules for a subreddit to ensure compliance before posting |
+| [Get User Posts](block-integrations/misc.md#get-user-posts) | Fetch posts by a specific Reddit user |
+| [Linkedin Person Lookup](block-integrations/enrichlayer/linkedin.md#linkedin-person-lookup) | Look up LinkedIn profiles by person information using Enrichlayer |
+| [Linkedin Role Lookup](block-integrations/enrichlayer/linkedin.md#linkedin-role-lookup) | Look up LinkedIn profiles by role in a company using Enrichlayer |
+| [Post Reddit Comment](block-integrations/misc.md#post-reddit-comment) | This block posts a Reddit comment on a specified Reddit post |
+| [Post To Bluesky](block-integrations/ayrshare/post_to_bluesky.md#post-to-bluesky) | Post to Bluesky using Ayrshare |
+| [Post To Facebook](block-integrations/ayrshare/post_to_facebook.md#post-to-facebook) | Post to Facebook using Ayrshare |
+| [Post To GMB](block-integrations/ayrshare/post_to_gmb.md#post-to-gmb) | Post to Google My Business using Ayrshare |
+| [Post To Instagram](block-integrations/ayrshare/post_to_instagram.md#post-to-instagram) | Post to Instagram using Ayrshare |
+| [Post To Linked In](block-integrations/ayrshare/post_to_linkedin.md#post-to-linked-in) | Post to LinkedIn using Ayrshare |
+| [Post To Pinterest](block-integrations/ayrshare/post_to_pinterest.md#post-to-pinterest) | Post to Pinterest using Ayrshare |
+| [Post To Reddit](block-integrations/ayrshare/post_to_reddit.md#post-to-reddit) | Post to Reddit using Ayrshare |
+| [Post To Snapchat](block-integrations/ayrshare/post_to_snapchat.md#post-to-snapchat) | Post to Snapchat using Ayrshare |
+| [Post To Telegram](block-integrations/ayrshare/post_to_telegram.md#post-to-telegram) | Post to Telegram using Ayrshare |
+| [Post To Threads](block-integrations/ayrshare/post_to_threads.md#post-to-threads) | Post to Threads using Ayrshare |
+| [Post To Tik Tok](block-integrations/ayrshare/post_to_tiktok.md#post-to-tik-tok) | Post to TikTok using Ayrshare |
+| [Post To X](block-integrations/ayrshare/post_to_x.md#post-to-x) | Post to X / Twitter using Ayrshare |
+| [Post To You Tube](block-integrations/ayrshare/post_to_youtube.md#post-to-you-tube) | Post to YouTube using Ayrshare |
+| [Publish To Medium](block-integrations/misc.md#publish-to-medium) | Publishes a post to Medium |
+| [Read Discord Messages](block-integrations/discord/bot_blocks.md#read-discord-messages) | Reads messages from a Discord channel using a bot token |
+| [Reddit Get My Posts](block-integrations/misc.md#reddit-get-my-posts) | Fetch posts created by the authenticated Reddit user (you) |
+| [Reply To Discord Message](block-integrations/discord/bot_blocks.md#reply-to-discord-message) | Replies to a specific Discord message |
+| [Reply To Reddit Comment](block-integrations/misc.md#reply-to-reddit-comment) | Reply to a specific Reddit comment |
+| [Search Reddit](block-integrations/misc.md#search-reddit) | Search Reddit for posts matching a query |
+| [Send Discord DM](block-integrations/discord/bot_blocks.md#send-discord-dm) | Sends a direct message to a Discord user using their user ID |
+| [Send Discord Embed](block-integrations/discord/bot_blocks.md#send-discord-embed) | Sends a rich embed message to a Discord channel |
+| [Send Discord File](block-integrations/discord/bot_blocks.md#send-discord-file) | Sends a file attachment to a Discord channel |
+| [Send Discord Message](block-integrations/discord/bot_blocks.md#send-discord-message) | Sends a message to a Discord channel using a bot token |
+| [Send Reddit Message](block-integrations/misc.md#send-reddit-message) | Send a private message (DM) to a Reddit user |
+| [Transcribe Youtube Video](block-integrations/misc.md#transcribe-youtube-video) | Transcribes a YouTube video using a proxy |
+| [Twitter Add List Member](block-integrations/twitter/list_members.md#twitter-add-list-member) | This block adds a specified user to a Twitter List owned by the authenticated user |
+| [Twitter Bookmark Tweet](block-integrations/twitter/bookmark.md#twitter-bookmark-tweet) | This block bookmarks a tweet on Twitter |
+| [Twitter Create List](block-integrations/twitter/manage_lists.md#twitter-create-list) | This block creates a new Twitter List for the authenticated user |
+| [Twitter Delete List](block-integrations/twitter/manage_lists.md#twitter-delete-list) | This block deletes a specified Twitter List owned by the authenticated user |
+| [Twitter Delete Tweet](block-integrations/twitter/manage.md#twitter-delete-tweet) | This block deletes a tweet on Twitter |
+| [Twitter Follow List](block-integrations/twitter/list_follows.md#twitter-follow-list) | This block follows a specified Twitter list for the authenticated user |
+| [Twitter Follow User](block-integrations/twitter/follows.md#twitter-follow-user) | This block follows a specified Twitter user |
+| [Twitter Get Blocked Users](block-integrations/twitter/blocks.md#twitter-get-blocked-users) | This block retrieves a list of users blocked by the authenticating user |
+| [Twitter Get Bookmarked Tweets](block-integrations/twitter/bookmark.md#twitter-get-bookmarked-tweets) | This block retrieves bookmarked tweets from Twitter |
+| [Twitter Get Followers](block-integrations/twitter/follows.md#twitter-get-followers) | This block retrieves followers of a specified Twitter user |
+| [Twitter Get Following](block-integrations/twitter/follows.md#twitter-get-following) | This block retrieves the users that a specified Twitter user is following |
+| [Twitter Get Home Timeline](block-integrations/twitter/timeline.md#twitter-get-home-timeline) | This block retrieves the authenticated user's home timeline |
+| [Twitter Get Liked Tweets](block-integrations/twitter/like.md#twitter-get-liked-tweets) | This block gets information about tweets liked by a user |
+| [Twitter Get Liking Users](block-integrations/twitter/like.md#twitter-get-liking-users) | This block gets information about users who liked a tweet |
+| [Twitter Get List](block-integrations/twitter/list_lookup.md#twitter-get-list) | This block retrieves information about a specified Twitter List |
+| [Twitter Get List Members](block-integrations/twitter/list_members.md#twitter-get-list-members) | This block retrieves the members of a specified Twitter List |
+| [Twitter Get List Memberships](block-integrations/twitter/list_members.md#twitter-get-list-memberships) | This block retrieves all Lists that a specified user is a member of |
+| [Twitter Get List Tweets](block-integrations/twitter/list_tweets_lookup.md#twitter-get-list-tweets) | This block retrieves tweets from a specified Twitter list |
+| [Twitter Get Muted Users](block-integrations/twitter/mutes.md#twitter-get-muted-users) | This block gets a list of users muted by the authenticating user |
+| [Twitter Get Owned Lists](block-integrations/twitter/list_lookup.md#twitter-get-owned-lists) | This block retrieves all Lists owned by a specified Twitter user |
+| [Twitter Get Pinned Lists](block-integrations/twitter/pinned_lists.md#twitter-get-pinned-lists) | This block returns the Lists pinned by the authenticated user |
+| [Twitter Get Quote Tweets](block-integrations/twitter/quote.md#twitter-get-quote-tweets) | This block gets quote tweets for a specific tweet |
+| [Twitter Get Retweeters](block-integrations/twitter/retweet.md#twitter-get-retweeters) | This block gets information about who has retweeted a tweet |
+| [Twitter Get Space Buyers](block-integrations/twitter/spaces_lookup.md#twitter-get-space-buyers) | This block retrieves a list of users who purchased tickets to a Twitter Space |
+| [Twitter Get Space By Id](block-integrations/twitter/spaces_lookup.md#twitter-get-space-by-id) | This block retrieves information about a single Twitter Space |
+| [Twitter Get Space Tweets](block-integrations/twitter/spaces_lookup.md#twitter-get-space-tweets) | This block retrieves tweets shared in a Twitter Space |
+| [Twitter Get Spaces](block-integrations/twitter/spaces_lookup.md#twitter-get-spaces) | This block retrieves information about multiple Twitter Spaces |
+| [Twitter Get Tweet](block-integrations/twitter/tweet_lookup.md#twitter-get-tweet) | This block retrieves information about a specific Tweet |
+| [Twitter Get Tweets](block-integrations/twitter/tweet_lookup.md#twitter-get-tweets) | This block retrieves information about multiple Tweets |
+| [Twitter Get User](block-integrations/twitter/user_lookup.md#twitter-get-user) | This block retrieves information about a specified Twitter user |
+| [Twitter Get User Mentions](block-integrations/twitter/timeline.md#twitter-get-user-mentions) | This block retrieves Tweets mentioning a specific user |
+| [Twitter Get User Tweets](block-integrations/twitter/timeline.md#twitter-get-user-tweets) | This block retrieves Tweets composed by a single user |
+| [Twitter Get Users](block-integrations/twitter/user_lookup.md#twitter-get-users) | This block retrieves information about multiple Twitter users |
+| [Twitter Hide Reply](block-integrations/twitter/hide.md#twitter-hide-reply) | This block hides a reply to a tweet |
+| [Twitter Like Tweet](block-integrations/twitter/like.md#twitter-like-tweet) | This block likes a tweet |
+| [Twitter Mute User](block-integrations/twitter/mutes.md#twitter-mute-user) | This block mutes a specified Twitter user |
+| [Twitter Pin List](block-integrations/twitter/pinned_lists.md#twitter-pin-list) | This block allows the authenticated user to pin a specified List |
+| [Twitter Post Tweet](block-integrations/twitter/manage.md#twitter-post-tweet) | This block posts a tweet on Twitter |
+| [Twitter Remove Bookmark Tweet](block-integrations/twitter/bookmark.md#twitter-remove-bookmark-tweet) | This block removes a bookmark from a tweet on Twitter |
+| [Twitter Remove List Member](block-integrations/twitter/list_members.md#twitter-remove-list-member) | This block removes a specified user from a Twitter List owned by the authenticated user |
+| [Twitter Remove Retweet](block-integrations/twitter/retweet.md#twitter-remove-retweet) | This block removes a retweet on Twitter |
+| [Twitter Retweet](block-integrations/twitter/retweet.md#twitter-retweet) | This block retweets a tweet on Twitter |
+| [Twitter Search Recent Tweets](block-integrations/twitter/manage.md#twitter-search-recent-tweets) | This block searches all public Tweets in Twitter history |
+| [Twitter Search Spaces](block-integrations/twitter/search_spaces.md#twitter-search-spaces) | This block searches for Twitter Spaces based on specified terms |
+| [Twitter Unfollow List](block-integrations/twitter/list_follows.md#twitter-unfollow-list) | This block unfollows a specified Twitter list for the authenticated user |
+| [Twitter Unfollow User](block-integrations/twitter/follows.md#twitter-unfollow-user) | This block unfollows a specified Twitter user |
+| [Twitter Unhide Reply](block-integrations/twitter/hide.md#twitter-unhide-reply) | This block unhides a reply to a tweet |
+| [Twitter Unlike Tweet](block-integrations/twitter/like.md#twitter-unlike-tweet) | This block unlikes a tweet |
+| [Twitter Unmute User](block-integrations/twitter/mutes.md#twitter-unmute-user) | This block unmutes a specified Twitter user |
+| [Twitter Unpin List](block-integrations/twitter/pinned_lists.md#twitter-unpin-list) | This block allows the authenticated user to unpin a specified List |
+| [Twitter Update List](block-integrations/twitter/manage_lists.md#twitter-update-list) | This block updates a specified Twitter List owned by the authenticated user |
+
+## Communication
+
+| Block Name | Description |
+|------------|-------------|
+| [Baas Bot Join Meeting](block-integrations/baas/bots.md#baas-bot-join-meeting) | Deploy a bot to join and record a meeting |
+| [Baas Bot Leave Meeting](block-integrations/baas/bots.md#baas-bot-leave-meeting) | Remove a bot from an ongoing meeting |
+| [Gmail Add Label](block-integrations/google/gmail.md#gmail-add-label) | A block that adds a label to a specific email message in Gmail, creating the label if it doesn't exist |
+| [Gmail Create Draft](block-integrations/google/gmail.md#gmail-create-draft) | Create draft emails in Gmail with automatic HTML detection and proper text formatting |
+| [Gmail Draft Reply](block-integrations/google/gmail.md#gmail-draft-reply) | Create draft replies to Gmail threads with automatic HTML detection and proper text formatting |
+| [Gmail Forward](block-integrations/google/gmail.md#gmail-forward) | Forward Gmail messages to other recipients with automatic HTML detection and proper formatting |
+| [Gmail Get Profile](block-integrations/google/gmail.md#gmail-get-profile) | Get the authenticated user's Gmail profile details including email address and message statistics |
+| [Gmail Get Thread](block-integrations/google/gmail.md#gmail-get-thread) | A block that retrieves an entire Gmail thread (email conversation) by ID, returning all messages with decoded bodies for reading complete conversations |
+| [Gmail List Labels](block-integrations/google/gmail.md#gmail-list-labels) | A block that retrieves all labels (categories) from a Gmail account for organizing and categorizing emails |
+| [Gmail Read](block-integrations/google/gmail.md#gmail-read) | A block that retrieves and reads emails from a Gmail account based on search criteria, returning detailed message information including subject, sender, body, and attachments |
+| [Gmail Remove Label](block-integrations/google/gmail.md#gmail-remove-label) | A block that removes a label from a specific email message in a Gmail account |
+| [Gmail Reply](block-integrations/google/gmail.md#gmail-reply) | Reply to Gmail threads with automatic HTML detection and proper text formatting |
+| [Gmail Send](block-integrations/google/gmail.md#gmail-send) | Send emails via Gmail with automatic HTML detection and proper text formatting |
+| [Hub Spot Engagement](block-integrations/hubspot/engagement.md#hub-spot-engagement) | Manages HubSpot engagements - sends emails and tracks engagement metrics |
+
+## Developer Tools
+
+| Block Name | Description |
+|------------|-------------|
+| [Exa Code Context](block-integrations/exa/code_context.md#exa-code-context) | Search billions of GitHub repos, docs, and Stack Overflow for relevant code examples |
+| [Execute Code](block-integrations/misc.md#execute-code) | Executes code in a sandbox environment with internet access |
+| [Execute Code Step](block-integrations/misc.md#execute-code-step) | Execute code in a previously instantiated sandbox |
+| [Github Add Label](block-integrations/github/issues.md#github-add-label) | A block that adds a label to a GitHub issue or pull request for categorization and organization |
+| [Github Assign Issue](block-integrations/github/issues.md#github-assign-issue) | A block that assigns a GitHub user to an issue for task ownership and tracking |
+| [Github Assign PR Reviewer](block-integrations/github/pull_requests.md#github-assign-pr-reviewer) | This block assigns a reviewer to a specified GitHub pull request |
+| [Github Comment](block-integrations/github/issues.md#github-comment) | A block that posts comments on GitHub issues or pull requests using the GitHub API |
+| [Github Create Check Run](block-integrations/github/checks.md#github-create-check-run) | Creates a new check run for a specific commit in a GitHub repository |
+| [Github Create Comment Object](block-integrations/github/reviews.md#github-create-comment-object) | Creates a comment object for use with GitHub blocks |
+| [Github Create File](block-integrations/github/repo.md#github-create-file) | This block creates a new file in a GitHub repository |
+| [Github Create PR Review](block-integrations/github/reviews.md#github-create-pr-review) | This block creates a review on a GitHub pull request with optional inline comments |
+| [Github Create Repository](block-integrations/github/repo.md#github-create-repository) | This block creates a new GitHub repository |
+| [Github Create Status](block-integrations/github/statuses.md#github-create-status) | Creates a new commit status in a GitHub repository |
+| [Github Delete Branch](block-integrations/github/repo.md#github-delete-branch) | This block deletes a specified branch |
+| [Github Discussion Trigger](block-integrations/github/triggers.md#github-discussion-trigger) | This block triggers on GitHub Discussions events |
+| [Github Get CI Results](block-integrations/github/ci.md#github-get-ci-results) | This block gets CI results for a commit or PR, with optional search for specific errors/warnings in logs |
+| [Github Get PR Review Comments](block-integrations/github/reviews.md#github-get-pr-review-comments) | This block gets all review comments from a GitHub pull request or from a specific review |
+| [Github Issues Trigger](block-integrations/github/triggers.md#github-issues-trigger) | This block triggers on GitHub issues events |
+| [Github List Branches](block-integrations/github/repo.md#github-list-branches) | This block lists all branches for a specified GitHub repository |
+| [Github List Comments](block-integrations/github/issues.md#github-list-comments) | A block that retrieves all comments from a GitHub issue or pull request, including comment metadata and content |
+| [Github List Discussions](block-integrations/github/repo.md#github-list-discussions) | This block lists recent discussions for a specified GitHub repository |
+| [Github List Issues](block-integrations/github/issues.md#github-list-issues) | A block that retrieves a list of issues from a GitHub repository with their titles and URLs |
+| [Github List PR Reviewers](block-integrations/github/pull_requests.md#github-list-pr-reviewers) | This block lists all reviewers for a specified GitHub pull request |
+| [Github List PR Reviews](block-integrations/github/reviews.md#github-list-pr-reviews) | This block lists all reviews for a specified GitHub pull request |
+| [Github List Pull Requests](block-integrations/github/pull_requests.md#github-list-pull-requests) | This block lists all pull requests for a specified GitHub repository |
+| [Github List Releases](block-integrations/github/repo.md#github-list-releases) | This block lists all releases for a specified GitHub repository |
+| [Github List Stargazers](block-integrations/github/repo.md#github-list-stargazers) | This block lists all users who have starred a specified GitHub repository |
+| [Github List Tags](block-integrations/github/repo.md#github-list-tags) | This block lists all tags for a specified GitHub repository |
+| [Github Make Branch](block-integrations/github/repo.md#github-make-branch) | This block creates a new branch from a specified source branch |
+| [Github Make Issue](block-integrations/github/issues.md#github-make-issue) | A block that creates new issues on GitHub repositories with a title and body content |
+| [Github Make Pull Request](block-integrations/github/pull_requests.md#github-make-pull-request) | This block creates a new pull request on a specified GitHub repository |
+| [Github Pull Request Trigger](block-integrations/github/triggers.md#github-pull-request-trigger) | This block triggers on pull request events and outputs the event type and payload |
+| [Github Read File](block-integrations/github/repo.md#github-read-file) | This block reads the content of a specified file from a GitHub repository |
+| [Github Read Folder](block-integrations/github/repo.md#github-read-folder) | This block reads the content of a specified folder from a GitHub repository |
+| [Github Read Issue](block-integrations/github/issues.md#github-read-issue) | A block that retrieves information about a specific GitHub issue, including its title, body content, and creator |
+| [Github Read Pull Request](block-integrations/github/pull_requests.md#github-read-pull-request) | This block reads the body, title, user, and changes of a specified GitHub pull request |
+| [Github Release Trigger](block-integrations/github/triggers.md#github-release-trigger) | This block triggers on GitHub release events |
+| [Github Remove Label](block-integrations/github/issues.md#github-remove-label) | A block that removes a label from a GitHub issue or pull request |
+| [Github Resolve Review Discussion](block-integrations/github/reviews.md#github-resolve-review-discussion) | This block resolves or unresolves a review discussion thread on a GitHub pull request |
+| [Github Star Trigger](block-integrations/github/triggers.md#github-star-trigger) | This block triggers on GitHub star events |
+| [Github Submit Pending Review](block-integrations/github/reviews.md#github-submit-pending-review) | This block submits a pending (draft) review on a GitHub pull request |
+| [Github Unassign Issue](block-integrations/github/issues.md#github-unassign-issue) | A block that removes a user's assignment from a GitHub issue |
+| [Github Unassign PR Reviewer](block-integrations/github/pull_requests.md#github-unassign-pr-reviewer) | This block unassigns a reviewer from a specified GitHub pull request |
+| [Github Update Check Run](block-integrations/github/checks.md#github-update-check-run) | Updates an existing check run in a GitHub repository |
+| [Github Update Comment](block-integrations/github/issues.md#github-update-comment) | A block that updates an existing comment on a GitHub issue or pull request |
+| [Github Update File](block-integrations/github/repo.md#github-update-file) | This block updates an existing file in a GitHub repository |
+| [Instantiate Code Sandbox](block-integrations/misc.md#instantiate-code-sandbox) | Instantiate a sandbox environment with internet access in which you can execute code with the Execute Code Step block |
+| [Slant3D Order Webhook](block-integrations/slant3d/webhook.md#slant3d-order-webhook) | This block triggers on Slant3D order status updates and outputs the event details, including tracking information when orders are shipped |
+
+## Media Generation
+
+| Block Name | Description |
+|------------|-------------|
+| [Add Audio To Video](block-integrations/multimedia.md#add-audio-to-video) | Block to attach an audio file to a video file using moviepy |
+| [Loop Video](block-integrations/multimedia.md#loop-video) | Block to loop a video to a given duration or number of repeats |
+| [Media Duration](block-integrations/multimedia.md#media-duration) | Block to get the duration of a media file |
+
+## Productivity
+
+| Block Name | Description |
+|------------|-------------|
+| [Google Calendar Create Event](block-integrations/google/calendar.md#google-calendar-create-event) | This block creates a new event in Google Calendar with customizable parameters |
+| [Notion Create Page](block-integrations/notion/create_page.md#notion-create-page) | Create a new page in Notion |
+| [Notion Read Database](block-integrations/notion/read_database.md#notion-read-database) | Query a Notion database with optional filtering and sorting, returning structured entries |
+| [Notion Read Page](block-integrations/notion/read_page.md#notion-read-page) | Read a Notion page by its ID and return its raw JSON |
+| [Notion Read Page Markdown](block-integrations/notion/read_page_markdown.md#notion-read-page-markdown) | Read a Notion page and convert it to Markdown format with proper formatting for headings, lists, links, and rich text |
+| [Notion Search](block-integrations/notion/search.md#notion-search) | Search your Notion workspace for pages and databases by text query |
+| [Todoist Close Task](block-integrations/todoist/tasks.md#todoist-close-task) | Closes a task in Todoist |
+| [Todoist Create Comment](block-integrations/todoist/comments.md#todoist-create-comment) | Creates a new comment on a Todoist task or project |
+| [Todoist Create Label](block-integrations/todoist/labels.md#todoist-create-label) | Creates a new label in Todoist, It will not work if same name already exists |
+| [Todoist Create Project](block-integrations/todoist/projects.md#todoist-create-project) | Creates a new project in Todoist |
+| [Todoist Create Task](block-integrations/todoist/tasks.md#todoist-create-task) | Creates a new task in a Todoist project |
+| [Todoist Delete Comment](block-integrations/todoist/comments.md#todoist-delete-comment) | Deletes a Todoist comment |
+| [Todoist Delete Label](block-integrations/todoist/labels.md#todoist-delete-label) | Deletes a personal label in Todoist |
+| [Todoist Delete Project](block-integrations/todoist/projects.md#todoist-delete-project) | Deletes a Todoist project and all its contents |
+| [Todoist Delete Section](block-integrations/todoist/sections.md#todoist-delete-section) | Deletes a section and all its tasks from Todoist |
+| [Todoist Delete Task](block-integrations/todoist/tasks.md#todoist-delete-task) | Deletes a task in Todoist |
+| [Todoist Get Comment](block-integrations/todoist/comments.md#todoist-get-comment) | Get a single comment from Todoist |
+| [Todoist Get Comments](block-integrations/todoist/comments.md#todoist-get-comments) | Get all comments for a Todoist task or project |
+| [Todoist Get Label](block-integrations/todoist/labels.md#todoist-get-label) | Gets a personal label from Todoist by ID |
+| [Todoist Get Project](block-integrations/todoist/projects.md#todoist-get-project) | Gets details for a specific Todoist project |
+| [Todoist Get Section](block-integrations/todoist/sections.md#todoist-get-section) | Gets a single section by ID from Todoist |
+| [Todoist Get Shared Labels](block-integrations/todoist/labels.md#todoist-get-shared-labels) | Gets all shared labels from Todoist |
+| [Todoist Get Task](block-integrations/todoist/tasks.md#todoist-get-task) | Get an active task from Todoist |
+| [Todoist Get Tasks](block-integrations/todoist/tasks.md#todoist-get-tasks) | Get active tasks from Todoist |
+| [Todoist List Collaborators](block-integrations/todoist/projects.md#todoist-list-collaborators) | Gets all collaborators for a specific Todoist project |
+| [Todoist List Labels](block-integrations/todoist/labels.md#todoist-list-labels) | Gets all personal labels from Todoist |
+| [Todoist List Projects](block-integrations/todoist/projects.md#todoist-list-projects) | Gets all projects and their details from Todoist |
+| [Todoist List Sections](block-integrations/todoist/sections.md#todoist-list-sections) | Gets all sections and their details from Todoist |
+| [Todoist Remove Shared Labels](block-integrations/todoist/labels.md#todoist-remove-shared-labels) | Removes all instances of a shared label |
+| [Todoist Rename Shared Labels](block-integrations/todoist/labels.md#todoist-rename-shared-labels) | Renames all instances of a shared label |
+| [Todoist Reopen Task](block-integrations/todoist/tasks.md#todoist-reopen-task) | Reopens a task in Todoist |
+| [Todoist Update Comment](block-integrations/todoist/comments.md#todoist-update-comment) | Updates a Todoist comment |
+| [Todoist Update Label](block-integrations/todoist/labels.md#todoist-update-label) | Updates a personal label in Todoist |
+| [Todoist Update Project](block-integrations/todoist/projects.md#todoist-update-project) | Updates an existing project in Todoist |
+| [Todoist Update Task](block-integrations/todoist/tasks.md#todoist-update-task) | Updates an existing task in Todoist |
+
+## Logic and Control Flow
+
+| Block Name | Description |
+|------------|-------------|
+| [Calculator](block-integrations/logic.md#calculator) | Performs a mathematical operation on two numbers |
+| [Condition](block-integrations/logic.md#condition) | Handles conditional logic based on comparison operators |
+| [Count Items](block-integrations/logic.md#count-items) | Counts the number of items in a collection |
+| [Data Sampling](block-integrations/logic.md#data-sampling) | This block samples data from a given dataset using various sampling methods |
+| [Exa Webset Ready Check](block-integrations/exa/websets.md#exa-webset-ready-check) | Check if webset is ready for next operation - enables conditional workflow branching |
+| [If Input Matches](block-integrations/logic.md#if-input-matches) | Handles conditional logic based on comparison operators |
+| [Pinecone Init](block-integrations/logic.md#pinecone-init) | Initializes a Pinecone index |
+| [Pinecone Insert](block-integrations/logic.md#pinecone-insert) | Upload data to a Pinecone index |
+| [Pinecone Query](block-integrations/logic.md#pinecone-query) | Queries a Pinecone index |
+| [Step Through Items](block-integrations/logic.md#step-through-items) | Iterates over a list or dictionary and outputs each item |
+
+## Input/Output
+
+| Block Name | Description |
+|------------|-------------|
+| [Exa Webset Webhook](block-integrations/exa/webhook_blocks.md#exa-webset-webhook) | Receive webhook notifications for Exa webset events |
+| [Generic Webhook Trigger](block-integrations/generic_webhook/triggers.md#generic-webhook-trigger) | This block will output the contents of the generic input for the webhook |
+| [Read RSS Feed](block-integrations/misc.md#read-rss-feed) | Reads RSS feed entries from a given URL |
+| [Send Authenticated Web Request](block-integrations/misc.md#send-authenticated-web-request) | Make an authenticated HTTP request with host-scoped credentials (JSON / form / multipart) |
+| [Send Email](block-integrations/misc.md#send-email) | This block sends an email using the provided SMTP credentials |
+| [Send Web Request](block-integrations/misc.md#send-web-request) | Make an HTTP request (JSON / form / multipart) |
+
+## Agent Integration
+
+| Block Name | Description |
+|------------|-------------|
+| [Agent Executor](block-integrations/misc.md#agent-executor) | Executes an existing agent inside your agent |
+
+## CRM Services
+
+| Block Name | Description |
+|------------|-------------|
+| [Add Lead To Campaign](block-integrations/smartlead/campaign.md#add-lead-to-campaign) | Add a lead to a campaign in SmartLead |
+| [Create Campaign](block-integrations/smartlead/campaign.md#create-campaign) | Create a campaign in SmartLead |
+| [Hub Spot Company](block-integrations/hubspot/company.md#hub-spot-company) | Manages HubSpot companies - create, update, and retrieve company information |
+| [Hub Spot Contact](block-integrations/hubspot/contact.md#hub-spot-contact) | Manages HubSpot contacts - create, update, and retrieve contact information |
+| [Save Campaign Sequences](block-integrations/smartlead/campaign.md#save-campaign-sequences) | Save sequences within a campaign |
+
+## AI Safety
+
+| Block Name | Description |
+|------------|-------------|
+| [Nvidia Deepfake Detect](block-integrations/nvidia/deepfake.md#nvidia-deepfake-detect) | Detects potential deepfakes in images using Nvidia's AI API |
+
+## Issue Tracking
+
+| Block Name | Description |
+|------------|-------------|
+| [Linear Create Comment](block-integrations/linear/comment.md#linear-create-comment) | Creates a new comment on a Linear issue |
+| [Linear Create Issue](block-integrations/linear/issues.md#linear-create-issue) | Creates a new issue on Linear |
+| [Linear Get Project Issues](block-integrations/linear/issues.md#linear-get-project-issues) | Gets issues from a Linear project filtered by status and assignee |
+| [Linear Search Issues](block-integrations/linear/issues.md#linear-search-issues) | Searches for issues on Linear |
+| [Linear Search Projects](block-integrations/linear/projects.md#linear-search-projects) | Searches for projects on Linear |
+
+## Hardware
+
+| Block Name | Description |
+|------------|-------------|
+| [Compass AI Trigger](block-integrations/compass/triggers.md#compass-ai-trigger) | This block will output the contents of the compass transcription |
diff --git a/docs/integrations/SUMMARY.md b/docs/integrations/SUMMARY.md
new file mode 100644
index 0000000000..9ce440ca45
--- /dev/null
+++ b/docs/integrations/SUMMARY.md
@@ -0,0 +1,133 @@
+# Table of contents
+
+* [AutoGPT Blocks Overview](README.md)
+
+## Guides
+
+* [LLM Providers](guides/llm-providers.md)
+* [Voice Providers](guides/voice-providers.md)
+
+## Block Integrations
+
+* [Airtable Bases](block-integrations/airtable/bases.md)
+* [Airtable Records](block-integrations/airtable/records.md)
+* [Airtable Schema](block-integrations/airtable/schema.md)
+* [Airtable Triggers](block-integrations/airtable/triggers.md)
+* [Apollo Organization](block-integrations/apollo/organization.md)
+* [Apollo People](block-integrations/apollo/people.md)
+* [Apollo Person](block-integrations/apollo/person.md)
+* [Ayrshare Post To Bluesky](block-integrations/ayrshare/post_to_bluesky.md)
+* [Ayrshare Post To Facebook](block-integrations/ayrshare/post_to_facebook.md)
+* [Ayrshare Post To GMB](block-integrations/ayrshare/post_to_gmb.md)
+* [Ayrshare Post To Instagram](block-integrations/ayrshare/post_to_instagram.md)
+* [Ayrshare Post To LinkedIn](block-integrations/ayrshare/post_to_linkedin.md)
+* [Ayrshare Post To Pinterest](block-integrations/ayrshare/post_to_pinterest.md)
+* [Ayrshare Post To Reddit](block-integrations/ayrshare/post_to_reddit.md)
+* [Ayrshare Post To Snapchat](block-integrations/ayrshare/post_to_snapchat.md)
+* [Ayrshare Post To Telegram](block-integrations/ayrshare/post_to_telegram.md)
+* [Ayrshare Post To Threads](block-integrations/ayrshare/post_to_threads.md)
+* [Ayrshare Post To TikTok](block-integrations/ayrshare/post_to_tiktok.md)
+* [Ayrshare Post To X](block-integrations/ayrshare/post_to_x.md)
+* [Ayrshare Post To YouTube](block-integrations/ayrshare/post_to_youtube.md)
+* [Baas Bots](block-integrations/baas/bots.md)
+* [Bannerbear Text Overlay](block-integrations/bannerbear/text_overlay.md)
+* [Basic](block-integrations/basic.md)
+* [Compass Triggers](block-integrations/compass/triggers.md)
+* [Data](block-integrations/data.md)
+* [Dataforseo Keyword Suggestions](block-integrations/dataforseo/keyword_suggestions.md)
+* [Dataforseo Related Keywords](block-integrations/dataforseo/related_keywords.md)
+* [Discord Bot Blocks](block-integrations/discord/bot_blocks.md)
+* [Discord OAuth Blocks](block-integrations/discord/oauth_blocks.md)
+* [Enrichlayer LinkedIn](block-integrations/enrichlayer/linkedin.md)
+* [Exa Answers](block-integrations/exa/answers.md)
+* [Exa Code Context](block-integrations/exa/code_context.md)
+* [Exa Contents](block-integrations/exa/contents.md)
+* [Exa Research](block-integrations/exa/research.md)
+* [Exa Search](block-integrations/exa/search.md)
+* [Exa Similar](block-integrations/exa/similar.md)
+* [Exa Webhook Blocks](block-integrations/exa/webhook_blocks.md)
+* [Exa Websets](block-integrations/exa/websets.md)
+* [Exa Websets Enrichment](block-integrations/exa/websets_enrichment.md)
+* [Exa Websets Import Export](block-integrations/exa/websets_import_export.md)
+* [Exa Websets Items](block-integrations/exa/websets_items.md)
+* [Exa Websets Monitor](block-integrations/exa/websets_monitor.md)
+* [Exa Websets Polling](block-integrations/exa/websets_polling.md)
+* [Exa Websets Search](block-integrations/exa/websets_search.md)
+* [Fal AI Video Generator](block-integrations/fal/ai_video_generator.md)
+* [Firecrawl Crawl](block-integrations/firecrawl/crawl.md)
+* [Firecrawl Extract](block-integrations/firecrawl/extract.md)
+* [Firecrawl Map](block-integrations/firecrawl/map.md)
+* [Firecrawl Scrape](block-integrations/firecrawl/scrape.md)
+* [Firecrawl Search](block-integrations/firecrawl/search.md)
+* [Generic Webhook Triggers](block-integrations/generic_webhook/triggers.md)
+* [GitHub Checks](block-integrations/github/checks.md)
+* [GitHub CI](block-integrations/github/ci.md)
+* [GitHub Issues](block-integrations/github/issues.md)
+* [GitHub Pull Requests](block-integrations/github/pull_requests.md)
+* [GitHub Repo](block-integrations/github/repo.md)
+* [GitHub Reviews](block-integrations/github/reviews.md)
+* [GitHub Statuses](block-integrations/github/statuses.md)
+* [GitHub Triggers](block-integrations/github/triggers.md)
+* [Google Calendar](block-integrations/google/calendar.md)
+* [Google Docs](block-integrations/google/docs.md)
+* [Google Gmail](block-integrations/google/gmail.md)
+* [Google Sheets](block-integrations/google/sheets.md)
+* [HubSpot Company](block-integrations/hubspot/company.md)
+* [HubSpot Contact](block-integrations/hubspot/contact.md)
+* [HubSpot Engagement](block-integrations/hubspot/engagement.md)
+* [Jina Chunking](block-integrations/jina/chunking.md)
+* [Jina Embeddings](block-integrations/jina/embeddings.md)
+* [Jina Fact Checker](block-integrations/jina/fact_checker.md)
+* [Jina Search](block-integrations/jina/search.md)
+* [Linear Comment](block-integrations/linear/comment.md)
+* [Linear Issues](block-integrations/linear/issues.md)
+* [Linear Projects](block-integrations/linear/projects.md)
+* [LLM](block-integrations/llm.md)
+* [Logic](block-integrations/logic.md)
+* [Misc](block-integrations/misc.md)
+* [Multimedia](block-integrations/multimedia.md)
+* [Notion Create Page](block-integrations/notion/create_page.md)
+* [Notion Read Database](block-integrations/notion/read_database.md)
+* [Notion Read Page](block-integrations/notion/read_page.md)
+* [Notion Read Page Markdown](block-integrations/notion/read_page_markdown.md)
+* [Notion Search](block-integrations/notion/search.md)
+* [Nvidia Deepfake](block-integrations/nvidia/deepfake.md)
+* [Replicate Flux Advanced](block-integrations/replicate/flux_advanced.md)
+* [Replicate Replicate Block](block-integrations/replicate/replicate_block.md)
+* [Search](block-integrations/search.md)
+* [Slant3D Filament](block-integrations/slant3d/filament.md)
+* [Slant3D Order](block-integrations/slant3d/order.md)
+* [Slant3D Slicing](block-integrations/slant3d/slicing.md)
+* [Slant3D Webhook](block-integrations/slant3d/webhook.md)
+* [Smartlead Campaign](block-integrations/smartlead/campaign.md)
+* [Stagehand Blocks](block-integrations/stagehand/blocks.md)
+* [System Library Operations](block-integrations/system/library_operations.md)
+* [System Store Operations](block-integrations/system/store_operations.md)
+* [Text](block-integrations/text.md)
+* [Todoist Comments](block-integrations/todoist/comments.md)
+* [Todoist Labels](block-integrations/todoist/labels.md)
+* [Todoist Projects](block-integrations/todoist/projects.md)
+* [Todoist Sections](block-integrations/todoist/sections.md)
+* [Todoist Tasks](block-integrations/todoist/tasks.md)
+* [Twitter Blocks](block-integrations/twitter/blocks.md)
+* [Twitter Bookmark](block-integrations/twitter/bookmark.md)
+* [Twitter Follows](block-integrations/twitter/follows.md)
+* [Twitter Hide](block-integrations/twitter/hide.md)
+* [Twitter Like](block-integrations/twitter/like.md)
+* [Twitter List Follows](block-integrations/twitter/list_follows.md)
+* [Twitter List Lookup](block-integrations/twitter/list_lookup.md)
+* [Twitter List Members](block-integrations/twitter/list_members.md)
+* [Twitter List Tweets Lookup](block-integrations/twitter/list_tweets_lookup.md)
+* [Twitter Manage](block-integrations/twitter/manage.md)
+* [Twitter Manage Lists](block-integrations/twitter/manage_lists.md)
+* [Twitter Mutes](block-integrations/twitter/mutes.md)
+* [Twitter Pinned Lists](block-integrations/twitter/pinned_lists.md)
+* [Twitter Quote](block-integrations/twitter/quote.md)
+* [Twitter Retweet](block-integrations/twitter/retweet.md)
+* [Twitter Search Spaces](block-integrations/twitter/search_spaces.md)
+* [Twitter Spaces Lookup](block-integrations/twitter/spaces_lookup.md)
+* [Twitter Timeline](block-integrations/twitter/timeline.md)
+* [Twitter Tweet Lookup](block-integrations/twitter/tweet_lookup.md)
+* [Twitter User Lookup](block-integrations/twitter/user_lookup.md)
+* [Wolfram LLM API](block-integrations/wolfram/llm_api.md)
+* [Zerobounce Validate Emails](block-integrations/zerobounce/validate_emails.md)
diff --git a/docs/content/platform/blocks/ai_condition.md b/docs/integrations/block-integrations/ai_condition.md
similarity index 100%
rename from docs/content/platform/blocks/ai_condition.md
rename to docs/integrations/block-integrations/ai_condition.md
diff --git a/docs/content/platform/blocks/ai_shortform_video_block.md b/docs/integrations/block-integrations/ai_shortform_video_block.md
similarity index 100%
rename from docs/content/platform/blocks/ai_shortform_video_block.md
rename to docs/integrations/block-integrations/ai_shortform_video_block.md
diff --git a/docs/integrations/block-integrations/airtable/bases.md b/docs/integrations/block-integrations/airtable/bases.md
new file mode 100644
index 0000000000..fac928f0ae
--- /dev/null
+++ b/docs/integrations/block-integrations/airtable/bases.md
@@ -0,0 +1,84 @@
+# Airtable Bases
+<!-- MANUAL: file_description -->
+Blocks for creating and managing Airtable bases, which are the top-level containers for tables, records, and data in Airtable.
+<!-- END MANUAL -->
+
+## Airtable Create Base
+
+### What it is
+Create or find a base in Airtable
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a new Airtable base in a specified workspace, or finds an existing one with the same name. When creating, you can optionally define initial tables and their fields to set up the schema.
+
+Enable find_existing to search for a base with the same name before creating a new one, preventing duplicates in your workspace.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| workspace_id | The workspace ID where the base will be created | str | Yes |
+| name | The name of the new base | str | Yes |
+| find_existing | If true, return existing base with same name instead of creating duplicate | bool | No |
+| tables | At least one table and field must be specified. Array of table objects to create in the base. Each table should have 'name' and 'fields' properties | List[Dict[str, Any]] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| base_id | The ID of the created or found base | str |
+| tables | Array of table objects | List[Dict[str, Any]] |
+| table | A single table object | Dict[str, Any] |
+| was_created | True if a new base was created, False if existing was found | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Project Setup**: Automatically create new bases when projects start with predefined table structures.
+
+**Template Deployment**: Deploy standardized base templates across teams or clients.
+
+**Multi-Tenant Apps**: Create separate bases for each customer or project programmatically.
+<!-- END MANUAL -->
+
+---
+
+## Airtable List Bases
+
+### What it is
+List all bases in Airtable
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves a list of all Airtable bases accessible to your connected account. It returns basic information about each base including ID, name, and permission level.
+
+Results are paginated; use the offset output to retrieve additional pages if there are more bases than returned in a single call.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| trigger | Trigger the block to run - value is ignored | str | No |
+| offset | Pagination offset from previous request | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| bases | Array of base objects | List[Dict[str, Any]] |
+| offset | Offset for next page (null if no more bases) | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Base Discovery**: Find available bases for building dynamic dropdowns or navigation.
+
+**Inventory Management**: List all bases in an organization for auditing or documentation.
+
+**Cross-Base Operations**: Enumerate bases to perform operations across multiple databases.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/airtable/records.md b/docs/integrations/block-integrations/airtable/records.md
new file mode 100644
index 0000000000..28d2dad1ce
--- /dev/null
+++ b/docs/integrations/block-integrations/airtable/records.md
@@ -0,0 +1,214 @@
+# Airtable Records
+<!-- MANUAL: file_description -->
+Blocks for creating, reading, updating, and deleting records in Airtable tables.
+<!-- END MANUAL -->
+
+## Airtable Create Records
+
+### What it is
+Create records in an Airtable table
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates new records in an Airtable table using the Airtable API. Each record is specified with a fields object containing field names and values. You can create up to 10 records in a single call.
+
+Enable typecast to automatically convert string values to appropriate field types (dates, numbers, etc.). The block returns the created records with their assigned IDs.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| base_id | The Airtable base ID | str | Yes |
+| table_id_or_name | Table ID or name | str | Yes |
+| records | Array of records to create (each with 'fields' object) | List[Dict[str, Any]] | Yes |
+| skip_normalization | Skip output normalization to get raw Airtable response (faster but may have missing fields) | bool | No |
+| typecast | Automatically convert string values to appropriate types | bool | No |
+| return_fields_by_field_id | Return fields by field ID | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| records | Array of created record objects | List[Dict[str, Any]] |
+| details | Details of the created records | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Data Import**: Bulk import data from external sources into Airtable tables.
+
+**Form Submissions**: Create records from form submissions or API integrations.
+
+**Workflow Output**: Save workflow results or processed data to Airtable for tracking.
+<!-- END MANUAL -->
+
+---
+
+## Airtable Delete Records
+
+### What it is
+Delete records from an Airtable table
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block deletes records from an Airtable table by their record IDs. You can delete up to 10 records in a single call. The operation is permanent and cannot be undone.
+
+Provide an array of record IDs to delete. Using the table ID instead of the name is recommended for reliability.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| base_id | The Airtable base ID | str | Yes |
+| table_id_or_name | Table ID or name - It's better to use the table ID instead of the name | str | Yes |
+| record_ids | Array of upto 10 record IDs to delete | List[str] | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| records | Array of deletion results | List[Dict[str, Any]] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Data Cleanup**: Remove outdated or duplicate records from tables.
+
+**Workflow Cleanup**: Delete temporary records after processing is complete.
+
+**Batch Removal**: Remove multiple records that match certain criteria.
+<!-- END MANUAL -->
+
+---
+
+## Airtable Get Record
+
+### What it is
+Get a single record from Airtable
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves a single record from an Airtable table by its ID. The record includes all field values and metadata like creation time. Enable normalize_output to ensure all fields are included with proper empty values.
+
+Optionally include field metadata for type information and configuration details about each field.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| base_id | The Airtable base ID | str | Yes |
+| table_id_or_name | Table ID or name | str | Yes |
+| record_id | The record ID to retrieve | str | Yes |
+| normalize_output | Normalize output to include all fields with proper empty values (disable to skip schema fetch and get raw Airtable response) | bool | No |
+| include_field_metadata | Include field type and configuration metadata (requires normalize_output=true) | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| id | The record ID | str |
+| fields | The record fields | Dict[str, Any] |
+| created_time | The record created time | str |
+| field_metadata | Field type and configuration metadata (only when include_field_metadata=true) | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Detail View**: Fetch complete record data for display or detailed processing.
+
+**Record Lookup**: Retrieve specific records by ID from webhook payloads or references.
+
+**Data Validation**: Check record contents before performing updates or related operations.
+<!-- END MANUAL -->
+
+---
+
+## Airtable List Records
+
+### What it is
+List records from an Airtable table
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries records from an Airtable table with optional filtering, sorting, and pagination. Use Airtable formulas to filter records and specify sort order by field and direction.
+
+Results can be limited, paginated with offsets, and restricted to specific fields. Enable normalize_output for consistent field values across records.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| base_id | The Airtable base ID | str | Yes |
+| table_id_or_name | Table ID or name | str | Yes |
+| filter_formula | Airtable formula to filter records | str | No |
+| view | View ID or name to use | str | No |
+| sort | Sort configuration (array of {field, direction}) | List[Dict[str, Any]] | No |
+| max_records | Maximum number of records to return | int | No |
+| page_size | Number of records per page (max 100) | int | No |
+| offset | Pagination offset from previous request | str | No |
+| return_fields | Specific fields to return (comma-separated) | List[str] | No |
+| normalize_output | Normalize output to include all fields with proper empty values (disable to skip schema fetch and get raw Airtable response) | bool | No |
+| include_field_metadata | Include field type and configuration metadata (requires normalize_output=true) | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| records | Array of record objects | List[Dict[str, Any]] |
+| offset | Offset for next page (null if no more records) | str |
+| field_metadata | Field type and configuration metadata (only when include_field_metadata=true) | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Report Generation**: Query records with filters to build reports or dashboards.
+
+**Data Export**: Fetch records matching criteria for export to other systems.
+
+**Batch Processing**: List records to process in subsequent workflow steps.
+<!-- END MANUAL -->
+
+---
+
+## Airtable Update Records
+
+### What it is
+Update records in an Airtable table
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block updates existing records in an Airtable table. Each record update requires the record ID and a fields object with the values to update. Only specified fields are modified; other fields remain unchanged.
+
+Enable typecast to automatically convert string values to appropriate types. You can update up to 10 records per call.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| base_id | The Airtable base ID | str | Yes |
+| table_id_or_name | Table ID or name - It's better to use the table ID instead of the name | str | Yes |
+| records | Array of records to update (each with 'id' and 'fields') | List[Dict[str, Any]] | Yes |
+| typecast | Automatically convert string values to appropriate types | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| records | Array of updated record objects | List[Dict[str, Any]] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Status Updates**: Update record status fields as workflows progress.
+
+**Data Enrichment**: Add computed or fetched data to existing records.
+
+**Batch Modifications**: Update multiple records based on processed results.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/airtable/schema.md b/docs/integrations/block-integrations/airtable/schema.md
new file mode 100644
index 0000000000..286a25ddb1
--- /dev/null
+++ b/docs/integrations/block-integrations/airtable/schema.md
@@ -0,0 +1,202 @@
+# Airtable Schema
+<!-- MANUAL: file_description -->
+Blocks for managing Airtable schema including tables, fields, and their configurations.
+<!-- END MANUAL -->
+
+## Airtable Create Field
+
+### What it is
+Add a new field to an Airtable table
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block adds a new field to an existing Airtable table using the Airtable API. Specify the field type (text, email, URL, etc.), name, and optional description and configuration options.
+
+The field is created immediately and becomes available for use in all records. Returns the created field object with its assigned ID.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| base_id | The Airtable base ID | str | Yes |
+| table_id | The table ID to add field to | str | Yes |
+| field_type | The type of the field to create | "singleLineText" \| "email" \| "url" \| "multilineText" \| "number" \| "percent" \| "currency" \| "singleSelect" \| "multipleSelects" \| "singleCollaborator" \| "multipleCollaborators" \| "multipleRecordLinks" \| "date" \| "dateTime" \| "phoneNumber" \| "multipleAttachments" \| "checkbox" \| "formula" \| "createdTime" \| "rollup" \| "count" \| "lookup" \| "multipleLookupValues" \| "autoNumber" \| "barcode" \| "rating" \| "richText" \| "duration" \| "lastModifiedTime" \| "button" \| "createdBy" \| "lastModifiedBy" \| "externalSyncSource" \| "aiText" | No |
+| name | The name of the field to create | str | Yes |
+| description | The description of the field to create | str | No |
+| options | The options of the field to create | Dict[str, str] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| field | Created field object | Dict[str, Any] |
+| field_id | ID of the created field | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Schema Evolution**: Add new fields to tables as application requirements grow.
+
+**Dynamic Forms**: Create fields based on user configuration or form builder settings.
+
+**Data Integration**: Add fields to capture data from newly integrated external systems.
+<!-- END MANUAL -->
+
+---
+
+## Airtable Create Table
+
+### What it is
+Create a new table in an Airtable base
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a new table in an Airtable base with the specified name and optional field definitions. Each field definition includes name, type, and type-specific options.
+
+The table is created with the defined schema and is immediately ready for use. Returns the created table object with its ID.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| base_id | The Airtable base ID | str | Yes |
+| table_name | The name of the table to create | str | Yes |
+| table_fields | Table fields with name, type, and options | List[Dict[str, Any]] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| table | Created table object | Dict[str, Any] |
+| table_id | ID of the created table | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Application Scaffolding**: Create tables programmatically when setting up new application modules.
+
+**Multi-Tenant Setup**: Generate customer-specific tables dynamically.
+
+**Feature Expansion**: Add new tables as features are enabled or installed.
+<!-- END MANUAL -->
+
+---
+
+## Airtable List Schema
+
+### What it is
+Get the complete schema of an Airtable base
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves the complete schema of an Airtable base, including all tables, their fields, field types, and views. This metadata is essential for building dynamic integrations that need to understand table structure.
+
+The schema includes field configurations, validation rules, and relationship definitions between tables.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| base_id | The Airtable base ID | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| base_schema | Complete base schema with tables, fields, and views | Dict[str, Any] |
+| tables | Array of table objects | List[Dict[str, Any]] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Schema Discovery**: Understand table structure for building dynamic forms or queries.
+
+**Documentation**: Generate documentation of database schema automatically.
+
+**Migration Planning**: Analyze schema before migrating data to other systems.
+<!-- END MANUAL -->
+
+---
+
+## Airtable Update Field
+
+### What it is
+Update field properties in an Airtable table
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block updates properties of an existing field in an Airtable table. You can modify the field name and description. Note that field type cannot be changed after creation.
+
+Changes take effect immediately across all records and views that use the field.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| base_id | The Airtable base ID | str | Yes |
+| table_id | The table ID containing the field | str | Yes |
+| field_id | The field ID to update | str | Yes |
+| name | The name of the field to update | str | No |
+| description | The description of the field to update | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| field | Updated field object | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Field Renaming**: Update field names to match evolving terminology or standards.
+
+**Documentation Updates**: Add or update field descriptions for better team understanding.
+
+**Schema Maintenance**: Keep field metadata current as application requirements change.
+<!-- END MANUAL -->
+
+---
+
+## Airtable Update Table
+
+### What it is
+Update table properties
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block updates table properties in an Airtable base. You can change the table name, description, and date dependency settings. Changes apply immediately and affect all users accessing the table.
+
+This is useful for maintaining table metadata and organizing your base structure.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| base_id | The Airtable base ID | str | Yes |
+| table_id | The table ID to update | str | Yes |
+| table_name | The name of the table to update | str | No |
+| table_description | The description of the table to update | str | No |
+| date_dependency | The date dependency of the table to update | Dict[str, Any] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| table | Updated table object | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Table Organization**: Rename tables to follow naming conventions or reflect current usage.
+
+**Description Management**: Update table descriptions for documentation purposes.
+
+**Configuration Updates**: Modify table settings like date dependencies as requirements change.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/airtable/triggers.md b/docs/integrations/block-integrations/airtable/triggers.md
new file mode 100644
index 0000000000..0eea41ade6
--- /dev/null
+++ b/docs/integrations/block-integrations/airtable/triggers.md
@@ -0,0 +1,42 @@
+# Airtable Triggers
+<!-- MANUAL: file_description -->
+Blocks for triggering workflows based on Airtable events like record creation, updates, and deletions.
+<!-- END MANUAL -->
+
+## Airtable Webhook Trigger
+
+### What it is
+Starts a flow whenever Airtable emits a webhook event
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block subscribes to Airtable webhook events for a specific base and table. When records are created, updated, or deleted, Airtable sends a webhook notification that triggers your workflow.
+
+You specify which events to listen for using the event selector. The webhook payload includes details about the changed records and the type of change that occurred.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| base_id | Airtable base ID | str | Yes |
+| table_id_or_name | Airtable table ID or name | str | Yes |
+| events | Airtable webhook event filter | AirtableEventSelector | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| payload | Airtable webhook payload | WebhookPayload |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Real-Time Sync**: Automatically sync Airtable changes to other systems like CRMs or databases.
+
+**Notification Workflows**: Send alerts when specific records are created or modified in Airtable.
+
+**Automated Processing**: Trigger document generation or emails when new entries are added to a table.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/apollo/organization.md b/docs/integrations/block-integrations/apollo/organization.md
new file mode 100644
index 0000000000..ca245ffb15
--- /dev/null
+++ b/docs/integrations/block-integrations/apollo/organization.md
@@ -0,0 +1,47 @@
+# Apollo Organization
+<!-- MANUAL: file_description -->
+Blocks for searching and retrieving organization data from Apollo's B2B database.
+<!-- END MANUAL -->
+
+## Search Organizations
+
+### What it is
+Search for organizations in Apollo
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block searches the Apollo database for organizations using various filters like employee count, location, and keywords. Apollo maintains a comprehensive database of company information for sales and marketing purposes.
+
+Results can be filtered by headquarters location, excluded locations, industry keywords, and specific Apollo organization IDs.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| organization_num_employees_range | The number range of employees working for the company. This enables you to find companies based on headcount. You can add multiple ranges to expand your search results.  Each range you add needs to be a string, with the upper and lower numbers of the range separated only by a comma. | List[int] | No |
+| organization_locations | The location of the company headquarters. You can search across cities, US states, and countries.  If a company has several office locations, results are still based on the headquarters location. For example, if you search chicago but a company's HQ location is in boston, any Boston-based companies will not appear in your search results, even if they match other parameters.  To exclude companies based on location, use the organization_not_locations parameter.  | List[str] | No |
+| organizations_not_locations | Exclude companies from search results based on the location of the company headquarters. You can use cities, US states, and countries as locations to exclude.  This parameter is useful for ensuring you do not prospect in an undesirable territory. For example, if you use ireland as a value, no Ireland-based companies will appear in your search results.  | List[str] | No |
+| q_organization_keyword_tags | Filter search results based on keywords associated with companies. For example, you can enter mining as a value to return only companies that have an association with the mining industry. | List[str] | No |
+| q_organization_name | Filter search results to include a specific company name.  If the value you enter for this parameter does not match with a company's name, the company will not appear in search results, even if it matches other parameters. Partial matches are accepted. For example, if you filter by the value marketing, a company called NY Marketing Unlimited would still be eligible as a search result, but NY Market Analysis would not be eligible. | str | No |
+| organization_ids | The Apollo IDs for the companies you want to include in your search results. Each company in the Apollo database is assigned a unique ID.  To find IDs, identify the values for organization_id when you call this endpoint. | List[str] | No |
+| max_results | The maximum number of results to return. If you don't specify this parameter, the default is 100. | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the search failed | str |
+| organizations | List of organizations found | List[Dict[str, Any]] |
+| organization | Each found organization, one at a time | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Market Research**: Find companies matching specific criteria for market analysis.
+
+**Lead List Building**: Build targeted lists of companies for outbound sales campaigns.
+
+**Competitive Intelligence**: Research competitors and similar companies in your market.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/apollo/people.md b/docs/integrations/block-integrations/apollo/people.md
new file mode 100644
index 0000000000..d451a67a49
--- /dev/null
+++ b/docs/integrations/block-integrations/apollo/people.md
@@ -0,0 +1,50 @@
+# Apollo People
+<!-- MANUAL: file_description -->
+Blocks for searching people in Apollo's B2B contact database with various filters.
+<!-- END MANUAL -->
+
+## Search People
+
+### What it is
+Search for people in Apollo
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block searches Apollo's database for people based on job titles, seniority, location, company, and other criteria. It's designed for finding prospects and contacts for sales and marketing.
+
+Enable enrich_info to get detailed contact information including verified email addresses (costs more credits).
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| person_titles | Job titles held by the people you want to find. For a person to be included in search results, they only need to match 1 of the job titles you add. Adding more job titles expands your search results.          Results also include job titles with the same terms, even if they are not exact matches. For example, searching for marketing manager might return people with the job title content marketing manager.          Use this parameter in combination with the person_seniorities[] parameter to find people based on specific job functions and seniority levels.          | List[str] | No |
+| person_locations | The location where people live. You can search across cities, US states, and countries.          To find people based on the headquarters locations of their current employer, use the organization_locations parameter. | List[str] | No |
+| person_seniorities | The job seniority that people hold within their current employer. This enables you to find people that currently hold positions at certain reporting levels, such as Director level or senior IC level.          For a person to be included in search results, they only need to match 1 of the seniorities you add. Adding more seniorities expands your search results.          Searches only return results based on their current job title, so searching for Director-level employees only returns people that currently hold a Director-level title. If someone was previously a Director, but is currently a VP, they would not be included in your search results.          Use this parameter in combination with the person_titles[] parameter to find people based on specific job functions and seniority levels. | List["owner" \| "founder" \| "c_suite" \| "partner" \| "vp" \| "head" \| "director" \| "manager" \| "senior" \| "entry" \| "intern"] | No |
+| organization_locations | The location of the company headquarters for a person's current employer. You can search across cities, US states, and countries.          If a company has several office locations, results are still based on the headquarters location. For example, if you search chicago but a company's HQ location is in boston, people that work for the Boston-based company will not appear in your results, even if they match other parameters.          To find people based on their personal location, use the person_locations parameter. | List[str] | No |
+| q_organization_domains | The domain name for the person's employer. This can be the current employer or a previous employer. Do not include www., the @ symbol, or similar.          You can add multiple domains to search across companies.            Examples: apollo.io and microsoft.com | List[str] | No |
+| contact_email_statuses | The email statuses for the people you want to find. You can add multiple statuses to expand your search. | List["verified" \| "unverified" \| "likely_to_engage" \| "unavailable"] | No |
+| organization_ids | The Apollo IDs for the companies (employers) you want to include in your search results. Each company in the Apollo database is assigned a unique ID.          To find IDs, call the Organization Search endpoint and identify the values for organization_id. | List[str] | No |
+| organization_num_employees_range | The number range of employees working for the company. This enables you to find companies based on headcount. You can add multiple ranges to expand your search results.          Each range you add needs to be a string, with the upper and lower numbers of the range separated only by a comma. | List[int] | No |
+| q_keywords | A string of words over which we want to filter the results | str | No |
+| max_results | The maximum number of results to return. If you don't specify this parameter, the default is 25. Limited to 500 to prevent overspending. | int | No |
+| enrich_info | Whether to enrich contacts with detailed information including real email addresses. This will double the search cost. | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the search failed | str |
+| people | List of people found | List[Dict[str, Any]] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Prospecting**: Find decision-makers at target companies for outbound sales.
+
+**Recruiting**: Search for candidates with specific titles and experience.
+
+**ABM Campaigns**: Build contact lists at specific accounts for account-based marketing.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/apollo/person.md b/docs/integrations/block-integrations/apollo/person.md
new file mode 100644
index 0000000000..8162b1fc91
--- /dev/null
+++ b/docs/integrations/block-integrations/apollo/person.md
@@ -0,0 +1,49 @@
+# Apollo Person
+<!-- MANUAL: file_description -->
+Blocks for enriching individual person data including contact details and email discovery.
+<!-- END MANUAL -->
+
+## Get Person Detail
+
+### What it is
+Get detailed person data with Apollo API, including email reveal
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block enriches person data using Apollo's API. You can look up by Apollo person ID for best accuracy, or match by name plus company information, LinkedIn URL, or email address.
+
+Returns comprehensive contact details including email addresses (if available), job title, company information, and social profiles.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| person_id | Apollo person ID to enrich (most accurate method) | str | No |
+| first_name | First name of the person to enrich | str | No |
+| last_name | Last name of the person to enrich | str | No |
+| name | Full name of the person to enrich (alternative to first_name + last_name) | str | No |
+| email | Known email address of the person (helps with matching) | str | No |
+| domain | Company domain of the person (e.g., 'google.com') | str | No |
+| company | Company name of the person | str | No |
+| linkedin_url | LinkedIn URL of the person | str | No |
+| organization_id | Apollo organization ID of the person's company | str | No |
+| title | Job title of the person to enrich | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if enrichment failed | str |
+| contact | Enriched contact information | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Contact Enrichment**: Get full contact details from partial information like name and company.
+
+**Email Discovery**: Find verified email addresses for outreach campaigns.
+
+**Profile Completion**: Fill in missing contact details in your CRM or database.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/ayrshare/post_to_bluesky.md b/docs/integrations/block-integrations/ayrshare/post_to_bluesky.md
new file mode 100644
index 0000000000..9931a2edb0
--- /dev/null
+++ b/docs/integrations/block-integrations/ayrshare/post_to_bluesky.md
@@ -0,0 +1,52 @@
+# Ayrshare Post To Bluesky
+<!-- MANUAL: file_description -->
+Blocks for posting content to Bluesky using the Ayrshare social media management API.
+<!-- END MANUAL -->
+
+## Post To Bluesky
+
+### What it is
+Post to Bluesky using Ayrshare
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Ayrshare's social media API to publish content to Bluesky. It handles text posts (up to 300 characters), images (up to 4), and video content with support for scheduling, accessibility features like alt text, and link shortening.
+
+The block authenticates through your Ayrshare credentials and sends the post data to Ayrshare's unified API, which then publishes to Bluesky. It returns post identifiers and status information upon completion, or error details if the operation fails.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| post | The post text to be published (max 300 characters for Bluesky) | str | No |
+| media_urls | Optional list of media URLs to include. Bluesky supports up to 4 images or 1 video. | List[str] | No |
+| is_video | Whether the media is a video | bool | No |
+| schedule_date | UTC datetime for scheduling (YYYY-MM-DDThh:mm:ssZ) | str (date-time) | No |
+| disable_comments | Whether to disable comments | bool | No |
+| shorten_links | Whether to shorten links | bool | No |
+| unsplash | Unsplash image configuration | str | No |
+| requires_approval | Whether to enable approval workflow | bool | No |
+| random_post | Whether to generate random post text | bool | No |
+| random_media_url | Whether to generate random media | bool | No |
+| notes | Additional notes for the post | str | No |
+| alt_text | Alt text for each media item (accessibility) | List[str] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| post_result | The result of the post | PostResponse |
+| post | The result of the post | PostIds |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Cross-Platform Publishing**: Automatically share content across Bluesky and other social networks from a single workflow.
+
+**Scheduled Content Calendar**: Queue up posts with specific publishing times to maintain consistent presence on Bluesky.
+
+**Visual Content Sharing**: Share image galleries with accessibility-friendly alt text for photo-focused content strategies.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/ayrshare/post_to_facebook.md b/docs/integrations/block-integrations/ayrshare/post_to_facebook.md
new file mode 100644
index 0000000000..ee41ded42c
--- /dev/null
+++ b/docs/integrations/block-integrations/ayrshare/post_to_facebook.md
@@ -0,0 +1,68 @@
+# Ayrshare Post To Facebook
+<!-- MANUAL: file_description -->
+Blocks for posting content to Facebook Pages using the Ayrshare social media management API.
+<!-- END MANUAL -->
+
+## Post To Facebook
+
+### What it is
+Post to Facebook using Ayrshare
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Ayrshare's social media API to publish content to Facebook Pages. It supports text posts, images, videos, carousels (2-10 items), Reels, and Stories, with features like audience targeting by age and country, location tagging, and scheduling.
+
+The block authenticates through Ayrshare and leverages the Meta Graph API to handle various Facebook-specific formats. Advanced options include draft mode for Meta Business Suite, custom link previews, and video thumbnails. Results include post IDs for tracking engagement.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| post | The post text to be published | str | No |
+| media_urls | Optional list of media URLs to include. Set is_video in advanced settings to true if you want to upload videos. | List[str] | No |
+| is_video | Whether the media is a video | bool | No |
+| schedule_date | UTC datetime for scheduling (YYYY-MM-DDThh:mm:ssZ) | str (date-time) | No |
+| disable_comments | Whether to disable comments | bool | No |
+| shorten_links | Whether to shorten links | bool | No |
+| unsplash | Unsplash image configuration | str | No |
+| requires_approval | Whether to enable approval workflow | bool | No |
+| random_post | Whether to generate random post text | bool | No |
+| random_media_url | Whether to generate random media | bool | No |
+| notes | Additional notes for the post | str | No |
+| is_carousel | Whether to post a carousel | bool | No |
+| carousel_link | The URL for the 'See More At' button in the carousel | str | No |
+| carousel_items | List of carousel items with name, link and picture URLs. Min 2, max 10 items. | List[CarouselItem] | No |
+| is_reels | Whether to post to Facebook Reels | bool | No |
+| reels_title | Title for the Reels video (max 255 chars) | str | No |
+| reels_thumbnail | Thumbnail URL for Reels video (JPEG/PNG, <10MB) | str | No |
+| is_story | Whether to post as a Facebook Story | bool | No |
+| media_captions | Captions for each media item | List[str] | No |
+| location_id | Facebook Page ID or name for location tagging | str | No |
+| age_min | Minimum age for audience targeting (13,15,18,21,25) | int | No |
+| target_countries | List of country codes to target (max 25) | List[str] | No |
+| alt_text | Alt text for each media item | List[str] | No |
+| video_title | Title for video post | str | No |
+| video_thumbnail | Thumbnail URL for video post | str | No |
+| is_draft | Save as draft in Meta Business Suite | bool | No |
+| scheduled_publish_date | Schedule publish time in Meta Business Suite (UTC) | str | No |
+| preview_link | URL for custom link preview | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| post_result | The result of the post | PostResponse |
+| post | The result of the post | PostIds |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Product Launches**: Create carousel posts showcasing multiple product images with links to purchase pages.
+
+**Event Promotion**: Share event details with age-targeted reach and location tagging for local business events.
+
+**Short-Form Video**: Automatically publish Reels with custom thumbnails to maximize video content reach.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/ayrshare/post_to_gmb.md b/docs/integrations/block-integrations/ayrshare/post_to_gmb.md
new file mode 100644
index 0000000000..4ada1bd966
--- /dev/null
+++ b/docs/integrations/block-integrations/ayrshare/post_to_gmb.md
@@ -0,0 +1,64 @@
+# Ayrshare Post To GMB
+<!-- MANUAL: file_description -->
+Blocks for posting content to Google My Business profiles using the Ayrshare social media management API.
+<!-- END MANUAL -->
+
+## Post To GMB
+
+### What it is
+Post to Google My Business using Ayrshare
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Ayrshare's API to publish content to Google My Business profiles. It supports standard posts, photo/video posts (categorized by type like exterior, interior, product), and special post types including events and promotional offers with coupon codes.
+
+The block integrates with Google's Business Profile API through Ayrshare, enabling call-to-action buttons (book, order, shop, learn more, sign up, call), event scheduling with start/end dates, and promotional offers with terms and redemption URLs.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| post | The post text to be published | str | No |
+| media_urls | Optional list of media URLs. GMB supports only one image or video per post. | List[str] | No |
+| is_video | Whether the media is a video | bool | No |
+| schedule_date | UTC datetime for scheduling (YYYY-MM-DDThh:mm:ssZ) | str (date-time) | No |
+| disable_comments | Whether to disable comments | bool | No |
+| shorten_links | Whether to shorten links | bool | No |
+| unsplash | Unsplash image configuration | str | No |
+| requires_approval | Whether to enable approval workflow | bool | No |
+| random_post | Whether to generate random post text | bool | No |
+| random_media_url | Whether to generate random media | bool | No |
+| notes | Additional notes for the post | str | No |
+| is_photo_video | Whether this is a photo/video post (appears in Photos section) | bool | No |
+| photo_category | Category for photo/video: cover, profile, logo, exterior, interior, product, at_work, food_and_drink, menu, common_area, rooms, teams | str | No |
+| call_to_action_type | Type of action button: 'book', 'order', 'shop', 'learn_more', 'sign_up', or 'call' | str | No |
+| call_to_action_url | URL for the action button (not required for 'call' action) | str | No |
+| event_title | Event title for event posts | str | No |
+| event_start_date | Event start date in ISO format (e.g., '2024-03-15T09:00:00Z') | str | No |
+| event_end_date | Event end date in ISO format (e.g., '2024-03-15T17:00:00Z') | str | No |
+| offer_title | Offer title for promotional posts | str | No |
+| offer_start_date | Offer start date in ISO format (e.g., '2024-03-15T00:00:00Z') | str | No |
+| offer_end_date | Offer end date in ISO format (e.g., '2024-04-15T23:59:59Z') | str | No |
+| offer_coupon_code | Coupon code for the offer (max 58 characters) | str | No |
+| offer_redeem_online_url | URL where customers can redeem the offer online | str | No |
+| offer_terms_conditions | Terms and conditions for the offer | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| post_result | The result of the post | PostResponse |
+| post | The result of the post | PostIds |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Local Business Updates**: Post daily specials, new arrivals, or service announcements directly to your Google Business Profile.
+
+**Promotional Campaigns**: Create time-limited offers with coupon codes and online redemption links to drive sales.
+
+**Event Marketing**: Announce upcoming events with dates, descriptions, and call-to-action buttons for reservations.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/ayrshare/post_to_instagram.md b/docs/integrations/block-integrations/ayrshare/post_to_instagram.md
new file mode 100644
index 0000000000..63ea5a3208
--- /dev/null
+++ b/docs/integrations/block-integrations/ayrshare/post_to_instagram.md
@@ -0,0 +1,61 @@
+# Ayrshare Post To Instagram
+<!-- MANUAL: file_description -->
+Blocks for posting content to Instagram using the Ayrshare social media management API.
+<!-- END MANUAL -->
+
+## Post To Instagram
+
+### What it is
+Post to Instagram using Ayrshare. Requires a Business or Creator Instagram Account connected with a Facebook Page
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Ayrshare's API to publish content to Instagram Business or Creator accounts. It supports feed posts, Stories (24-hour expiration), Reels, and carousels (up to 10 images/videos), with features like collaborator invitations, location tagging, and user tags with coordinates.
+
+The block requires an Instagram account connected to a Facebook Page and authenticates through Meta's Graph API via Ayrshare. Instagram-specific features include auto-resize for optimal dimensions, audio naming for Reels, and thumbnail customization with frame offset control.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| post | The post text (max 2,200 chars, up to 30 hashtags, 3 @mentions) | str | No |
+| media_urls | Optional list of media URLs. Instagram supports up to 10 images/videos in a carousel. | List[str] | No |
+| is_video | Whether the media is a video | bool | No |
+| schedule_date | UTC datetime for scheduling (YYYY-MM-DDThh:mm:ssZ) | str (date-time) | No |
+| disable_comments | Whether to disable comments | bool | No |
+| shorten_links | Whether to shorten links | bool | No |
+| unsplash | Unsplash image configuration | str | No |
+| requires_approval | Whether to enable approval workflow | bool | No |
+| random_post | Whether to generate random post text | bool | No |
+| random_media_url | Whether to generate random media | bool | No |
+| notes | Additional notes for the post | str | No |
+| is_story | Whether to post as Instagram Story (24-hour expiration) | bool | No |
+| share_reels_feed | Whether Reel should appear in both Feed and Reels tabs | bool | No |
+| audio_name | Audio name for Reels (e.g., 'The Weeknd - Blinding Lights') | str | No |
+| thumbnail | Thumbnail URL for Reel video | str | No |
+| thumbnail_offset | Thumbnail frame offset in milliseconds (default: 0) | int | No |
+| alt_text | Alt text for each media item (up to 1,000 chars each, accessibility feature), each item in the list corresponds to a media item in the media_urls list | List[str] | No |
+| location_id | Facebook Page ID or name for location tagging (e.g., '7640348500' or '@guggenheimmuseum') | str | No |
+| user_tags | List of users to tag with coordinates for images | List[Dict[str, Any]] | No |
+| collaborators | Instagram usernames to invite as collaborators (max 3, public accounts only) | List[str] | No |
+| auto_resize | Auto-resize images to 1080x1080px for Instagram | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| post_result | The result of the post | PostResponse |
+| post | The result of the post | PostIds |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Influencer Collaborations**: Create posts with collaborator tags to feature brand partnerships across multiple accounts.
+
+**E-commerce Product Showcases**: Share carousel posts of product images with location tags for local discovery.
+
+**Reels Automation**: Automatically publish short-form video content with custom thumbnails and trending audio.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/ayrshare/post_to_linkedin.md b/docs/integrations/block-integrations/ayrshare/post_to_linkedin.md
new file mode 100644
index 0000000000..5d062a02a3
--- /dev/null
+++ b/docs/integrations/block-integrations/ayrshare/post_to_linkedin.md
@@ -0,0 +1,63 @@
+# Ayrshare Post To LinkedIn
+<!-- MANUAL: file_description -->
+Blocks for posting content to LinkedIn using the Ayrshare social media management API.
+<!-- END MANUAL -->
+
+## Post To Linked In
+
+### What it is
+Post to LinkedIn using Ayrshare
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Ayrshare's social media API to post content to LinkedIn. It handles text posts, images, videos, and documents, with support for scheduling and audience targeting. The block authenticates through Ayrshare's API.
+
+LinkedIn-specific features include visibility controls, comment management, and targeting by country, seniority, industry, and other demographics (requires 300+ followers in target audience).
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| post | The post text (max 3,000 chars, hashtags supported with #) | str | No |
+| media_urls | Optional list of media URLs. LinkedIn supports up to 9 images, videos, or documents (PPT, PPTX, DOC, DOCX, PDF <100MB, <300 pages). | List[str] | No |
+| is_video | Whether the media is a video | bool | No |
+| schedule_date | UTC datetime for scheduling (YYYY-MM-DDThh:mm:ssZ) | str (date-time) | No |
+| disable_comments | Whether to disable comments | bool | No |
+| shorten_links | Whether to shorten links | bool | No |
+| unsplash | Unsplash image configuration | str | No |
+| requires_approval | Whether to enable approval workflow | bool | No |
+| random_post | Whether to generate random post text | bool | No |
+| random_media_url | Whether to generate random media | bool | No |
+| notes | Additional notes for the post | str | No |
+| visibility | Post visibility: 'public' (default), 'connections' (personal only), 'loggedin' | str | No |
+| alt_text | Alt text for each image (accessibility feature, not supported for videos/documents) | List[str] | No |
+| titles | Title/caption for each image or video | List[str] | No |
+| document_title | Title for document posts (max 400 chars, uses filename if not specified) | str | No |
+| thumbnail | Thumbnail URL for video (PNG/JPG, same dimensions as video, <10MB) | str | No |
+| targeting_countries | Country codes for targeting (e.g., ['US', 'IN', 'DE', 'GB']). Requires 300+ followers in target audience. | List[str] | No |
+| targeting_seniorities | Seniority levels for targeting (e.g., ['Senior', 'VP']). Requires 300+ followers in target audience. | List[str] | No |
+| targeting_degrees | Education degrees for targeting. Requires 300+ followers in target audience. | List[str] | No |
+| targeting_fields_of_study | Fields of study for targeting. Requires 300+ followers in target audience. | List[str] | No |
+| targeting_industries | Industry categories for targeting. Requires 300+ followers in target audience. | List[str] | No |
+| targeting_job_functions | Job function categories for targeting. Requires 300+ followers in target audience. | List[str] | No |
+| targeting_staff_count_ranges | Company size ranges for targeting. Requires 300+ followers in target audience. | List[str] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| post_result | The result of the post | PostResponse |
+| post | The result of the post | PostIds |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Thought Leadership**: Automatically share blog posts or industry insights with professional network.
+
+**Scheduled Content**: Queue up a week's worth of LinkedIn posts with scheduled publishing times.
+
+**Targeted Announcements**: Share company updates targeted to specific industries or seniority levels.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/ayrshare/post_to_pinterest.md b/docs/integrations/block-integrations/ayrshare/post_to_pinterest.md
new file mode 100644
index 0000000000..f548e69749
--- /dev/null
+++ b/docs/integrations/block-integrations/ayrshare/post_to_pinterest.md
@@ -0,0 +1,58 @@
+# Ayrshare Post To Pinterest
+<!-- MANUAL: file_description -->
+Blocks for posting pins to Pinterest using the Ayrshare social media management API.
+<!-- END MANUAL -->
+
+## Post To Pinterest
+
+### What it is
+Post to Pinterest using Ayrshare
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Ayrshare's API to publish pins to Pinterest boards. It supports image pins, video pins (with required thumbnails), and carousel pins (up to 5 images), with customizable titles, descriptions, destination links, and private notes.
+
+The block connects to Pinterest's API through Ayrshare, allowing you to specify target boards, add alt text for accessibility, and configure per-image carousel options including individual titles, links, and descriptions. Pins can be scheduled for future publishing.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| post | Pin description (max 500 chars, links not clickable - use link field instead) | str | No |
+| media_urls | Required image/video URLs. Pinterest requires at least one image. Videos need thumbnail. Up to 5 images for carousel. | List[str] | No |
+| is_video | Whether the media is a video | bool | No |
+| schedule_date | UTC datetime for scheduling (YYYY-MM-DDThh:mm:ssZ) | str (date-time) | No |
+| disable_comments | Whether to disable comments | bool | No |
+| shorten_links | Whether to shorten links | bool | No |
+| unsplash | Unsplash image configuration | str | No |
+| requires_approval | Whether to enable approval workflow | bool | No |
+| random_post | Whether to generate random post text | bool | No |
+| random_media_url | Whether to generate random media | bool | No |
+| notes | Additional notes for the post | str | No |
+| pin_title | Pin title displayed in 'Add your title' section (max 100 chars) | str | No |
+| link | Clickable destination URL when users click the pin (max 2048 chars) | str | No |
+| board_id | Pinterest Board ID to post to (from /user/details endpoint, uses default board if not specified) | str | No |
+| note | Private note for the pin (only visible to you and board collaborators) | str | No |
+| thumbnail | Required thumbnail URL for video pins (must have valid image Content-Type) | str | No |
+| carousel_options | Options for each image in carousel (title, link, description per image) | List[PinterestCarouselOption] | No |
+| alt_text | Alt text for each image/video (max 500 chars each, accessibility feature) | List[str] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| post_result | The result of the post | PostResponse |
+| post | The result of the post | PostIds |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Product Catalog Distribution**: Automatically pin product images with direct links to purchase pages organized by board category.
+
+**Content Repurposing**: Convert blog posts and articles into visual pins with clickable destination URLs.
+
+**Visual Inspiration Boards**: Create carousel pins showcasing design ideas, recipes, or tutorials with step-by-step images.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/ayrshare/post_to_reddit.md b/docs/integrations/block-integrations/ayrshare/post_to_reddit.md
new file mode 100644
index 0000000000..1fab74fd8a
--- /dev/null
+++ b/docs/integrations/block-integrations/ayrshare/post_to_reddit.md
@@ -0,0 +1,51 @@
+# Ayrshare Post To Reddit
+<!-- MANUAL: file_description -->
+Blocks for posting content to Reddit using the Ayrshare social media management API.
+<!-- END MANUAL -->
+
+## Post To Reddit
+
+### What it is
+Post to Reddit using Ayrshare
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Ayrshare's API to publish content to Reddit. It supports text posts, image posts, and video submissions with optional scheduling and link shortening features.
+
+The block authenticates through Ayrshare and submits content to your connected Reddit account. Common options include approval workflows for content review before publishing, random content generation, and Unsplash integration for sourcing images.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| post | The post text to be published | str | No |
+| media_urls | Optional list of media URLs to include. Set is_video in advanced settings to true if you want to upload videos. | List[str] | No |
+| is_video | Whether the media is a video | bool | No |
+| schedule_date | UTC datetime for scheduling (YYYY-MM-DDThh:mm:ssZ) | str (date-time) | No |
+| disable_comments | Whether to disable comments | bool | No |
+| shorten_links | Whether to shorten links | bool | No |
+| unsplash | Unsplash image configuration | str | No |
+| requires_approval | Whether to enable approval workflow | bool | No |
+| random_post | Whether to generate random post text | bool | No |
+| random_media_url | Whether to generate random media | bool | No |
+| notes | Additional notes for the post | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| post_result | The result of the post | PostResponse |
+| post | The result of the post | PostIds |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Community Engagement**: Share relevant content to niche subreddits as part of community marketing strategies.
+
+**Content Distribution**: Cross-post blog articles or announcements to relevant Reddit communities for broader reach.
+
+**Brand Monitoring Response**: Automatically share updates or responses in communities where your brand is discussed.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/ayrshare/post_to_snapchat.md b/docs/integrations/block-integrations/ayrshare/post_to_snapchat.md
new file mode 100644
index 0000000000..247f49f8c5
--- /dev/null
+++ b/docs/integrations/block-integrations/ayrshare/post_to_snapchat.md
@@ -0,0 +1,53 @@
+# Ayrshare Post To Snapchat
+<!-- MANUAL: file_description -->
+Blocks for posting video content to Snapchat using the Ayrshare social media management API.
+<!-- END MANUAL -->
+
+## Post To Snapchat
+
+### What it is
+Post to Snapchat using Ayrshare
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Ayrshare's API to publish video content to Snapchat. Snapchat only supports video content, with three destination options: Stories (24-hour ephemeral content), Saved Stories (persistent Stories), and Spotlight (public discovery feed).
+
+The block authenticates through Ayrshare and uploads video content with optional custom thumbnails. Videos can be scheduled for future publishing and support approval workflows for content review before going live.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| post | The post text (optional for video-only content) | str | No |
+| media_urls | Required video URL for Snapchat posts. Snapchat only supports video content. | List[str] | No |
+| is_video | Whether the media is a video | bool | No |
+| schedule_date | UTC datetime for scheduling (YYYY-MM-DDThh:mm:ssZ) | str (date-time) | No |
+| disable_comments | Whether to disable comments | bool | No |
+| shorten_links | Whether to shorten links | bool | No |
+| unsplash | Unsplash image configuration | str | No |
+| requires_approval | Whether to enable approval workflow | bool | No |
+| random_post | Whether to generate random post text | bool | No |
+| random_media_url | Whether to generate random media | bool | No |
+| notes | Additional notes for the post | str | No |
+| story_type | Type of Snapchat content: 'story' (24-hour Stories), 'saved_story' (Saved Stories), or 'spotlight' (Spotlight posts) | str | No |
+| video_thumbnail | Thumbnail URL for video content (optional, auto-generated if not provided) | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| post_result | The result of the post | PostResponse |
+| post | The result of the post | PostIds |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Ephemeral Marketing**: Share time-sensitive promotions or behind-the-scenes content that creates urgency through 24-hour Stories.
+
+**Public Discovery**: Post engaging video content to Spotlight to reach new audiences beyond your followers.
+
+**Scheduled Story Series**: Plan and schedule a sequence of video Stories for product launches or events.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/ayrshare/post_to_telegram.md b/docs/integrations/block-integrations/ayrshare/post_to_telegram.md
new file mode 100644
index 0000000000..c2c082d7b6
--- /dev/null
+++ b/docs/integrations/block-integrations/ayrshare/post_to_telegram.md
@@ -0,0 +1,51 @@
+# Ayrshare Post To Telegram
+<!-- MANUAL: file_description -->
+Blocks for posting messages to Telegram channels using the Ayrshare social media management API.
+<!-- END MANUAL -->
+
+## Post To Telegram
+
+### What it is
+Post to Telegram using Ayrshare
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Ayrshare's API to publish messages to Telegram channels. It supports text messages, images, videos, and animated GIFs, with automatic link preview generation unless media is included.
+
+The block authenticates through Ayrshare and sends content to your connected Telegram channel or bot. User mentions are supported via @handle syntax, and content can be scheduled for future delivery.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| post | The post text (empty string allowed). Use @handle to mention other Telegram users. | str | No |
+| media_urls | Optional list of media URLs. For animated GIFs, only one URL is allowed. Telegram will auto-preview links unless image/video is included. | List[str] | No |
+| is_video | Whether the media is a video. Set to true for animated GIFs that don't end in .gif/.GIF extension. | bool | No |
+| schedule_date | UTC datetime for scheduling (YYYY-MM-DDThh:mm:ssZ) | str (date-time) | No |
+| disable_comments | Whether to disable comments | bool | No |
+| shorten_links | Whether to shorten links | bool | No |
+| unsplash | Unsplash image configuration | str | No |
+| requires_approval | Whether to enable approval workflow | bool | No |
+| random_post | Whether to generate random post text | bool | No |
+| random_media_url | Whether to generate random media | bool | No |
+| notes | Additional notes for the post | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| post_result | The result of the post | PostResponse |
+| post | The result of the post | PostIds |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Channel Broadcasting**: Automatically distribute announcements, updates, or news to Telegram channel subscribers.
+
+**Alert Systems**: Send automated notifications with media attachments to monitoring or alert channels.
+
+**Content Syndication**: Cross-post content from other platforms to Telegram communities for broader reach.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/ayrshare/post_to_threads.md b/docs/integrations/block-integrations/ayrshare/post_to_threads.md
new file mode 100644
index 0000000000..65c5fdbe99
--- /dev/null
+++ b/docs/integrations/block-integrations/ayrshare/post_to_threads.md
@@ -0,0 +1,51 @@
+# Ayrshare Post To Threads
+<!-- MANUAL: file_description -->
+Blocks for posting content to Threads using the Ayrshare social media management API.
+<!-- END MANUAL -->
+
+## Post To Threads
+
+### What it is
+Post to Threads using Ayrshare
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Ayrshare's API to publish content to Threads (Meta's text-based social platform). It supports text posts (up to 500 characters with one hashtag), images, videos, and carousels (up to 20 items), with automatic link previews when no media is attached.
+
+The block authenticates through Meta's API via Ayrshare. Content can mention users via @handle syntax, be scheduled for future publishing, and include approval workflows for content review.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| post | The post text (max 500 chars, empty string allowed). Only 1 hashtag allowed. Use @handle to mention users. | str | No |
+| media_urls | Optional list of media URLs. Supports up to 20 images/videos in a carousel. Auto-preview links unless media is included. | List[str] | No |
+| is_video | Whether the media is a video | bool | No |
+| schedule_date | UTC datetime for scheduling (YYYY-MM-DDThh:mm:ssZ) | str (date-time) | No |
+| disable_comments | Whether to disable comments | bool | No |
+| shorten_links | Whether to shorten links | bool | No |
+| unsplash | Unsplash image configuration | str | No |
+| requires_approval | Whether to enable approval workflow | bool | No |
+| random_post | Whether to generate random post text | bool | No |
+| random_media_url | Whether to generate random media | bool | No |
+| notes | Additional notes for the post | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| post_result | The result of the post | PostResponse |
+| post | The result of the post | PostIds |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Thought Leadership**: Share quick insights, opinions, or industry commentary in a conversational format.
+
+**Cross-Platform Text Content**: Automatically syndicate text-based content from other platforms to Threads.
+
+**Community Engagement**: Post discussion prompts or responses to engage with your Threads audience.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/ayrshare/post_to_tiktok.md b/docs/integrations/block-integrations/ayrshare/post_to_tiktok.md
new file mode 100644
index 0000000000..f6bff7b940
--- /dev/null
+++ b/docs/integrations/block-integrations/ayrshare/post_to_tiktok.md
@@ -0,0 +1,62 @@
+# Ayrshare Post To TikTok
+<!-- MANUAL: file_description -->
+Blocks for posting videos and image slideshows to TikTok using the Ayrshare social media management API.
+<!-- END MANUAL -->
+
+## Post To Tik Tok
+
+### What it is
+Post to TikTok using Ayrshare
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Ayrshare's API to publish content to TikTok. It supports video posts and image slideshows (up to 35 images), with extensive options for content labeling including AI-generated disclosure, branded content, and brand organic content tags.
+
+The block connects to TikTok's API through Ayrshare with controls for visibility, duet/stitch permissions, comment settings, auto-music, and thumbnail selection. Videos can be posted as drafts for final review, and scheduled for future publishing.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| post | The post text (max 2,200 chars, empty string allowed). Use @handle to mention users. Line breaks will be ignored. | str | Yes |
+| media_urls | Required media URLs. Either 1 video OR up to 35 images (JPG/JPEG/WEBP only). Cannot mix video and images. | List[str] | No |
+| is_video | Whether the media is a video | bool | No |
+| schedule_date | UTC datetime for scheduling (YYYY-MM-DDThh:mm:ssZ) | str (date-time) | No |
+| disable_comments | Disable comments on the published post | bool | No |
+| shorten_links | Whether to shorten links | bool | No |
+| unsplash | Unsplash image configuration | str | No |
+| requires_approval | Whether to enable approval workflow | bool | No |
+| random_post | Whether to generate random post text | bool | No |
+| random_media_url | Whether to generate random media | bool | No |
+| notes | Additional notes for the post | str | No |
+| auto_add_music | Whether to automatically add recommended music to the post. If you set this field to true, you can change the music later in the TikTok app. | bool | No |
+| disable_duet | Disable duets on published video (video only) | bool | No |
+| disable_stitch | Disable stitch on published video (video only) | bool | No |
+| is_ai_generated | If you enable the toggle, your video will be labeled as “Creator labeled as AI-generated” once posted and can’t be changed. The “Creator labeled as AI-generated” label indicates that the content was completely AI-generated or significantly edited with AI. | bool | No |
+| is_branded_content | Whether to enable the Branded Content toggle. If this field is set to true, the video will be labeled as Branded Content, indicating you are in a paid partnership with a brand. A “Paid partnership” label will be attached to the video. | bool | No |
+| is_brand_organic | Whether to enable the Brand Organic Content toggle. If this field is set to true, the video will be labeled as Brand Organic Content, indicating you are promoting yourself or your own business. A “Promotional content” label will be attached to the video. | bool | No |
+| image_cover_index | Index of image to use as cover (0-based, image posts only) | int | No |
+| title | Title for image posts | str | No |
+| thumbnail_offset | Video thumbnail frame offset in milliseconds (video only) | int | No |
+| visibility | Post visibility: 'public', 'private', 'followers', or 'friends' | "public" \| "private" \| "followers" | No |
+| draft | Create as draft post (video only) | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| post_result | The result of the post | PostResponse |
+| post | The result of the post | PostIds |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Creator Content Pipeline**: Automate video uploads with proper AI disclosure labels and visibility settings for content creators.
+
+**Brand Campaigns**: Publish branded content with proper disclosure labels to maintain FTC compliance and platform guidelines.
+
+**Image Slideshow Posts**: Create TikTok slideshows from product images or photo series with automatic cover selection.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/ayrshare/post_to_x.md b/docs/integrations/block-integrations/ayrshare/post_to_x.md
new file mode 100644
index 0000000000..9881107505
--- /dev/null
+++ b/docs/integrations/block-integrations/ayrshare/post_to_x.md
@@ -0,0 +1,64 @@
+# Ayrshare Post To X
+<!-- MANUAL: file_description -->
+Blocks for posting tweets and threads to X (Twitter) using the Ayrshare social media management API.
+<!-- END MANUAL -->
+
+## Post To X
+
+### What it is
+Post to X / Twitter using Ayrshare
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Ayrshare's API to publish content to X (formerly Twitter). It supports standard tweets (280 characters, or 25,000 for Premium users), threads, polls, quote tweets, and replies, with up to 4 media attachments including video with subtitles.
+
+The block authenticates through Ayrshare and handles X-specific features like automatic thread breaking using double newlines, thread numbering, per-post media attachments, and long-form video uploads (with approval). Poll options and duration can be configured for engagement posts.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| post | The post text (max 280 chars, up to 25,000 for Premium users). Use @handle to mention users. Use \n\n for thread breaks. | str | Yes |
+| media_urls | Optional list of media URLs. X supports up to 4 images or videos per tweet. Auto-preview links unless media is included. | List[str] | No |
+| is_video | Whether the media is a video | bool | No |
+| schedule_date | UTC datetime for scheduling (YYYY-MM-DDThh:mm:ssZ) | str (date-time) | No |
+| disable_comments | Whether to disable comments | bool | No |
+| shorten_links | Whether to shorten links | bool | No |
+| unsplash | Unsplash image configuration | str | No |
+| requires_approval | Whether to enable approval workflow | bool | No |
+| random_post | Whether to generate random post text | bool | No |
+| random_media_url | Whether to generate random media | bool | No |
+| notes | Additional notes for the post | str | No |
+| reply_to_id | ID of the tweet to reply to | str | No |
+| quote_tweet_id | ID of the tweet to quote (low-level Tweet ID) | str | No |
+| poll_options | Poll options (2-4 choices) | List[str] | No |
+| poll_duration | Poll duration in minutes (1-10080) | int | No |
+| alt_text | Alt text for each image (max 1,000 chars each, not supported for videos) | List[str] | No |
+| is_thread | Whether to automatically break post into thread based on line breaks | bool | No |
+| thread_number | Add thread numbers (1/n format) to each thread post | bool | No |
+| thread_media_urls | Media URLs for thread posts (one per thread, use 'null' to skip) | List[str] | No |
+| long_post | Force long form post (requires Premium X account) | bool | No |
+| long_video | Enable long video upload (requires approval and Business/Enterprise plan) | bool | No |
+| subtitle_url | URL to SRT subtitle file for videos (must be HTTPS and end in .srt) | str | No |
+| subtitle_language | Language code for subtitles (default: 'en') | str | No |
+| subtitle_name | Name of caption track (max 150 chars, default: 'English') | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| post_result | The result of the post | PostResponse |
+| post | The result of the post | PostIds |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Thread Publishing**: Automatically format and publish long-form content as numbered thread sequences.
+
+**Engagement Polls**: Create polls to gather audience feedback or drive interaction with scheduled posting.
+
+**Reply Automation**: Build workflows that automatically respond to mentions or engage in conversations.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/ayrshare/post_to_youtube.md b/docs/integrations/block-integrations/ayrshare/post_to_youtube.md
new file mode 100644
index 0000000000..4210ac8571
--- /dev/null
+++ b/docs/integrations/block-integrations/ayrshare/post_to_youtube.md
@@ -0,0 +1,67 @@
+# Ayrshare Post To YouTube
+<!-- MANUAL: file_description -->
+Blocks for uploading videos to YouTube using the Ayrshare social media management API.
+<!-- END MANUAL -->
+
+## Post To You Tube
+
+### What it is
+Post to YouTube using Ayrshare
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Ayrshare's API to upload videos to YouTube. It handles video uploads with extensive metadata including titles, descriptions, tags, custom thumbnails, playlist assignment, category selection, and visibility controls (public, private, unlisted).
+
+The block supports YouTube Shorts (up to 3 minutes), geographic targeting to allow or block specific countries, subtitle files (SRT/SBV format), synthetic/AI content disclosure, kids content labeling, and subscriber notification controls. Videos can be scheduled for specific publish times.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| post | Video description (max 5,000 chars, empty string allowed). Cannot contain < or > characters. | str | Yes |
+| media_urls | Required video URL. YouTube only supports 1 video per post. | List[str] | No |
+| is_video | Whether the media is a video | bool | No |
+| schedule_date | UTC datetime for scheduling (YYYY-MM-DDThh:mm:ssZ) | str (date-time) | No |
+| disable_comments | Whether to disable comments | bool | No |
+| shorten_links | Whether to shorten links | bool | No |
+| unsplash | Unsplash image configuration | str | No |
+| requires_approval | Whether to enable approval workflow | bool | No |
+| random_post | Whether to generate random post text | bool | No |
+| random_media_url | Whether to generate random media | bool | No |
+| notes | Additional notes for the post | str | No |
+| title | Video title (max 100 chars, required). Cannot contain < or > characters. | str | Yes |
+| visibility | Video visibility: 'private' (default), 'public' , or 'unlisted' | "private" \| "public" \| "unlisted" | No |
+| thumbnail | Thumbnail URL (JPEG/PNG under 2MB, must end in .png/.jpg/.jpeg). Requires phone verification. | str | No |
+| playlist_id | Playlist ID to add video (user must own playlist) | str | No |
+| tags | Video tags (min 2 chars each, max 500 chars total) | List[str] | No |
+| made_for_kids | Self-declared kids content | bool | No |
+| is_shorts | Post as YouTube Short (max 3 minutes, adds #shorts) | bool | No |
+| notify_subscribers | Send notification to subscribers | bool | No |
+| category_id | Video category ID (e.g., 24 = Entertainment) | int | No |
+| contains_synthetic_media | Disclose realistic AI/synthetic content | bool | No |
+| publish_at | UTC publish time (YouTube controlled, format: 2022-10-08T21:18:36Z) | str | No |
+| targeting_block_countries | Country codes to block from viewing (e.g., ['US', 'CA']) | List[str] | No |
+| targeting_allow_countries | Country codes to allow viewing (e.g., ['GB', 'AU']) | List[str] | No |
+| subtitle_url | URL to SRT or SBV subtitle file (must be HTTPS and end in .srt/.sbv, under 100MB) | str | No |
+| subtitle_language | Language code for subtitles (default: 'en') | str | No |
+| subtitle_name | Name of caption track (max 150 chars, default: 'English') | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| post_result | The result of the post | PostResponse |
+| post | The result of the post | PostIds |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Video Publishing Pipeline**: Automate video uploads with thumbnails, descriptions, and playlist organization for content creators.
+
+**YouTube Shorts Automation**: Publish short-form vertical videos to YouTube Shorts with proper metadata and hashtags.
+
+**Multi-Region Content**: Upload videos with geographic restrictions for region-specific content licensing or compliance.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/baas/bots.md b/docs/integrations/block-integrations/baas/bots.md
new file mode 100644
index 0000000000..38cf9028cd
--- /dev/null
+++ b/docs/integrations/block-integrations/baas/bots.md
@@ -0,0 +1,160 @@
+# Baas Bots
+<!-- MANUAL: file_description -->
+Blocks for deploying and managing meeting recording bots using the BaaS (Bot as a Service) API.
+<!-- END MANUAL -->
+
+## Baas Bot Delete Recording
+
+### What it is
+Permanently delete a meeting's recorded data
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block permanently deletes the recorded data for a meeting bot using the BaaS (Bot as a Service) API. The deletion is irreversible and removes all associated recording files and transcripts.
+
+Provide the bot_id from a previous recording session to delete that specific meeting's data.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| bot_id | UUID of the bot whose data to delete | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| deleted | Whether the data was successfully deleted | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Privacy Compliance**: Delete recordings to comply with data retention policies or user requests.
+
+**Storage Management**: Clean up old recordings to manage storage costs.
+
+**Post-Processing Cleanup**: Delete recordings after extracting needed information.
+<!-- END MANUAL -->
+
+---
+
+## Baas Bot Fetch Meeting Data
+
+### What it is
+Retrieve recorded meeting data
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves recorded meeting data including video URL, transcript, and metadata from a completed bot session. The video URL is time-limited and should be downloaded promptly.
+
+Enable include_transcripts to receive the full meeting transcript with speaker identification and timestamps.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| bot_id | UUID of the bot whose data to fetch | str | Yes |
+| include_transcripts | Include transcript data in response | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| mp4_url | URL to download the meeting recording (time-limited) | str |
+| transcript | Meeting transcript data | List[Any] |
+| metadata | Meeting metadata and bot information | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Meeting Summarization**: Retrieve transcripts for AI summarization and action item extraction.
+
+**Recording Archive**: Download and store meeting recordings for compliance or reference.
+
+**Analytics**: Extract meeting metadata for participation and duration analytics.
+<!-- END MANUAL -->
+
+---
+
+## Baas Bot Join Meeting
+
+### What it is
+Deploy a bot to join and record a meeting
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block deploys a recording bot to join a video meeting (Zoom, Google Meet, Teams). Configure the bot's display name, avatar, and entry message. The bot joins, records, and transcribes the meeting.
+
+Use webhooks to receive notifications when the meeting ends and recordings are ready.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| meeting_url | The URL of the meeting the bot should join | str | Yes |
+| bot_name | Display name for the bot in the meeting | str | Yes |
+| bot_image | URL to an image for the bot's avatar (16:9 ratio recommended) | str | No |
+| entry_message | Chat message the bot will post upon entry | str | No |
+| reserved | Use a reserved bot slot (joins 4 min before meeting) | bool | No |
+| start_time | Unix timestamp (ms) when bot should join | int | No |
+| webhook_url | URL to receive webhook events for this bot | str | No |
+| timeouts | Automatic leave timeouts configuration | Dict[str, Any] | No |
+| extra | Custom metadata to attach to the bot | Dict[str, Any] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| bot_id | UUID of the deployed bot | str |
+| join_response | Full response from join operation | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Automated Recording**: Record meetings automatically without requiring host intervention.
+
+**Meeting Assistant**: Deploy bots to take notes and transcribe customer or team meetings.
+
+**Compliance Recording**: Ensure all meetings are recorded for compliance or quality assurance.
+<!-- END MANUAL -->
+
+---
+
+## Baas Bot Leave Meeting
+
+### What it is
+Remove a bot from an ongoing meeting
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block removes a recording bot from an ongoing meeting. Use this when you need to stop recording before the meeting naturally ends.
+
+The bot leaves gracefully and recording data becomes available for retrieval.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| bot_id | UUID of the bot to remove from meeting | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| left | Whether the bot successfully left | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Early Termination**: Stop recording when a meeting transitions to an off-record discussion.
+
+**Time-Based Recording**: Leave after capturing a specific portion of a meeting.
+
+**Error Recovery**: Remove and redeploy bots when issues occur during recording.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/bannerbear/text_overlay.md b/docs/integrations/block-integrations/bannerbear/text_overlay.md
new file mode 100644
index 0000000000..80ac9bd236
--- /dev/null
+++ b/docs/integrations/block-integrations/bannerbear/text_overlay.md
@@ -0,0 +1,49 @@
+# Bannerbear Text Overlay
+<!-- MANUAL: file_description -->
+Blocks for generating dynamic images with text overlays using Bannerbear templates.
+<!-- END MANUAL -->
+
+## Bannerbear Text Overlay
+
+### What it is
+Add text overlay to images using Bannerbear templates. Perfect for creating social media graphics, marketing materials, and dynamic image content.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Bannerbear's API to generate images by populating templates with dynamic text and images. Create templates in Bannerbear with text layers, then modify layer content programmatically.
+
+Webhooks can notify you when asynchronous generation completes. Include custom metadata for tracking generated images.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| template_id | The unique ID of your Bannerbear template | str | Yes |
+| project_id | Optional: Project ID (required when using Master API Key) | str | No |
+| text_modifications | List of text layers to modify in the template | List[TextModification] | Yes |
+| image_url | Optional: URL of an image to use in the template | str | No |
+| image_layer_name | Optional: Name of the image layer in the template | str | No |
+| webhook_url | Optional: URL to receive webhook notification when image is ready | str | No |
+| metadata | Optional: Custom metadata to attach to the image | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the image generation was successfully initiated | bool |
+| image_url | URL of the generated image (if synchronous) or placeholder | str |
+| uid | Unique identifier for the generated image | str |
+| status | Status of the image generation | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Social Media Graphics**: Generate personalized social posts with dynamic quotes, stats, or headlines.
+
+**Marketing Banners**: Create ad banners with different product names, prices, or offers.
+
+**Certificates & Cards**: Generate personalized certificates, invitations, or greeting cards.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/basic.md b/docs/integrations/block-integrations/basic.md
new file mode 100644
index 0000000000..5a73fd5a03
--- /dev/null
+++ b/docs/integrations/block-integrations/basic.md
@@ -0,0 +1,1454 @@
+# Basic
+<!-- MANUAL: file_description -->
+Core utility blocks for storing values, printing output, file operations, type conversion, and basic data manipulation.
+<!-- END MANUAL -->
+
+## Add Memory
+
+### What it is
+Add new memories to Mem0 with user segmentation
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block integrates with Mem0, a memory layer service that stores and retrieves information across conversations. When you add a memory, the content is stored with the user's context and can optionally be segmented by run or agent, allowing for scoped memory retrieval later.
+
+The block accepts either plain text or structured message objects (like those from AI blocks). You can attach metadata to memories for better organization and filtering. Memories persist across workflow executions, enabling your agents to "remember" past interactions.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| content | Content to add - either a string or list of message objects as output from an AI block | Content | No |
+| metadata | Optional metadata for the memory | Dict[str, Any] | No |
+| limit_memory_to_run | Limit the memory to the run | bool | No |
+| limit_memory_to_agent | Limit the memory to the agent | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| action | Action of the operation | str |
+| memory | Memory created | str |
+| results | List of all results from the operation | List[Dict[str, str]] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Personalized Assistants**: Store user preferences, past interactions, or learned information so your AI agent can provide personalized responses in future conversations.
+
+**Context Carryover**: Save important details from one workflow run (like customer issues or project context) to reference in subsequent runs without asking the user again.
+
+**Knowledge Building**: Accumulate facts and insights over time, creating a growing knowledge base that improves your agent's helpfulness with each interaction.
+<!-- END MANUAL -->
+
+---
+
+## Add To Dictionary
+
+### What it is
+Adds a new key-value pair to a dictionary. If no dictionary is provided, a new one is created.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block adds one or more key-value pairs to a dictionary. If you don't provide an existing dictionary, it creates a new one. You can add entries one at a time using the key/value fields, or add multiple entries at once using the entries field.
+
+The block outputs the updated dictionary with all new entries added. This is useful for building up structured data objects as your workflow progresses, collecting information from multiple sources into a single data structure.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| dictionary | The dictionary to add the entry to. If not provided, a new dictionary will be created. | Dict[str, Any] | No |
+| key | The key for the new entry. | str | No |
+| value | The value for the new entry. | Value | No |
+| entries | The entries to add to the dictionary. This is the batch version of the `key` and `value` fields. | Dict[str, Any] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| updated_dictionary | The dictionary with the new entry added. | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Building API Payloads**: Construct complex JSON objects by adding fields from different workflow branches before sending to an API.
+
+**Aggregating Form Data**: Collect user inputs from multiple form fields into a single structured object for processing or storage.
+
+**Creating Configuration Objects**: Build up settings or configuration dictionaries dynamically based on conditional logic in your workflow.
+<!-- END MANUAL -->
+
+---
+
+## Add To List
+
+### What it is
+Adds a new entry to a list. The entry can be of any type. If no list is provided, a new one is created.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block appends items to a list or creates a new list if none is provided. You can add a single entry or multiple entries at once. The optional position parameter lets you insert items at a specific index rather than appending to the end.
+
+Items can be of any type—strings, numbers, dictionaries, or other lists. This flexibility makes the block useful for building up collections of data as your workflow processes multiple items or accumulates results.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| list | The list to add the entry to. If not provided, a new list will be created. | List[Any] | No |
+| entry | The entry to add to the list. Can be of any type (string, int, dict, etc.). | Entry | No |
+| entries | The entries to add to the list. This is the batch version of the `entry` field. | List[Any] | No |
+| position | The position to insert the new entry. If not provided, the entry will be appended to the end of the list. | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| updated_list | The list with the new entry added. | List[Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Collecting Search Results**: Accumulate items from paginated API responses into a single list for batch processing or display.
+
+**Building Email Recipients**: Gather email addresses from various sources into a recipient list before sending a message.
+
+**Aggregating Errors**: Collect validation errors or warnings from multiple checks into a list for consolidated error reporting.
+<!-- END MANUAL -->
+
+---
+
+## Agent Date Input
+
+### What it is
+Block for date input.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block provides a date picker input field for users interacting with your agent. When the agent runs, users see a calendar widget to select a date, which is then passed to your workflow in YYYY-MM-DD format.
+
+The block is part of the Agent Input family, allowing you to collect structured input from users at runtime rather than hardcoding values. This makes your agents interactive and reusable for different scenarios.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| name | The name of the input. | str | Yes |
+| value | Date input (YYYY-MM-DD). | str (date) | No |
+| title | The title of the input. | str | No |
+| description | The description of the input. | str | No |
+| advanced | Whether to show the input in the advanced section, if the field is not required. | bool | No |
+| secret | Whether the input should be treated as a secret. | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| result | Date result. | str (date) |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Appointment Scheduling**: Let users select a date for booking appointments, meetings, or reservations through your agent.
+
+**Report Generation**: Allow users to specify a date range start or end point for generating custom reports.
+
+**Deadline Setting**: Enable users to set due dates for tasks or projects when creating them through your workflow.
+<!-- END MANUAL -->
+
+---
+
+## Agent Dropdown Input
+
+### What it is
+Block for dropdown text selection.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block provides a dropdown selection input for users interacting with your agent. You define the available options using placeholder_values, and users select one option from the list at runtime.
+
+This is ideal when you want to constrain user input to a predefined set of choices, ensuring valid input and simplifying the user experience. The selected value is passed to downstream blocks in your workflow.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| name | The name of the input. | str | Yes |
+| value | Text selected from a dropdown. | str | No |
+| title | The title of the input. | str | No |
+| description | The description of the input. | str | No |
+| placeholder_values | Possible values for the dropdown. | List[Any] | No |
+| advanced | Whether to show the input in the advanced section, if the field is not required. | bool | No |
+| secret | Whether the input should be treated as a secret. | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| result | Selected dropdown value. | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Service Selection**: Let users choose from available service tiers (Basic, Pro, Enterprise) when configuring their request.
+
+**Language Selection**: Allow users to select their preferred language from a list of supported options.
+
+**Category Filtering**: Enable users to select a category (Sales, Support, Billing) to route their inquiry appropriately.
+<!-- END MANUAL -->
+
+---
+
+## Agent File Input
+
+### What it is
+Block for file upload input (string path for example).
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block provides a file upload input for users interacting with your agent. Users can upload files which are stored temporarily and passed to your workflow as a file path reference.
+
+By default, the block outputs a file path string that other blocks can use to access the uploaded file. The optional base64 mode converts the file content to base64 encoding, though using file paths is generally recommended for better performance with large files.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| name | The name of the input. | str | Yes |
+| value | Path or reference to an uploaded file. | str (file) | No |
+| title | The title of the input. | str | No |
+| description | The description of the input. | str | No |
+| advanced | Whether to show the input in the advanced section, if the field is not required. | bool | No |
+| secret | Whether the input should be treated as a secret. | bool | No |
+| base_64 | Whether produce an output in base64 format (not recommended, you can pass the string path just fine accross blocks). | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| result | File reference/path result. | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Document Processing**: Accept PDF or Word documents from users for analysis, summarization, or data extraction.
+
+**Image Upload**: Allow users to upload images for processing, resizing, or AI-based analysis.
+
+**Data Import**: Enable users to upload CSV or Excel files to import data into your workflow for processing.
+<!-- END MANUAL -->
+
+---
+
+## Agent Google Drive File Input
+
+### What it is
+Block for selecting a file from Google Drive.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block integrates with Google Drive to let users select files directly from their connected Drive account. The Google Drive file picker appears at runtime, allowing users to browse and select files without manually copying file IDs or URLs.
+
+You can configure which file types to display (documents, spreadsheets, presentations) using the allowed_views option. The block outputs the selected file's metadata including its ID, name, and URL for use by other Google-integrated blocks.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| name | The name of the input. | str | Yes |
+| value | The selected Google Drive file. | GoogleDriveFile | No |
+| title | The title of the input. | str | No |
+| description | The description of the input. | str | No |
+| advanced | Whether to show the input in the advanced section, if the field is not required. | bool | No |
+| secret | Whether the input should be treated as a secret. | bool | No |
+| allowed_views | Which views to show in the file picker (DOCS, SPREADSHEETS, PRESENTATIONS, etc.). | List["DOCS" \| "DOCUMENTS" \| "SPREADSHEETS" \| "PRESENTATIONS" \| "DOCS_IMAGES" \| "FOLDERS"] | No |
+| allow_folder_selection | Whether to allow selecting folders. | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| result | The selected Google Drive file with ID, name, URL, and other metadata. | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Document Workflow**: Let users select a Google Doc to read, analyze, or append content to without knowing the file ID.
+
+**Spreadsheet Data Import**: Allow users to pick a Google Sheet to import data from for processing or analysis.
+
+**File Organization**: Enable users to select folders or files for bulk operations like moving, copying, or organizing content.
+<!-- END MANUAL -->
+
+---
+
+## Agent Input
+
+### What it is
+A block that accepts and processes user input values within a workflow, supporting various input types and validation.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+It accepts a value from the user, along with metadata such as name, description, and optional placeholder values. The block then outputs the provided value.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| name | The name of the input. | str | Yes |
+| value | The value to be passed as input. | Value | No |
+| title | The title of the input. | str | No |
+| description | The description of the input. | str | No |
+| advanced | Whether to show the input in the advanced section, if the field is not required. | bool | No |
+| secret | Whether the input should be treated as a secret. | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| result | The value passed as input. | Result |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Collecting user preferences at the start of a personalized recommendation workflow.
+<!-- END MANUAL -->
+
+---
+
+## Agent Long Text Input
+
+### What it is
+Block for long text input (multi-line).
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block provides a multi-line text area input for users interacting with your agent. Unlike the short text input, this displays a larger text area suitable for paragraphs, descriptions, or any content that may span multiple lines.
+
+The block is ideal for collecting longer-form content like messages, descriptions, or code snippets from users at runtime. The text is passed as-is to downstream blocks in your workflow.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| name | The name of the input. | str | Yes |
+| value | Long text input (potentially multi-line). | str (long-text) | No |
+| title | The title of the input. | str | No |
+| description | The description of the input. | str | No |
+| advanced | Whether to show the input in the advanced section, if the field is not required. | bool | No |
+| secret | Whether the input should be treated as a secret. | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| result | Long text result. | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Feedback Collection**: Accept detailed user feedback, reviews, or comments that may require multiple paragraphs.
+
+**Content Submission**: Let users submit articles, blog posts, or documentation content for processing or publication.
+
+**Query Input**: Allow users to enter complex questions or prompts for AI processing that require detailed context.
+<!-- END MANUAL -->
+
+---
+
+## Agent Number Input
+
+### What it is
+Block for number input.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block provides a numeric input field for users interacting with your agent. The input validates that the user enters a valid integer, preventing text or invalid values from being submitted.
+
+This is useful when you need numeric parameters like quantities, counts, limits, or any integer value from users at runtime. The number is passed to downstream blocks for use in calculations or configurations.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| name | The name of the input. | str | Yes |
+| value | Number input. | int | No |
+| title | The title of the input. | str | No |
+| description | The description of the input. | str | No |
+| advanced | Whether to show the input in the advanced section, if the field is not required. | bool | No |
+| secret | Whether the input should be treated as a secret. | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| result | Number result. | int |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Quantity Selection**: Let users specify how many items to process, order, or generate.
+
+**Pagination Control**: Allow users to specify page numbers or result limits for data retrieval.
+
+**Threshold Setting**: Enable users to set numeric thresholds or limits for alerts, filtering, or processing logic.
+<!-- END MANUAL -->
+
+---
+
+## Agent Output
+
+### What it is
+A block that records and formats workflow results for display to users, with optional Jinja2 template formatting support.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+It accepts an input value along with a name, description, and optional format string. If a format string is provided, it attempts to apply the formatting to the input value before outputting it.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| value | The value to be recorded as output. | Value | No |
+| name | The name of the output. | str | Yes |
+| title | The title of the output. | str | No |
+| description | The description of the output. | str | No |
+| format | The format string to be used to format the recorded_value. Use Jinja2 syntax. | str | No |
+| escape_html | Whether to escape special characters in the inserted values to be HTML-safe. Enable for HTML output, disable for plain text. | bool | No |
+| advanced | Whether to treat the output as advanced. | bool | No |
+| secret | Whether the output should be treated as a secret. | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| output | The value recorded as output. | Output |
+| name | The name of the value recorded as output. | Name |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Presenting the final results of a data analysis workflow in a specific format.
+<!-- END MANUAL -->
+
+---
+
+## Agent Short Text Input
+
+### What it is
+Block for short text input (single-line).
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block provides a single-line text input field for users interacting with your agent. It's designed for brief text entries like names, titles, URLs, or short responses.
+
+The input displays as a standard text field and passes the entered text to downstream blocks. Use this for collecting concise information that doesn't require multiple lines or extensive formatting.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| name | The name of the input. | str | Yes |
+| value | Short text input. | str (short-text) | No |
+| title | The title of the input. | str | No |
+| description | The description of the input. | str | No |
+| advanced | Whether to show the input in the advanced section, if the field is not required. | bool | No |
+| secret | Whether the input should be treated as a secret. | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| result | Short text result. | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Name Collection**: Gather user names, company names, or project names for personalization.
+
+**Search Queries**: Accept search terms or keywords from users to drive search functionality.
+
+**URL Input**: Let users provide URLs for websites, APIs, or resources to process in your workflow.
+<!-- END MANUAL -->
+
+---
+
+## Agent Table Input
+
+### What it is
+Block for table data input with customizable headers.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block provides a tabular data input interface for users interacting with your agent. Users can enter data in a spreadsheet-like table format with customizable column headers.
+
+The table input is ideal for structured data entry where users need to provide multiple records with consistent fields. The block outputs the data as a list of dictionaries, with each row becoming a dictionary where column headers are keys.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| name | The name of the input. | str | Yes |
+| value | The table data as a list of dictionaries. | List[Dict[str, Any]] | No |
+| title | The title of the input. | str | No |
+| description | The description of the input. | str | No |
+| advanced | Whether to show the input in the advanced section, if the field is not required. | bool | No |
+| secret | Whether the input should be treated as a secret. | bool | No |
+| column_headers | Column headers for the table. | List[str] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| result | The table data as a list of dictionaries with headers as keys. | List[Dict[str, Any]] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Bulk Data Entry**: Let users input multiple records at once, like a list of contacts with name, email, and phone columns.
+
+**Order Processing**: Accept line items for an order with product, quantity, and price columns.
+
+**Task Lists**: Allow users to submit multiple tasks with columns for title, assignee, and priority.
+<!-- END MANUAL -->
+
+---
+
+## Agent Time Input
+
+### What it is
+Block for time input.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block provides a time picker input for users interacting with your agent. Users select a time (hours, minutes, and optionally seconds) which is passed to your workflow in HH:MM:SS format.
+
+The time picker provides a user-friendly interface for selecting times without requiring users to type in a specific format. This ensures valid time values and improves the user experience.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| name | The name of the input. | str | Yes |
+| value | Time input (HH:MM:SS). | str (time) | No |
+| title | The title of the input. | str | No |
+| description | The description of the input. | str | No |
+| advanced | Whether to show the input in the advanced section, if the field is not required. | bool | No |
+| secret | Whether the input should be treated as a secret. | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| result | Time result. | str (time) |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Appointment Scheduling**: Let users specify a time for meetings, calls, or appointments.
+
+**Reminder Setting**: Allow users to set reminder times for notifications or alerts.
+
+**Shift Configuration**: Enable users to define start or end times for work shifts or availability windows.
+<!-- END MANUAL -->
+
+---
+
+## Agent Toggle Input
+
+### What it is
+Block for boolean toggle input.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block provides a boolean toggle (on/off switch) input for users interacting with your agent. Users simply click to toggle between true and false states, making yes/no decisions quick and error-free.
+
+The toggle is ideal for binary choices like enabling features, confirming actions, or setting preferences. The boolean value is passed to downstream blocks for conditional logic.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| name | The name of the input. | str | Yes |
+| value | Boolean toggle input. | bool | No |
+| title | The title of the input. | str | No |
+| description | The description of the input. | str | No |
+| advanced | Whether to show the input in the advanced section, if the field is not required. | bool | No |
+| secret | Whether the input should be treated as a secret. | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| result | Boolean toggle result. | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Feature Flags**: Let users enable or disable optional features in your workflow.
+
+**Confirmation Toggles**: Require users to acknowledge terms, confirm destructive actions, or opt into notifications.
+
+**Mode Selection**: Allow users to switch between modes like "test mode" vs "production mode" or "verbose" vs "quiet" output.
+<!-- END MANUAL -->
+
+---
+
+## Block Installation
+
+### What it is
+Given a code string, this block allows the verification and installation of a block code into the system.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block allows dynamic installation of new block types into the system from Python code. The code is verified for safety and correctness before installation. Once installed, the new block becomes available for use in workflows.
+
+This enables extensibility by allowing custom blocks to be added without modifying the core system, though it requires the code to follow the block specification format.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| code | Python code of the block to be installed | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the block installation fails | str |
+| success | Success message if the block is installed successfully | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Custom Integrations**: Install blocks that connect to proprietary or internal APIs not covered by built-in blocks.
+
+**Dynamic Workflows**: Allow administrators to extend workflow capabilities without redeploying the entire system.
+
+**Experimental Features**: Test new block implementations before formally adding them to the block library.
+<!-- END MANUAL -->
+
+---
+
+## Concatenate Lists
+
+### What it is
+Concatenates multiple lists into a single list. All elements from all input lists are combined in order.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block iterates through each list in the input and extends a result list with all elements from each one. It processes lists in order, so `[[1, 2], [3, 4]]` becomes `[1, 2, 3, 4]`.
+
+The block includes validation to ensure each item is actually a list. If a non-list value (like a string or number) is encountered, the block outputs an error message instead of proceeding. None values are skipped automatically.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| lists | A list of lists to concatenate together. All lists will be combined in order into a single list. | List[List[Any]] | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if concatenation failed due to invalid input types. | str |
+| concatenated_list | The concatenated list containing all elements from all input lists in order. | List[Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Paginated API Merging**: Combine results from multiple API pages into a single list for batch processing or display.
+
+**Parallel Task Aggregation**: Merge outputs from parallel workflow branches that each produce a list of results.
+
+**Multi-Source Data Collection**: Combine data collected from different sources (like multiple RSS feeds or API endpoints) into one unified list.
+<!-- END MANUAL -->
+
+---
+
+## Dictionary Is Empty
+
+### What it is
+Checks if a dictionary is empty.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block checks whether a dictionary has any entries and returns a boolean result. An empty dictionary (no key-value pairs) returns true, while a dictionary with any entries returns false.
+
+This is useful for conditional logic where you need to verify if data was returned from an API, if user input was provided, or if a collection process yielded any results.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| dictionary | The dictionary to check. | Dict[str, Any] | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| is_empty | True if the dictionary is empty. | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Response Validation**: Check if an API returned an empty response before processing data.
+
+**Input Verification**: Verify that user-provided form data contains at least one field before submission.
+
+**Conditional Processing**: Skip processing steps when no matching data was found in a search or filter operation.
+<!-- END MANUAL -->
+
+---
+
+## File Store
+
+### What it is
+Downloads and stores a file from a URL, data URI, or local path. Use this to fetch images, documents, or other files for processing. In CoPilot: saves to workspace (use list_workspace_files to see it). In graphs: outputs a data URI to pass to other blocks.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block takes a file from various sources (URL, data URI, or local path) and stores it in a temporary directory for use by other blocks in your workflow. This normalizes file handling regardless of the original source.
+
+The block outputs a file path that other blocks can use to access the stored file. The optional base64 output mode is available but file paths are recommended for better performance with large files.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| file_in | The file to download and store. Can be a URL (https://...), data URI, or local path. | str (file) | Yes |
+| base_64 | Whether to produce output in base64 format (not recommended, you can pass the file reference across blocks). | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| file_out | Reference to the stored file. In CoPilot: workspace:// URI (visible in list_workspace_files). In graphs: data URI for passing to other blocks. | str (file) |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**URL File Download**: Fetch a file from a URL and make it available for local processing by other blocks.
+
+**Data URI Conversion**: Convert base64-encoded data URIs (like from a web form) into accessible file paths.
+
+**File Normalization**: Standardize file access across different input sources (URLs, uploads, local files) for consistent downstream processing.
+<!-- END MANUAL -->
+
+---
+
+## Find In Dictionary
+
+### What it is
+A block that looks up a value in a dictionary, list, or object by key or index and returns the corresponding value.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block extracts a value from a dictionary (object) or list using a key or index. If the key exists, the value is output through the "output" pin. If the key is missing, the original input is output through the "missing" pin.
+
+This enables safe data access with built-in handling for missing keys, preventing workflow errors when expected data isn't present. You can use string keys for dictionaries or integer indices for lists.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| input | Dictionary to lookup from | Input | Yes |
+| key | Key to lookup in the dictionary | str \| int | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| output | Value found for the given key | Output |
+| missing | Value of the input that missing the key | Missing |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**API Response Parsing**: Extract specific fields (like "data" or "results") from API response objects.
+
+**Configuration Access**: Retrieve settings from a configuration dictionary by key name.
+
+**User Data Extraction**: Pull specific user attributes (name, email, preferences) from a user profile object.
+<!-- END MANUAL -->
+
+---
+
+## Find In List
+
+### What it is
+Finds the index of the value in the list.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block searches a list for a specific value and returns its position (index). If found, it outputs the zero-based index and sets "found" to true. If not found, it outputs the original value through "not_found_value" and sets "found" to false.
+
+This enables conditional logic based on list membership and helps locate items for subsequent list operations like replacement or removal.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| list | The list to search in. | List[Any] | Yes |
+| value | The value to search for. | Value | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| index | The index of the value in the list. | int |
+| found | Whether the value was found in the list. | bool |
+| not_found_value | The value that was not found in the list. | Not Found Value |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Duplicate Detection**: Check if an item already exists in a list before adding it.
+
+**Status Lookup**: Find if a value is in a list of valid states or allowed values.
+
+**Position Finding**: Locate an item's position for subsequent operations like updates or removals.
+<!-- END MANUAL -->
+
+---
+
+## Get All Memories
+
+### What it is
+Retrieve all memories from Mem0 with optional conversation filtering
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves all stored memories from Mem0 for the current user context. You can filter results by categories or metadata, and scope the retrieval to the current run or agent using the limit options.
+
+Memories are returned as a list that your workflow can iterate through. This is useful for reviewing accumulated knowledge, debugging what your agent has learned, or aggregating past interactions for analysis.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| trigger | An unused field that is used to trigger the block when you have no other inputs | bool | No |
+| categories | Filter by categories | List[str] | No |
+| metadata_filter | Optional metadata filters to apply | Dict[str, Any] | No |
+| limit_memory_to_run | Limit the memory to the run | bool | No |
+| limit_memory_to_agent | Limit the memory to the agent | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| memories | List of memories | Memories |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Context Review**: Retrieve all memories at the start of a session to understand what your agent already knows about a user.
+
+**Memory Export**: Collect all stored memories for backup, analysis, or migration to another system.
+
+**Memory Management**: List all memories to identify outdated or incorrect information that needs updating.
+<!-- END MANUAL -->
+
+---
+
+## Get Latest Memory
+
+### What it is
+Retrieve the latest memory from Mem0 with optional key filtering
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves the most recently stored memory from Mem0. You can filter by categories, metadata, or conversation ID to find the latest relevant memory. The block indicates whether a memory was found and returns it if available.
+
+This is useful for quickly accessing the last piece of information stored without iterating through all memories, such as checking the most recent user preference or the last conversation topic.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| trigger | An unused field that is used to trigger the block when you have no other inputs | bool | No |
+| categories | Filter by categories | List[str] | No |
+| conversation_id | Optional conversation ID to retrieve the latest memory from (uses run_id) | str | No |
+| metadata_filter | Optional metadata filters to apply | Dict[str, Any] | No |
+| limit_memory_to_run | Limit the memory to the run | bool | No |
+| limit_memory_to_agent | Limit the memory to the agent | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| memory | Latest memory if found | Dict[str, Any] |
+| found | Whether a memory was found | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Conversation Continuity**: Retrieve the last topic discussed to provide context when resuming a conversation.
+
+**Status Tracking**: Get the most recent status update or progress report stored during a workflow.
+
+**Quick Recall**: Access the last user preference or setting without loading the full memory history.
+<!-- END MANUAL -->
+
+---
+
+## Get List Item
+
+### What it is
+Returns the element at the given index.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves an item from a list at a specific index position. It uses zero-based indexing (first item is 0) and supports negative indices for accessing items from the end (e.g., -1 for the last item).
+
+If the index is out of range, the block outputs an error. This is useful for accessing specific elements without iterating through the entire list.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| list | The list to get the item from. | List[Any] | Yes |
+| index | The 0-based index of the item (supports negative indices). | int | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| item | The item at the specified index. | Item |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**First/Last Item Access**: Get the first item (index 0) or last item (index -1) from a list of results.
+
+**Ordered Selection**: Access a specific position in a ranked list, like the second-highest score or third most recent entry.
+
+**Array Unpacking**: Extract individual elements from a fixed-structure list where each position has a known meaning.
+<!-- END MANUAL -->
+
+---
+
+## Get Weather Information
+
+### What it is
+Retrieves weather information for a specified location using OpenWeatherMap API.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block sends a request to a weather API (like OpenWeatherMap) with the provided location. It then processes the response to extract relevant weather data.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| location | Location to get weather information for | str | Yes |
+| use_celsius | Whether to use Celsius or Fahrenheit for temperature | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the weather information cannot be retrieved | str |
+| temperature | Temperature in the specified location | str |
+| humidity | Humidity in the specified location | str |
+| condition | Weather condition in the specified location | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+A travel planning application could use this block to provide users with current weather information for their destination cities.
+<!-- END MANUAL -->
+
+---
+
+## Human In The Loop
+
+### What it is
+Pause execution and wait for human approval or modification of data
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block pauses workflow execution and presents data to a human reviewer for approval. The workflow waits until the human approves or rejects the data, then routes to the corresponding output. If editable is enabled, the reviewer can modify the data before approving.
+
+This enables human oversight at critical points in automated workflows, ensuring important decisions have human verification before proceeding.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| data | The data to be reviewed by a human user | Data | Yes |
+| name | A descriptive name for what this data represents | str | Yes |
+| editable | Whether the human reviewer can edit the data | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| approved_data | The data when approved (may be modified by reviewer) | Approved Data |
+| rejected_data | The data when rejected (may be modified by reviewer) | Rejected Data |
+| review_message | Any message provided by the reviewer | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Moderation**: Review AI-generated content before publishing to ensure quality and appropriateness.
+
+**Approval Workflows**: Require manager approval for actions like large purchases, access requests, or configuration changes.
+
+**Quality Assurance**: Let reviewers verify data transformations or calculations before they're committed to production systems.
+<!-- END MANUAL -->
+
+---
+
+## List Is Empty
+
+### What it is
+Checks if a list is empty.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block checks whether a list contains any items and returns a boolean result. An empty list (no elements) returns true, while a list with any elements returns false.
+
+This is useful for conditional logic where you need to verify if search results were found, if items are available for processing, or if a collection has any entries to iterate over.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| list | The list to check. | List[Any] | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| is_empty | True if the list is empty. | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Search Result Handling**: Check if a search returned any results before processing, displaying "no results found" when empty.
+
+**Batch Processing Guard**: Verify that a list has items before starting a batch operation to avoid empty iterations.
+
+**Conditional Messaging**: Send different notifications based on whether pending items exist or the queue is empty.
+<!-- END MANUAL -->
+
+---
+
+## Note
+
+### What it is
+A visual annotation block that displays a sticky note in the workflow editor for documentation and organization purposes.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+It simply accepts a text input and passes it through as an output to be displayed as a note.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| text | The text to display in the sticky note. | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| output | The text to display in the sticky note. | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Adding explanatory notes or reminders within a complex workflow to help users understand different stages or provide additional context.
+<!-- END MANUAL -->
+
+---
+
+## Print To Console
+
+### What it is
+A debugging block that outputs text to the console for monitoring and troubleshooting workflow execution.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block outputs the provided data to the server console log and passes it through as output. It's primarily used for debugging workflows by allowing you to inspect values at any point in the data flow.
+
+The block accepts any data type and both prints it for debugging visibility and forwards it to downstream blocks, making it easy to insert into existing connections without disrupting the workflow.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| text | The data to print to the console. | Text | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| output | The data printed to the console. | Output |
+| status | The status of the print operation. | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Workflow Debugging**: Insert at any point to inspect what data is flowing through that connection during testing.
+
+**Variable Inspection**: Log the values of variables or API responses to understand what your workflow is receiving.
+
+**Progress Tracking**: Add print statements at key stages to monitor workflow progress in the server logs.
+<!-- END MANUAL -->
+
+---
+
+## Remove From Dictionary
+
+### What it is
+Removes a key-value pair from a dictionary.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block removes a key-value pair from a dictionary by specifying the key. The updated dictionary without that entry is output. Optionally, you can retrieve the value that was removed by enabling return_value.
+
+If the key doesn't exist in the dictionary, the operation may error or return the dictionary unchanged depending on the implementation. This is useful for cleaning up data or extracting and removing values in one step.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| dictionary | The dictionary to modify. | Dict[str, Any] | Yes |
+| key | Key to remove from the dictionary. | str \| int | Yes |
+| return_value | Whether to return the removed value. | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| updated_dictionary | The dictionary after removal. | Dict[str, Any] |
+| removed_value | The removed value if requested. | Removed Value |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Data Cleaning**: Remove sensitive fields (like passwords or tokens) from data before logging or storing.
+
+**Pop Pattern**: Extract and remove a value from a dictionary in a single operation, like dequeuing items.
+
+**Object Trimming**: Remove unnecessary or deprecated fields from configuration objects before processing.
+<!-- END MANUAL -->
+
+---
+
+## Remove From List
+
+### What it is
+Removes an item from a list by value or index.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block removes an item from a list either by value (remove first occurrence) or by index (remove at specific position). Negative indices are supported for removal from the end. Optionally, the removed item can be returned.
+
+This provides flexibility for both "remove this specific item" and "remove the item at this position" use cases in a single block.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| list | The list to modify. | List[Any] | Yes |
+| value | Value to remove from the list. | Value | No |
+| index | Index of the item to pop (supports negative indices). | int | No |
+| return_item | Whether to return the removed item. | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| updated_list | The list after removal. | List[Any] |
+| removed_item | The removed item if requested. | Removed Item |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Queue Processing**: Pop items from the front of a list to process them one at a time (FIFO queue).
+
+**Exclusion Lists**: Remove specific values from a list, like filtering out certain options or invalid entries.
+
+**Stack Operations**: Pop items from the end of a list for last-in-first-out processing.
+<!-- END MANUAL -->
+
+---
+
+## Replace Dictionary Value
+
+### What it is
+Replaces the value for a specified key in a dictionary.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block updates the value for an existing key in a dictionary. The old value is replaced with the new one, and the updated dictionary is output. The block also returns the old value that was replaced.
+
+This is useful for updating specific fields in a data object while preserving all other fields, or for tracking what value was changed during an update operation.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| dictionary | The dictionary to modify. | Dict[str, Any] | Yes |
+| key | Key to replace the value for. | str \| int | Yes |
+| value | The new value for the given key. | Value | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| updated_dictionary | The dictionary after replacement. | Dict[str, Any] |
+| old_value | The value that was replaced. | Old Value |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Status Updates**: Change the status field in a record from "pending" to "completed" while preserving all other data.
+
+**Configuration Changes**: Update a single setting in a configuration object without rebuilding the entire config.
+
+**Field Transformations**: Replace a raw value with a processed or formatted version while tracking the original.
+<!-- END MANUAL -->
+
+---
+
+## Replace List Item
+
+### What it is
+Replaces an item at the specified index.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block replaces an item at a specific position in a list with a new value. It uses zero-based indexing and supports negative indices for accessing positions from the end. The old item that was replaced is also returned.
+
+This is useful for updating specific elements in an ordered list without rebuilding the entire list or losing other elements.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| list | The list to modify. | List[Any] | Yes |
+| index | Index of the item to replace (supports negative indices). | int | Yes |
+| value | The new value for the given index. | Value | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| updated_list | The list after replacement. | List[Any] |
+| old_item | The item that was replaced. | Old Item |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**List Updates**: Replace an outdated entry in a list with updated information while keeping other entries intact.
+
+**Correction Workflows**: Fix a specific item in a results list after validation identifies an error at a known position.
+
+**Value Swapping**: Replace placeholder values in a list with computed or fetched actual values at known positions.
+<!-- END MANUAL -->
+
+---
+
+## Reverse List Order
+
+### What it is
+Reverses the order of elements in a list
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block takes a list and returns a new list with all elements in reverse order. The first element becomes the last, and the last element becomes the first. The original list is not modified.
+
+This is useful for changing the processing order of items or displaying lists in a different order than they were collected.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| input_list | The list to reverse | List[Any] | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| reversed_list | The list in reversed order | List[Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Chronological Reversal**: Display the most recent items first when data was collected oldest-to-newest.
+
+**Processing Order Change**: Process a stack of items last-in-first-out by reversing a first-in-first-out list.
+
+**Display Formatting**: Reverse leaderboard rankings to show from lowest to highest or vice versa.
+<!-- END MANUAL -->
+
+---
+
+## Search Memory
+
+### What it is
+Search memories in Mem0 by user
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block searches through stored memories using a natural language query. It uses semantic search to find memories that are relevant to your query, not just exact matches. Results can be filtered by categories or metadata.
+
+The search is performed against the Mem0 memory store and returns memories ranked by relevance to your query. This enables intelligent recall of past information based on meaning rather than keywords.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| query | Search query | str | Yes |
+| trigger | An unused field that is used to (re-)trigger the block when you have no other inputs | bool | No |
+| categories_filter | Categories to filter by | List[str] | No |
+| metadata_filter | Optional metadata filters to apply | Dict[str, Any] | No |
+| limit_memory_to_run | Limit the memory to the run | bool | No |
+| limit_memory_to_agent | Limit the memory to the agent | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| memories | List of matching memories | Memories |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Contextual Recall**: Search for memories related to a user's current question to provide informed, contextual responses.
+
+**Knowledge Retrieval**: Find previously stored facts or insights that are relevant to a new task or decision.
+
+**Conversation History**: Search past interactions to recall what was discussed about a specific topic or person.
+<!-- END MANUAL -->
+
+---
+
+## Store Value
+
+### What it is
+A basic block that stores and forwards a value throughout workflows, allowing it to be reused without changes across multiple blocks.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+It accepts an input value and optionally a data value. If a data value is provided, it is used as the output. Otherwise, the input value is used as the output.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| input | Trigger the block to produce the output. The value is only used when `data` is None. | Input | Yes |
+| data | The constant data to be retained in the block. This value is passed as `output`. | Data | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| output | The stored data retained in the block. | Output |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Storing a user's name at the beginning of a workflow to use it in multiple subsequent blocks without asking for it again.
+<!-- END MANUAL -->
+
+---
+
+## Universal Type Converter
+
+### What it is
+This block is used to convert a value to a universal type.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block converts values between common data types: string, number, boolean, list, and dictionary. It handles type coercion intelligently—for example, converting the string "true" to boolean true, or the string "42" to the number 42.
+
+This is useful when data from different sources needs to be in a consistent type for processing, comparison, or API requirements.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| value | The value to convert to a universal type. | Value | Yes |
+| type | The type to convert the value to. | "string" \| "number" \| "boolean" \| "list" \| "dictionary" | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| value | The converted value. | Value |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**API Compatibility**: Convert string inputs to numbers or booleans as required by specific API parameters.
+
+**User Input Processing**: Transform user-entered text values into appropriate types for calculations or logic.
+
+**Data Normalization**: Standardize mixed-type data from various sources into consistent types for processing.
+<!-- END MANUAL -->
+
+---
+
+## XML Parser
+
+### What it is
+Parses XML using gravitasml to tokenize and coverts it to dict
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block parses XML content and converts it into a dictionary structure that can be easily navigated and processed in workflows. It uses the gravitasml library to tokenize the XML and produces a nested dictionary matching the XML hierarchy.
+
+This makes XML data accessible using standard dictionary operations, allowing you to extract values, iterate over elements, and process XML-based API responses or data files.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| input_xml | input xml to be parsed | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error in parsing | str |
+| parsed_xml | output parsed xml to dict | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**API Response Processing**: Parse XML responses from SOAP APIs or legacy systems to extract the data you need.
+
+**Configuration File Reading**: Read XML configuration files and convert them to dictionaries for easy access.
+
+**Data Import**: Transform XML data exports from other systems into a format suitable for your workflow processing.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/content/platform/blocks/branching.md b/docs/integrations/block-integrations/branching.md
similarity index 100%
rename from docs/content/platform/blocks/branching.md
rename to docs/integrations/block-integrations/branching.md
diff --git a/docs/integrations/block-integrations/claude_code.md b/docs/integrations/block-integrations/claude_code.md
new file mode 100644
index 0000000000..fea67cb494
--- /dev/null
+++ b/docs/integrations/block-integrations/claude_code.md
@@ -0,0 +1,67 @@
+# Claude Code Execution
+
+## What it is
+The Claude Code block executes complex coding tasks using Anthropic's Claude Code AI assistant in a secure E2B sandbox environment.
+
+## What it does
+This block allows you to delegate coding tasks to Claude Code, which can autonomously create files, install packages, run commands, and build complete applications within a sandboxed environment. Claude Code can handle multi-step development tasks and maintain conversation context across multiple turns.
+
+## How it works
+When activated, the block:
+1. Creates or connects to an E2B sandbox (a secure, isolated Linux environment)
+2. Installs the latest version of Claude Code in the sandbox
+3. Optionally runs setup commands to prepare the environment
+4. Executes your prompt using Claude Code, which can:
+   - Create and edit files
+   - Install dependencies (npm, pip, etc.)
+   - Run terminal commands
+   - Build and test applications
+5. Extracts all text files created/modified during execution
+6. Returns the response and files, optionally keeping the sandbox alive for follow-up tasks
+
+The block supports conversation continuation through three mechanisms:
+- **Same sandbox continuation** (via `session_id` + `sandbox_id`): Resume on the same live sandbox
+- **Fresh sandbox continuation** (via `conversation_history`): Restore context on a new sandbox if the previous one timed out
+- **Dispose control** (`dispose_sandbox` flag): Keep sandbox alive for multi-turn conversations
+
+## Inputs
+| Input | Description |
+|-------|-------------|
+| E2B Credentials | API key for the E2B platform to create the sandbox. Get one at [e2b.dev](https://e2b.dev/docs) |
+| Anthropic Credentials | API key for Anthropic to power Claude Code. Get one at [Anthropic's website](https://console.anthropic.com) |
+| Prompt | The task or instruction for Claude Code to execute. Claude Code can create files, install packages, run commands, and perform complex coding tasks |
+| Timeout | Sandbox timeout in seconds (default: 300). Set higher for complex tasks. Note: Only applies when creating a new sandbox |
+| Setup Commands | Optional shell commands to run before executing Claude Code (e.g., installing dependencies) |
+| Working Directory | Working directory for Claude Code to operate in (default: /home/user) |
+| Session ID | Session ID to resume a previous conversation. Leave empty for new conversations |
+| Sandbox ID | Sandbox ID to reconnect to an existing sandbox. Required when resuming a session |
+| Conversation History | Previous conversation history to restore context on a fresh sandbox if the previous one timed out |
+| Dispose Sandbox | Whether to dispose of the sandbox after execution (default: true). Set to false to continue conversations later |
+
+## Outputs
+| Output | Description |
+|--------|-------------|
+| Response | The output/response from Claude Code execution |
+| Files | List of text files created/modified during execution. Each file includes path, relative_path, name, and content fields |
+| Conversation History | Full conversation history including this turn. Use to restore context on a fresh sandbox |
+| Session ID | Session ID for this conversation. Pass back with sandbox_id to continue the conversation |
+| Sandbox ID | ID of the sandbox instance (null if disposed). Pass back with session_id to continue the conversation |
+| Error | Error message if execution failed |
+
+## Possible use case
+**API Documentation to Full Application:**
+A product team wants to quickly prototype applications based on API documentation. They create an agent that:
+1. Uses Firecrawl to fetch API documentation from a URL
+2. Passes the docs to Claude Code with a prompt like "Create a web app that demonstrates all the key features of this API"
+3. Claude Code builds a complete application with HTML/CSS/JS frontend, proper error handling, and example API calls
+4. The Files output is used with GitHub blocks to push the generated code to a new repository
+
+The team can then iterate on the application by passing the sandbox_id and session_id back to Claude Code with refinement requests like "Add authentication" or "Improve the UI", and Claude Code will modify the existing files in the same sandbox.
+
+**Multi-turn Development:**
+A developer uses Claude Code to scaffold a new project:
+- Turn 1: "Create a Python FastAPI project with user authentication" (dispose_sandbox=false)
+- Turn 2: Uses the returned session_id + sandbox_id to ask "Add rate limiting middleware"
+- Turn 3: Continues with "Add comprehensive tests"
+
+Each turn builds on the previous work in the same sandbox environment.
diff --git a/docs/integrations/block-integrations/compass/triggers.md b/docs/integrations/block-integrations/compass/triggers.md
new file mode 100644
index 0000000000..802dad1aad
--- /dev/null
+++ b/docs/integrations/block-integrations/compass/triggers.md
@@ -0,0 +1,34 @@
+# Compass Triggers
+<!-- MANUAL: file_description -->
+Blocks for triggering workflows from Compass AI transcription events.
+<!-- END MANUAL -->
+
+## Compass AI Trigger
+
+### What it is
+This block will output the contents of the compass transcription.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block triggers when a Compass AI transcription is received. It outputs the transcription text content, enabling workflows that process voice input or meeting transcripts from Compass AI.
+
+The transcription is output as a string for downstream processing, analysis, or storage.
+<!-- END MANUAL -->
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| transcription | The contents of the compass transcription. | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Voice Command Processing**: Trigger workflows from voice commands transcribed by Compass AI.
+
+**Meeting Automation**: Process meeting transcripts to extract action items or summaries.
+
+**Transcription Analysis**: Analyze transcribed content for sentiment, topics, or key information.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/content/platform/blocks/csv.md b/docs/integrations/block-integrations/csv.md
similarity index 100%
rename from docs/content/platform/blocks/csv.md
rename to docs/integrations/block-integrations/csv.md
diff --git a/docs/integrations/block-integrations/data.md b/docs/integrations/block-integrations/data.md
new file mode 100644
index 0000000000..73abef5a6b
--- /dev/null
+++ b/docs/integrations/block-integrations/data.md
@@ -0,0 +1,285 @@
+# Data
+<!-- MANUAL: file_description -->
+Blocks for creating, reading, and manipulating data structures including lists, dictionaries, spreadsheets, and persistent storage.
+<!-- END MANUAL -->
+
+## Create Dictionary
+
+### What it is
+Creates a dictionary with the specified key-value pairs. Use this when you know all the values you want to add upfront.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a new dictionary from specified key-value pairs in a single operation. It's designed for cases where you know all the data upfront, rather than building the dictionary incrementally.
+
+The block takes a dictionary input and outputs it as-is, making it useful as a starting point for workflows that need to pass structured data between blocks.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| values | Key-value pairs to create the dictionary with | Dict[str, Any] | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if dictionary creation failed | str |
+| dictionary | The created dictionary containing the specified key-value pairs | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**API Request Payloads**: Create complete request body objects with all required fields before sending to an API.
+
+**Configuration Objects**: Build settings dictionaries with predefined values for initializing services or workflows.
+
+**Data Mapping**: Transform input data into a structured format with specific keys expected by downstream blocks.
+<!-- END MANUAL -->
+
+---
+
+## Create List
+
+### What it is
+Creates a list with the specified values. Use this when you know all the values you want to add upfront. This block can also yield the list in batches based on a maximum size or token limit.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a list from provided values and can optionally chunk it into smaller batches. When max_size is set, the list is yielded in chunks of that size. When max_tokens is set, chunks are sized to fit within token limits for LLM processing.
+
+This batching capability is particularly useful when processing large datasets that need to be split for API limits or memory constraints.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| values | A list of values to be combined into a new list. | List[Any] | Yes |
+| max_size | Maximum size of the list. If provided, the list will be yielded in chunks of this size. | int | No |
+| max_tokens | Maximum tokens for the list. If provided, the list will be yielded in chunks that fit within this token limit. | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| list | The created list containing the specified values. | List[Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Batch Processing**: Split large datasets into manageable chunks for API calls with rate limits.
+
+**LLM Token Management**: Divide text content into token-limited batches for processing by language models.
+
+**Parallel Processing**: Create batches of work items that can be processed concurrently by multiple blocks.
+<!-- END MANUAL -->
+
+---
+
+## File Read
+
+### What it is
+Reads a file and returns its content as a string, with optional chunking by delimiter and size limits
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block reads file content from various sources (URL, data URI, or local path) and returns it as a string. It supports chunking via delimiter (like newlines) or size limits, yielding content in manageable pieces.
+
+Use skip_rows and skip_size to skip header content or initial bytes. When delimiter and limits are set, content is yielded chunk by chunk, enabling processing of large files without loading everything into memory.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| file_input | The file to read from (URL, data URI, or local path) | str (file) | Yes |
+| delimiter | Delimiter to split the content into rows/chunks (e.g., '\n' for lines) | str | No |
+| size_limit | Maximum size in bytes per chunk to yield (0 for no limit) | int | No |
+| row_limit | Maximum number of rows to process (0 for no limit, requires delimiter) | int | No |
+| skip_size | Number of characters to skip from the beginning of the file | int | No |
+| skip_rows | Number of rows to skip from the beginning (requires delimiter) | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| content | File content, yielded as individual chunks when delimiter or size limits are applied | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Log File Processing**: Read and process log files line by line, filtering or transforming each entry.
+
+**Large Document Analysis**: Read large text files in chunks for summarization or analysis without memory issues.
+
+**Data Import**: Read text-based data files and process them row by row for database import.
+<!-- END MANUAL -->
+
+---
+
+## Persist Information
+
+### What it is
+Persist key-value information for the current user
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block stores key-value data that persists across workflow runs. You can scope the persistence to either within_agent (available to all runs of this specific agent) or across_agents (available to all agents for this user).
+
+The stored data remains available until explicitly overwritten, enabling state management and configuration persistence between workflow executions.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| key | Key to store the information under | str | Yes |
+| value | Value to store | Value | Yes |
+| scope | Scope of persistence: within_agent (shared across all runs of this agent) or across_agents (shared across all agents for this user) | "within_agent" \| "across_agents" | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| value | Value that was stored | Value |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**User Preferences**: Store user settings like preferred language or notification preferences for future runs.
+
+**Progress Tracking**: Save the last processed item ID to resume batch processing where you left off.
+
+**API Token Caching**: Store refreshed API tokens that can be reused across multiple workflow executions.
+<!-- END MANUAL -->
+
+---
+
+## Read Spreadsheet
+
+### What it is
+Reads CSV and Excel files and outputs the data as a list of dictionaries and individual rows. Excel files are automatically converted to CSV format.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block parses CSV and Excel files, converting each row into a dictionary with column headers as keys. Excel files are automatically converted to CSV format before processing.
+
+Configure delimiter, quote character, and escape character for proper CSV parsing. Use skip_rows to ignore headers or initial rows, and skip_columns to exclude unwanted columns from the output.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| contents | The contents of the CSV/spreadsheet data to read | str | No |
+| file_input | CSV or Excel file to read from (URL, data URI, or local path). Excel files are automatically converted to CSV | str (file) | No |
+| delimiter | The delimiter used in the CSV/spreadsheet data | str | No |
+| quotechar | The character used to quote fields | str | No |
+| escapechar | The character used to escape the delimiter | str | No |
+| has_header | Whether the CSV file has a header row | bool | No |
+| skip_rows | The number of rows to skip from the start of the file | int | No |
+| strip | Whether to strip whitespace from the values | bool | No |
+| skip_columns | The columns to skip from the start of the row | List[str] | No |
+| produce_singular_result | If True, yield individual 'row' outputs only (can be slow). If False, yield both 'rows' (all data) | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| row | The data produced from each row in the spreadsheet | Dict[str, str] |
+| rows | All the data in the spreadsheet as a list of rows | List[Dict[str, str]] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Data Import**: Import product catalogs, contact lists, or inventory data from spreadsheet exports.
+
+**Report Processing**: Parse generated CSV reports from other systems for analysis or transformation.
+
+**Bulk Operations**: Process spreadsheets of email addresses, user records, or configuration data row by row.
+<!-- END MANUAL -->
+
+---
+
+## Retrieve Information
+
+### What it is
+Retrieve key-value information for the current user
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves previously stored key-value data for the current user. Specify the key and scope to fetch the corresponding value. If the key doesn't exist, the default_value is returned.
+
+Use within_agent scope for agent-specific data or across_agents for data shared across all user agents.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| key | Key to retrieve the information for | str | Yes |
+| scope | Scope of persistence: within_agent (shared across all runs of this agent) or across_agents (shared across all agents for this user) | "within_agent" \| "across_agents" | No |
+| default_value | Default value to return if key is not found | Default Value | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| value | Retrieved value or default value | Value |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Resume Processing**: Retrieve the last processed item ID to continue batch operations from where you left off.
+
+**Load Preferences**: Fetch stored user preferences at workflow start to customize behavior.
+
+**State Restoration**: Retrieve workflow state saved from a previous run to maintain continuity.
+<!-- END MANUAL -->
+
+---
+
+## Screenshot Web Page
+
+### What it is
+Takes a screenshot of a specified website using ScreenshotOne API
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the ScreenshotOne API to capture screenshots of web pages. Configure viewport dimensions, output format, and whether to capture the full page or just the visible area.
+
+Optional features include blocking ads, cookie banners, and chat widgets for cleaner screenshots. Caching can be enabled to improve performance for repeated captures of the same page.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| url | URL of the website to screenshot | str | Yes |
+| viewport_width | Width of the viewport in pixels | int | No |
+| viewport_height | Height of the viewport in pixels | int | No |
+| full_page | Whether to capture the full page length | bool | No |
+| format | Output format (png, jpeg, webp) | "png" \| "jpeg" \| "webp" | No |
+| block_ads | Whether to block ads | bool | No |
+| block_cookie_banners | Whether to block cookie banners | bool | No |
+| block_chats | Whether to block chat widgets | bool | No |
+| cache | Whether to enable caching | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| image | The screenshot image data | str (file) |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Visual Documentation**: Capture screenshots of web pages for documentation, reports, or archives.
+
+**Competitive Monitoring**: Regularly screenshot competitor websites to track design and content changes.
+
+**Visual Testing**: Capture page renders for visual regression testing or design verification workflows.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/dataforseo/keyword_suggestions.md b/docs/integrations/block-integrations/dataforseo/keyword_suggestions.md
new file mode 100644
index 0000000000..3500f7e434
--- /dev/null
+++ b/docs/integrations/block-integrations/dataforseo/keyword_suggestions.md
@@ -0,0 +1,91 @@
+# Dataforseo Keyword Suggestions
+<!-- MANUAL: file_description -->
+Blocks for getting keyword suggestions with search volume and competition metrics from DataForSEO.
+<!-- END MANUAL -->
+
+## Data For Seo Keyword Suggestions
+
+### What it is
+Get keyword suggestions from DataForSEO Labs Google API
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block calls the DataForSEO Labs Google Keyword Suggestions API to generate keyword ideas based on a seed keyword. It provides search volume, competition metrics, CPC data, and keyword difficulty scores for each suggestion.
+
+Configure location and language targeting to get region-specific results. Optional SERP and clickstream data provide additional insights into search behavior and click patterns.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| keyword | Seed keyword to get suggestions for | str | Yes |
+| location_code | Location code for targeting (e.g., 2840 for USA) | int | No |
+| language_code | Language code (e.g., 'en' for English) | str | No |
+| include_seed_keyword | Include the seed keyword in results | bool | No |
+| include_serp_info | Include SERP information | bool | No |
+| include_clickstream_data | Include clickstream metrics | bool | No |
+| limit | Maximum number of results (up to 3000) | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| suggestions | List of keyword suggestions with metrics | List[KeywordSuggestion] |
+| suggestion | A single keyword suggestion with metrics | KeywordSuggestion |
+| total_count | Total number of suggestions returned | int |
+| seed_keyword | The seed keyword used for the query | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Planning**: Generate blog post and article ideas based on keyword suggestions with high search volume.
+
+**SEO Strategy**: Discover new keyword opportunities to target based on competition and difficulty metrics.
+
+**PPC Campaigns**: Find keywords for advertising campaigns using CPC and competition data.
+<!-- END MANUAL -->
+
+---
+
+## Keyword Suggestion Extractor
+
+### What it is
+Extract individual fields from a KeywordSuggestion object
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block extracts individual fields from a KeywordSuggestion object returned by the Keyword Suggestions block. It decomposes the suggestion into separate outputs for easier use in workflows.
+
+Each field including keyword text, search volume, competition level, CPC, difficulty score, and optional SERP/clickstream data becomes available as individual outputs for downstream processing.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| suggestion | The keyword suggestion object to extract fields from | KeywordSuggestion | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| keyword | The keyword suggestion | str |
+| search_volume | Monthly search volume | int |
+| competition | Competition level (0-1) | float |
+| cpc | Cost per click in USD | float |
+| keyword_difficulty | Keyword difficulty score | int |
+| serp_info | data from SERP for each keyword | Dict[str, Any] |
+| clickstream_data | Clickstream data metrics | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Keyword Filtering**: Extract search volume and difficulty to filter keywords meeting specific thresholds.
+
+**Data Analysis**: Access individual metrics for comparison, sorting, or custom scoring algorithms.
+
+**Report Generation**: Pull specific fields like CPC and competition for SEO or PPC reports.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/dataforseo/related_keywords.md b/docs/integrations/block-integrations/dataforseo/related_keywords.md
new file mode 100644
index 0000000000..c5dab36467
--- /dev/null
+++ b/docs/integrations/block-integrations/dataforseo/related_keywords.md
@@ -0,0 +1,92 @@
+# Dataforseo Related Keywords
+<!-- MANUAL: file_description -->
+Blocks for finding semantically related keywords using the DataForSEO Labs API.
+<!-- END MANUAL -->
+
+## Data For Seo Related Keywords
+
+### What it is
+Get related keywords from DataForSEO Labs Google API
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the DataForSEO Labs Google Related Keywords API to find semantically related keywords based on a seed keyword. It returns keywords that share similar search intent or topic relevance.
+
+The depth parameter controls the breadth of the search, with higher values returning exponentially more related keywords. Results include search metrics, competition data, and optional SERP/clickstream information.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| keyword | Seed keyword to find related keywords for | str | Yes |
+| location_code | Location code for targeting (e.g., 2840 for USA) | int | No |
+| language_code | Language code (e.g., 'en' for English) | str | No |
+| include_seed_keyword | Include the seed keyword in results | bool | No |
+| include_serp_info | Include SERP information | bool | No |
+| include_clickstream_data | Include clickstream metrics | bool | No |
+| limit | Maximum number of results (up to 3000) | int | No |
+| depth | Keyword search depth (0-4). Controls the number of returned keywords: 0=1 keyword, 1=~8 keywords, 2=~72 keywords, 3=~584 keywords, 4=~4680 keywords | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| related_keywords | List of related keywords with metrics | List[RelatedKeyword] |
+| related_keyword | A related keyword with metrics | RelatedKeyword |
+| total_count | Total number of related keywords returned | int |
+| seed_keyword | The seed keyword used for the query | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Topic Clustering**: Group related keywords to build comprehensive content clusters around a topic.
+
+**Semantic SEO**: Discover LSI (latent semantic indexing) keywords to improve content relevance.
+
+**Keyword Expansion**: Expand targeting beyond exact match to capture related search traffic.
+<!-- END MANUAL -->
+
+---
+
+## Related Keyword Extractor
+
+### What it is
+Extract individual fields from a RelatedKeyword object
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block extracts individual fields from a RelatedKeyword object returned by the Related Keywords block. It separates the compound object into distinct outputs for workflow integration.
+
+Outputs include the keyword text, search volume, competition score, CPC, keyword difficulty, and any SERP or clickstream data that was requested in the original search.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| related_keyword | The related keyword object to extract fields from | RelatedKeyword | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| keyword | The related keyword | str |
+| search_volume | Monthly search volume | int |
+| competition | Competition level (0-1) | float |
+| cpc | Cost per click in USD | float |
+| keyword_difficulty | Keyword difficulty score | int |
+| serp_info | SERP data for the keyword | Dict[str, Any] |
+| clickstream_data | Clickstream data metrics | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Keyword Prioritization**: Extract metrics to rank related keywords by opportunity score.
+
+**Content Optimization**: Access keyword difficulty and search volume for content planning decisions.
+
+**Competitive Analysis**: Pull competition and CPC data to assess keyword viability.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/content/platform/blocks/decoder_block.md b/docs/integrations/block-integrations/decoder_block.md
similarity index 100%
rename from docs/content/platform/blocks/decoder_block.md
rename to docs/integrations/block-integrations/decoder_block.md
diff --git a/docs/content/platform/blocks/discord.md b/docs/integrations/block-integrations/discord.md
similarity index 100%
rename from docs/content/platform/blocks/discord.md
rename to docs/integrations/block-integrations/discord.md
diff --git a/docs/integrations/block-integrations/discord/bot_blocks.md b/docs/integrations/block-integrations/discord/bot_blocks.md
new file mode 100644
index 0000000000..978cdd021e
--- /dev/null
+++ b/docs/integrations/block-integrations/discord/bot_blocks.md
@@ -0,0 +1,358 @@
+# Discord Bot Blocks
+<!-- MANUAL: file_description -->
+Blocks for interacting with Discord using bot tokens, including sending messages, managing threads, and reading channel data.
+<!-- END MANUAL -->
+
+## Create Discord Thread
+
+### What it is
+Creates a new thread in a Discord channel.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Discord API with a bot token to create a new thread in a specified channel. Threads can be public or private (private requires Boost Level 2+).
+
+Configure auto-archive duration and optionally send an initial message when the thread is created.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| channel_name | Channel ID or channel name to create the thread in | str | Yes |
+| server_name | Server name (only needed if using channel name) | str | No |
+| thread_name | The name of the thread to create | str | Yes |
+| is_private | Whether to create a private thread (requires Boost Level 2+) or public thread | bool | No |
+| auto_archive_duration | Duration before the thread is automatically archived | "60" \| "1440" \| "4320" \| "10080" | No |
+| message_content | Optional initial message to send in the thread | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| status | Operation status | str |
+| thread_id | ID of the created thread | str |
+| thread_name | Name of the created thread | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Support Tickets**: Create threads for individual support conversations to keep channels organized.
+
+**Discussion Topics**: Automatically create threads for new topics or announcements.
+
+**Project Channels**: Spin up discussion threads for specific tasks or features.
+<!-- END MANUAL -->
+
+---
+
+## Discord Channel Info
+
+### What it is
+Resolves Discord channel names to IDs and vice versa.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block resolves Discord channel identifiers, converting between channel names and IDs. It queries the Discord API to find the channel and returns comprehensive information including server details.
+
+Useful for workflows that receive channel names but need IDs for other Discord operations.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| channel_identifier | Channel name or channel ID to look up | str | Yes |
+| server_name | Server name (optional, helps narrow down search) | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| channel_id | The channel's ID | str |
+| channel_name | The channel's name | str |
+| server_id | The server's ID | str |
+| server_name | The server's name | str |
+| channel_type | Type of channel (text, voice, etc) | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Dynamic Routing**: Look up channel IDs to route messages to user-specified channels by name.
+
+**Validation**: Verify channel existence before attempting to send messages.
+
+**Workflow Setup**: Get channel details during workflow configuration.
+<!-- END MANUAL -->
+
+---
+
+## Discord User Info
+
+### What it is
+Gets information about a Discord user by their ID.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves information about a Discord user by their ID. It queries the Discord API and returns profile details including username, display name, avatar, and account creation date.
+
+The user must be visible to your bot (share a server with your bot).
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| user_id | The Discord user ID to get information about | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| user_id | The user's ID (passed through for chaining) | str |
+| username | The user's username | str |
+| display_name | The user's display name | str |
+| discriminator | The user's discriminator (if applicable) | str |
+| avatar_url | URL to the user's avatar | str |
+| is_bot | Whether the user is a bot | bool |
+| created_at | When the account was created | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**User Profiling**: Get user details to personalize responses or create user profiles.
+
+**Mention Resolution**: Look up user information when processing mentions in messages.
+
+**Activity Logging**: Retrieve user details for logging or analytics purposes.
+<!-- END MANUAL -->
+
+---
+
+## Read Discord Messages
+
+### What it is
+Reads messages from a Discord channel using a bot token.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block uses a Discord bot to log into a server and listen for new messages. When a message is received, it extracts the content, channel name, and username of the sender. If the message contains a text file attachment, the block also retrieves and includes the file's content.
+<!-- END MANUAL -->
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| message_content | The content of the message received | str |
+| message_id | The ID of the message | str |
+| channel_id | The ID of the channel | str |
+| channel_name | The name of the channel the message was received from | str |
+| user_id | The ID of the user who sent the message | str |
+| username | The username of the user who sent the message | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+This block could be used to monitor a Discord channel for support requests. When a user posts a message, the block captures it, allowing another part of the system to process and respond to the request.
+<!-- END MANUAL -->
+
+---
+
+## Reply To Discord Message
+
+### What it is
+Replies to a specific Discord message.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block sends a reply to a specific Discord message, creating a threaded reply that references the original message. Optionally mention the original author to notify them.
+
+The reply appears linked to the original message in Discord's UI, maintaining conversation context.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| channel_id | The channel ID where the message to reply to is located | str | Yes |
+| message_id | The ID of the message to reply to | str | Yes |
+| reply_content | The content of the reply | str | Yes |
+| mention_author | Whether to mention the original message author | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| status | Operation status | str |
+| reply_id | ID of the reply message | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Conversation Bots**: Reply to user questions maintaining conversation context.
+
+**Support Responses**: Respond to support requests by replying to the original message.
+
+**Interactive Commands**: Reply to command messages with results or confirmations.
+<!-- END MANUAL -->
+
+---
+
+## Send Discord DM
+
+### What it is
+Sends a direct message to a Discord user using their user ID.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block sends a direct message to a Discord user. It opens a DM channel with the user (if not already open) and sends the message. The user must allow DMs from server members or share a server with your bot.
+
+Returns the message ID of the sent DM for tracking purposes.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| user_id | The Discord user ID to send the DM to (e.g., '123456789012345678') | str | Yes |
+| message_content | The content of the direct message to send | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| status | The status of the operation | str |
+| message_id | The ID of the sent message | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Private Notifications**: Send private alerts or notifications to specific users.
+
+**Welcome Messages**: DM new server members with welcome information.
+
+**Verification Systems**: Send verification codes or instructions via DM.
+<!-- END MANUAL -->
+
+---
+
+## Send Discord Embed
+
+### What it is
+Sends a rich embed message to a Discord channel.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block sends a rich embed message to a Discord channel. Embeds support formatted content with titles, descriptions, colors, images, thumbnails, author sections, footers, and structured fields.
+
+Configure the embed's appearance with colors, images, and multiple fields for organized information display.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| channel_identifier | Channel ID or channel name to send the embed to | str | Yes |
+| server_name | Server name (only needed if using channel name) | str | No |
+| title | The title of the embed | str | No |
+| description | The main content/description of the embed | str | No |
+| color | Embed color as integer (e.g., 0x00ff00 for green) | int | No |
+| thumbnail_url | URL for the thumbnail image | str | No |
+| image_url | URL for the main embed image | str | No |
+| author_name | Author name to display | str | No |
+| footer_text | Footer text | str | No |
+| fields | List of field dictionaries with 'name', 'value', and optional 'inline' keys | List[Dict[str, Any]] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| status | Operation status | str |
+| message_id | ID of the sent embed message | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Status Updates**: Send formatted status updates with colors and structured information.
+
+**Data Displays**: Present data in organized embed fields for easy reading.
+
+**Announcements**: Create visually appealing announcements with images and branding.
+<!-- END MANUAL -->
+
+---
+
+## Send Discord File
+
+### What it is
+Sends a file attachment to a Discord channel.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uploads and sends a file attachment to a Discord channel. It supports various file types including images, documents, and other media. Files can be provided as URLs, data URIs, or local paths.
+
+Optionally include a message along with the file attachment.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| channel_identifier | Channel ID or channel name to send the file to | str | Yes |
+| server_name | Server name (only needed if using channel name) | str | No |
+| file | The file to send (URL, data URI, or local path). Supports images, videos, documents, etc. | str (file) | Yes |
+| filename | Name of the file when sent (e.g., 'report.pdf', 'image.png') | str | No |
+| message_content | Optional message to send with the file | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| status | Operation status | str |
+| message_id | ID of the sent message | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Report Sharing**: Send generated reports or documents to Discord channels.
+
+**Image Posting**: Share images from workflows or external sources.
+
+**Backup Distribution**: Share backup files or exports with team channels.
+<!-- END MANUAL -->
+
+---
+
+## Send Discord Message
+
+### What it is
+Sends a message to a Discord channel using a bot token.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block uses a Discord bot to log into a server, locate the specified channel, and send the provided message. If the message is longer than Discord's character limit, it automatically splits the message into smaller chunks and sends them sequentially.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| message_content | The content of the message to send | str | Yes |
+| channel_name | Channel ID or channel name to send the message to | str | Yes |
+| server_name | Server name (only needed if using channel name) | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| status | The status of the operation (e.g., 'Message sent', 'Error') | str |
+| message_id | The ID of the sent message | str |
+| channel_id | The ID of the channel where the message was sent | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+This block could be used as part of an automated notification system. For example, it could send alerts to a Discord channel when certain events occur in another system, such as when a new user signs up or when a critical error is detected.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/discord/oauth_blocks.md b/docs/integrations/block-integrations/discord/oauth_blocks.md
new file mode 100644
index 0000000000..bd402ca51f
--- /dev/null
+++ b/docs/integrations/block-integrations/discord/oauth_blocks.md
@@ -0,0 +1,38 @@
+# Discord OAuth Blocks
+<!-- MANUAL: file_description -->
+Blocks for Discord OAuth2 authentication and retrieving user information.
+<!-- END MANUAL -->
+
+## Discord Get Current User
+
+### What it is
+Gets information about the currently authenticated Discord user using OAuth2 credentials.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Discord's OAuth2 API to retrieve information about the currently authenticated user. It requires valid OAuth2 credentials that have been obtained through Discord's authorization flow with the `identify` scope.
+
+The block queries the Discord `/users/@me` endpoint and returns the user's profile information including their unique ID, username, avatar, and customization settings like banner and accent color.
+<!-- END MANUAL -->
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| user_id | The authenticated user's Discord ID | str |
+| username | The user's username | str |
+| avatar_url | URL to the user's avatar image | str |
+| banner_url | URL to the user's banner image (if set) | str |
+| accent_color | The user's accent color as an integer | int |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**User Authentication**: Verify user identity after OAuth login to personalize experiences or grant access.
+
+**Profile Integration**: Display Discord user information in external applications or dashboards.
+
+**Account Linking**: Connect Discord accounts with other services using the unique user ID.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/content/platform/blocks/email_block.md b/docs/integrations/block-integrations/email_block.md
similarity index 100%
rename from docs/content/platform/blocks/email_block.md
rename to docs/integrations/block-integrations/email_block.md
diff --git a/docs/integrations/block-integrations/enrichlayer/linkedin.md b/docs/integrations/block-integrations/enrichlayer/linkedin.md
new file mode 100644
index 0000000000..5e2f14c34b
--- /dev/null
+++ b/docs/integrations/block-integrations/enrichlayer/linkedin.md
@@ -0,0 +1,164 @@
+# Enrichlayer LinkedIn
+<!-- MANUAL: file_description -->
+Blocks for enriching LinkedIn profile data and looking up profiles using the Enrichlayer API.
+<!-- END MANUAL -->
+
+## Get Linkedin Profile
+
+### What it is
+Fetch LinkedIn profile data using Enrichlayer
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves comprehensive LinkedIn profile data using Enrichlayer's API. Provide a LinkedIn profile URL to fetch details including work history, education, skills, and contact information.
+
+Configure caching options for performance and optionally include additional data like inferred salary, personal email, or social media links.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| linkedin_url | LinkedIn profile URL to fetch data from | str | Yes |
+| fallback_to_cache | Cache usage if live fetch fails | "on-error" \| "never" | No |
+| use_cache | Cache utilization strategy | "if-present" \| "never" | No |
+| include_skills | Include skills data | bool | No |
+| include_inferred_salary | Include inferred salary data | bool | No |
+| include_personal_email | Include personal email | bool | No |
+| include_personal_contact_number | Include personal contact number | bool | No |
+| include_social_media | Include social media profiles | bool | No |
+| include_extra | Include additional data | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| profile | LinkedIn profile data | PersonProfileResponse |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Lead Enrichment**: Enrich sales leads with detailed professional background information.
+
+**Recruitment Research**: Gather candidate information for hiring and outreach workflows.
+
+**Contact Discovery**: Find contact details associated with LinkedIn profiles.
+<!-- END MANUAL -->
+
+---
+
+## Get Linkedin Profile Picture
+
+### What it is
+Get LinkedIn profile pictures using Enrichlayer
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves the profile picture URL for a LinkedIn profile using Enrichlayer's API. Provide the LinkedIn profile URL to get a direct link to the user's profile photo.
+
+The returned URL can be used for display, download, or further image processing.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| linkedin_profile_url | LinkedIn profile URL | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| profile_picture_url | LinkedIn profile picture URL | str (file) |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**CRM Enhancement**: Add profile photos to contact records for visual identification.
+
+**Personalized Outreach**: Include profile pictures in personalized email or message templates.
+
+**Identity Verification**: Retrieve profile photos for manual identity verification workflows.
+<!-- END MANUAL -->
+
+---
+
+## Linkedin Person Lookup
+
+### What it is
+Look up LinkedIn profiles by person information using Enrichlayer
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block finds LinkedIn profiles by matching person details like name, company, and title using Enrichlayer's API. Provide first name and company domain as minimum inputs, with optional last name, location, and title for better matching.
+
+Enable similarity checks and profile enrichment for more detailed results.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| first_name | Person's first name | str | Yes |
+| last_name | Person's last name | str | No |
+| company_domain | Domain of the company they work for (optional) | str | Yes |
+| location | Person's location (optional) | str | No |
+| title | Person's job title (optional) | str | No |
+| include_similarity_checks | Include similarity checks | bool | No |
+| enrich_profile | Enrich the profile with additional data | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| lookup_result | LinkedIn profile lookup result | PersonLookupResponse |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Lead Discovery**: Find LinkedIn profiles for leads when you only have name and company.
+
+**Contact Matching**: Match CRM contacts to their LinkedIn profiles for enrichment.
+
+**Prospecting**: Discover LinkedIn profiles of people at target companies.
+<!-- END MANUAL -->
+
+---
+
+## Linkedin Role Lookup
+
+### What it is
+Look up LinkedIn profiles by role in a company using Enrichlayer
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block finds LinkedIn profiles by role title and company using Enrichlayer's API. Specify a role like CEO, CTO, or VP of Sales along with the company name to find matching profiles.
+
+Enable enrich_profile to automatically fetch full profile data for the matched result.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| role | Role title (e.g., CEO, CTO) | str | Yes |
+| company_name | Name of the company | str | Yes |
+| enrich_profile | Enrich the profile with additional data | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| role_lookup_result | LinkedIn role lookup result | RoleLookupResponse |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Decision Maker Discovery**: Find key decision makers at target companies for sales outreach.
+
+**Executive Research**: Look up C-suite executives for account-based marketing.
+
+**Org Chart Building**: Map leadership at companies by looking up specific roles.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/exa/answers.md b/docs/integrations/block-integrations/exa/answers.md
new file mode 100644
index 0000000000..ae1994ef8b
--- /dev/null
+++ b/docs/integrations/block-integrations/exa/answers.md
@@ -0,0 +1,43 @@
+# Exa Answers
+<!-- MANUAL: file_description -->
+Blocks for getting AI-generated answers to questions using Exa's search-informed answer API.
+<!-- END MANUAL -->
+
+## Exa Answer
+
+### What it is
+Get an LLM answer to a question informed by Exa search results
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block sends your question to the Exa Answer API, which performs a semantic search across billions of web pages to find relevant information. The API then uses an LLM to synthesize the search results into a coherent answer with citations.
+
+The block returns both the generated answer and the source citations that informed it. You can optionally include full text content from the search results for more comprehensive answers.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| query | The question or query to answer | str | Yes |
+| text | Include full text content in the search results used for the answer | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the request failed | str |
+| answer | The generated answer based on search results | str |
+| citations | Search results used to generate the answer | List[AnswerCitation] |
+| citation | Individual citation from the answer | AnswerCitation |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Research Assistance**: Get quick, sourced answers to complex questions without manually searching multiple websites.
+
+**Fact Verification**: Verify claims or statements by getting answers backed by real web sources with citations.
+
+**Content Creation**: Generate research-backed content by asking questions about topics and using the cited sources.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/exa/code_context.md b/docs/integrations/block-integrations/exa/code_context.md
new file mode 100644
index 0000000000..90079c5b3b
--- /dev/null
+++ b/docs/integrations/block-integrations/exa/code_context.md
@@ -0,0 +1,47 @@
+# Exa Code Context
+<!-- MANUAL: file_description -->
+Blocks for searching code repositories and documentation using Exa's code context API.
+<!-- END MANUAL -->
+
+## Exa Code Context
+
+### What it is
+Search billions of GitHub repos, docs, and Stack Overflow for relevant code examples
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Exa's specialized code search API to find relevant code examples from GitHub repositories, official documentation, and Stack Overflow. The search is optimized for code context, returning formatted snippets with source references.
+
+The block returns code snippets along with metadata including the source URL, search time, and token counts. You can control response size with the tokens_num parameter to balance comprehensiveness with cost.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| query | Search query to find relevant code snippets. Describe what you're trying to do or what code you're looking for. | str | Yes |
+| tokens_num | Token limit for response. Use 'dynamic' for automatic sizing, 5000 for standard queries, or 10000 for comprehensive examples. | str \| int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| request_id | Unique identifier for this request | str |
+| query | The search query used | str |
+| response | Formatted code snippets and contextual examples with sources | str |
+| results_count | Number of code sources found and included | int |
+| cost_dollars | Cost of this request in dollars | str |
+| search_time | Time taken to search in milliseconds | float |
+| output_tokens | Number of tokens in the response | int |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**API Integration Examples**: Find real-world code examples showing how to integrate with specific APIs or libraries.
+
+**Debugging Assistance**: Search for code patterns related to error messages or specific programming challenges.
+
+**Learning New Technologies**: Discover implementation examples when learning a new framework or programming language.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/exa/contents.md b/docs/integrations/block-integrations/exa/contents.md
new file mode 100644
index 0000000000..7dece2536f
--- /dev/null
+++ b/docs/integrations/block-integrations/exa/contents.md
@@ -0,0 +1,54 @@
+# Exa Contents
+<!-- MANUAL: file_description -->
+Blocks for retrieving and extracting content from web pages using Exa's contents API.
+<!-- END MANUAL -->
+
+## Exa Contents
+
+### What it is
+Retrieves document contents using Exa's contents API
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves full content from web pages using Exa's contents API. You can provide URLs directly or document IDs from previous searches. The API supports live crawling to fetch fresh content and can extract text, highlights, and AI-generated summaries.
+
+The block supports subpage crawling to gather related content and offers various content retrieval options including full text extraction, relevant highlights, and customizable summary generation. Results are formatted for easy use with LLMs.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| urls | Array of URLs to crawl (preferred over 'ids') | List[str] | No |
+| ids | [DEPRECATED - use 'urls' instead] Array of document IDs obtained from searches | List[str] | No |
+| text | Retrieve text content from pages | bool | No |
+| highlights | Text snippets most relevant from each page | HighlightSettings | No |
+| summary | LLM-generated summary of the webpage | SummarySettings | No |
+| livecrawl | Livecrawling options: never, fallback (default), always, preferred | "never" \| "fallback" \| "always" \| "preferred" | No |
+| livecrawl_timeout | Timeout for livecrawling in milliseconds | int | No |
+| subpages | Number of subpages to crawl | int | No |
+| subpage_target | Keyword(s) to find specific subpages of search results | str \| List[str] | No |
+| extras | Extra parameters for additional content | ExtrasSettings | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the request failed | str |
+| results | List of document contents with metadata | List[ExaSearchResults] |
+| result | Single document content result | ExaSearchResults |
+| context | A formatted string of the results ready for LLMs | str |
+| request_id | Unique identifier for the request | str |
+| statuses | Status information for each requested URL | List[ContentStatus] |
+| cost_dollars | Cost breakdown for the request | CostDollars |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Aggregation**: Retrieve full article content from multiple URLs for analysis or summarization.
+
+**Competitive Research**: Crawl competitor websites to extract product information, pricing, or feature details.
+
+**Data Enrichment**: Fetch detailed content from URLs discovered through Exa searches to build comprehensive datasets.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/exa/research.md b/docs/integrations/block-integrations/exa/research.md
new file mode 100644
index 0000000000..67f05052d0
--- /dev/null
+++ b/docs/integrations/block-integrations/exa/research.md
@@ -0,0 +1,186 @@
+# Exa Research
+<!-- MANUAL: file_description -->
+Blocks for creating and managing autonomous research tasks using Exa's Research API.
+<!-- END MANUAL -->
+
+## Exa Create Research
+
+### What it is
+Create research task with optional waiting - explores web and synthesizes findings with citations
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates an asynchronous research task using Exa's Research API. The API autonomously explores the web, searches for relevant information, and synthesizes findings into a comprehensive report with citations.
+
+You can choose from different model tiers (fast, standard, pro) depending on your speed vs. depth requirements. The block supports structured output via JSON Schema and can optionally wait for completion to return results immediately.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| instructions | Research instructions - clearly define what information to find, how to conduct research, and desired output format. | str | Yes |
+| model | Research model: 'fast' for quick results, 'standard' for balanced quality, 'pro' for thorough analysis | "exa-research-fast" \| "exa-research" \| "exa-research-pro" | No |
+| output_schema | JSON Schema to enforce structured output. When provided, results are validated and returned as parsed JSON. | Dict[str, Any] | No |
+| wait_for_completion | Wait for research to complete before returning. Ensures you get results immediately. | bool | No |
+| polling_timeout | Maximum time to wait for completion in seconds (only if wait_for_completion is True) | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| research_id | Unique identifier for tracking this research request | str |
+| status | Final status of the research | str |
+| model | The research model used | str |
+| instructions | The research instructions provided | str |
+| created_at | When the research was created (Unix timestamp in ms) | int |
+| output_content | Research output as text (only if wait_for_completion was True and completed) | str |
+| output_parsed | Structured JSON output (only if wait_for_completion and outputSchema were provided) | Dict[str, Any] |
+| cost_total | Total cost in USD (only if wait_for_completion was True and completed) | float |
+| elapsed_time | Time taken to complete in seconds (only if wait_for_completion was True) | float |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Market Research**: Automatically research market trends, competitors, or industry developments with cited sources.
+
+**Due Diligence**: Conduct comprehensive background research on companies, people, or technologies.
+
+**Content Research**: Gather research on topics for articles, reports, or presentations with proper citations.
+<!-- END MANUAL -->
+
+---
+
+## Exa Get Research
+
+### What it is
+Get status and results of a research task
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves the current status and results of a previously created research task. You can check whether the research is still running, completed, or failed.
+
+When the research is complete, the block returns the full output content along with cost breakdown including searches performed, pages crawled, and tokens used. You can also optionally retrieve the detailed event log of research operations.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| research_id | The ID of the research task to retrieve | str | Yes |
+| include_events | Include detailed event log of research operations | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| research_id | The research task identifier | str |
+| status | Current status: pending, running, completed, canceled, or failed | str |
+| instructions | The original research instructions | str |
+| model | The research model used | str |
+| created_at | When research was created (Unix timestamp in ms) | int |
+| finished_at | When research finished (Unix timestamp in ms, if completed/canceled/failed) | int |
+| output_content | Research output as text (if completed) | str |
+| output_parsed | Structured JSON output matching outputSchema (if provided and completed) | Dict[str, Any] |
+| cost_total | Total cost in USD (if completed) | float |
+| cost_searches | Number of searches performed (if completed) | int |
+| cost_pages | Number of pages crawled (if completed) | int |
+| cost_reasoning_tokens | AI tokens used for reasoning (if completed) | int |
+| error_message | Error message if research failed | str |
+| events | Detailed event log (if include_events was True) | List[Dict[str, Any]] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Status Monitoring**: Check progress of long-running research tasks that were started asynchronously.
+
+**Result Retrieval**: Fetch completed research results from tasks started earlier in your workflow.
+
+**Cost Tracking**: Review the cost breakdown of completed research for budgeting and optimization.
+<!-- END MANUAL -->
+
+---
+
+## Exa List Research
+
+### What it is
+List all research tasks with pagination support
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves a list of all your research tasks, ordered by creation time with newest first. It supports pagination for handling large numbers of tasks.
+
+The block returns basic information about each task including its ID, status, instructions, and timestamps. Use this to find specific research tasks or monitor all ongoing research activities.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| cursor | Cursor for pagination through results | str | No |
+| limit | Number of research tasks to return (1-50) | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| research_tasks | List of research tasks ordered by creation time (newest first) | List[ResearchTaskModel] |
+| research_task | Individual research task (yielded for each task) | ResearchTaskModel |
+| has_more | Whether there are more tasks to paginate through | bool |
+| next_cursor | Cursor for the next page of results | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Research Management**: View all active and completed research tasks for project management.
+
+**Task Discovery**: Find previously created research tasks to retrieve their results or check status.
+
+**Activity Auditing**: Review research activity history for compliance or reporting purposes.
+<!-- END MANUAL -->
+
+---
+
+## Exa Wait For Research
+
+### What it is
+Wait for a research task to complete with configurable timeout
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block polls a research task until it completes or times out. It periodically checks the task status at configurable intervals and returns the final results when done.
+
+The block is useful when you need to block workflow execution until research completes. It returns whether the operation timed out, allowing you to handle incomplete research gracefully.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| research_id | The ID of the research task to wait for | str | Yes |
+| timeout | Maximum time to wait in seconds | int | No |
+| check_interval | Seconds between status checks | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| research_id | The research task identifier | str |
+| final_status | Final status when polling stopped | str |
+| output_content | Research output as text (if completed) | str |
+| output_parsed | Structured JSON output (if outputSchema was provided and completed) | Dict[str, Any] |
+| cost_total | Total cost in USD | float |
+| elapsed_time | Total time waited in seconds | float |
+| timed_out | Whether polling timed out before completion | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Sequential Workflows**: Ensure research completes before proceeding to dependent workflow steps.
+
+**Synchronous Integration**: Convert asynchronous research into synchronous operations for simpler workflow logic.
+
+**Timeout Handling**: Implement research with graceful timeout handling for time-sensitive applications.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/exa/search.md b/docs/integrations/block-integrations/exa/search.md
new file mode 100644
index 0000000000..e7ddbe02fd
--- /dev/null
+++ b/docs/integrations/block-integrations/exa/search.md
@@ -0,0 +1,59 @@
+# Exa Search
+<!-- MANUAL: file_description -->
+Blocks for searching the web using Exa's advanced neural and keyword search API.
+<!-- END MANUAL -->
+
+## Exa Search
+
+### What it is
+Searches the web using Exa's advanced search API
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Exa's advanced search API to find web content. Unlike traditional search engines, Exa offers neural search that understands semantic meaning, making it excellent for finding specific types of content. You can choose between keyword search (traditional), neural search (semantic understanding), or fast search.
+
+The block supports powerful filtering by domain, date ranges, content categories (companies, research papers, news, etc.), and text patterns. Results include URLs, titles, and optionally full content extraction.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| query | The search query | str | Yes |
+| type | Type of search | "keyword" \| "neural" \| "fast" \| "auto" | No |
+| category | Category to search within: company, research paper, news, pdf, github, tweet, personal site, linkedin profile, financial report | "company" \| "research paper" \| "news" \| "pdf" \| "github" \| "tweet" \| "personal site" \| "linkedin profile" \| "financial report" | No |
+| user_location | The two-letter ISO country code of the user (e.g., 'US') | str | No |
+| number_of_results | Number of results to return | int | No |
+| include_domains | Domains to include in search | List[str] | No |
+| exclude_domains | Domains to exclude from search | List[str] | No |
+| start_crawl_date | Start date for crawled content | str (date-time) | No |
+| end_crawl_date | End date for crawled content | str (date-time) | No |
+| start_published_date | Start date for published content | str (date-time) | No |
+| end_published_date | End date for published content | str (date-time) | No |
+| include_text | Text patterns to include | List[str] | No |
+| exclude_text | Text patterns to exclude | List[str] | No |
+| contents | Content retrieval settings | ContentSettings | No |
+| moderation | Enable content moderation to filter unsafe content from search results | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the request failed | str |
+| results | List of search results | List[ExaSearchResults] |
+| result | Single search result | ExaSearchResults |
+| context | A formatted string of the search results ready for LLMs. | str |
+| search_type | For auto searches, indicates which search type was selected. | str |
+| resolved_search_type | The search type that was actually used for this request (neural or keyword) | str |
+| cost_dollars | Cost breakdown for the request | CostDollars |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Competitive Research**: Search for companies in a specific industry, filtered by recent news or funding announcements.
+
+**Content Curation**: Find relevant articles and research papers on specific topics for newsletters or content aggregation.
+
+**Lead Generation**: Search for companies matching specific criteria (industry, size, recent activity) for sales prospecting.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/exa/similar.md b/docs/integrations/block-integrations/exa/similar.md
new file mode 100644
index 0000000000..f768c549f0
--- /dev/null
+++ b/docs/integrations/block-integrations/exa/similar.md
@@ -0,0 +1,55 @@
+# Exa Similar
+<!-- MANUAL: file_description -->
+Blocks for finding semantically similar web pages using Exa's findSimilar API.
+<!-- END MANUAL -->
+
+## Exa Find Similar
+
+### What it is
+Finds similar links using Exa's findSimilar API
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Exa's findSimilar API to discover web pages that are semantically similar to a given URL. The API analyzes the content and context of the provided page to find related content across the web.
+
+The block supports filtering by domains, date ranges, and text patterns to refine results. You can retrieve content directly with results and enable content moderation to filter unsafe content.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| url | The url for which you would like to find similar links | str | Yes |
+| number_of_results | Number of results to return | int | No |
+| include_domains | List of domains to include in the search. If specified, results will only come from these domains. | List[str] | No |
+| exclude_domains | Domains to exclude from search | List[str] | No |
+| start_crawl_date | Start date for crawled content | str (date-time) | No |
+| end_crawl_date | End date for crawled content | str (date-time) | No |
+| start_published_date | Start date for published content | str (date-time) | No |
+| end_published_date | End date for published content | str (date-time) | No |
+| include_text | Text patterns to include (max 1 string, up to 5 words) | List[str] | No |
+| exclude_text | Text patterns to exclude (max 1 string, up to 5 words) | List[str] | No |
+| contents | Content retrieval settings | ContentSettings | No |
+| moderation | Enable content moderation to filter unsafe content from search results | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the request failed | str |
+| results | List of similar documents with metadata and content | List[ExaSearchResults] |
+| result | Single similar document result | ExaSearchResults |
+| context | A formatted string of the results ready for LLMs. | str |
+| request_id | Unique identifier for the request | str |
+| cost_dollars | Cost breakdown for the request | CostDollars |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Discovery**: Find related articles, blog posts, or resources similar to content you already like.
+
+**Competitor Analysis**: Discover similar companies or products by finding pages similar to known competitors.
+
+**Research Expansion**: Expand your research by finding additional sources similar to key reference materials.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/exa/webhook_blocks.md b/docs/integrations/block-integrations/exa/webhook_blocks.md
new file mode 100644
index 0000000000..2c6c312d2a
--- /dev/null
+++ b/docs/integrations/block-integrations/exa/webhook_blocks.md
@@ -0,0 +1,46 @@
+# Exa Webhook Blocks
+<!-- MANUAL: file_description -->
+Blocks for receiving webhook notifications from Exa webset events.
+<!-- END MANUAL -->
+
+## Exa Webset Webhook
+
+### What it is
+Receive webhook notifications for Exa webset events
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block acts as a webhook receiver for Exa webset events. When events occur on your websets (like new items found, searches completed, or enrichments finished), Exa sends notifications to this webhook endpoint.
+
+The block can filter events by webset ID and event type. It parses incoming webhook payloads and outputs structured event data including the event type, affected webset, and event-specific details.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The webset ID to monitor (optional, monitors all if empty) | str | No |
+| event_filter | Configure which events to receive | WebsetEventFilter | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| event_type | Type of event that occurred | str |
+| event_id | Unique identifier for this event | str |
+| webset_id | ID of the affected webset | str |
+| data | Event-specific data | Dict[str, Any] |
+| timestamp | When the event occurred | str |
+| metadata | Additional event metadata | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Real-Time Processing**: Trigger workflows automatically when new items are added to websets without polling.
+
+**Alert Systems**: Receive instant notifications when webset searches find new relevant results.
+
+**Integration Pipelines**: Build event-driven integrations that react to webset changes in real time.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/exa/websets.md b/docs/integrations/block-integrations/exa/websets.md
new file mode 100644
index 0000000000..d3b3870e0e
--- /dev/null
+++ b/docs/integrations/block-integrations/exa/websets.md
@@ -0,0 +1,484 @@
+# Exa Websets
+<!-- MANUAL: file_description -->
+Blocks for creating and managing Exa websets for continuous web monitoring.
+<!-- END MANUAL -->
+
+## Exa Cancel Webset
+
+### What it is
+Cancel all operations being performed on a Webset
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block cancels all running operations (searches, enrichments) on a webset. The webset transitions to an idle state and any in-progress operations are stopped.
+
+The block is useful for stopping long-running operations that are no longer needed or when you need to modify the webset configuration. Items already processed before cancellation are retained.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The ID or external ID of the Webset to cancel | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| webset_id | The unique identifier for the webset | str |
+| status | The status of the webset after cancellation | str |
+| external_id | The external identifier for the webset | str |
+| success | Whether the cancellation was successful | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Resource Management**: Stop expensive operations on websets that are no longer needed.
+
+**Configuration Updates**: Cancel operations before making changes to webset settings.
+
+**Error Recovery**: Stop problematic operations and restart with corrected parameters.
+<!-- END MANUAL -->
+
+---
+
+## Exa Create Or Find Webset
+
+### What it is
+Create a new webset or return existing one by external_id (idempotent operation)
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block implements idempotent webset creation using an external ID. If a webset with the given external_id already exists, it returns that webset. Otherwise, it creates a new one.
+
+This pattern prevents duplicate websets when workflows retry or run multiple times. The block indicates whether the webset was newly created or already existed.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| external_id | External identifier for this webset - used to find existing or create new | str | Yes |
+| search_query | Search query (optional - only needed if creating new webset) | str | No |
+| search_count | Number of items to find in initial search | int | No |
+| metadata | Key-value pairs to associate with the webset | Dict[str, Any] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| webset | The webset (existing or newly created) | Webset |
+| was_created | True if webset was newly created, False if it already existed | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Idempotent Workflows**: Safely re-run workflows without creating duplicate websets.
+
+**External System Integration**: Map websets to IDs from your own systems for easy reference.
+
+**Retry-Safe Operations**: Handle workflow retries gracefully by reusing existing websets.
+<!-- END MANUAL -->
+
+---
+
+## Exa Create Webset
+
+### What it is
+Create a new Exa Webset for persistent web search collections with optional waiting for initial results
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a new Exa Webset, a persistent collection that stores web search results. You define a search query, entity type, and optional criteria that items must meet. The webset continuously evaluates potential matches against your criteria.
+
+The block supports advanced features like scoped searches (searching within specific imports or other websets), enrichments for extracting structured data, and relationship-based "hop" searches. You can wait for initial results or return immediately for asynchronous processing.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| search_query | Your search query. Use this to describe what you are looking for. Any URL provided will be crawled and used as context for the search. | str | Yes |
+| search_count | Number of items the search will attempt to find. The actual number of items found may be less than this number depending on the search complexity. | int | No |
+| search_entity_type | Entity type: 'company', 'person', 'article', 'research_paper', or 'custom'. If not provided, we automatically detect the entity from the query. | "company" \| "person" \| "article" \| "research_paper" \| "custom" \| "auto" | No |
+| search_entity_description | Description for custom entity type (required when search_entity_type is 'custom') | str | No |
+| search_criteria | List of criteria descriptions that every item will be evaluated against. If not provided, we automatically detect the criteria from the query. | List[str] | No |
+| search_exclude_sources | List of source IDs (imports or websets) to exclude from search results | List[str] | No |
+| search_exclude_types | List of source types corresponding to exclude sources ('import' or 'webset') | List["import" \| "webset"] | No |
+| search_scope_sources | List of source IDs (imports or websets) to limit search scope to | List[str] | No |
+| search_scope_types | List of source types corresponding to scope sources ('import' or 'webset') | List["import" \| "webset"] | No |
+| search_scope_relationships | List of relationship definitions for hop searches (optional, one per scope source) | List[str] | No |
+| search_scope_relationship_limits | List of limits on the number of related entities to find (optional, one per scope relationship) | List[int] | No |
+| import_sources | List of source IDs to import from | List[str] | No |
+| import_types | List of source types corresponding to import sources ('import' or 'webset') | List["import" \| "webset"] | No |
+| enrichment_descriptions | List of enrichment task descriptions to perform on each webset item | List[str] | No |
+| enrichment_formats | List of formats for enrichment responses ('text', 'date', 'number', 'options', 'email', 'phone'). If not specified, we automatically select the best format. | List["text" \| "date" \| "number" \| "options" \| "email" \| "phone"] | No |
+| enrichment_options | List of option lists for enrichments with 'options' format. Each inner list contains the option labels. | List[List[str]] | No |
+| enrichment_metadata | List of metadata dictionaries for enrichments | List[Dict[str, Any]] | No |
+| external_id | External identifier for the webset. You can use this to reference the webset by your own internal identifiers. | str | No |
+| metadata | Key-value pairs to associate with this webset | Dict[str, Any] | No |
+| wait_for_initial_results | Wait for the initial search to complete before returning. This ensures you get results immediately. | bool | No |
+| polling_timeout | Maximum time to wait for completion in seconds (only used if wait_for_initial_results is True) | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| webset | The created webset with full details | Webset |
+| initial_item_count | Number of items found in the initial search (only if wait_for_initial_results was True) | int |
+| completion_time | Time taken to complete the initial search in seconds (only if wait_for_initial_results was True) | float |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Lead Generation**: Create websets to find companies or people matching specific criteria for sales outreach.
+
+**Competitive Intelligence**: Build persistent collections tracking competitors, market entrants, or industry news.
+
+**Research Databases**: Compile curated collections of articles, papers, or resources on specific topics.
+<!-- END MANUAL -->
+
+---
+
+## Exa Delete Webset
+
+### What it is
+Delete a Webset and all its items
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block permanently deletes a webset and all of its items, searches, enrichments, and monitors. The operation cannot be undone.
+
+Use this to clean up websets that are no longer needed or to remove test data. The block accepts either the Exa-generated ID or your custom external_id.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The ID or external ID of the Webset to delete | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| webset_id | The unique identifier for the deleted webset | str |
+| external_id | The external identifier for the deleted webset | str |
+| status | The status of the deleted webset | str |
+| success | Whether the deletion was successful | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Cleanup Operations**: Remove completed or abandoned websets to maintain organization.
+
+**Data Management**: Delete websets containing outdated or irrelevant data.
+
+**Cost Control**: Remove unused websets to prevent unnecessary storage costs.
+<!-- END MANUAL -->
+
+---
+
+## Exa Get Webset
+
+### What it is
+Retrieve a Webset by ID or external ID
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves detailed information about a specific webset including its status, configured searches, enrichments, and monitors.
+
+The block returns the webset's current state, metadata, and timestamps. Use this to check webset configuration or monitor status before performing operations.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The ID or external ID of the Webset to retrieve | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| webset_id | The unique identifier for the webset | str |
+| status | The status of the webset | str |
+| external_id | The external identifier for the webset | str |
+| searches | The searches performed on the webset | List[Dict[str, Any]] |
+| enrichments | The enrichments applied to the webset | List[Dict[str, Any]] |
+| monitors | The monitors for the webset | List[Dict[str, Any]] |
+| metadata | Key-value pairs associated with the webset | Dict[str, Any] |
+| created_at | The date and time the webset was created | str |
+| updated_at | The date and time the webset was last updated | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Configuration Review**: Retrieve webset details to verify settings before making changes.
+
+**Status Checking**: Check the current status and configuration of a webset.
+
+**Workflow Integration**: Fetch webset information for use in downstream workflow steps.
+<!-- END MANUAL -->
+
+---
+
+## Exa List Websets
+
+### What it is
+List all Websets with pagination support
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves a paginated list of all your websets. Results include basic webset information and can be paginated through using cursor tokens.
+
+Use this to discover existing websets, find specific websets by browsing, or build management interfaces for your webset collections.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| trigger | Trigger for the webset, value is ignored! | Any | No |
+| cursor | Cursor for pagination through results | str | No |
+| limit | Number of websets to return (1-100) | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| websets | List of websets | List[Webset] |
+| has_more | Whether there are more results to paginate through | bool |
+| next_cursor | Cursor for the next page of results | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Inventory Management**: List all websets to understand your current data collections.
+
+**Bulk Operations**: Iterate through websets to perform batch updates or cleanup.
+
+**Dashboard Building**: Retrieve webset listings for management dashboards or reporting.
+<!-- END MANUAL -->
+
+---
+
+## Exa Preview Webset
+
+### What it is
+Preview how a search query will be interpreted before creating a webset. Helps understand entity detection, criteria generation, and available enrichments.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block analyzes your search query and shows how Exa will interpret it before you create a webset. It reveals the detected entity type, generated criteria, and available enrichment columns.
+
+Use this to refine your query and understand what results to expect. The block also provides suggestions for improving your query for better results.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| query | Your search query to preview. Use this to see how Exa will interpret your search before creating a webset. | str | Yes |
+| entity_type | Entity type to force: 'company', 'person', 'article', 'research_paper', or 'custom'. If not provided, Exa will auto-detect. | "company" \| "person" \| "article" \| "research_paper" \| "custom" \| "auto" | No |
+| entity_description | Description for custom entity type (required when entity_type is 'custom') | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| preview | Full preview response with search and enrichment details | PreviewWebsetModel |
+| entity_type | The detected or specified entity type | str |
+| entity_description | Description of the entity type | str |
+| criteria | Generated search criteria that will be used | List[PreviewCriterionModel] |
+| enrichment_columns | Available enrichment columns that can be extracted | List[PreviewEnrichmentModel] |
+| interpretation | Human-readable interpretation of how the query will be processed | str |
+| suggestions | Suggestions for improving the query | List[str] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Query Optimization**: Test and refine search queries before committing to webset creation.
+
+**Entity Validation**: Verify that Exa correctly detects the entity type for your use case.
+
+**Enrichment Planning**: Discover available enrichment columns to plan data extraction.
+<!-- END MANUAL -->
+
+---
+
+## Exa Update Webset
+
+### What it is
+Update metadata for an existing Webset
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block updates the metadata associated with an existing webset. Metadata is stored as key-value pairs and can be used to organize, tag, or annotate websets.
+
+Setting metadata to null clears all existing metadata. This operation does not affect the webset's items, searches, or enrichments.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The ID or external ID of the Webset to update | str | Yes |
+| metadata | Key-value pairs to associate with this webset (set to null to clear) | Dict[str, Any] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| webset_id | The unique identifier for the webset | str |
+| status | The status of the webset | str |
+| external_id | The external identifier for the webset | str |
+| metadata | Updated metadata for the webset | Dict[str, Any] |
+| updated_at | The date and time the webset was updated | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Tagging Systems**: Add tags or labels to websets for organization and filtering.
+
+**Project Association**: Link websets to specific projects or campaigns via metadata.
+
+**Workflow State**: Store workflow-related state or flags in webset metadata.
+<!-- END MANUAL -->
+
+---
+
+## Exa Webset Ready Check
+
+### What it is
+Check if webset is ready for next operation - enables conditional workflow branching
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block checks if a webset is idle (no running operations) and optionally has a minimum number of items. It returns a boolean ready status along with a recommendation for the next action.
+
+Use this block for conditional workflow branching to decide whether to proceed with processing, wait for more results, or add additional searches.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The ID or external ID of the Webset to check | str | Yes |
+| min_items | Minimum number of items required to be 'ready' | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| is_ready | True if webset is idle AND has minimum items | bool |
+| status | Current webset status | str |
+| item_count | Number of items in webset | int |
+| has_searches | Whether webset has any searches configured | bool |
+| has_enrichments | Whether webset has any enrichments | bool |
+| recommendation | Suggested next action (ready_to_process, waiting_for_results, needs_search, etc.) | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Workflow Gating**: Only proceed with data processing when webset has enough items.
+
+**Conditional Branching**: Route workflow based on webset readiness for different scenarios.
+
+**Polling Logic**: Implement smart polling by checking readiness before fetching items.
+<!-- END MANUAL -->
+
+---
+
+## Exa Webset Status
+
+### What it is
+Get a quick status overview of a webset
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block returns a lightweight status overview of a webset without retrieving full item data. It includes counts for items, searches, enrichments, and monitors along with the current processing status.
+
+Use this for quick status checks and monitoring without the overhead of retrieving complete webset details or items.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The ID or external ID of the Webset | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| webset_id | The webset identifier | str |
+| status | Current status (idle, running, paused, etc.) | str |
+| item_count | Total number of items in the webset | int |
+| search_count | Number of searches performed | int |
+| enrichment_count | Number of enrichments configured | int |
+| monitor_count | Number of monitors configured | int |
+| last_updated | When the webset was last updated | str |
+| is_processing | Whether any operations are currently running | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Status Dashboards**: Display webset status in monitoring dashboards.
+
+**Health Checks**: Verify websets are active and processing as expected.
+
+**Lightweight Polling**: Check status without fetching full webset data.
+<!-- END MANUAL -->
+
+---
+
+## Exa Webset Summary
+
+### What it is
+Get a comprehensive summary of a webset with samples and statistics
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block generates a comprehensive summary of a webset including statistics, sample items, and detailed breakdowns of searches and enrichments. It provides an overview useful for reporting and analysis.
+
+You can control what to include in the summary such as sample items, search details, and enrichment details to balance comprehensiveness with response size.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The ID or external ID of the Webset | str | Yes |
+| include_sample_items | Include sample items in the summary | bool | No |
+| sample_size | Number of sample items to include | int | No |
+| include_search_details | Include details about searches | bool | No |
+| include_enrichment_details | Include details about enrichments | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| webset_id | The webset identifier | str |
+| status | Current status | str |
+| entity_type | Type of entities in the webset | str |
+| total_items | Total number of items | int |
+| sample_items | Sample items from the webset | List[Dict[str, Any]] |
+| search_summary | Summary of searches performed | SearchSummaryModel |
+| enrichment_summary | Summary of enrichments applied | EnrichmentSummaryModel |
+| monitor_summary | Summary of monitors configured | MonitorSummaryModel |
+| statistics | Various statistics about the webset | WebsetStatisticsModel |
+| created_at | When the webset was created | str |
+| updated_at | When the webset was last updated | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Executive Reporting**: Generate summaries of webset collections for stakeholder reports.
+
+**Quality Review**: Review sample items and statistics to assess webset quality.
+
+**Progress Tracking**: Monitor webset growth and activity through periodic summaries.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/exa/websets_enrichment.md b/docs/integrations/block-integrations/exa/websets_enrichment.md
new file mode 100644
index 0000000000..016ded5010
--- /dev/null
+++ b/docs/integrations/block-integrations/exa/websets_enrichment.md
@@ -0,0 +1,226 @@
+# Exa Websets Enrichment
+<!-- MANUAL: file_description -->
+Blocks for enriching webset items with additional data using Exa's enrichment API.
+<!-- END MANUAL -->
+
+## Exa Cancel Enrichment
+
+### What it is
+Cancel a running enrichment operation
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block stops a running enrichment operation on a webset. Items already enriched before cancellation retain their enrichment data, but remaining items will not be processed.
+
+Use this when an enrichment is taking too long, producing unexpected results, or is no longer needed. The block returns the approximate number of items enriched before cancellation.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The ID or external ID of the Webset | str | Yes |
+| enrichment_id | The ID of the enrichment to cancel | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| enrichment_id | The ID of the canceled enrichment | str |
+| status | Status after cancellation | str |
+| items_enriched_before_cancel | Approximate number of items enriched before cancellation | int |
+| success | Whether the cancellation was successful | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Cost Control**: Stop enrichments that are exceeding budget or taking too long.
+
+**Error Handling**: Cancel enrichments producing incorrect results to fix configuration.
+
+**Priority Changes**: Stop lower-priority enrichments to free resources for urgent tasks.
+<!-- END MANUAL -->
+
+---
+
+## Exa Create Enrichment
+
+### What it is
+Create enrichments to extract additional structured data from webset items
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates an enrichment task that extracts specific data from each webset item using AI. You define what to extract via a description, and the enrichment runs against all current and future items in the webset.
+
+Enrichments support various output formats including text, dates, numbers, and predefined options. You can apply enrichments to existing items immediately or configure them to run only on new items.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The ID or external ID of the Webset | str | Yes |
+| description | What data to extract from each item | str | Yes |
+| title | Short title for this enrichment (auto-generated if not provided) | str | No |
+| format | Expected format of the extracted data | "text" \| "date" \| "number" \| "options" \| "email" \| "phone" | No |
+| options | Available options when format is 'options' | List[str] | No |
+| apply_to_existing | Apply this enrichment to existing items in the webset | bool | No |
+| metadata | Metadata to attach to the enrichment | Dict[str, Any] | No |
+| wait_for_completion | Wait for the enrichment to complete on existing items | bool | No |
+| polling_timeout | Maximum time to wait for completion in seconds | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| enrichment_id | The unique identifier for the created enrichment | str |
+| webset_id | The webset this enrichment belongs to | str |
+| status | Current status of the enrichment | str |
+| title | Title of the enrichment | str |
+| description | Description of what data is extracted | str |
+| format | Format of the extracted data | str |
+| instructions | Generated instructions for the enrichment | str |
+| items_enriched | Number of items enriched (if wait_for_completion was True) | int |
+| completion_time | Time taken to complete in seconds (if wait_for_completion was True) | float |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Data Extraction**: Extract specific fields like founding dates, employee counts, or contact info from company profiles.
+
+**Classification**: Categorize items into predefined buckets using the options format.
+
+**Sentiment Analysis**: Analyze sentiment or tone from article content or reviews.
+<!-- END MANUAL -->
+
+---
+
+## Exa Delete Enrichment
+
+### What it is
+Delete an enrichment from a webset
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block removes an enrichment configuration from a webset. The enrichment will no longer be applied to new items, but existing enrichment data on items is not deleted.
+
+Use this to clean up enrichments that are no longer needed or to remove misconfigured enrichments before creating corrected ones.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The ID or external ID of the Webset | str | Yes |
+| enrichment_id | The ID of the enrichment to delete | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| enrichment_id | The ID of the deleted enrichment | str |
+| success | Whether the deletion was successful | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Configuration Cleanup**: Remove enrichments that are no longer relevant to your data needs.
+
+**Reconfiguration**: Delete misconfigured enrichments before creating corrected replacements.
+
+**Cost Optimization**: Remove unnecessary enrichments to reduce processing costs on new items.
+<!-- END MANUAL -->
+
+---
+
+## Exa Get Enrichment
+
+### What it is
+Get the status and details of a webset enrichment
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves detailed information about a specific enrichment including its configuration, current status, and processing progress.
+
+Use this to monitor enrichment progress, verify configuration, or troubleshoot issues with enrichment results. Returns the full enrichment specification along with timestamps.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The ID or external ID of the Webset | str | Yes |
+| enrichment_id | The ID of the enrichment to retrieve | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| enrichment_id | The unique identifier for the enrichment | str |
+| status | Current status of the enrichment | str |
+| title | Title of the enrichment | str |
+| description | Description of what data is extracted | str |
+| format | Format of the extracted data | str |
+| options | Available options (for 'options' format) | List[str] |
+| instructions | Generated instructions for the enrichment | str |
+| created_at | When the enrichment was created | str |
+| updated_at | When the enrichment was last updated | str |
+| metadata | Metadata attached to the enrichment | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Progress Monitoring**: Check enrichment status to monitor completion of large batch operations.
+
+**Configuration Verification**: Retrieve enrichment details to verify settings before making changes.
+
+**Debugging**: Investigate enrichment configuration when results don't match expectations.
+<!-- END MANUAL -->
+
+---
+
+## Exa Update Enrichment
+
+### What it is
+Update an existing enrichment configuration
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block modifies an existing enrichment's configuration. You can update the description, output format, available options, or metadata without recreating the enrichment.
+
+Changes apply to future items; existing enrichment data is not reprocessed unless you explicitly re-run the enrichment on existing items.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The ID or external ID of the Webset | str | Yes |
+| enrichment_id | The ID of the enrichment to update | str | Yes |
+| description | New description for what data to extract | str | No |
+| format | New format for the extracted data | "text" \| "date" \| "number" \| "options" \| "email" \| "phone" | No |
+| options | New options when format is 'options' | List[str] | No |
+| metadata | New metadata to attach to the enrichment | Dict[str, Any] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| enrichment_id | The unique identifier for the enrichment | str |
+| status | Current status of the enrichment | str |
+| title | Title of the enrichment | str |
+| description | Updated description | str |
+| format | Updated format | str |
+| success | Whether the update was successful | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Refinement**: Improve enrichment descriptions based on initial results to get better extractions.
+
+**Option Updates**: Add or modify options for classification enrichments as needs evolve.
+
+**Metadata Management**: Update enrichment metadata for organization or tracking purposes.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/exa/websets_import_export.md b/docs/integrations/block-integrations/exa/websets_import_export.md
new file mode 100644
index 0000000000..af0934aabd
--- /dev/null
+++ b/docs/integrations/block-integrations/exa/websets_import_export.md
@@ -0,0 +1,222 @@
+# Exa Websets Import Export
+<!-- MANUAL: file_description -->
+Blocks for importing and exporting data with Exa websets.
+<!-- END MANUAL -->
+
+## Exa Create Import
+
+### What it is
+Import CSV data to use with websets for targeted searches
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates an import from CSV data that can be used as a source for webset searches. Imports allow you to bring your own data (like company lists or contact lists) and use them for scoped or exclusion searches.
+
+You specify the entity type and which columns contain identifiers and URLs. The import becomes available as a source that can be referenced when creating webset searches.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| title | Title for this import | str | Yes |
+| csv_data | CSV data to import (as a string) | str | Yes |
+| entity_type | Type of entities being imported | "company" \| "person" \| "article" \| "research_paper" \| "custom" | No |
+| entity_description | Description for custom entity type | str | No |
+| identifier_column | Column index containing the identifier (0-based) | int | No |
+| url_column | Column index containing URLs (optional) | int | No |
+| metadata | Metadata to attach to the import | Dict[str, Any] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| import_id | The unique identifier for the created import | str |
+| status | Current status of the import | str |
+| title | Title of the import | str |
+| count | Number of items in the import | int |
+| entity_type | Type of entities imported | str |
+| upload_url | Upload URL for CSV data (only if csv_data not provided in request) | str |
+| upload_valid_until | Expiration time for upload URL (only if upload_url is provided) | str |
+| created_at | When the import was created | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Customer Enrichment**: Import your customer list to find similar companies or related contacts.
+
+**Exclusion Lists**: Import existing leads to exclude from new prospecting searches.
+
+**Targeted Expansion**: Use imported data as a starting point for relationship-based searches.
+<!-- END MANUAL -->
+
+---
+
+## Exa Delete Import
+
+### What it is
+Delete an import
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block permanently deletes an import and its data. Any websets that reference this import for scoped or exclusion searches will no longer have access to it.
+
+Use this to clean up imports that are no longer needed or contain outdated data. The deletion cannot be undone.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| import_id | The ID of the import to delete | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| import_id | The ID of the deleted import | str |
+| success | Whether the deletion was successful | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Data Refresh**: Delete outdated imports before uploading updated versions.
+
+**Cleanup Operations**: Remove imports that are no longer used in any webset searches.
+
+**Compliance**: Delete imports containing data that needs to be removed for privacy compliance.
+<!-- END MANUAL -->
+
+---
+
+## Exa Export Webset
+
+### What it is
+Export webset data in JSON, CSV, or JSON Lines format
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block exports all items from a webset in your chosen format. You can include full content and enrichment data in the export, and limit the number of items exported.
+
+Supported formats include JSON for structured data, CSV for spreadsheet compatibility, and JSON Lines for streaming or large dataset processing.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The ID or external ID of the Webset to export | str | Yes |
+| format | Export format | "json" \| "csv" \| "jsonl" | No |
+| include_content | Include full content in export | bool | No |
+| include_enrichments | Include enrichment data in export | bool | No |
+| max_items | Maximum number of items to export | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| export_data | Exported data in the requested format | str |
+| item_count | Number of items exported | int |
+| total_items | Total number of items in the webset | int |
+| truncated | Whether the export was truncated due to max_items limit | bool |
+| format | Format of the exported data | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**CRM Integration**: Export webset data as CSV to import into CRM or marketing automation systems.
+
+**Reporting**: Generate exports for analysis in spreadsheets or business intelligence tools.
+
+**Backup**: Create periodic exports of valuable webset data for archival purposes.
+<!-- END MANUAL -->
+
+---
+
+## Exa Get Import
+
+### What it is
+Get the status and details of an import
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves detailed information about an import including its status, item count, and configuration. Use this to check if an import is ready to use or to troubleshoot failed imports.
+
+The block returns upload status information if the import is pending data upload, or failure details if the import encountered errors.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| import_id | The ID of the import to retrieve | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| import_id | The unique identifier for the import | str |
+| status | Current status of the import | str |
+| title | Title of the import | str |
+| format | Format of the imported data | str |
+| entity_type | Type of entities imported | str |
+| count | Number of items imported | int |
+| upload_url | Upload URL for CSV data (if import not yet uploaded) | str |
+| upload_valid_until | Expiration time for upload URL (if applicable) | str |
+| failed_reason | Reason for failure (if applicable) | str |
+| failed_message | Detailed failure message (if applicable) | str |
+| created_at | When the import was created | str |
+| updated_at | When the import was last updated | str |
+| metadata | Metadata attached to the import | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Status Verification**: Check import status after upload to confirm data is ready for use.
+
+**Error Investigation**: Retrieve import details to understand why an import failed.
+
+**Audit Trail**: Review import configuration and metadata for documentation purposes.
+<!-- END MANUAL -->
+
+---
+
+## Exa List Imports
+
+### What it is
+List all imports with pagination support
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves a paginated list of all your imports. Results include basic information about each import such as title, status, and item count.
+
+Use this to discover existing imports that can be referenced in webset searches or to manage your import library.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| limit | Number of imports to return | int | No |
+| cursor | Cursor for pagination | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| imports | List of imports | List[Dict[str, Any]] |
+| import_item | Individual import (yielded for each import) | Dict[str, Any] |
+| has_more | Whether there are more imports to paginate through | bool |
+| next_cursor | Cursor for the next page of results | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Import Discovery**: Find existing imports to reference when creating new webset searches.
+
+**Library Management**: Review all imports to identify outdated data that can be cleaned up.
+
+**Source Selection**: Browse available imports when setting up scoped or exclusion searches.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/exa/websets_items.md b/docs/integrations/block-integrations/exa/websets_items.md
new file mode 100644
index 0000000000..0992d914b3
--- /dev/null
+++ b/docs/integrations/block-integrations/exa/websets_items.md
@@ -0,0 +1,254 @@
+# Exa Websets Items
+<!-- MANUAL: file_description -->
+Blocks for retrieving and managing items within Exa websets.
+<!-- END MANUAL -->
+
+## Exa Bulk Webset Items
+
+### What it is
+Get all items from a webset in bulk (with configurable limits)
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves all items from a webset in a single operation, automatically handling pagination internally. You can specify a maximum number of items and choose whether to include enrichments and full content.
+
+Use this for batch processing when you need all webset data at once rather than paginating through results manually.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The ID or external ID of the Webset | str | Yes |
+| max_items | Maximum number of items to retrieve (1-1000). Note: Large values may take longer. | int | No |
+| include_enrichments | Include enrichment data for each item | bool | No |
+| include_content | Include full content for each item | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| items | All items from the webset | List[WebsetItemModel] |
+| item | Individual item (yielded for each item) | WebsetItemModel |
+| total_retrieved | Total number of items retrieved | int |
+| truncated | Whether results were truncated due to max_items limit | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Batch Processing**: Retrieve all webset items for bulk analysis or processing in external systems.
+
+**Data Export**: Get complete webset data for integration with other tools or databases.
+
+**Full Dataset Analysis**: Analyze entire webset contents when pagination isn't practical.
+<!-- END MANUAL -->
+
+---
+
+## Exa Delete Webset Item
+
+### What it is
+Delete a specific item from a webset
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block permanently removes a specific item from a webset. The item and all its enrichment data are deleted and cannot be recovered.
+
+Use this to clean up irrelevant results, remove duplicates, or curate webset contents by removing items that don't meet your quality standards.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The ID or external ID of the Webset | str | Yes |
+| item_id | The ID of the item to delete | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| item_id | The ID of the deleted item | str |
+| success | Whether the deletion was successful | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Data Curation**: Remove irrelevant or low-quality items to improve webset accuracy.
+
+**Duplicate Removal**: Delete duplicate entries discovered during review.
+
+**Compliance**: Remove items that shouldn't be included for legal or policy reasons.
+<!-- END MANUAL -->
+
+---
+
+## Exa Get New Items
+
+### What it is
+Get items added since a cursor - enables incremental processing without reprocessing
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves only items added to a webset since your last check, identified by a cursor. This enables efficient incremental processing without re-fetching previously processed items.
+
+Save the returned next_cursor for subsequent calls to implement continuous incremental processing of new webset additions.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The ID or external ID of the Webset | str | Yes |
+| since_cursor | Cursor from previous run - only items after this will be returned. Leave empty on first run. | str | No |
+| max_items | Maximum number of new items to retrieve | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| new_items | Items added since the cursor | List[WebsetItemModel] |
+| item | Individual item (yielded for each new item) | WebsetItemModel |
+| count | Number of new items found | int |
+| next_cursor | Save this cursor for the next run to get only newer items | str |
+| has_more | Whether there are more new items beyond max_items | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Incremental Processing**: Process only new webset items in scheduled workflows without duplicating work.
+
+**Real-Time Pipelines**: Build efficient pipelines that react to new data without full dataset scans.
+
+**Change Detection**: Track what's new in websets for alerting or notification systems.
+<!-- END MANUAL -->
+
+---
+
+## Exa Get Webset Item
+
+### What it is
+Get a specific item from a webset by its ID
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves detailed information about a specific webset item including its content, entity data, and enrichments. Use this when you need complete data for a particular item.
+
+The block returns the full item record with all available data, timestamps, and any enrichment results that have been applied.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The ID or external ID of the Webset | str | Yes |
+| item_id | The ID of the specific item to retrieve | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| item_id | The unique identifier for the item | str |
+| url | The URL of the original source | str |
+| title | The title of the item | str |
+| content | The main content of the item | str |
+| entity_data | Entity-specific structured data | Dict[str, Any] |
+| enrichments | Enrichment data added to the item | Dict[str, Any] |
+| created_at | When the item was added to the webset | str |
+| updated_at | When the item was last updated | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Detail View**: Fetch complete item data for display in detail views or profiles.
+
+**Enrichment Review**: Retrieve item with enrichments to verify data extraction quality.
+
+**Reference Lookup**: Get specific items by ID for cross-referencing or validation.
+<!-- END MANUAL -->
+
+---
+
+## Exa List Webset Items
+
+### What it is
+List items in a webset with pagination support
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves a paginated list of items from a webset. You control page size and can optionally wait for items if the webset is still processing.
+
+Use pagination cursors to iterate through large websets efficiently. Each page returns items along with metadata about whether more pages exist.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The ID or external ID of the Webset | str | Yes |
+| limit | Number of items to return (1-100) | int | No |
+| cursor | Cursor for pagination through results | str | No |
+| wait_for_items | Wait for items to be available if webset is still processing | bool | No |
+| wait_timeout | Maximum time to wait for items in seconds | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| items | List of webset items | List[WebsetItemModel] |
+| webset_id | The ID of the webset | str |
+| item | Individual item (yielded for each item in the list) | WebsetItemModel |
+| has_more | Whether there are more items to paginate through | bool |
+| next_cursor | Cursor for the next page of results | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Paginated Display**: Build UIs that display webset items with pagination controls.
+
+**Streaming Processing**: Process webset items in manageable batches to avoid memory issues.
+
+**Controlled Iteration**: Step through large websets methodically for thorough analysis.
+<!-- END MANUAL -->
+
+---
+
+## Exa Webset Items Summary
+
+### What it is
+Get a summary of webset items without retrieving all data
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block provides a lightweight summary of webset items including total count, entity type, available enrichment columns, and optional sample items. It's efficient for getting an overview without fetching full data.
+
+Use this to understand webset contents at a glance, check enrichment availability, or get sample data for validation.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The ID or external ID of the Webset | str | Yes |
+| sample_size | Number of sample items to include | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| total_items | Total number of items in the webset | int |
+| entity_type | Type of entities in the webset | str |
+| sample_items | Sample of items from the webset | List[WebsetItemModel] |
+| enrichment_columns | List of enrichment columns available | List[str] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Quick Overview**: Get webset statistics and samples without loading all data.
+
+**Schema Discovery**: Check what enrichment columns are available before building exports.
+
+**Validation**: Review sample items to verify webset quality before full processing.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/exa/websets_monitor.md b/docs/integrations/block-integrations/exa/websets_monitor.md
new file mode 100644
index 0000000000..65ac38ec1a
--- /dev/null
+++ b/docs/integrations/block-integrations/exa/websets_monitor.md
@@ -0,0 +1,227 @@
+# Exa Websets Monitor
+<!-- MANUAL: file_description -->
+Blocks for creating scheduled monitors to automatically update Exa websets.
+<!-- END MANUAL -->
+
+## Exa Create Monitor
+
+### What it is
+Create automated monitors to keep websets updated with fresh data on a schedule
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a scheduled monitor that automatically updates a webset on a cron schedule. Monitors can either search for new items matching criteria or refresh existing item content and enrichments.
+
+Configure the cron expression for your desired frequency (daily, weekly, etc.) and choose between search behavior to find new items or refresh behavior to update existing data.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The ID or external ID of the Webset to monitor | str | Yes |
+| cron_expression | Cron expression for scheduling (5 fields, max once per day) | str | Yes |
+| timezone | IANA timezone for the schedule | str | No |
+| behavior_type | Type of monitor behavior (search for new items or refresh existing) | "search" \| "refresh" | No |
+| search_query | Search query for finding new items (required for search behavior) | str | No |
+| search_count | Number of items to find in each search | int | No |
+| search_criteria | Criteria that items must meet | List[str] | No |
+| search_behavior | How new results interact with existing items | "append" \| "override" | No |
+| entity_type | Type of entity to search for (company, person, etc.) | str | No |
+| refresh_content | Refresh content from source URLs (for refresh behavior) | bool | No |
+| refresh_enrichments | Re-run enrichments on items (for refresh behavior) | bool | No |
+| metadata | Metadata to attach to the monitor | Dict[str, Any] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| monitor_id | The unique identifier for the created monitor | str |
+| webset_id | The webset this monitor belongs to | str |
+| status | Status of the monitor | str |
+| behavior_type | Type of monitor behavior | str |
+| next_run_at | When the monitor will next run | str |
+| cron_expression | The schedule cron expression | str |
+| timezone | The timezone for scheduling | str |
+| created_at | When the monitor was created | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Continuous Lead Generation**: Schedule daily searches to find new companies matching your criteria.
+
+**News Monitoring**: Set up monitors to discover fresh articles on topics of interest.
+
+**Data Freshness**: Schedule periodic refreshes to keep enrichment data current.
+<!-- END MANUAL -->
+
+---
+
+## Exa Delete Monitor
+
+### What it is
+Delete a monitor from a webset
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block permanently deletes a monitor, stopping all future scheduled runs. Any data already collected by the monitor remains in the webset.
+
+Use this to clean up monitors that are no longer needed or to stop scheduled operations before deleting a webset.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| monitor_id | The ID of the monitor to delete | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| monitor_id | The ID of the deleted monitor | str |
+| success | Whether the deletion was successful | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Project Completion**: Delete monitors when monitoring campaigns or projects conclude.
+
+**Cost Management**: Remove monitors that are no longer providing value to reduce costs.
+
+**Configuration Cleanup**: Delete old monitors before creating updated replacements.
+<!-- END MANUAL -->
+
+---
+
+## Exa Get Monitor
+
+### What it is
+Get the details and status of a webset monitor
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves detailed information about a monitor including its configuration, schedule, current status, and information about the last run.
+
+Use this to verify monitor settings, check when the next run is scheduled, or review results from recent executions.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| monitor_id | The ID of the monitor to retrieve | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| monitor_id | The unique identifier for the monitor | str |
+| webset_id | The webset this monitor belongs to | str |
+| status | Current status of the monitor | str |
+| behavior_type | Type of monitor behavior | str |
+| behavior_config | Configuration for the monitor behavior | Dict[str, Any] |
+| cron_expression | The schedule cron expression | str |
+| timezone | The timezone for scheduling | str |
+| next_run_at | When the monitor will next run | str |
+| last_run | Information about the last run | Dict[str, Any] |
+| created_at | When the monitor was created | str |
+| updated_at | When the monitor was last updated | str |
+| metadata | Metadata attached to the monitor | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Schedule Verification**: Check when monitors are scheduled to run next.
+
+**Performance Review**: Examine last run details to assess monitor effectiveness.
+
+**Configuration Audit**: Retrieve monitor settings for documentation or troubleshooting.
+<!-- END MANUAL -->
+
+---
+
+## Exa List Monitors
+
+### What it is
+List all monitors with optional webset filtering
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves a paginated list of all monitors, optionally filtered by webset. Results include basic monitor information such as status, schedule, and next run time.
+
+Use this to get an overview of all active monitors or find monitors associated with a specific webset.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | Filter monitors by webset ID | str | No |
+| limit | Number of monitors to return | int | No |
+| cursor | Cursor for pagination | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| monitors | List of monitors | List[Dict[str, Any]] |
+| monitor | Individual monitor (yielded for each monitor) | Dict[str, Any] |
+| has_more | Whether there are more monitors to paginate through | bool |
+| next_cursor | Cursor for the next page of results | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Monitor Dashboard**: Build dashboards showing all active monitors and their schedules.
+
+**Webset Management**: Find monitors associated with websets before making changes.
+
+**Activity Overview**: Review all scheduled monitoring activity across your account.
+<!-- END MANUAL -->
+
+---
+
+## Exa Update Monitor
+
+### What it is
+Update a monitor's status, schedule, or metadata
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block modifies an existing monitor's configuration. You can enable, disable, or pause monitors, change their schedule, update the timezone, or modify metadata.
+
+Changes take effect immediately. Disabling a monitor stops future scheduled runs until re-enabled.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| monitor_id | The ID of the monitor to update | str | Yes |
+| status | New status for the monitor | "enabled" \| "disabled" \| "paused" | No |
+| cron_expression | New cron expression for scheduling | str | No |
+| timezone | New timezone for the schedule | str | No |
+| metadata | New metadata for the monitor | Dict[str, Any] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| monitor_id | The unique identifier for the monitor | str |
+| status | Updated status of the monitor | str |
+| next_run_at | When the monitor will next run | str |
+| updated_at | When the monitor was updated | str |
+| success | Whether the update was successful | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Schedule Changes**: Adjust monitor frequency based on data velocity or business needs.
+
+**Pause/Resume**: Temporarily pause monitors during maintenance or when not needed.
+
+**Status Management**: Enable or disable monitors programmatically based on conditions.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/exa/websets_polling.md b/docs/integrations/block-integrations/exa/websets_polling.md
new file mode 100644
index 0000000000..6212604095
--- /dev/null
+++ b/docs/integrations/block-integrations/exa/websets_polling.md
@@ -0,0 +1,143 @@
+# Exa Websets Polling
+<!-- MANUAL: file_description -->
+Blocks for polling and waiting on Exa webset operations to complete.
+<!-- END MANUAL -->
+
+## Exa Wait For Enrichment
+
+### What it is
+Wait for a webset enrichment to complete with progress tracking
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block polls an enrichment operation until it completes or times out. It checks status at configurable intervals and can include sample results when done.
+
+Use this to block workflow execution until enrichments finish, enabling sequential operations that depend on enrichment data being available.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The ID or external ID of the Webset | str | Yes |
+| enrichment_id | The ID of the enrichment to monitor | str | Yes |
+| timeout | Maximum time to wait in seconds | int | No |
+| check_interval | Initial interval between status checks in seconds | int | No |
+| sample_results | Include sample enrichment results in output | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| enrichment_id | The enrichment ID that was monitored | str |
+| final_status | The final status of the enrichment | str |
+| items_enriched | Number of items successfully enriched | int |
+| enrichment_title | Title/description of the enrichment | str |
+| elapsed_time | Total time elapsed in seconds | float |
+| sample_data | Sample of enriched data (if requested) | List[SampleEnrichmentModel] |
+| timed_out | Whether the operation timed out | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Sequential Processing**: Wait for enrichments to complete before proceeding to export or analysis.
+
+**Data Validation**: Ensure enrichments finish and review samples before continuing workflow.
+
+**Synchronous Workflows**: Convert async enrichment operations to blocking calls for simpler logic.
+<!-- END MANUAL -->
+
+---
+
+## Exa Wait For Search
+
+### What it is
+Wait for a specific webset search to complete with progress tracking
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block polls a webset search operation until it completes or times out. It provides progress information including items found, items analyzed, and completion percentage.
+
+Use this when you need search results before proceeding with downstream operations like enrichments or exports.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The ID or external ID of the Webset | str | Yes |
+| search_id | The ID of the search to monitor | str | Yes |
+| timeout | Maximum time to wait in seconds | int | No |
+| check_interval | Initial interval between status checks in seconds | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| search_id | The search ID that was monitored | str |
+| final_status | The final status of the search | str |
+| items_found | Number of items found by the search | int |
+| items_analyzed | Number of items analyzed | int |
+| completion_percentage | Completion percentage (0-100) | int |
+| elapsed_time | Total time elapsed in seconds | float |
+| recall_info | Information about expected results and confidence | Dict[str, Any] |
+| timed_out | Whether the operation timed out | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Search Completion**: Wait for initial webset population before accessing items.
+
+**Progress Monitoring**: Track search progress in long-running operations.
+
+**Sequential Workflows**: Ensure searches complete before starting enrichments.
+<!-- END MANUAL -->
+
+---
+
+## Exa Wait For Webset
+
+### What it is
+Wait for a webset to reach a specific status with progress tracking
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block polls a webset until it reaches a target status (idle, completed, or running). It uses exponential backoff for efficient polling and provides detailed progress information.
+
+Use this for general-purpose waiting on webset operations when you don't need to track a specific search or enrichment.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The ID or external ID of the Webset to monitor | str | Yes |
+| target_status | Status to wait for (idle=all operations complete, completed=search done, running=actively processing) | "idle" \| "completed" \| "running" \| "paused" \| "any_complete" | No |
+| timeout | Maximum time to wait in seconds | int | No |
+| check_interval | Initial interval between status checks in seconds | int | No |
+| max_interval | Maximum interval between checks (for exponential backoff) | int | No |
+| include_progress | Include detailed progress information in output | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| webset_id | The webset ID that was monitored | str |
+| final_status | The final status of the webset | str |
+| elapsed_time | Total time elapsed in seconds | float |
+| item_count | Number of items found | int |
+| search_progress | Detailed search progress information | Dict[str, Any] |
+| enrichment_progress | Detailed enrichment progress information | Dict[str, Any] |
+| timed_out | Whether the operation timed out | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Workflow Orchestration**: Wait for all webset operations to complete before next workflow steps.
+
+**Idle State Detection**: Ensure webset is fully idle before making configuration changes.
+
+**Completion Gates**: Block workflow until webset reaches a specific readiness state.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/exa/websets_search.md b/docs/integrations/block-integrations/exa/websets_search.md
new file mode 100644
index 0000000000..8ed7b90d70
--- /dev/null
+++ b/docs/integrations/block-integrations/exa/websets_search.md
@@ -0,0 +1,195 @@
+# Exa Websets Search
+<!-- MANUAL: file_description -->
+Blocks for running and managing searches within Exa websets.
+<!-- END MANUAL -->
+
+## Exa Cancel Webset Search
+
+### What it is
+Cancel a running webset search
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block stops a running search operation on a webset. Items already found before cancellation are retained in the webset.
+
+Use this when a search is taking too long, returning unexpected results, or is no longer needed. The block returns the number of items found before cancellation.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The ID or external ID of the Webset | str | Yes |
+| search_id | The ID of the search to cancel | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| search_id | The ID of the canceled search | str |
+| status | Status after cancellation | str |
+| items_found_before_cancel | Number of items found before cancellation | int |
+| success | Whether the cancellation was successful | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Resource Control**: Stop searches that are taking longer than expected.
+
+**Query Refinement**: Cancel searches to adjust query and restart with better parameters.
+
+**Partial Results**: Stop searches early when you have enough items for your needs.
+<!-- END MANUAL -->
+
+---
+
+## Exa Create Webset Search
+
+### What it is
+Add a new search to an existing webset to find more items
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block adds a new search to an existing webset to expand its contents. You define the search query, target count, and how results should integrate with existing items (append, override, or merge).
+
+Searches support scoped and exclusion sources, criteria validation, and relationship-based "hop" searches to find related entities.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The ID or external ID of the Webset | str | Yes |
+| query | Search query describing what to find | str | Yes |
+| count | Number of items to find | int | No |
+| entity_type | Type of entity to search for | "company" \| "person" \| "article" \| "research_paper" \| "custom" \| "auto" | No |
+| entity_description | Description for custom entity type | str | No |
+| criteria | List of criteria that items must meet. If not provided, auto-detected from query. | List[str] | No |
+| behavior | How new results interact with existing items | "override" \| "append" \| "merge" | No |
+| recall | Enable recall estimation for expected results | bool | No |
+| exclude_source_ids | IDs of imports/websets to exclude from results | List[str] | No |
+| exclude_source_types | Types of sources to exclude ('import' or 'webset') | List[str] | No |
+| scope_source_ids | IDs of imports/websets to limit search scope to | List[str] | No |
+| scope_source_types | Types of scope sources ('import' or 'webset') | List[str] | No |
+| scope_relationships | Relationship definitions for hop searches | List[str] | No |
+| scope_relationship_limits | Limits on related entities to find | List[int] | No |
+| metadata | Metadata to attach to the search | Dict[str, Any] | No |
+| wait_for_completion | Wait for the search to complete before returning | bool | No |
+| polling_timeout | Maximum time to wait for completion in seconds | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| search_id | The unique identifier for the created search | str |
+| webset_id | The webset this search belongs to | str |
+| status | Current status of the search | str |
+| query | The search query | str |
+| expected_results | Recall estimation of expected results | Dict[str, Any] |
+| items_found | Number of items found (if wait_for_completion was True) | int |
+| completion_time | Time taken to complete in seconds (if wait_for_completion was True) | float |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Webset Expansion**: Add more items to existing websets with new or refined queries.
+
+**Multi-Criteria Collection**: Run multiple searches with different criteria to build comprehensive datasets.
+
+**Iterative Building**: Progressively expand websets based on analysis of initial results.
+<!-- END MANUAL -->
+
+---
+
+## Exa Find Or Create Search
+
+### What it is
+Find existing search by query or create new - prevents duplicate searches in workflows
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block implements idempotent search creation. If a search with the same query already exists in the webset, it returns that search. Otherwise, it creates a new one.
+
+Use this pattern to prevent duplicate searches when workflows retry or run multiple times with the same parameters.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The ID or external ID of the Webset | str | Yes |
+| query | Search query to find or create | str | Yes |
+| count | Number of items to find (only used if creating new search) | int | No |
+| entity_type | Entity type (only used if creating) | "company" \| "person" \| "article" \| "research_paper" \| "custom" \| "auto" | No |
+| behavior | Search behavior (only used if creating) | "override" \| "append" \| "merge" | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| search_id | The search ID (existing or new) | str |
+| webset_id | The webset ID | str |
+| status | Current search status | str |
+| query | The search query | str |
+| was_created | True if search was newly created, False if already existed | bool |
+| items_found | Number of items found (0 if still running) | int |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Retry-Safe Workflows**: Safely handle workflow retries without creating duplicate searches.
+
+**Deduplication**: Avoid running the same search multiple times when called from different workflow branches.
+
+**Efficient Operations**: Skip search creation when results from identical queries already exist.
+<!-- END MANUAL -->
+
+---
+
+## Exa Get Webset Search
+
+### What it is
+Get the status and details of a webset search
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves detailed information about a webset search including its query, criteria, progress, and recall estimation.
+
+Use this to monitor search progress, verify search configuration, or investigate search behavior when results don't match expectations.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| webset_id | The ID or external ID of the Webset | str | Yes |
+| search_id | The ID of the search to retrieve | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| search_id | The unique identifier for the search | str |
+| status | Current status of the search | str |
+| query | The search query | str |
+| entity_type | Type of entity being searched | str |
+| criteria | Criteria used for verification | List[Dict[str, Any]] |
+| progress | Search progress information | Dict[str, Any] |
+| recall | Recall estimation information | Dict[str, Any] |
+| created_at | When the search was created | str |
+| updated_at | When the search was last updated | str |
+| canceled_at | When the search was canceled (if applicable) | str |
+| canceled_reason | Reason for cancellation (if applicable) | str |
+| metadata | Metadata attached to the search | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Progress Tracking**: Monitor search completion and items found during long-running operations.
+
+**Configuration Review**: Retrieve search details to verify criteria and settings are correct.
+
+**Debugging**: Investigate search configuration when results don't match expectations.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/fal/ai_video_generator.md b/docs/integrations/block-integrations/fal/ai_video_generator.md
new file mode 100644
index 0000000000..16c8cb18d5
--- /dev/null
+++ b/docs/integrations/block-integrations/fal/ai_video_generator.md
@@ -0,0 +1,42 @@
+# Fal AI Video Generator
+<!-- MANUAL: file_description -->
+Blocks for generating AI videos using FAL.ai models.
+<!-- END MANUAL -->
+
+## AI Video Generator
+
+### What it is
+Generate videos using FAL AI models.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block generates videos from text prompts using FAL.ai's video generation models including Mochi, Luma Dream Machine, and Veo3. Describe the video you want to create, and the AI generates it.
+
+The generated video URL is returned along with progress logs for monitoring longer generation jobs.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| prompt | Description of the video to generate. | str | Yes |
+| model | The FAL model to use for video generation. | "fal-ai/mochi-v1" \| "fal-ai/luma-dream-machine" \| "fal-ai/veo3" | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if video generation failed. | str |
+| video_url | The URL of the generated video. | str |
+| logs | Generation progress logs. | List[str] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Creation**: Generate video clips for social media, ads, or creative projects.
+
+**Visualization**: Create visual representations of concepts, products, or stories.
+
+**Prototyping**: Generate video mockups for creative ideation and storyboarding.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/firecrawl/crawl.md b/docs/integrations/block-integrations/firecrawl/crawl.md
new file mode 100644
index 0000000000..38c2f3174c
--- /dev/null
+++ b/docs/integrations/block-integrations/firecrawl/crawl.md
@@ -0,0 +1,53 @@
+# Firecrawl Crawl
+<!-- MANUAL: file_description -->
+Blocks for crawling multiple pages of a website using Firecrawl.
+<!-- END MANUAL -->
+
+## Firecrawl Crawl
+
+### What it is
+Firecrawl crawls websites to extract comprehensive data while bypassing blockers.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Firecrawl's API to crawl multiple pages of a website starting from a given URL. It navigates through links, handling JavaScript rendering and bypassing anti-bot measures to extract clean content from each page.
+
+Configure the crawl depth with the limit parameter, choose output formats (markdown, HTML, or raw HTML), and optionally filter to main content only. The block supports caching with configurable max age and wait times for dynamic content.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| url | The URL to crawl | str | Yes |
+| limit | The number of pages to crawl | int | No |
+| only_main_content | Only return the main content of the page excluding headers, navs, footers, etc. | bool | No |
+| max_age | The maximum age of the page in milliseconds - default is 1 hour | int | No |
+| wait_for | Specify a delay in milliseconds before fetching the content, allowing the page sufficient time to load. | int | No |
+| formats | The format of the crawl | List["markdown" \| "html" \| "rawHtml" \| "links" \| "screenshot" \| "screenshot@fullPage" \| "json" \| "changeTracking"] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the crawl failed | str |
+| data | The result of the crawl | List[Dict[str, Any]] |
+| markdown | The markdown of the crawl | str |
+| html | The html of the crawl | str |
+| raw_html | The raw html of the crawl | str |
+| links | The links of the crawl | List[str] |
+| screenshot | The screenshot of the crawl | str |
+| screenshot_full_page | The screenshot full page of the crawl | str |
+| json_data | The json data of the crawl | Dict[str, Any] |
+| change_tracking | The change tracking of the crawl | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Documentation Indexing**: Crawl entire documentation sites to build searchable knowledge bases or training data.
+
+**Competitor Research**: Extract content from competitor websites for market analysis and comparison.
+
+**Content Archival**: Systematically archive website content for backup or compliance purposes.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/firecrawl/extract.md b/docs/integrations/block-integrations/firecrawl/extract.md
new file mode 100644
index 0000000000..9590fdd910
--- /dev/null
+++ b/docs/integrations/block-integrations/firecrawl/extract.md
@@ -0,0 +1,43 @@
+# Firecrawl Extract
+<!-- MANUAL: file_description -->
+Blocks for extracting structured data from web pages using Firecrawl's AI extraction.
+<!-- END MANUAL -->
+
+## Firecrawl Extract
+
+### What it is
+Firecrawl crawls websites to extract comprehensive data while bypassing blockers.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Firecrawl's extraction API to pull structured data from web pages based on a prompt or schema. It crawls the specified URLs and uses AI to extract information matching your requirements.
+
+Define the data structure you want using a JSON schema for precise extraction, or use natural language prompts for flexible extraction. Wildcards in URLs allow extracting data from multiple pages matching a pattern.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| urls | The URLs to crawl - at least one is required. Wildcards are supported. (/*) | List[str] | Yes |
+| prompt | The prompt to use for the crawl | str | No |
+| output_schema | A Json Schema describing the output structure if more rigid structure is desired. | Dict[str, Any] | No |
+| enable_web_search | When true, extraction can follow links outside the specified domain. | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the extraction failed | str |
+| data | The result of the crawl | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Product Data Extraction**: Extract structured product information (prices, specs, reviews) from e-commerce sites.
+
+**Contact Scraping**: Pull business contact information from company websites in a structured format.
+
+**Data Pipeline Input**: Automatically extract and structure web data for analysis or database population.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/firecrawl/map.md b/docs/integrations/block-integrations/firecrawl/map.md
new file mode 100644
index 0000000000..6bab1aa588
--- /dev/null
+++ b/docs/integrations/block-integrations/firecrawl/map.md
@@ -0,0 +1,41 @@
+# Firecrawl Map
+<!-- MANUAL: file_description -->
+Blocks for mapping website structure and discovering all links using Firecrawl.
+<!-- END MANUAL -->
+
+## Firecrawl Map Website
+
+### What it is
+Firecrawl maps a website to extract all the links.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Firecrawl's mapping API to discover all links on a website without extracting full content. It quickly scans the site structure and returns a comprehensive list of URLs found.
+
+The block is useful for understanding site architecture before performing targeted scraping or for building site maps. Results include both the raw list of links and structured results with titles and descriptions.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| url | The website url to map | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the map failed | str |
+| links | List of URLs found on the website | List[str] |
+| results | List of search results with url, title, and description | List[Dict[str, Any]] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Site Audit**: Map all pages on a website to identify broken links, orphan pages, or SEO issues.
+
+**Crawl Planning**: Discover site structure before deciding which pages to scrape in detail.
+
+**Content Discovery**: Find all blog posts, product pages, or documentation entries on a site.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/firecrawl/scrape.md b/docs/integrations/block-integrations/firecrawl/scrape.md
new file mode 100644
index 0000000000..7dead595d7
--- /dev/null
+++ b/docs/integrations/block-integrations/firecrawl/scrape.md
@@ -0,0 +1,53 @@
+# Firecrawl Scrape
+<!-- MANUAL: file_description -->
+Blocks for scraping individual web pages and extracting content using Firecrawl.
+<!-- END MANUAL -->
+
+## Firecrawl Scrape
+
+### What it is
+Firecrawl scrapes a website to extract comprehensive data while bypassing blockers.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Firecrawl's scraping API to extract content from a single URL. It handles JavaScript rendering, bypasses anti-bot measures, and can return content in multiple formats including markdown, HTML, and screenshots.
+
+Configure output formats, filter to main content only, and set wait times for dynamic pages. The block returns comprehensive results including extracted content, links found on the page, and optional change tracking data.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| url | The URL to crawl | str | Yes |
+| limit | The number of pages to crawl | int | No |
+| only_main_content | Only return the main content of the page excluding headers, navs, footers, etc. | bool | No |
+| max_age | The maximum age of the page in milliseconds - default is 1 hour | int | No |
+| wait_for | Specify a delay in milliseconds before fetching the content, allowing the page sufficient time to load. | int | No |
+| formats | The format of the crawl | List["markdown" \| "html" \| "rawHtml" \| "links" \| "screenshot" \| "screenshot@fullPage" \| "json" \| "changeTracking"] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the scrape failed | str |
+| data | The result of the crawl | Dict[str, Any] |
+| markdown | The markdown of the crawl | str |
+| html | The html of the crawl | str |
+| raw_html | The raw html of the crawl | str |
+| links | The links of the crawl | List[str] |
+| screenshot | The screenshot of the crawl | str |
+| screenshot_full_page | The screenshot full page of the crawl | str |
+| json_data | The json data of the crawl | Dict[str, Any] |
+| change_tracking | The change tracking of the crawl | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Article Extraction**: Scrape news articles or blog posts to extract clean, readable content.
+
+**Price Monitoring**: Regularly scrape product pages to track price changes over time.
+
+**Content Backup**: Create markdown backups of important web pages for offline reference.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/firecrawl/search.md b/docs/integrations/block-integrations/firecrawl/search.md
new file mode 100644
index 0000000000..67ce63d196
--- /dev/null
+++ b/docs/integrations/block-integrations/firecrawl/search.md
@@ -0,0 +1,45 @@
+# Firecrawl Search
+<!-- MANUAL: file_description -->
+Blocks for searching the web and extracting content using Firecrawl.
+<!-- END MANUAL -->
+
+## Firecrawl Search
+
+### What it is
+Firecrawl searches the web for the given query.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Firecrawl's search API to find web pages matching your query and optionally extract their content. It performs a web search and can return results with full page content in your chosen format.
+
+Configure the number of results to return, output formats (markdown, HTML, raw HTML), and caching behavior. The wait_for parameter allows time for JavaScript-heavy pages to fully render before extraction.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| query | The query to search for | str | Yes |
+| limit | The number of pages to crawl | int | No |
+| max_age | The maximum age of the page in milliseconds - default is 1 hour | int | No |
+| wait_for | Specify a delay in milliseconds before fetching the content, allowing the page sufficient time to load. | int | No |
+| formats | Returns the content of the search if specified | List["markdown" \| "html" \| "rawHtml" \| "links" \| "screenshot" \| "screenshot@fullPage" \| "json" \| "changeTracking"] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the search failed | str |
+| data | The result of the search | Dict[str, Any] |
+| site | The site of the search | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Research Automation**: Search for topics and automatically extract content from relevant pages for analysis.
+
+**Lead Generation**: Find companies or contacts matching specific criteria across the web.
+
+**Content Aggregation**: Gather articles, reviews, or information on specific topics from multiple sources.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/content/platform/blocks/flux_kontext.md b/docs/integrations/block-integrations/flux_kontext.md
similarity index 100%
rename from docs/content/platform/blocks/flux_kontext.md
rename to docs/integrations/block-integrations/flux_kontext.md
diff --git a/docs/integrations/block-integrations/generic_webhook/triggers.md b/docs/integrations/block-integrations/generic_webhook/triggers.md
new file mode 100644
index 0000000000..3ca6562438
--- /dev/null
+++ b/docs/integrations/block-integrations/generic_webhook/triggers.md
@@ -0,0 +1,41 @@
+# Generic Webhook Triggers
+<!-- MANUAL: file_description -->
+Blocks for receiving and processing generic webhook payloads from external services.
+<!-- END MANUAL -->
+
+## Generic Webhook Trigger
+
+### What it is
+This block will output the contents of the generic input for the webhook.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a webhook endpoint that receives and outputs any incoming HTTP payload. When external services send data to this webhook URL, the block triggers and outputs the complete payload as a dictionary.
+
+Constants can be configured to pass additional static values alongside the dynamic webhook data.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| constants | The constants to be set when the block is put on the graph | Dict[str, Any] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| payload | The complete webhook payload that was received from the generic webhook. | Dict[str, Any] |
+| constants | The constants to be set when the block is put on the graph | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**External Integrations**: Receive data from any third-party service that supports webhooks.
+
+**Custom Triggers**: Create custom workflow triggers from external systems or internal tools.
+
+**Event Processing**: Capture and process events from IoT devices, payment processors, or notification services.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/github/checks.md b/docs/integrations/block-integrations/github/checks.md
new file mode 100644
index 0000000000..b11f3592c5
--- /dev/null
+++ b/docs/integrations/block-integrations/github/checks.md
@@ -0,0 +1,90 @@
+# GitHub Checks
+<!-- MANUAL: file_description -->
+Blocks for creating and updating GitHub check runs, enabling custom CI integration and detailed status reporting on commits and pull requests.
+<!-- END MANUAL -->
+
+## Github Create Check Run
+
+### What it is
+Creates a new check run for a specific commit in a GitHub repository
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a new check run associated with a specific commit using the GitHub Checks API. Check runs represent individual test suites, linting tools, or other CI processes that report status against commits or pull requests.
+
+You specify the commit SHA, check name, and current status. For completed checks, provide a conclusion (success, failure, or neutral) and optional detailed output including title, summary, and extended text for rich reporting in the GitHub UI.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo_url | URL of the GitHub repository | str | Yes |
+| name | The name of the check run (e.g., 'code-coverage') | str | Yes |
+| head_sha | The SHA of the commit to check | str | Yes |
+| status | Current status of the check run | "queued" \| "in_progress" \| "completed" \| "waiting" \| "requested" \| "pending" | No |
+| conclusion | The final conclusion of the check (required if status is completed) | "success" \| "failure" \| "neutral" \| "cancelled" \| "timed_out" \| "action_required" \| "skipped" | No |
+| details_url | The URL for the full details of the check | str | No |
+| output_title | Title of the check run output | str | No |
+| output_summary | Summary of the check run output | str | No |
+| output_text | Detailed text of the check run output | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if check run creation failed | str |
+| check_run | Details of the created check run | CheckRunResult |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Custom CI Integration**: Create check runs for external CI systems that aren't natively integrated with GitHub.
+
+**Code Quality Reporting**: Report linting, security scan, or test coverage results directly on commits and PRs.
+
+**Deployment Status**: Track deployment progress by creating check runs that show pending, in-progress, and completed states.
+<!-- END MANUAL -->
+
+---
+
+## Github Update Check Run
+
+### What it is
+Updates an existing check run in a GitHub repository
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block updates an existing check run's status, conclusion, and output details via the GitHub Checks API. Use it to report progress as your CI process advances through different stages.
+
+You can update the status from queued to in_progress to completed, and set the final conclusion when done. The output fields allow you to provide detailed results, annotations, and summaries visible in the GitHub UI.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo_url | URL of the GitHub repository | str | Yes |
+| check_run_id | The ID of the check run to update | int | Yes |
+| status | New status of the check run | "queued" \| "in_progress" \| "completed" \| "waiting" \| "requested" \| "pending" | Yes |
+| conclusion | The final conclusion of the check (required if status is completed) | "success" \| "failure" \| "neutral" \| "cancelled" \| "timed_out" \| "action_required" \| "skipped" | Yes |
+| output_title | New title of the check run output | str | No |
+| output_summary | New summary of the check run output | str | No |
+| output_text | New detailed text of the check run output | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| check_run | Details of the updated check run | CheckRunResult |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Progress Reporting**: Update check runs as your CI pipeline progresses through build, test, and deployment stages.
+
+**Real-Time Feedback**: Provide immediate feedback on pull requests as tests complete, rather than waiting for the entire suite.
+
+**Failure Details**: Update check runs with detailed error messages and output when tests fail.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/github/ci.md b/docs/integrations/block-integrations/github/ci.md
new file mode 100644
index 0000000000..8b8be57897
--- /dev/null
+++ b/docs/integrations/block-integrations/github/ci.md
@@ -0,0 +1,51 @@
+# GitHub CI
+<!-- MANUAL: file_description -->
+Blocks for retrieving CI check results from commits or pull requests, including overall status, pass/fail counts, and optional log searching.
+<!-- END MANUAL -->
+
+## Github Get CI Results
+
+### What it is
+This block gets CI results for a commit or PR, with optional search for specific errors/warnings in logs.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves CI check results for a specific commit or pull request using the GitHub Checks API. It aggregates results from all CI checks, providing an overall status summary along with individual check details.
+
+Optionally search through CI logs using regex patterns to find specific errors or warnings. You can filter by check name to focus on particular CI jobs. The block returns comprehensive results including pass/fail counts and matched log lines.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo | GitHub repository | str | Yes |
+| target | Commit SHA or PR number to get CI results for | str \| int | Yes |
+| search_pattern | Optional regex pattern to search for in CI logs (e.g., error messages, file names) | str | No |
+| check_name_filter | Optional filter for specific check names (supports wildcards) | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| check_run | Individual CI check run with details | Check Run |
+| check_runs | List of all CI check runs | List[CheckRunItem] |
+| matched_line | Line matching the search pattern with context | Matched Line |
+| matched_lines | All lines matching the search pattern across all checks | List[MatchedLine] |
+| overall_status | Overall CI status (pending, success, failure) | str |
+| overall_conclusion | Overall CI conclusion if completed | str |
+| total_checks | Total number of CI checks | int |
+| passed_checks | Number of passed checks | int |
+| failed_checks | Number of failed checks | int |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**CI Status Monitoring**: Check the overall CI status of commits or PRs before merging or deploying.
+
+**Error Diagnosis**: Search CI logs for specific error patterns to quickly identify why builds are failing.
+
+**Automated PR Validation**: Verify all required checks pass before automatically proceeding with merge or deployment workflows.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/github/issues.md b/docs/integrations/block-integrations/github/issues.md
new file mode 100644
index 0000000000..300eda5c5e
--- /dev/null
+++ b/docs/integrations/block-integrations/github/issues.md
@@ -0,0 +1,333 @@
+# GitHub Issues
+<!-- MANUAL: file_description -->
+Blocks for managing GitHub issues including creating, reading, listing, commenting, labeling, and assigning issues programmatically.
+<!-- END MANUAL -->
+
+## Github Add Label
+
+### What it is
+A block that adds a label to a GitHub issue or pull request for categorization and organization.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block takes the GitHub credentials, the URL of the issue or pull request, and the label to be added as inputs. It then sends a request to the GitHub API to add the label to the specified issue or pull request.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| issue_url | URL of the GitHub issue or pull request | str | Yes |
+| label | Label to add to the issue or pull request | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the label addition failed | str |
+| status | Status of the label addition operation | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Automatically categorizing issues based on their content or assigning priority labels to newly created issues.
+<!-- END MANUAL -->
+
+---
+
+## Github Assign Issue
+
+### What it is
+A block that assigns a GitHub user to an issue for task ownership and tracking.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block takes the GitHub credentials, the URL of the issue, and the username of the person to be assigned as inputs. It then sends a request to the GitHub API to assign the specified user to the issue.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| issue_url | URL of the GitHub issue | str | Yes |
+| assignee | Username to assign to the issue | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the issue assignment failed | str |
+| status | Status of the issue assignment operation | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Automatically assigning new issues to team members based on their expertise or workload.
+<!-- END MANUAL -->
+
+---
+
+## Github Comment
+
+### What it is
+A block that posts comments on GitHub issues or pull requests using the GitHub API.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block takes the GitHub credentials, the URL of the issue or pull request, and the comment text as inputs. It then sends a request to the GitHub API to post the comment on the specified issue or pull request.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| issue_url | URL of the GitHub issue or pull request | str | Yes |
+| comment | Comment to post on the issue or pull request | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the comment posting failed | str |
+| id | ID of the created comment | int |
+| url | URL to the comment on GitHub | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Automating responses to issues in a GitHub repository, such as thanking contributors for their submissions or providing status updates on reported bugs.
+<!-- END MANUAL -->
+
+---
+
+## Github List Comments
+
+### What it is
+A block that retrieves all comments from a GitHub issue or pull request, including comment metadata and content.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves all comments from a GitHub issue or pull request via the GitHub API. It authenticates using your GitHub credentials and fetches the complete comment history, returning both individual comments and a list of all comments with their metadata.
+
+Each comment includes the comment ID, body text, author username, and a direct URL to the comment on GitHub.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| issue_url | URL of the GitHub issue or pull request | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| comment | Comments with their ID, body, user, and URL | Comment |
+| comments | List of comments with their ID, body, user, and URL | List[CommentItem] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Conversation Analysis**: Extract all comments from an issue to analyze the discussion or generate a summary of the conversation.
+
+**Comment Monitoring**: Track all responses on specific issues to monitor team communication or customer feedback.
+
+**Audit Trails**: Collect comment history for compliance or documentation purposes.
+<!-- END MANUAL -->
+
+---
+
+## Github List Issues
+
+### What it is
+A block that retrieves a list of issues from a GitHub repository with their titles and URLs.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block takes the GitHub credentials and repository URL as inputs. It then sends a request to the GitHub API to fetch the list of issues and returns their details.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo_url | URL of the GitHub repository | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| issue | Issues with their title and URL | Issue |
+| issues | List of issues with their title and URL | List[IssueItem] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Creating a summary of open issues for a project status report or displaying them on a project management dashboard.
+<!-- END MANUAL -->
+
+---
+
+## Github Make Issue
+
+### What it is
+A block that creates new issues on GitHub repositories with a title and body content.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block takes the GitHub credentials, repository URL, issue title, and issue body as inputs. It then sends a request to the GitHub API to create a new issue with the provided information.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo_url | URL of the GitHub repository | str | Yes |
+| title | Title of the issue | str | Yes |
+| body | Body of the issue | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the issue creation failed | str |
+| number | Number of the created issue | int |
+| url | URL of the created issue | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Automatically creating issues for bug reports or feature requests submitted through an external system or form.
+<!-- END MANUAL -->
+
+---
+
+## Github Read Issue
+
+### What it is
+A block that retrieves information about a specific GitHub issue, including its title, body content, and creator.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block takes the GitHub credentials and the issue URL as inputs. It then sends a request to the GitHub API to fetch the issue's details and returns the relevant information.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| issue_url | URL of the GitHub issue | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if reading the issue failed | str |
+| title | Title of the issue | str |
+| body | Body of the issue | str |
+| user | User who created the issue | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Gathering information about reported issues for analysis or to display on a dashboard.
+<!-- END MANUAL -->
+
+---
+
+## Github Remove Label
+
+### What it is
+A block that removes a label from a GitHub issue or pull request.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block takes the GitHub credentials, the URL of the issue or pull request, and the label to be removed as inputs. It then sends a request to the GitHub API to remove the label from the specified issue or pull request.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| issue_url | URL of the GitHub issue or pull request | str | Yes |
+| label | Label to remove from the issue or pull request | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the label removal failed | str |
+| status | Status of the label removal operation | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Updating the status of issues as they progress through a workflow, such as removing a "In Progress" label when an issue is completed.
+<!-- END MANUAL -->
+
+---
+
+## Github Unassign Issue
+
+### What it is
+A block that removes a user's assignment from a GitHub issue.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block takes the GitHub credentials, the URL of the issue, and the username of the person to be unassigned as inputs. It then sends a request to the GitHub API to remove the specified user's assignment from the issue.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| issue_url | URL of the GitHub issue | str | Yes |
+| assignee | Username to unassign from the issue | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the issue unassignment failed | str |
+| status | Status of the issue unassignment operation | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Automatically unassigning issues that have been inactive for a certain period or when reassigning workload among team members.
+<!-- END MANUAL -->
+
+---
+
+## Github Update Comment
+
+### What it is
+A block that updates an existing comment on a GitHub issue or pull request.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block updates an existing comment on a GitHub issue or pull request. You can identify the comment to update using either the direct comment URL, or a combination of the issue URL and comment ID. The block sends a PATCH request to the GitHub API to replace the comment's content.
+
+The updated comment retains its original author and timestamp context while replacing the body text with your new content.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| comment_url | URL of the GitHub comment | str | No |
+| issue_url | URL of the GitHub issue or pull request | str | No |
+| comment_id | ID of the GitHub comment | str | No |
+| comment | Comment to update | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the comment update failed | str |
+| id | ID of the updated comment | int |
+| url | URL to the comment on GitHub | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Status Updates**: Modify a pinned status comment to reflect current progress on an issue.
+
+**Bot Maintenance**: Update automated bot comments with new information instead of creating duplicate comments.
+
+**Error Corrections**: Fix typos or incorrect information in previously posted comments.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/github/pull_requests.md b/docs/integrations/block-integrations/github/pull_requests.md
new file mode 100644
index 0000000000..dd5c194ea3
--- /dev/null
+++ b/docs/integrations/block-integrations/github/pull_requests.md
@@ -0,0 +1,233 @@
+# GitHub Pull Requests
+<!-- MANUAL: file_description -->
+Blocks for managing GitHub pull requests including creating, reading, listing PRs, and assigning or unassigning reviewers.
+<!-- END MANUAL -->
+
+## Github Assign PR Reviewer
+
+### What it is
+This block assigns a reviewer to a specified GitHub pull request.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block requests a code review from a specific user on a GitHub pull request. It uses the GitHub API to add the specified username to the list of requested reviewers, triggering a notification to that user.
+
+The reviewer must have access to the repository. Organization members can typically be assigned as reviewers on any repository they have at least read access to.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| pr_url | URL of the GitHub pull request | str | Yes |
+| reviewer | Username of the reviewer to assign | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the reviewer assignment failed | str |
+| status | Status of the reviewer assignment operation | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Automated Code Review Assignment**: Automatically assign reviewers based on the files changed or the PR author.
+
+**Round-Robin Reviews**: Distribute code review load evenly across team members.
+
+**Expertise-Based Routing**: Assign reviewers who are experts in the specific area of code being modified.
+<!-- END MANUAL -->
+
+---
+
+## Github List PR Reviewers
+
+### What it is
+This block lists all reviewers for a specified GitHub pull request.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves the list of requested reviewers for a GitHub pull request. It queries the GitHub API to fetch all users who have been requested to review the PR, returning their usernames and profile URLs.
+
+This includes both pending review requests and users who have already submitted reviews.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| pr_url | URL of the GitHub pull request | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if listing reviewers failed | str |
+| reviewer | Reviewers with their username and profile URL | Reviewer |
+| reviewers | List of reviewers with their username and profile URL | List[ReviewerItem] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Review Status Monitoring**: Check which reviewers have been assigned to a PR and send reminders to those who haven't responded.
+
+**Workflow Validation**: Verify that required reviewers have been assigned before a PR can be merged.
+
+**Team Dashboard**: Display reviewer assignments across multiple PRs for team visibility.
+<!-- END MANUAL -->
+
+---
+
+## Github List Pull Requests
+
+### What it is
+This block lists all pull requests for a specified GitHub repository.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block fetches all open pull requests from a GitHub repository. It queries the GitHub API and returns a list of PRs with their titles and URLs, outputting both individual PRs and a complete list.
+
+The block returns open pull requests by default, allowing you to monitor pending code changes in a repository.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo_url | URL of the GitHub repository | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if listing pull requests failed | str |
+| pull_request | PRs with their title and URL | Pull Request |
+| pull_requests | List of pull requests with their title and URL | List[PRItem] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**PR Dashboard**: Create a dashboard showing all open pull requests across your repositories.
+
+**Merge Queue Monitoring**: Track pending PRs to prioritize code reviews and identify bottlenecks.
+
+**Stale PR Detection**: List PRs to identify those that have been open too long and need attention.
+<!-- END MANUAL -->
+
+---
+
+## Github Make Pull Request
+
+### What it is
+This block creates a new pull request on a specified GitHub repository.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a new pull request on a GitHub repository. It uses the GitHub API to submit a PR from your source branch (head) to the target branch (base), with the specified title and description.
+
+For cross-repository PRs, format the head branch as "username:branch". The branches must exist and have divergent commits for the PR to be created successfully.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo_url | URL of the GitHub repository | str | Yes |
+| title | Title of the pull request | str | Yes |
+| body | Body of the pull request | str | Yes |
+| head | The name of the branch where your changes are implemented. For cross-repository pull requests in the same network, namespace head with a user like this: username:branch. | str | Yes |
+| base | The name of the branch you want the changes pulled into. | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the pull request creation failed | str |
+| number | Number of the created pull request | int |
+| url | URL of the created pull request | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Automated Releases**: Create PRs automatically when a release branch is ready to merge to main.
+
+**Dependency Updates**: Programmatically create PRs for dependency updates after testing passes.
+
+**Feature Flags**: Automatically create PRs to enable feature flags in configuration files.
+<!-- END MANUAL -->
+
+---
+
+## Github Read Pull Request
+
+### What it is
+This block reads the body, title, user, and changes of a specified GitHub pull request.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block reads the details of a GitHub pull request including its title, description, author, and optionally the code diff. It fetches this information via the GitHub API using your credentials.
+
+When include_pr_changes is enabled, the block also retrieves the full diff of all changes in the PR, which can be useful for code review automation or analysis.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| pr_url | URL of the GitHub pull request | str | Yes |
+| include_pr_changes | Whether to include the changes made in the pull request | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if reading the pull request failed | str |
+| title | Title of the pull request | str |
+| body | Body of the pull request | str |
+| author | User who created the pull request | str |
+| changes | Changes made in the pull request | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Automated Code Review**: Read PR content and changes to perform automated code analysis or send to AI for review.
+
+**Changelog Generation**: Extract PR titles and descriptions to automatically compile release notes.
+
+**PR Summarization**: Read PR details to generate summaries for stakeholder updates.
+<!-- END MANUAL -->
+
+---
+
+## Github Unassign PR Reviewer
+
+### What it is
+This block unassigns a reviewer from a specified GitHub pull request.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block removes a reviewer from a GitHub pull request's review request list. It uses the GitHub API to remove the specified user from pending reviewers, which stops further review notifications to that user.
+
+This is useful for reassigning reviews or removing reviewers who are unavailable.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| pr_url | URL of the GitHub pull request | str | Yes |
+| reviewer | Username of the reviewer to unassign | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the reviewer unassignment failed | str |
+| status | Status of the reviewer unassignment operation | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Reviewer Reassignment**: Remove unavailable reviewers and replace them with available team members.
+
+**Load Balancing**: Unassign reviewers who have too many pending reviews.
+
+**Vacation Coverage**: Automatically remove reviewers who are out of office.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/github/repo.md b/docs/integrations/block-integrations/github/repo.md
new file mode 100644
index 0000000000..c68f138dba
--- /dev/null
+++ b/docs/integrations/block-integrations/github/repo.md
@@ -0,0 +1,467 @@
+# GitHub Repo
+<!-- MANUAL: file_description -->
+Blocks for managing GitHub repositories, branches, files, and repository metadata.
+<!-- END MANUAL -->
+
+## Github Create File
+
+### What it is
+This block creates a new file in a GitHub repository.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a new file in a GitHub repository using the GitHub Contents API. It commits the file with the specified content to the chosen branch (or the default branch if not specified).
+
+The commit message can be customized, and the block returns the URL of the created file along with the commit SHA for tracking purposes.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo_url | URL of the GitHub repository | str | Yes |
+| file_path | Path where the file should be created | str | Yes |
+| content | Content to write to the file | str | Yes |
+| branch | Branch where the file should be created | str | No |
+| commit_message | Message for the commit | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the file creation failed | str |
+| url | URL of the created file | str |
+| sha | SHA of the commit | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Configuration Deployment**: Automatically add configuration files to repositories during project setup.
+
+**Documentation Generation**: Create markdown files or documentation pages programmatically.
+
+**Template Deployment**: Add boilerplate files like LICENSE, .gitignore, or CI configs to repositories.
+<!-- END MANUAL -->
+
+---
+
+## Github Create Repository
+
+### What it is
+This block creates a new GitHub repository.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a new GitHub repository under your account using the GitHub API. You can configure visibility (public/private), add a description, and optionally initialize with a README and .gitignore file based on common templates.
+
+The block returns both the web URL for viewing the repository and the clone URL for git operations.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| name | Name of the repository to create | str | Yes |
+| description | Description of the repository | str | No |
+| private | Whether the repository should be private | bool | No |
+| auto_init | Whether to initialize the repository with a README | bool | No |
+| gitignore_template | Git ignore template to use (e.g., Python, Node, Java) | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the repository creation failed | str |
+| url | URL of the created repository | str |
+| clone_url | Git clone URL of the repository | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Project Bootstrapping**: Automatically create repositories with standard configuration when starting new projects.
+
+**Template Deployment**: Create pre-configured repositories from templates for team members.
+
+**Automated Workflows**: Generate repositories programmatically as part of onboarding or project management workflows.
+<!-- END MANUAL -->
+
+---
+
+## Github Delete Branch
+
+### What it is
+This block deletes a specified branch.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block deletes a specified branch from a GitHub repository using the GitHub References API. The branch is permanently removed, so use with caution—this cannot be undone without re-pushing the branch.
+
+Protected branches cannot be deleted unless protection rules are first removed.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo_url | URL of the GitHub repository | str | Yes |
+| branch | Name of the branch to delete | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the branch deletion failed | str |
+| status | Status of the branch deletion operation | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Post-Merge Cleanup**: Automatically delete feature branches after they've been merged.
+
+**Stale Branch Management**: Clean up old or abandoned branches to keep the repository tidy.
+
+**CI/CD Automation**: Delete temporary branches created during build or deployment processes.
+<!-- END MANUAL -->
+
+---
+
+## Github List Branches
+
+### What it is
+This block lists all branches for a specified GitHub repository.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves all branches from a GitHub repository. It queries the GitHub API and returns each branch with its name and a URL to browse the files at that branch.
+
+This provides visibility into all development streams in a repository.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo_url | URL of the GitHub repository | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| branch | Branches with their name and file tree browser URL | Branch |
+| branches | List of branches with their name and file tree browser URL | List[BranchItem] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Branch Inventory**: Create a dashboard showing all active branches across repositories.
+
+**Naming Convention Validation**: Check branch names against team conventions.
+
+**Active Development Tracking**: Monitor which branches exist to track parallel development efforts.
+<!-- END MANUAL -->
+
+---
+
+## Github List Discussions
+
+### What it is
+This block lists recent discussions for a specified GitHub repository.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block fetches recent discussions from a GitHub repository using the GitHub GraphQL API. Discussions are a forum-style feature for community conversations separate from issues and PRs.
+
+You can limit the number of discussions retrieved with the num_discussions parameter.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo_url | URL of the GitHub repository | str | Yes |
+| num_discussions | Number of discussions to fetch | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if listing discussions failed | str |
+| discussion | Discussions with their title and URL | Discussion |
+| discussions | List of discussions with their title and URL | List[DiscussionItem] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Community Monitoring**: Track community discussions to identify popular topics or user concerns.
+
+**Q&A Automation**: Monitor discussions for questions that can be answered automatically.
+
+**Content Aggregation**: Collect discussion topics for community newsletters or summaries.
+<!-- END MANUAL -->
+
+---
+
+## Github List Releases
+
+### What it is
+This block lists all releases for a specified GitHub repository.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves all releases from a GitHub repository. Releases are versioned packages of your software that may include release notes, binaries, and source code archives.
+
+The block returns release information including names and URLs, outputting both individual releases and a complete list.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo_url | URL of the GitHub repository | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| release | Releases with their name and file tree browser URL | Release |
+| releases | List of releases with their name and file tree browser URL | List[ReleaseItem] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Version Tracking**: Monitor releases across dependencies to stay current with updates.
+
+**Changelog Compilation**: Gather release information for documentation or announcement purposes.
+
+**Dependency Monitoring**: Track when new versions of libraries your project depends on are released.
+<!-- END MANUAL -->
+
+---
+
+## Github List Stargazers
+
+### What it is
+This block lists all users who have starred a specified GitHub repository.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves the list of users who have starred a GitHub repository. Stars are a way for users to bookmark or show appreciation for repositories.
+
+Each stargazer entry includes their username and a link to their GitHub profile.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo_url | URL of the GitHub repository | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if listing stargazers failed | str |
+| stargazer | Stargazers with their username and profile URL | Stargazer |
+| stargazers | List of stargazers with their username and profile URL | List[StargazerItem] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Community Engagement**: Identify and thank users who have starred your repository.
+
+**Growth Analytics**: Track repository popularity over time by monitoring star growth.
+
+**User Research**: Analyze who is interested in your project based on their profiles.
+<!-- END MANUAL -->
+
+---
+
+## Github List Tags
+
+### What it is
+This block lists all tags for a specified GitHub repository.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves all git tags from a GitHub repository. Tags are typically used to mark release points or significant milestones in the repository history.
+
+Each tag includes its name and a URL to browse the repository files at that tag.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo_url | URL of the GitHub repository | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| tag | Tags with their name and file tree browser URL | Tag |
+| tags | List of tags with their name and file tree browser URL | List[TagItem] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Version Enumeration**: List all versions of a project to check for available updates.
+
+**Release Verification**: Confirm that tags exist for expected release versions.
+
+**Historical Code Access**: Find tags to access the codebase at specific historical points.
+<!-- END MANUAL -->
+
+---
+
+## Github Make Branch
+
+### What it is
+This block creates a new branch from a specified source branch.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a new branch in a GitHub repository based on an existing source branch. It uses the GitHub References API to create a new ref pointing to the same commit as the source branch.
+
+The new branch immediately contains all the code from the source branch at the time of creation.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo_url | URL of the GitHub repository | str | Yes |
+| new_branch | Name of the new branch | str | Yes |
+| source_branch | Name of the source branch | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the branch creation failed | str |
+| status | Status of the branch creation operation | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Feature Branch Creation**: Automatically create feature branches from main when work begins.
+
+**Release Preparation**: Create release branches from development when ready to stabilize.
+
+**Hotfix Workflows**: Quickly create hotfix branches from production for urgent fixes.
+<!-- END MANUAL -->
+
+---
+
+## Github Read File
+
+### What it is
+This block reads the content of a specified file from a GitHub repository.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block reads the contents of a file from a GitHub repository using the Contents API. You can specify which branch to read from, defaulting to the repository's default branch.
+
+The block returns both the decoded text content (for text files) and the raw base64-encoded content, along with the file size.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo_url | URL of the GitHub repository | str | Yes |
+| file_path | Path to the file in the repository | str | Yes |
+| branch | Branch to read from | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| text_content | Content of the file (decoded as UTF-8 text) | str |
+| raw_content | Raw base64-encoded content of the file | str |
+| size | The size of the file (in bytes) | int |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Configuration Reading**: Fetch configuration files from repositories for processing or validation.
+
+**Code Analysis**: Read source files for automated analysis, linting, or documentation generation.
+
+**Version Comparison**: Compare file contents across different branches or versions.
+<!-- END MANUAL -->
+
+---
+
+## Github Read Folder
+
+### What it is
+This block reads the content of a specified folder from a GitHub repository.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block lists the contents of a folder in a GitHub repository. It returns separate outputs for files and directories found in the specified path, allowing you to explore the repository structure.
+
+You can specify which branch to read from; it defaults to master if not specified.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo_url | URL of the GitHub repository | str | Yes |
+| folder_path | Path to the folder in the repository | str | Yes |
+| branch | Branch name to read from (defaults to master) | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if reading the folder failed | str |
+| file | Files in the folder | FileEntry |
+| dir | Directories in the folder | DirEntry |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Repository Exploration**: Browse repository structure to understand project organization.
+
+**File Discovery**: Find specific file types in directories for batch processing.
+
+**Directory Monitoring**: Check for expected files in specific locations.
+<!-- END MANUAL -->
+
+---
+
+## Github Update File
+
+### What it is
+This block updates an existing file in a GitHub repository.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block updates an existing file in a GitHub repository using the Contents API. It creates a new commit with the updated file content. The block automatically handles the required SHA of the existing file.
+
+You can customize the commit message and specify which branch to update.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo_url | URL of the GitHub repository | str | Yes |
+| file_path | Path to the file to update | str | Yes |
+| content | New content for the file | str | Yes |
+| branch | Branch containing the file | str | No |
+| commit_message | Message for the commit | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| url | URL of the updated file | str |
+| sha | SHA of the commit | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Configuration Updates**: Programmatically update configuration files in repositories.
+
+**Version Bumping**: Automatically update version numbers in package files.
+
+**Documentation Sync**: Update documentation files based on code changes.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/github/reviews.md b/docs/integrations/block-integrations/github/reviews.md
new file mode 100644
index 0000000000..fac3818b6c
--- /dev/null
+++ b/docs/integrations/block-integrations/github/reviews.md
@@ -0,0 +1,245 @@
+# GitHub Reviews
+<!-- MANUAL: file_description -->
+Blocks for creating and managing GitHub pull request reviews and review comments.
+<!-- END MANUAL -->
+
+## Github Create Comment Object
+
+### What it is
+Creates a comment object for use with GitHub blocks. Note: For review comments, only path, body, and position are used. Side fields are only for standalone PR comments.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a structured comment object that can be used with GitHub review blocks. It formats the comment data according to GitHub API requirements, including file path, body text, and position information.
+
+For review comments, only path, body, and position fields are used. The side, start_line, and start_side fields are only applicable for standalone PR comments, not review comments.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| path | The file path to comment on | str | Yes |
+| body | The comment text | str | Yes |
+| position | Position in the diff (line number from first @@ hunk). Use this OR line. | int | No |
+| line | Line number in the file (will be used as position if position not provided) | int | No |
+| side | Side of the diff to comment on (NOTE: Only for standalone comments, not review comments) | str | No |
+| start_line | Start line for multi-line comments (NOTE: Only for standalone comments, not review comments) | int | No |
+| start_side | Side for the start of multi-line comments (NOTE: Only for standalone comments, not review comments) | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| comment_object | The comment object formatted for GitHub API | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Automated Code Review**: Generate comment objects for automated review systems that analyze code changes.
+
+**Batch Comments**: Create multiple comment objects to submit together in a single review.
+
+**Template Responses**: Build reusable comment templates for common code review feedback patterns.
+<!-- END MANUAL -->
+
+---
+
+## Github Create PR Review
+
+### What it is
+This block creates a review on a GitHub pull request with optional inline comments. You can create it as a draft or post immediately. Note: For inline comments, 'position' should be the line number in the diff (starting from the first @@ hunk header).
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a code review on a GitHub pull request using the Reviews API. Reviews can include a summary comment and optionally inline comments on specific lines of code in the diff.
+
+You can create reviews as drafts (pending) for later submission, or post them immediately with an action: COMMENT for neutral feedback, APPROVE to approve the changes, or REQUEST_CHANGES to block merging until addressed.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo | GitHub repository | str | Yes |
+| pr_number | Pull request number | int | Yes |
+| body | Body of the review comment | str | Yes |
+| event | The review action to perform | "COMMENT" \| "APPROVE" \| "REQUEST_CHANGES" | No |
+| create_as_draft | Create the review as a draft (pending) or post it immediately | bool | No |
+| comments | Optional inline comments to add to specific files/lines. Note: Only path, body, and position are supported. Position is line number in diff from first @@ hunk. | List[ReviewComment] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the review creation failed | str |
+| review_id | ID of the created review | int |
+| state | State of the review (e.g., PENDING, COMMENTED, APPROVED, CHANGES_REQUESTED) | str |
+| html_url | URL of the created review | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Automated Code Review**: Submit AI-generated code reviews with inline comments on specific lines.
+
+**Review Workflows**: Create structured reviews as part of automated CI/CD pipelines.
+
+**Approval Automation**: Automatically approve PRs that pass all automated checks and criteria.
+<!-- END MANUAL -->
+
+---
+
+## Github Get PR Review Comments
+
+### What it is
+This block gets all review comments from a GitHub pull request or from a specific review.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves review comments from a GitHub pull request. Review comments are inline comments made on specific lines of code during code review, distinct from general issue-style comments.
+
+You can get all review comments on the PR, or filter to comments from a specific review by providing the review ID. Each comment includes metadata like the file path, line number, author, and comment body.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo | GitHub repository | str | Yes |
+| pr_number | Pull request number | int | Yes |
+| review_id | ID of a specific review to get comments from (optional) | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| comment | Individual review comment with details | Comment |
+| comments | List of all review comments on the pull request | List[CommentItem] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Review Analysis**: Extract all review comments to analyze feedback patterns or generate summaries.
+
+**Comment Tracking**: Monitor which review feedback has been addressed by comparing comments to code changes.
+
+**Documentation**: Collect review discussions for documentation or knowledge base purposes.
+<!-- END MANUAL -->
+
+---
+
+## Github List PR Reviews
+
+### What it is
+This block lists all reviews for a specified GitHub pull request.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves all reviews submitted on a GitHub pull request. It returns information about each review including the reviewer, their verdict (approve, request changes, or comment), and the review body.
+
+Use this to check approval status, see who has reviewed, or analyze the review history of a pull request.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo | GitHub repository | str | Yes |
+| pr_number | Pull request number | int | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| review | Individual review with details | Review |
+| reviews | List of all reviews on the pull request | List[ReviewItem] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Approval Status Check**: Verify that required reviewers have approved before proceeding with merge.
+
+**Review Metrics**: Track review participation and response times across team members.
+
+**Merge Readiness**: Check review states to determine if a PR meets merge requirements.
+<!-- END MANUAL -->
+
+---
+
+## Github Resolve Review Discussion
+
+### What it is
+This block resolves or unresolves a review discussion thread on a GitHub pull request.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block resolves or unresolves a review discussion thread on a GitHub pull request using the GraphQL API. Resolved discussions are collapsed in the GitHub UI, indicating the feedback has been addressed.
+
+Specify the comment ID of the thread to resolve. Set resolve to true to mark as resolved, or false to reopen the discussion.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo | GitHub repository | str | Yes |
+| pr_number | Pull request number | int | Yes |
+| comment_id | ID of the review comment to resolve/unresolve | int | Yes |
+| resolve | Whether to resolve (true) or unresolve (false) the discussion | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the operation was successful | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Automated Resolution**: Mark discussions as resolved when automated systems verify the feedback was addressed.
+
+**Review Cleanup**: Bulk resolve outdated discussions that no longer apply after significant refactoring.
+
+**Review Management**: Programmatically manage discussion states as part of review workflows.
+<!-- END MANUAL -->
+
+---
+
+## Github Submit Pending Review
+
+### What it is
+This block submits a pending (draft) review on a GitHub pull request.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block submits a pending (draft) review on a GitHub pull request. Draft reviews allow you to compose multiple inline comments before publishing them together as a cohesive review.
+
+When submitting, choose the review event: COMMENT for general feedback, APPROVE to approve the PR, or REQUEST_CHANGES to request modifications before merging.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo | GitHub repository | str | Yes |
+| pr_number | Pull request number | int | Yes |
+| review_id | ID of the pending review to submit | int | Yes |
+| event | The review action to perform when submitting | "COMMENT" \| "APPROVE" \| "REQUEST_CHANGES" | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the review submission failed | str |
+| state | State of the submitted review | str |
+| html_url | URL of the submitted review | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Batch Review Submission**: Build up multiple comments in a draft, then submit them all at once.
+
+**Review Finalization**: Complete the review process after adding all inline comments and deciding on the verdict.
+
+**Two-Phase Review**: Create draft reviews for internal review before officially submitting to the PR author.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/github/statuses.md b/docs/integrations/block-integrations/github/statuses.md
new file mode 100644
index 0000000000..e1d5656ac4
--- /dev/null
+++ b/docs/integrations/block-integrations/github/statuses.md
@@ -0,0 +1,45 @@
+# GitHub Statuses
+<!-- MANUAL: file_description -->
+Blocks for creating and managing GitHub commit statuses for CI/CD integration.
+<!-- END MANUAL -->
+
+## Github Create Status
+
+### What it is
+Creates a new commit status in a GitHub repository
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a commit status using the GitHub Status API. Commit statuses are simpler than check runs and appear as colored indicators (pending yellow, success green, failure red, error red) on commits and pull requests.
+
+Provide a context label to differentiate this status from others, an optional target URL for detailed results, and a description. Multiple statuses can exist on the same commit with different context labels.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo_url | URL of the GitHub repository | str | Yes |
+| sha | The SHA of the commit to set status for | str | Yes |
+| state | The state of the status (error, failure, pending, success) | "error" \| "failure" \| "pending" \| "success" | Yes |
+| target_url | URL with additional details about this status | str | No |
+| description | Short description of the status | str | No |
+| check_name | Label to differentiate this status from others | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| status | Details of the created status | StatusResult |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**External CI Integration**: Report build status from CI systems that don't have native GitHub integration.
+
+**Deployment Tracking**: Set commit statuses to indicate deployment state (pending, deployed, failed).
+
+**Required Status Checks**: Create statuses that GitHub branch protection rules require before merging.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/github/triggers.md b/docs/integrations/block-integrations/github/triggers.md
new file mode 100644
index 0000000000..11e83b5ee4
--- /dev/null
+++ b/docs/integrations/block-integrations/github/triggers.md
@@ -0,0 +1,230 @@
+# GitHub Triggers
+<!-- MANUAL: file_description -->
+Blocks for triggering workflows from GitHub webhook events like pull requests, issues, releases, and stars.
+<!-- END MANUAL -->
+
+## Github Discussion Trigger
+
+### What it is
+This block triggers on GitHub Discussions events. Great for syncing Q&A to Discord or auto-responding to common questions. Note: Discussions must be enabled on the repository.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a webhook subscription to GitHub Discussions events using the GitHub Webhooks API. When a discussion event occurs (created, edited, answered, etc.), GitHub sends a webhook payload that triggers your workflow.
+
+The block parses the webhook payload and extracts discussion details including the title, body, category, state, and the user who triggered the event. Note that GitHub Discussions must be enabled on the repository.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo | Repository to subscribe to.  **Note:** Make sure your GitHub credentials have permissions to create webhooks on this repo. | str | Yes |
+| events | The discussion events to subscribe to | Events | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the payload could not be processed | str |
+| payload | The complete webhook payload that was received from GitHub. Includes information about the affected resource (e.g. pull request), the event, and the user who triggered the event. | Dict[str, Any] |
+| triggered_by_user | Object representing the GitHub user who triggered the event | Dict[str, Any] |
+| event | The discussion event that triggered the webhook | str |
+| number | The discussion number | int |
+| discussion | The full discussion object | Dict[str, Any] |
+| discussion_url | URL to the discussion | str |
+| title | The discussion title | str |
+| body | The discussion body | str |
+| category | The discussion category object | Dict[str, Any] |
+| category_name | Name of the category | str |
+| state | Discussion state | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Discord Sync**: Post new discussions to Discord channels to keep the community engaged across platforms.
+
+**Auto-Responder**: Automatically respond to common questions in discussions with helpful resources.
+
+**Q&A Routing**: Route discussion questions to the appropriate team members based on category or content.
+<!-- END MANUAL -->
+
+---
+
+## Github Issues Trigger
+
+### What it is
+This block triggers on GitHub issues events. Useful for automated triage, notifications, and welcoming first-time contributors.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a webhook subscription to GitHub Issues events. When an issue event occurs (opened, closed, labeled, assigned, etc.), GitHub sends a webhook payload that triggers your workflow.
+
+The block extracts issue details including the title, body, labels, assignees, state, and the user who triggered the event. Use this for automated triage, notifications, and issue management workflows.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo | Repository to subscribe to.  **Note:** Make sure your GitHub credentials have permissions to create webhooks on this repo. | str | Yes |
+| events | The issue events to subscribe to | Events | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the payload could not be processed | str |
+| payload | The complete webhook payload that was received from GitHub. Includes information about the affected resource (e.g. pull request), the event, and the user who triggered the event. | Dict[str, Any] |
+| triggered_by_user | Object representing the GitHub user who triggered the event | Dict[str, Any] |
+| event | The issue event that triggered the webhook (e.g., 'opened') | str |
+| number | The issue number | int |
+| issue | The full issue object | Dict[str, Any] |
+| issue_url | URL to the issue | str |
+| issue_title | The issue title | str |
+| issue_body | The issue body/description | str |
+| labels | List of labels on the issue | List[Any] |
+| assignees | List of assignees | List[Any] |
+| state | Issue state ('open' or 'closed') | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Automated Triage**: Automatically label new issues based on keywords in title or description.
+
+**Welcome Messages**: Send welcome messages to first-time contributors when they open their first issue.
+
+**Slack Notifications**: Post notifications to Slack when issues are opened or closed.
+<!-- END MANUAL -->
+
+---
+
+## Github Pull Request Trigger
+
+### What it is
+This block triggers on pull request events and outputs the event type and payload.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a webhook subscription to GitHub Pull Request events. When a PR event occurs (opened, closed, merged, review requested, etc.), GitHub sends a webhook payload that triggers your workflow.
+
+The block extracts PR details including the number, URL, and full pull request object. This enables automated code review, CI/CD pipelines, and notification workflows.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo | Repository to subscribe to.  **Note:** Make sure your GitHub credentials have permissions to create webhooks on this repo. | str | Yes |
+| events | The events to subscribe to | Events | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the payload could not be processed | str |
+| payload | The complete webhook payload that was received from GitHub. Includes information about the affected resource (e.g. pull request), the event, and the user who triggered the event. | Dict[str, Any] |
+| triggered_by_user | Object representing the GitHub user who triggered the event | Dict[str, Any] |
+| event | The PR event that triggered the webhook (e.g. 'opened') | str |
+| number | The number of the affected pull request | int |
+| pull_request | Object representing the affected pull request | Dict[str, Any] |
+| pull_request_url | The URL of the affected pull request | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Automated Code Review**: Trigger AI-powered code review when new PRs are opened.
+
+**CI/CD Automation**: Start builds and tests when PRs are created or updated.
+
+**Reviewer Assignment**: Automatically assign reviewers based on files changed or PR author.
+<!-- END MANUAL -->
+
+---
+
+## Github Release Trigger
+
+### What it is
+This block triggers on GitHub release events. Perfect for automating announcements to Discord, Twitter, or other platforms.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a webhook subscription to GitHub Release events. When a release event occurs (published, created, edited, etc.), GitHub sends a webhook payload that triggers your workflow.
+
+The block extracts release details including tag name, release name, release notes, prerelease flag, and associated assets. Use this to automate announcements and deployment workflows.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo | Repository to subscribe to.  **Note:** Make sure your GitHub credentials have permissions to create webhooks on this repo. | str | Yes |
+| events | The release events to subscribe to | Events | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the payload could not be processed | str |
+| payload | The complete webhook payload that was received from GitHub. Includes information about the affected resource (e.g. pull request), the event, and the user who triggered the event. | Dict[str, Any] |
+| triggered_by_user | Object representing the GitHub user who triggered the event | Dict[str, Any] |
+| event | The release event that triggered the webhook (e.g., 'published') | str |
+| release | The full release object | Dict[str, Any] |
+| release_url | URL to the release page | str |
+| tag_name | The release tag name (e.g., 'v1.0.0') | str |
+| release_name | Human-readable release name | str |
+| body | Release notes/description | str |
+| prerelease | Whether this is a prerelease | bool |
+| draft | Whether this is a draft release | bool |
+| assets | List of release assets/files | List[Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Release Announcements**: Post release announcements to Discord, Twitter, or Slack when new versions are published.
+
+**Changelog Distribution**: Automatically send release notes to mailing lists or documentation sites.
+
+**Deployment Triggers**: Initiate deployment workflows when releases are published.
+<!-- END MANUAL -->
+
+---
+
+## Github Star Trigger
+
+### What it is
+This block triggers on GitHub star events. Useful for celebrating milestones (e.g., 1k, 10k stars) or tracking engagement.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a webhook subscription to GitHub Star events. When someone stars or unstars your repository, GitHub sends a webhook payload that triggers your workflow.
+
+The block extracts star details including the timestamp, current star count, repository name, and the user who starred. Use this to track engagement and celebrate milestones.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| repo | Repository to subscribe to.  **Note:** Make sure your GitHub credentials have permissions to create webhooks on this repo. | str | Yes |
+| events | The star events to subscribe to | Events | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the payload could not be processed | str |
+| payload | The complete webhook payload that was received from GitHub. Includes information about the affected resource (e.g. pull request), the event, and the user who triggered the event. | Dict[str, Any] |
+| triggered_by_user | Object representing the GitHub user who triggered the event | Dict[str, Any] |
+| event | The star event that triggered the webhook ('created' or 'deleted') | str |
+| starred_at | ISO timestamp when the repo was starred (empty if deleted) | str |
+| stargazers_count | Current number of stars on the repository | int |
+| repository_name | Full name of the repository (owner/repo) | str |
+| repository_url | URL to the repository | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Milestone Celebrations**: Announce when your repository reaches star milestones (100, 1k, 10k stars).
+
+**Engagement Tracking**: Log star events to track repository popularity over time.
+
+**Thank You Messages**: Send personalized thank you messages to users who star your repository.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/google/calendar.md b/docs/integrations/block-integrations/google/calendar.md
new file mode 100644
index 0000000000..07d286ce6a
--- /dev/null
+++ b/docs/integrations/block-integrations/google/calendar.md
@@ -0,0 +1,94 @@
+# Google Calendar
+<!-- MANUAL: file_description -->
+Blocks for creating and reading events from Google Calendar.
+<!-- END MANUAL -->
+
+## Google Calendar Create Event
+
+### What it is
+This block creates a new event in Google Calendar with customizable parameters.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates events in Google Calendar via the Google Calendar API. It handles various event parameters including timing, location, guest invitations, Google Meet links, and recurring schedules. The block authenticates using your connected Google account credentials.
+
+When you specify guests, they receive email invitations (if notifications are enabled). The Google Meet option adds a video conference link to the event automatically.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| event_title | Title of the event | str | Yes |
+| location | Location of the event | str | No |
+| description | Description of the event | str | No |
+| timing | Specify when the event starts and ends | Timing | No |
+| calendar_id | Calendar ID (use 'primary' for your main calendar) | str | No |
+| guest_emails | Email addresses of guests to invite | List[str] | No |
+| send_notifications | Send email notifications to guests | bool | No |
+| add_google_meet | Include a Google Meet video conference link | bool | No |
+| recurrence | Whether the event repeats | Recurrence | No |
+| reminder_minutes | When to send reminders before the event | List[int] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| event_id | ID of the created event | str |
+| event_link | Link to view the event in Google Calendar | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Automated Meeting Scheduling**: Create calendar events when appointments are booked through a form or scheduling system.
+
+**Event Reminders**: Schedule events with custom reminder notifications for team deadlines or milestones.
+
+**Team Coordination**: Create recurring meetings with Google Meet links when onboarding new team members.
+<!-- END MANUAL -->
+
+---
+
+## Google Calendar Read Events
+
+### What it is
+Retrieves upcoming events from a Google Calendar with filtering options
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block fetches upcoming events from Google Calendar using the Calendar API. It retrieves events within a specified time range, with options to filter by search term or exclude declined events. Pagination support allows handling large numbers of events.
+
+Events are returned with details like title, time, location, and attendees. Use 'primary' as the calendar_id to access your main calendar.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| calendar_id | Calendar ID (use 'primary' for your main calendar) | str | No |
+| max_events | Maximum number of events to retrieve | int | No |
+| start_time | Retrieve events starting from this time | str (date-time) | No |
+| time_range_days | Number of days to look ahead for events | int | No |
+| search_term | Optional search term to filter events by | str | No |
+| page_token | Page token from previous request to get the next batch of events. You can use this if you have lots of events you want to process in a loop | str | No |
+| include_declined_events | Include events you've declined | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the request failed | str |
+| events | List of calendar events in the requested time range | List[CalendarEvent] |
+| event | One of the calendar events in the requested time range | CalendarEvent |
+| next_page_token | Token for retrieving the next page of events if more exist | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Daily Briefings**: Fetch today's events to generate a morning summary or prepare for upcoming meetings.
+
+**Schedule Conflicts**: Check for overlapping events before scheduling new appointments.
+
+**Meeting Preparation**: Retrieve upcoming meetings to pre-load relevant documents or send reminders.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/google/docs.md b/docs/integrations/block-integrations/google/docs.md
new file mode 100644
index 0000000000..b0bf16abc3
--- /dev/null
+++ b/docs/integrations/block-integrations/google/docs.md
@@ -0,0 +1,758 @@
+# Google Docs
+<!-- MANUAL: file_description -->
+Blocks for creating and editing Google Docs documents.
+<!-- END MANUAL -->
+
+## Google Docs Append Markdown
+
+### What it is
+Append Markdown content to the end of a Google Doc with full formatting - ideal for LLM/AI output
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block appends Markdown content to the end of a Google Doc and automatically converts it to native Google Docs formatting using the Google Docs API. It supports headers, bold, italic, links, lists, and code formatting.
+
+Set add_newline to true to insert a line break before the appended content. The document is returned for chaining with other document operations.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| document | Select a Google Doc to append to | Document | No |
+| markdown | Markdown content to append to the document | str | Yes |
+| add_newline | Add a newline before the appended content | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if operation failed | str |
+| result | Result of the append operation | Dict[str, Any] |
+| document | The document for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**AI Report Generation**: Append LLM-generated analysis or summaries to existing report documents with proper formatting.
+
+**Content Aggregation**: Continuously add formatted content from multiple sources to a running document.
+
+**Meeting Notes**: Append AI-transcribed and formatted meeting notes to shared team documents.
+<!-- END MANUAL -->
+
+---
+
+## Google Docs Append Plain Text
+
+### What it is
+Append plain text to the end of a Google Doc (no formatting applied)
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block appends unformatted text to the end of a Google Doc using the Google Docs API. Unlike the Markdown version, text is inserted exactly as provided without any formatting interpretation.
+
+The block finds the document's end index and inserts the text there, with an optional newline prefix. This is useful for log entries, raw data, or when formatting is handled elsewhere.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| document | Select a Google Doc to append to | Document | No |
+| text | Plain text to append (no formatting applied) | str | Yes |
+| add_newline | Add a newline before the appended text | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if append failed | str |
+| result | Result of the append operation | Dict[str, Any] |
+| document | The document for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Activity Logging**: Append timestamped log entries to document-based activity logs.
+
+**Data Capture**: Add raw data or transcript text that will be formatted later.
+
+**Simple Notes**: Quickly add text notes without worrying about formatting.
+<!-- END MANUAL -->
+
+---
+
+## Google Docs Create
+
+### What it is
+Create a new Google Doc
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a new Google Doc in the user's Google Drive using the Google Docs API. You specify a title for the document and optionally provide initial text content.
+
+The newly created document is returned with its ID and URL, allowing immediate access and chaining to other document operations like formatting or sharing.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| title | Title for the new document | str | Yes |
+| initial_content | Optional initial text content | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if creation failed | str |
+| document | The created document | GoogleDriveFile |
+| document_id | ID of the created document | str |
+| document_url | URL to open the document | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Report Templates**: Create new documents for each report cycle with standardized titles.
+
+**Dynamic Document Generation**: Generate personalized documents for customers or projects.
+
+**Workflow Automation**: Create documents as part of onboarding or project kickoff workflows.
+<!-- END MANUAL -->
+
+---
+
+## Google Docs Delete Content
+
+### What it is
+Delete a range of content from a Google Doc
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block removes content from a Google Doc by specifying start and end index positions using the Google Docs API. Index positions are 1-based (index 0 is reserved for a section break).
+
+Use the Get Structure block first to find the correct index positions for content you want to delete. The deletion operation shifts all subsequent content to fill the gap.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| document | Select a Google Doc | Document | No |
+| start_index | Start index of content to delete (must be >= 1, as index 0 is a section break) | int | Yes |
+| end_index | End index of content to delete | int | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if operation failed | str |
+| result | Result of delete operation | Dict[str, Any] |
+| document | The document for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Cleanup**: Remove outdated sections or placeholder text from templates.
+
+**Document Restructuring**: Delete sections as part of document reorganization workflows.
+
+**Revision Management**: Remove draft content before finalizing documents.
+<!-- END MANUAL -->
+
+---
+
+## Google Docs Export
+
+### What it is
+Export a Google Doc to PDF, Word, text, or other formats
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block exports a Google Doc to various formats (PDF, DOCX, ODT) using the Google Drive API's export functionality. The exported content is returned as base64-encoded data for binary formats.
+
+The export preserves document formatting as closely as possible in the target format. PDF exports are ideal for final distribution, while DOCX exports enable further editing in Microsoft Word.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| document | Select a Google Doc to export | Document | No |
+| format | Export format | "application/pdf" \| "application/vnd.openxmlformats-officedocument.wordprocessingml.document" \| "application/vnd.oasis.opendocument.text" \| "text/plain" \| "text/html" \| "application/epub+zip" \| "application/rtf" | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if export failed | str |
+| content | Exported content (base64 encoded for binary formats) | str |
+| mime_type | MIME type of exported content | str |
+| document | The document for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Report Distribution**: Export finalized reports as PDF for email distribution or archival.
+
+**Cross-Platform Sharing**: Export to Word format for recipients who don't use Google Docs.
+
+**Backup Creation**: Create periodic PDF exports of important documents for offline storage.
+<!-- END MANUAL -->
+
+---
+
+## Google Docs Find Replace Plain Text
+
+### What it is
+Find and replace plain text in a Google Doc (no formatting applied to replacement)
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block performs a find-and-replace operation across the entire Google Doc using the Google Docs API. It searches for all occurrences of the specified text and replaces them with the provided replacement text.
+
+The replacement preserves the surrounding formatting but does not apply any new formatting to the replacement text. Case-matching is configurable.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| document | Select a Google Doc | Document | No |
+| find_text | Plain text to find | str | Yes |
+| replace_text | Plain text to replace with (no formatting applied) | str | Yes |
+| match_case | Match case when finding text | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if operation failed | str |
+| result | Result with replacement count | Dict[str, Any] |
+| document | The document for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Template Population**: Replace placeholder tokens like {{NAME}} with actual values in document templates.
+
+**Batch Updates**: Update company names, dates, or other text across multiple documents.
+
+**Error Correction**: Fix common typos or outdated terminology across documents.
+<!-- END MANUAL -->
+
+---
+
+## Google Docs Format Text
+
+### What it is
+Apply formatting (bold, italic, color, etc.) to text in a Google Doc
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block applies text formatting to a specific range within a Google Doc using the Google Docs API. You specify start and end indexes and choose formatting options like bold, italic, underline, font size, and text color.
+
+Use the Get Structure block to identify the correct index positions. Multiple formatting options can be applied simultaneously in a single request.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| document | Select a Google Doc | Document | No |
+| start_index | Start index of text to format (must be >= 1, as index 0 is a section break) | int | Yes |
+| end_index | End index of text to format | int | Yes |
+| bold | Make text bold | bool | No |
+| italic | Make text italic | bool | No |
+| underline | Underline text | bool | No |
+| font_size | Font size in points (0 = no change) | int | No |
+| foreground_color | Text color as hex (e.g., #FF0000 for red) | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if operation failed | str |
+| result | Result of format operation | Dict[str, Any] |
+| document | The document for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Highlight Important Content**: Apply bold or color formatting to emphasize key findings or action items.
+
+**Conditional Formatting**: Format text based on workflow conditions (e.g., red for overdue items).
+
+**Document Styling**: Apply consistent formatting to generated content that matches brand guidelines.
+<!-- END MANUAL -->
+
+---
+
+## Google Docs Get Metadata
+
+### What it is
+Get metadata about a Google Doc
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves document metadata from a Google Doc using the Google Docs API. It returns information including the document title, unique ID, current revision ID, and the URL for accessing the document.
+
+This metadata is useful for tracking document versions, building document inventories, or generating links for sharing.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| document | Select a Google Doc | Document | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if operation failed | str |
+| title | Document title | str |
+| document_id | Document ID | str |
+| revision_id | Current revision ID | str |
+| document_url | URL to open the document | str |
+| document | The document for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Document Inventory**: Gather metadata from multiple documents for tracking and cataloging.
+
+**Version Monitoring**: Track revision IDs to detect when documents have been modified.
+
+**Link Generation**: Extract document URLs for sharing via email or other channels.
+<!-- END MANUAL -->
+
+---
+
+## Google Docs Get Structure
+
+### What it is
+Get document structure with index positions for precise editing operations
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block analyzes a Google Doc's structure and returns detailed information about content segments with their index positions using the Google Docs API. Use flat mode for a simple list of segments or detailed mode for full hierarchical structure.
+
+The index positions are essential for precise editing operations like formatting, deletion, or insertion at specific locations within the document.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| document | Select a Google Doc to analyze | Document | No |
+| detailed | Return full hierarchical structure instead of flat segments | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if operation failed | str |
+| segments | Flat list of content segments with indexes (when detailed=False) | List[Dict[str, Any]] |
+| structure | Full hierarchical document structure (when detailed=True) | Dict[str, Any] |
+| document | The document for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Position Discovery**: Find correct index positions before performing insert or delete operations.
+
+**Document Analysis**: Understand document structure for content extraction or manipulation.
+
+**Navigation Aid**: Map document sections to enable targeted content operations.
+<!-- END MANUAL -->
+
+---
+
+## Google Docs Insert Markdown At
+
+### What it is
+Insert formatted Markdown at a specific position in a Google Doc - ideal for LLM/AI output
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block inserts Markdown content at a specific index position within a Google Doc, converting the Markdown to native Google Docs formatting using the Google Docs API. Index 1 inserts at the document start.
+
+The Markdown parser handles headers, bold, italic, links, lists, and code formatting. This enables inserting AI-generated content with proper formatting at precise document locations.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| document | Select a Google Doc to insert into | Document | No |
+| markdown | Markdown content to insert | str | Yes |
+| index | Position index to insert at (1 = start of document) | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if operation failed | str |
+| result | Result of the insert operation | Dict[str, Any] |
+| document | The document for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Insertion**: Insert AI-generated sections at specific locations in templates.
+
+**Document Assembly**: Build documents by inserting formatted content blocks at designated positions.
+
+**Dynamic Reports**: Insert data-driven formatted content at specific sections of report templates.
+<!-- END MANUAL -->
+
+---
+
+## Google Docs Insert Page Break
+
+### What it is
+Insert a page break into a Google Doc
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block inserts a page break at a specified index position in a Google Doc using the Google Docs API. Setting index to 0 inserts at the end of the document.
+
+Page breaks force subsequent content to start on a new page, useful for separating document sections for printing or PDF generation.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| document | Select a Google Doc | Document | No |
+| index | Position to insert page break (0 = end of document) | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if operation failed | str |
+| result | Result of page break insertion | Dict[str, Any] |
+| document | The document for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Report Formatting**: Add page breaks between major sections of generated reports.
+
+**Print Preparation**: Insert page breaks to control page layout before PDF export.
+
+**Document Structure**: Separate document chapters or sections for better readability.
+<!-- END MANUAL -->
+
+---
+
+## Google Docs Insert Plain Text
+
+### What it is
+Insert plain text at a specific position in a Google Doc (no formatting applied)
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block inserts unformatted text at a specific index position within a Google Doc using the Google Docs API. Index 1 inserts at the document start.
+
+Unlike the Markdown insert, text is inserted exactly as provided without any formatting interpretation, preserving surrounding document formatting.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| document | Select a Google Doc to insert into | Document | No |
+| text | Plain text to insert (no formatting applied) | str | Yes |
+| index | Position index to insert at (1 = start of document) | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if insert failed | str |
+| result | Result of the insert operation | Dict[str, Any] |
+| document | The document for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Data Insertion**: Insert raw data values at specific positions in documents.
+
+**Template Variables**: Insert variable values at designated template positions.
+
+**Sequential Content**: Add text entries to specific locations in running documents.
+<!-- END MANUAL -->
+
+---
+
+## Google Docs Insert Table
+
+### What it is
+Insert a table into a Google Doc, optionally with content and Markdown formatting
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block inserts a table into a Google Doc at a specified position using the Google Docs API. You can create empty tables by specifying row/column counts, or provide a 2D array of cell content to create pre-populated tables.
+
+Cell content can optionally be formatted as Markdown, enabling rich formatting like bold headers or links within table cells.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| document | Select a Google Doc | Document | No |
+| rows | Number of rows (ignored if content provided) | int | No |
+| columns | Number of columns (ignored if content provided) | int | No |
+| content | Optional 2D array of cell content, e.g. [['Header1', 'Header2'], ['Row1Col1', 'Row1Col2']]. If provided, rows/columns are derived from this. | List[List[str]] | No |
+| index | Position to insert table (0 = end of document) | int | No |
+| format_as_markdown | Format cell content as Markdown (headers, bold, links, etc.) | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if operation failed | str |
+| result | Result of table insertion | Dict[str, Any] |
+| document | The document for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Data Presentation**: Insert tables to display structured data from APIs or databases.
+
+**Report Tables**: Add summary tables with metrics, comparisons, or status information.
+
+**Template Tables**: Create table structures that get populated with dynamic content.
+<!-- END MANUAL -->
+
+---
+
+## Google Docs Read
+
+### What it is
+Read text content from a Google Doc
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block extracts the plain text content from a Google Doc using the Google Docs API. It returns the document's text content without formatting information, along with the document title.
+
+Use this for content analysis, text processing, or feeding document content to AI models for summarization or other processing.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| document | Select a Google Doc to read | Document | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if read failed | str |
+| text | Plain text content of the document | str |
+| title | Document title | str |
+| document | The document for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Extraction**: Read document text for processing, analysis, or AI summarization.
+
+**Search and Index**: Extract text from documents for full-text search indexing.
+
+**Content Migration**: Read document content to transform or migrate to other systems.
+<!-- END MANUAL -->
+
+---
+
+## Google Docs Replace All With Markdown
+
+### What it is
+Replace entire Google Doc content with formatted Markdown - ideal for LLM/AI output
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block clears all existing content from a Google Doc and replaces it with new formatted Markdown content using the Google Docs API. The Markdown is converted to native Google Docs formatting.
+
+This is ideal for completely regenerating document content from AI-generated Markdown output.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| document | Select a Google Doc to replace content in | Document | No |
+| markdown | Markdown content to replace the document with | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if operation failed | str |
+| result | Result of the replace operation | Dict[str, Any] |
+| document | The document for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Document Regeneration**: Completely replace document content with newly generated AI output.
+
+**Content Refresh**: Update recurring documents with fresh content while preserving the document.
+
+**Template Reset**: Clear and repopulate template documents for new projects or periods.
+<!-- END MANUAL -->
+
+---
+
+## Google Docs Replace Content With Markdown
+
+### What it is
+Find text and replace it with formatted Markdown - ideal for LLM/AI output and templates
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block finds specific text (like a placeholder token) in a Google Doc and replaces it with formatted Markdown content using the Google Docs API. The Markdown is converted to native Google Docs formatting.
+
+Use this for template systems where placeholders like {{SECTION}} are replaced with AI-generated formatted content.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| document | Select a Google Doc | Document | No |
+| find_text | Text to find and replace (e.g., '{{PLACEHOLDER}}' or any text) | str | Yes |
+| markdown | Markdown content to replace the found text with | str | Yes |
+| match_case | Match case when finding text | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if operation failed | str |
+| result | Result with replacement count | Dict[str, Any] |
+| document | The document for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Smart Templates**: Replace placeholder tokens with AI-generated formatted content in templates.
+
+**Dynamic Sections**: Populate document sections with contextual formatted content.
+
+**Mail Merge Plus**: Advanced mail merge with formatted content replacement, not just plain text.
+<!-- END MANUAL -->
+
+---
+
+## Google Docs Replace Range With Markdown
+
+### What it is
+Replace a specific index range in a Google Doc with formatted Markdown - ideal for LLM/AI output
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block replaces content between specific start and end index positions with formatted Markdown content using the Google Docs API. The existing content in the range is deleted and replaced with the new formatted content.
+
+Use Get Structure to find the correct index positions. This enables precise replacement of specific document sections with new formatted content.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| document | Select a Google Doc | Document | No |
+| markdown | Markdown content to insert in place of the range | str | Yes |
+| start_index | Start index of the range to replace (must be >= 1) | int | Yes |
+| end_index | End index of the range to replace | int | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if operation failed | str |
+| result | Result of the replace operation | Dict[str, Any] |
+| document | The document for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Section Updates**: Replace specific document sections with updated content while preserving the rest.
+
+**Targeted Regeneration**: Regenerate specific portions of documents with new AI-generated content.
+
+**Incremental Updates**: Update identified sections of recurring reports without affecting other areas.
+<!-- END MANUAL -->
+
+---
+
+## Google Docs Set Public Access
+
+### What it is
+Make a Google Doc public or private
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block modifies the sharing permissions of a Google Doc using the Google Drive API to make it publicly accessible or private. You can set the access level to reader (view only) or commenter.
+
+When made public, anyone with the link can access the document according to the specified role. The share link is returned for distribution.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| document | Select a Google Doc | Document | No |
+| public | True to make public, False to make private | bool | No |
+| role | Permission role for public access | "reader" \| "commenter" | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if operation failed | str |
+| result | Result of the operation | Dict[str, Any] |
+| share_link | Link to the document | str |
+| document | The document for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Public Publishing**: Make finalized documents publicly accessible for broad distribution.
+
+**Access Toggle**: Automate switching document access based on workflow stages.
+
+**Link Sharing**: Generate shareable links for documents that don't require individual access grants.
+<!-- END MANUAL -->
+
+---
+
+## Google Docs Share
+
+### What it is
+Share a Google Doc with specific users
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block shares a Google Doc with specific users by email address using the Google Drive API. You can set the permission level (reader, writer, commenter) and optionally send a notification email with a custom message.
+
+Leave the email blank to just generate a shareable link. The block returns the share link for easy distribution.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| document | Select a Google Doc to share | Document | No |
+| email | Email address to share with. Leave empty for link sharing. | str | No |
+| role | Permission role for the user | "reader" \| "writer" \| "commenter" | No |
+| send_notification | Send notification email to the user | bool | No |
+| message | Optional message to include in notification email | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if share failed | str |
+| result | Result of the share operation | Dict[str, Any] |
+| share_link | Link to the document | str |
+| document | The document for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Automated Collaboration**: Share generated documents with stakeholders automatically after creation.
+
+**Workflow Notifications**: Share documents and notify recipients as part of approval workflows.
+
+**Client Delivery**: Share completed deliverables with clients including notification messages.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/google/gmail.md b/docs/integrations/block-integrations/google/gmail.md
new file mode 100644
index 0000000000..08d0a71a5b
--- /dev/null
+++ b/docs/integrations/block-integrations/google/gmail.md
@@ -0,0 +1,408 @@
+# Google Gmail
+<!-- MANUAL: file_description -->
+Blocks for reading, sending, and managing emails in Gmail.
+<!-- END MANUAL -->
+
+## Gmail Add Label
+
+### What it is
+A block that adds a label to a specific email message in Gmail, creating the label if it doesn't exist.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block first checks if the specified label exists in the user's Gmail account. If it doesn't, it creates the label. Then, it adds the label to the specified email message using the message ID.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| message_id | Message ID to add label to | str | Yes |
+| label_name | Label name to add | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | Label addition result | GmailLabelResult |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Automatically categorizing incoming customer emails based on their content, adding labels like "Urgent," "Feedback," or "Invoice" for easier processing.
+<!-- END MANUAL -->
+
+---
+
+## Gmail Create Draft
+
+### What it is
+Create draft emails in Gmail with automatic HTML detection and proper text formatting. Plain text drafts preserve natural paragraph flow without 78-character line wrapping. HTML content is automatically detected and formatted correctly.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a draft email in Gmail without sending it. The draft is saved to your Drafts folder where you can review and send it manually. The block automatically detects HTML content or you can explicitly set the content type.
+
+Plain text emails preserve natural formatting without forced line breaks. HTML emails support rich formatting. File attachments are supported by providing file paths.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| to | Recipient email addresses | List[str] | Yes |
+| subject | Email subject | str | Yes |
+| body | Email body (plain text or HTML) | str | Yes |
+| cc | CC recipients | List[str] | No |
+| bcc | BCC recipients | List[str] | No |
+| content_type | Content type: 'auto' (default - detects HTML), 'plain', or 'html' | "auto" \| "plain" \| "html" | No |
+| attachments | Files to attach | List[str (file)] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | Draft creation result | GmailDraftResult |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Email Review Workflow**: Create draft emails for human review before sending important communications.
+
+**Newsletter Preparation**: Build email drafts with dynamic content that can be finalized before distribution.
+
+**Template Saving**: Save email templates as drafts for quick access and reuse.
+<!-- END MANUAL -->
+
+---
+
+## Gmail Draft Reply
+
+### What it is
+Create draft replies to Gmail threads with automatic HTML detection and proper text formatting. Plain text draft replies maintain natural paragraph flow without 78-character line wrapping. HTML content is automatically detected and formatted correctly.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a draft reply within an existing email thread. The draft maintains proper threading so your reply appears in the conversation. Use replyAll to respond to all original recipients, or specify custom recipients.
+
+The block preserves the thread context and adds proper email headers for threading. Draft replies can be reviewed in Gmail before sending.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| threadId | Thread ID to reply in | str | Yes |
+| parentMessageId | ID of the message being replied to | str | Yes |
+| to | To recipients | List[str] | No |
+| cc | CC recipients | List[str] | No |
+| bcc | BCC recipients | List[str] | No |
+| replyAll | Reply to all original recipients | bool | No |
+| subject | Email subject | str | No |
+| body | Email body (plain text or HTML) | str | Yes |
+| content_type | Content type: 'auto' (default - detects HTML), 'plain', or 'html' | "auto" \| "plain" \| "html" | No |
+| attachments | Files to attach | List[str (file)] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| draftId | Created draft ID | str |
+| messageId | Draft message ID | str |
+| threadId | Thread ID | str |
+| status | Draft creation status | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Support Response Preparation**: Draft replies to customer inquiries for review before sending.
+
+**Approval Workflows**: Create reply drafts that require manager approval before being sent.
+
+**Scheduled Responses**: Prepare replies to be reviewed and sent at appropriate times.
+<!-- END MANUAL -->
+
+---
+
+## Gmail Forward
+
+### What it is
+Forward Gmail messages to other recipients with automatic HTML detection and proper formatting. Preserves original message threading and attachments.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block forwards an existing Gmail message to new recipients. The original message content is preserved and can include attachments from the original email. You can add your own message before the forwarded content.
+
+The block handles proper email threading and formatting, prepending "Fwd:" to the subject unless you specify a custom subject.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| messageId | ID of the message to forward | str | Yes |
+| to | Recipients to forward the message to | List[str] | Yes |
+| cc | CC recipients | List[str] | No |
+| bcc | BCC recipients | List[str] | No |
+| subject | Optional custom subject (defaults to 'Fwd: [original subject]') | str | No |
+| forwardMessage | Optional message to include before the forwarded content | str | No |
+| includeAttachments | Include attachments from the original message | bool | No |
+| content_type | Content type: 'auto' (default - detects HTML), 'plain', or 'html' | "auto" \| "plain" \| "html" | No |
+| additionalAttachments | Additional files to attach | List[str (file)] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| messageId | Forwarded message ID | str |
+| threadId | Thread ID | str |
+| status | Forward status | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Email Escalation**: Automatically forward emails matching certain criteria to managers or specialists.
+
+**Team Distribution**: Forward important updates to relevant team members based on content.
+
+**Record Keeping**: Forward copies of important communications to an archive address.
+<!-- END MANUAL -->
+
+---
+
+## Gmail Get Profile
+
+### What it is
+Get the authenticated user's Gmail profile details including email address and message statistics.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves profile information for the authenticated Gmail user via the Gmail API. It returns the email address, total message count, thread count, and storage usage statistics.
+
+This is useful for verifying which account is connected and gathering basic mailbox statistics.
+<!-- END MANUAL -->
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| profile | Gmail user profile information | Profile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Account Verification**: Confirm which Gmail account is connected before performing operations.
+
+**Usage Monitoring**: Check storage usage and message counts for mailbox management.
+
+**Multi-Account Workflows**: Get the current user's email address to route workflows appropriately.
+<!-- END MANUAL -->
+
+---
+
+## Gmail Get Thread
+
+### What it is
+A block that retrieves an entire Gmail thread (email conversation) by ID, returning all messages with decoded bodies for reading complete conversations.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves a complete Gmail thread (email conversation) by its thread ID. It returns all messages in the thread with decoded bodies, allowing you to read the full conversation history.
+
+The thread includes all messages, their senders, timestamps, and content, making it easy to analyze entire email conversations.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| threadId | Gmail thread ID | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| thread | Gmail thread with decoded message bodies | Thread |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Conversation Analysis**: Read an entire email thread to understand the full context of a discussion.
+
+**Reply Detection**: Check if a recipient has responded within a conversation thread.
+
+**Thread Summarization**: Gather all messages in a thread for AI-powered summarization.
+<!-- END MANUAL -->
+
+---
+
+## Gmail List Labels
+
+### What it is
+A block that retrieves all labels (categories) from a Gmail account for organizing and categorizing emails.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block connects to the user's Gmail account and requests a list of all labels. It then processes this information and returns a simplified list of label names and their corresponding IDs.
+<!-- END MANUAL -->
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | List of labels | List[Dict[str, Any]] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Creating a dashboard that shows an overview of how many emails are in each category or label in a business email account.
+<!-- END MANUAL -->
+
+---
+
+## Gmail Read
+
+### What it is
+A block that retrieves and reads emails from a Gmail account based on search criteria, returning detailed message information including subject, sender, body, and attachments.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block connects to the user's Gmail account using their credentials, performs a search based on the provided query, and retrieves the specified number of email messages. It then processes each email to extract relevant information and returns the results.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| query | Search query for reading emails | str | No |
+| max_results | Maximum number of emails to retrieve | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| email | Email data | Email |
+| emails | List of email data | List[Email] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Automatically checking for new customer inquiries in a support email inbox and organizing them for quick response.
+<!-- END MANUAL -->
+
+---
+
+## Gmail Remove Label
+
+### What it is
+A block that removes a label from a specific email message in a Gmail account.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block first finds the ID of the specified label in the user's Gmail account. If the label exists, it removes it from the specified email message using the message ID.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| message_id | Message ID to remove label from | str | Yes |
+| label_name | Label name to remove | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | Label removal result | GmailLabelResult |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Automatically removing the "Unread" label from emails after they have been processed by a customer service representative.
+<!-- END MANUAL -->
+
+---
+
+## Gmail Reply
+
+### What it is
+Reply to Gmail threads with automatic HTML detection and proper text formatting. Plain text replies maintain natural paragraph flow without 78-character line wrapping. HTML content is automatically detected and sent with correct MIME type.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block sends a reply directly within an existing Gmail thread. Unlike the draft reply block, this immediately sends the message. The reply maintains proper threading and appears in the conversation.
+
+Use replyAll to respond to all recipients, or specify custom recipients. The block handles email headers and threading automatically.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| threadId | Thread ID to reply in | str | Yes |
+| parentMessageId | ID of the message being replied to | str | Yes |
+| to | To recipients | List[str] | No |
+| cc | CC recipients | List[str] | No |
+| bcc | BCC recipients | List[str] | No |
+| replyAll | Reply to all original recipients | bool | No |
+| subject | Email subject | str | No |
+| body | Email body (plain text or HTML) | str | Yes |
+| content_type | Content type: 'auto' (default - detects HTML), 'plain', or 'html' | "auto" \| "plain" \| "html" | No |
+| attachments | Files to attach | List[str (file)] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| messageId | Sent message ID | str |
+| threadId | Thread ID | str |
+| message | Raw Gmail message object | Dict[str, Any] |
+| email | Parsed email object with decoded body and attachments | Email |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Auto-Acknowledgments**: Automatically send acknowledgment replies to incoming support requests.
+
+**Scheduled Follow-ups**: Reply to threads with follow-up messages at appropriate times.
+
+**Conversation Continuity**: Respond to ongoing threads while keeping all messages organized.
+<!-- END MANUAL -->
+
+---
+
+## Gmail Send
+
+### What it is
+Send emails via Gmail with automatic HTML detection and proper text formatting. Plain text emails are sent without 78-character line wrapping, preserving natural paragraph flow. HTML emails are automatically detected and sent with correct MIME type.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block authenticates with the user's Gmail account, creates an email message with the provided details (recipient, subject, and body), and then sends the email using Gmail's API.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| to | Recipient email addresses | List[str] | Yes |
+| subject | Email subject | str | Yes |
+| body | Email body (plain text or HTML) | str | Yes |
+| cc | CC recipients | List[str] | No |
+| bcc | BCC recipients | List[str] | No |
+| content_type | Content type: 'auto' (default - detects HTML), 'plain', or 'html' | "auto" \| "plain" \| "html" | No |
+| attachments | Files to attach | List[str (file)] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | Send confirmation | GmailSendResult |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Automatically sending confirmation emails to customers after they make a purchase on an e-commerce website.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/content/platform/blocks/google/sheet.md b/docs/integrations/block-integrations/google/sheet.md
similarity index 100%
rename from docs/content/platform/blocks/google/sheet.md
rename to docs/integrations/block-integrations/google/sheet.md
diff --git a/docs/integrations/block-integrations/google/sheets.md b/docs/integrations/block-integrations/google/sheets.md
new file mode 100644
index 0000000000..38393819e5
--- /dev/null
+++ b/docs/integrations/block-integrations/google/sheets.md
@@ -0,0 +1,1470 @@
+# Google Sheets
+<!-- MANUAL: file_description -->
+Blocks for creating, reading, and editing Google Sheets spreadsheets.
+<!-- END MANUAL -->
+
+## Google Sheets Add Column
+
+### What it is
+Add a new column with a header. Can add at the end or insert at a specific position.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block adds a new column to a Google Sheet with a specified header name. You can add the column at the end or insert it before a specific column position. If you provide a default value, all existing data rows will be populated with that value.
+
+The block uses the Google Sheets API to perform the insertion, shifting existing columns to the right when inserting in the middle.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+| sheet_name | Sheet name (optional, defaults to first sheet) | str | No |
+| header | Header name for the new column | str | Yes |
+| position | Where to add: 'end' for last column, or column letter (e.g., 'C') to insert before | str | No |
+| default_value | Default value to fill in all data rows (optional). Requires existing data rows. | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | Result of the operation | Dict[str, Any] |
+| column_letter | Letter of the new column (e.g., 'D') | str |
+| column_index | 0-based index of the new column | int |
+| spreadsheet | The spreadsheet for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Schema Evolution**: Add new data fields to existing tracking sheets as requirements change.
+
+**Status Tracking**: Add a "Status" or "Processed" column to mark items as they flow through a workflow.
+
+**Data Enhancement**: Add computed or lookup columns to enrich existing datasets.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Add Dropdown
+
+### What it is
+Add a dropdown list (data validation) to cells. Useful for enforcing valid inputs.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block adds data validation rules to a cell range using the Google Sheets API, creating dropdown menus with predefined options. You can enforce strict validation (reject invalid inputs) or show warnings for non-list values.
+
+The dropdown arrow appears in cells when enabled, providing users with a list of valid choices.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+| sheet_name | Sheet name (optional, defaults to first sheet) | str | No |
+| range | Cell range to add dropdown to (e.g., 'B2:B100') | str | Yes |
+| options | List of dropdown options | List[str] | Yes |
+| strict | Reject input not in the list | bool | No |
+| show_dropdown | Show dropdown arrow in cells | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | Result of the operation | Dict[str, Any] |
+| spreadsheet | The spreadsheet for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Status Tracking**: Add status dropdowns (Pending, In Progress, Complete) to task tracking sheets.
+
+**Data Entry Control**: Restrict input options to valid categories, departments, or product types.
+
+**Survey Forms**: Create structured input fields with predefined response options.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Add Note
+
+### What it is
+Add a note to a cell in a Google Sheet
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block adds a text note to a specific cell using the Google Sheets API. Notes appear when hovering over a cell and provide additional context without affecting cell values.
+
+Notes are useful for documentation, explanations, or audit trails that shouldn't modify the underlying data.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | The spreadsheet to add note to | Spreadsheet | No |
+| cell | Cell to add note to (e.g., A1, B2) | str | Yes |
+| note | Note text to add | str | Yes |
+| sheet_name | Name of the sheet. Defaults to first sheet. | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if operation failed | str |
+| result | Result of the operation | Dict[str, Any] |
+| spreadsheet | The spreadsheet for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Audit Trail**: Add notes documenting who modified data and when.
+
+**Data Documentation**: Explain calculation logic or data sources for specific cells.
+
+**Error Flagging**: Mark cells with notes explaining validation issues or anomalies.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Append Row
+
+### What it is
+Append or Add a single row to the end of a Google Sheet. The row is added after the last row with data.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block appends a new row to the end of a Google Sheet after the last row containing data. You provide values as a list that maps to columns in order. The value_input_option controls whether values are parsed (like formulas or dates) or stored as raw text.
+
+This is ideal for continuously adding records to a log or database-style sheet.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+| row | Row values to append (e.g., ['Alice', 'alice@example.com', '25']) | List[str] | Yes |
+| sheet_name | Sheet to append to (optional, defaults to first sheet) | str | No |
+| value_input_option | How values are interpreted. USER_ENTERED: parsed like typed input (e.g., '=SUM(A1:A5)' becomes a formula, '1/2/2024' becomes a date). RAW: stored as-is without parsing. | "RAW" \| "USER_ENTERED" | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | Append API response | Dict[str, Any] |
+| spreadsheet | The spreadsheet for chaining to other blocks | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Lead Capture**: Append new leads from forms or webhooks to a sales tracking sheet.
+
+**Event Logging**: Add timestamped entries to an activity log or audit trail.
+
+**Data Collection**: Continuously gather data points from sensors, APIs, or user submissions.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Batch Operations
+
+### What it is
+This block performs multiple operations on a Google Sheets spreadsheet in a single batch request.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block combines multiple spreadsheet operations into a single API call using the Google Sheets API's batch update functionality. This is more efficient than making separate calls for each operation.
+
+Operations execute in order and can include various actions like formatting, data validation, and protection. The batch fails if any operation fails.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+| operations | List of operations to perform | List[BatchOperation] | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | The result of the batch operations | Dict[str, Any] |
+| spreadsheet | The spreadsheet as a GoogleDriveFile (for chaining to other blocks) | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Bulk Setup**: Apply multiple formatting rules, validations, and protections when setting up new sheets.
+
+**Performance Optimization**: Reduce API calls by batching multiple updates together.
+
+**Atomic Updates**: Ensure multiple related changes succeed or fail together.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Clear
+
+### What it is
+This block clears data from a specified range in a Google Sheets spreadsheet.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block removes all values from a specified cell range using the Google Sheets API. The cells remain but their contents are deleted, preserving any formatting.
+
+Use A1 notation (e.g., "A1:D10" or "Sheet1!B2:C5") to specify the range to clear.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+| range | The A1 notation of the range to clear | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | The result of the clear operation | Dict[str, Any] |
+| spreadsheet | The spreadsheet as a GoogleDriveFile (for chaining to other blocks) | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Data Reset**: Clear data areas before importing fresh data from external sources.
+
+**Template Preparation**: Reset input areas of templates before distributing new copies.
+
+**Periodic Cleanup**: Clear temporary or staging data areas as part of scheduled workflows.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Copy To Spreadsheet
+
+### What it is
+Copy a sheet from one spreadsheet to another.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block copies an entire sheet (tab) from one Google Spreadsheet to another using the Google Sheets API. The copied sheet includes all data, formatting, formulas, and structure.
+
+The new sheet is added to the destination spreadsheet with a potentially modified name if a sheet with the same name already exists.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| source_spreadsheet | Select the source spreadsheet | Source Spreadsheet | No |
+| source_sheet_name | Sheet to copy (optional, defaults to first sheet) | str | No |
+| destination_spreadsheet_id | ID of the destination spreadsheet | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | Result of the copy operation | Dict[str, Any] |
+| new_sheet_id | ID of the new sheet in the destination | int |
+| new_sheet_name | Name of the new sheet | str |
+| spreadsheet | The source spreadsheet for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Template Distribution**: Copy template sheets to individual project or client spreadsheets.
+
+**Report Consolidation**: Copy data sheets from multiple sources into a master spreadsheet.
+
+**Backup Creation**: Copy important sheets to backup spreadsheets for archival.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Create Named Range
+
+### What it is
+Create a named range to reference cells by name instead of A1 notation.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a named range in a Google Spreadsheet using the Google Sheets API. Named ranges allow you to reference cells by descriptive names instead of A1 notation, making formulas more readable.
+
+Named ranges can be used in formulas across the spreadsheet and make maintenance easier when data locations change.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+| sheet_name | Sheet name (optional, defaults to first sheet) | str | No |
+| name | Name for the range (e.g., 'SalesData', 'CustomerList') | str | Yes |
+| range | Cell range in A1 notation (e.g., 'A1:D10', 'B2:B100') | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | Result of the operation | Dict[str, Any] |
+| named_range_id | ID of the created named range | str |
+| spreadsheet | The spreadsheet for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Formula Clarity**: Create named ranges like "SalesData" or "TaxRate" for clearer formulas.
+
+**Dynamic References**: Define named ranges that formulas reference, simplifying updates.
+
+**Data Source Setup**: Create named ranges for areas that serve as data sources for charts or lookups.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Create Spreadsheet
+
+### What it is
+This block creates a new Google Sheets spreadsheet with specified sheets.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a brand new Google Sheets spreadsheet with a specified title and optional sheet names. The spreadsheet is created in the user's Google Drive and immediately accessible via the returned URL.
+
+The spreadsheet output can be chained to other Sheets blocks for immediate data population.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| title | The title of the new spreadsheet | str | Yes |
+| sheet_names | List of sheet names to create (optional, defaults to single 'Sheet1') | List[str] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | The result containing spreadsheet ID and URL | Dict[str, Any] |
+| spreadsheet | The created spreadsheet as a GoogleDriveFile (for chaining to other blocks) | GoogleDriveFile |
+| spreadsheet_id | The ID of the created spreadsheet | str |
+| spreadsheet_url | The URL of the created spreadsheet | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Report Generation**: Create new spreadsheets for periodic reports with dedicated sheets for different data sections.
+
+**Project Setup**: Automatically create project tracking spreadsheets with pre-defined sheet structures.
+
+**Data Export**: Create new spreadsheets to export data from other systems for sharing.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Delete Column
+
+### What it is
+Delete a column by header name or column letter.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block removes an entire column from a Google Sheet using the Google Sheets API. You can specify the column by its header name or column letter (A, B, C, etc.).
+
+All data in the column is permanently deleted and subsequent columns shift left to fill the gap.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+| sheet_name | Sheet name (optional, defaults to first sheet) | str | No |
+| column | Column to delete (header name or column letter like 'A', 'B') | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | Result of the delete operation | Dict[str, Any] |
+| spreadsheet | The spreadsheet for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Schema Cleanup**: Remove deprecated or unused columns from data sheets.
+
+**Data Reduction**: Delete columns containing sensitive or unnecessary information before sharing.
+
+**Structure Maintenance**: Remove temporary calculation columns after processing.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Delete Rows
+
+### What it is
+Delete specific rows from a Google Sheet by their row indices. Works well with FilterRowsBlock output.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block removes specific rows from a Google Sheet by their 1-based row indices using the Google Sheets API. It handles multiple deletions efficiently by processing from bottom to top to maintain correct indices.
+
+Works seamlessly with the Filter Rows block output to delete rows matching specific criteria.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+| sheet_name | Sheet name (optional, defaults to first sheet) | str | No |
+| row_indices | 1-based row indices to delete (e.g., [2, 5, 7]) | List[int] | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | Result of the delete operation | Dict[str, Any] |
+| deleted_count | Number of rows deleted | int |
+| spreadsheet | The spreadsheet for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Data Cleanup**: Delete rows with invalid or incomplete data identified by filtering.
+
+**Record Removal**: Remove processed or archived records from active sheets.
+
+**Conditional Deletion**: Delete rows matching specific criteria like outdated entries or cancelled items.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Export Csv
+
+### What it is
+Export a Google Sheet as CSV data
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block exports data from a Google Sheet as a CSV-formatted string using the Google Sheets API. You can choose whether to include headers and specify which sheet to export.
+
+The CSV data can be used for integration with other systems, file downloads, or data processing pipelines.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | The spreadsheet to export from | Spreadsheet | No |
+| sheet_name | Name of the sheet to export. Defaults to first sheet. | str | No |
+| include_headers | Include the first row (headers) in the CSV output | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if export failed | str |
+| csv_data | The sheet data as CSV string | str |
+| row_count | Number of rows exported | int |
+| spreadsheet | The spreadsheet for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**System Integration**: Export data as CSV for import into external systems or databases.
+
+**File Distribution**: Generate CSV exports for email attachments or file downloads.
+
+**Data Backup**: Create periodic CSV backups of spreadsheet data.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Filter Rows
+
+### What it is
+Filter rows in a Google Sheet based on a column condition. Returns matching rows and their indices.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block filters rows in a Google Sheet based on conditions applied to a specific column using the Google Sheets API. Supports operators like equals, not_equals, contains, is_empty, and is_not_empty.
+
+Returns matching rows along with their original 1-based row indices, making it easy to chain with delete or update operations.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+| sheet_name | Sheet name (optional, defaults to first sheet) | str | No |
+| filter_column | Column to filter on (header name or column letter like 'A', 'B') | str | Yes |
+| filter_value | Value to filter by (not used for is_empty/is_not_empty operators) | str | No |
+| operator | Filter comparison operator | "equals" \| "not_equals" \| "contains" \| "not_contains" \| "greater_than" \| "less_than" \| "greater_than_or_equal" \| "less_than_or_equal" \| "is_empty" \| "is_not_empty" | No |
+| match_case | Whether to match case in comparisons | bool | No |
+| include_header | Include header row in output | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| rows | Filtered rows (including header if requested) | List[List[str]] |
+| row_indices | Original 1-based row indices of matching rows (useful for deletion) | List[int] |
+| count | Number of matching rows (excluding header) | int |
+| spreadsheet | The spreadsheet for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Conditional Processing**: Filter rows by status to process only pending or active items.
+
+**Data Extraction**: Extract rows matching specific criteria for reports or analysis.
+
+**Cleanup Preparation**: Identify rows to delete based on conditions like empty values or specific statuses.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Find
+
+### What it is
+Find text in a Google Sheets spreadsheet. Returns locations and count of occurrences. Can find all occurrences or just the first one.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block searches for text across a Google Spreadsheet using the Google Sheets API. You can search entire spreadsheets or specific sheets/ranges, with options for case matching and whole-cell matching.
+
+Returns the locations (sheet, row, column) of all matches or just the first one, along with the total count.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+| find_text | The text to find | str | Yes |
+| sheet_id | The ID of the specific sheet to search (optional, searches all sheets if not provided) | int | No |
+| match_case | Whether to match case | bool | No |
+| match_entire_cell | Whether to match entire cell | bool | No |
+| find_all | Whether to find all occurrences (true) or just the first one (false) | bool | No |
+| range | The A1 notation range to search in (optional, searches entire sheet if not provided) | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | The result of the find operation including locations and count | Dict[str, Any] |
+| locations | List of cell locations where the text was found | List[Dict[str, Any]] |
+| count | Number of occurrences found | int |
+| spreadsheet | The spreadsheet as a GoogleDriveFile (for chaining to other blocks) | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Data Validation**: Find specific values to verify data presence or locate errors.
+
+**Position Lookup**: Find where specific text appears to determine update locations.
+
+**Audit Checks**: Search for specific terms across spreadsheets for compliance verification.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Find Replace
+
+### What it is
+This block finds and replaces text in a Google Sheets spreadsheet.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block performs find-and-replace operations across a Google Spreadsheet using the Google Sheets API. You can target all sheets or specific ones, with options for case matching and whole-cell matching.
+
+Returns the number of replacements made, enabling verification of the operation's scope.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+| find_text | The text to find | str | Yes |
+| replace_text | The text to replace with | str | Yes |
+| sheet_id | The ID of the specific sheet to search (optional, searches all sheets if not provided) | int | No |
+| match_case | Whether to match case | bool | No |
+| match_entire_cell | Whether to match entire cell | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | The result of the find/replace operation including number of replacements | Dict[str, Any] |
+| spreadsheet | The spreadsheet as a GoogleDriveFile (for chaining to other blocks) | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Data Standardization**: Replace variations of terms with standardized values.
+
+**Batch Updates**: Update company names, status values, or codes across entire spreadsheets.
+
+**Error Correction**: Fix systematic typos or outdated values across all sheets.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Format
+
+### What it is
+Format a range in a Google Sheet (sheet optional)
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block applies visual formatting to cell ranges in a Google Sheet using the Google Sheets API. Options include background color, text color, bold, italic, and font size.
+
+Formatting enhances readability and can highlight important data or create visual structure in reports.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+| range | A1 notation – sheet optional | str | Yes |
+| background_color | - | Dict[str, Any] | No |
+| text_color | - | Dict[str, Any] | No |
+| bold | - | bool | No |
+| italic | - | bool | No |
+| font_size | - | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | API response or success flag | Dict[str, Any] |
+| spreadsheet | The spreadsheet as a GoogleDriveFile (for chaining to other blocks) | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Header Styling**: Format header rows with bold text and background colors.
+
+**Conditional Highlighting**: Apply colors to highlight important values or warnings.
+
+**Report Presentation**: Style sheets for professional presentation before sharing.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Get Column
+
+### What it is
+Extract all values from a specific column. Useful for getting a list of emails, IDs, or any single field.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block extracts all values from a specific column in a Google Sheet using the Google Sheets API. You can reference the column by header name or column letter, with options to skip empty cells and include/exclude headers.
+
+Returns values as a list for easy iteration or processing in subsequent blocks.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+| sheet_name | Sheet name (optional, defaults to first sheet) | str | No |
+| column | Column to extract (header name or column letter like 'A', 'B') | str | Yes |
+| include_header | Include the header in output | bool | No |
+| skip_empty | Skip empty cells | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| values | List of values from the column | List[str] |
+| count | Number of values (excluding header if not included) | int |
+| column_index | 0-based column index | int |
+| spreadsheet | The spreadsheet for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Email Lists**: Extract email column values for sending notifications or marketing.
+
+**ID Processing**: Get all IDs from a column to process records individually.
+
+**Data Validation**: Extract values to check against allowed lists or external databases.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Get Notes
+
+### What it is
+Get notes from cells in a Google Sheet
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves cell notes from a specified range in a Google Sheet using the Google Sheets API. Notes are the comments that appear when hovering over cells.
+
+Returns a list of notes with their cell locations, useful for extracting documentation or audit information.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | The spreadsheet to get notes from | Spreadsheet | No |
+| range | Range to get notes from (e.g., A1:B10) | str | No |
+| sheet_name | Name of the sheet. Defaults to first sheet. | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if operation failed | str |
+| notes | List of notes with cell and text | List[Dict[str, Any]] |
+| count | Number of notes found | int |
+| spreadsheet | The spreadsheet for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Audit Extraction**: Retrieve notes documenting changes or approvals for compliance reports.
+
+**Documentation Review**: Gather explanatory notes for documentation or training purposes.
+
+**Quality Check**: Review cells with notes to identify items requiring attention.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Get Row
+
+### What it is
+Get a specific row by its index. Returns both list and dict formats.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves a specific row from a Google Sheet by its 1-based row index using the Google Sheets API. The row data is returned both as a list (ordered values) and as a dictionary with header names as keys.
+
+The dictionary format makes it easy to access specific fields by name rather than position.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+| sheet_name | Sheet name (optional, defaults to first sheet) | str | No |
+| row_index | 1-based row index to retrieve | int | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| row | The row values as a list | List[str] |
+| row_dict | The row as a dictionary (header: value) | Dict[str, str] |
+| spreadsheet | The spreadsheet for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Record Retrieval**: Fetch a specific record by its row number for display or processing.
+
+**Sequential Processing**: Get rows one at a time in a loop for individual processing.
+
+**Verification**: Retrieve specific rows to verify data or confirm updates.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Get Row Count
+
+### What it is
+Get row count and dimensions of a Google Sheet. Useful for knowing where data ends.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block analyzes a Google Sheet to determine its dimensions using the Google Sheets API. It returns total row count, data rows (excluding header), the last row with data, and column count.
+
+This information is essential for determining loop boundaries or validating data presence.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+| sheet_name | Sheet name (optional, defaults to first sheet) | str | No |
+| include_header | Include header row in count | bool | No |
+| count_empty | Count rows with only empty cells | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| total_rows | Total number of rows | int |
+| data_rows | Number of data rows (excluding header) | int |
+| last_row | 1-based index of the last row with data | int |
+| column_count | Number of columns | int |
+| spreadsheet | The spreadsheet for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Loop Boundaries**: Determine how many rows to iterate through when processing data.
+
+**Empty Check**: Verify if a sheet has data before attempting to process it.
+
+**Progress Tracking**: Track how many records exist for reporting or dashboards.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Get Unique Values
+
+### What it is
+Get unique values from a column. Useful for building dropdown options or finding distinct categories.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block extracts unique values from a column in a Google Sheet using the Google Sheets API. Optionally includes counts for each value and can sort results by frequency.
+
+Useful for discovering data categories, building dynamic dropdown lists, or analyzing data distribution.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+| sheet_name | Sheet name (optional, defaults to first sheet) | str | No |
+| column | Column to get unique values from (header name or column letter) | str | Yes |
+| include_count | Include count of each unique value | bool | No |
+| sort_by_count | Sort results by count (most frequent first) | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| values | List of unique values | List[str] |
+| counts | Count of each unique value (if include_count is True) | Dict[str, int] |
+| total_unique | Total number of unique values | int |
+| spreadsheet | The spreadsheet for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Dynamic Dropdowns**: Build dropdown options from actual data values in the sheet.
+
+**Category Analysis**: Discover all unique categories or types in a dataset.
+
+**Data Quality**: Identify unexpected values or typos by reviewing unique entries.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Import Csv
+
+### What it is
+Import CSV data into a Google Sheet
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block imports CSV-formatted data into a Google Sheet using the Google Sheets API. You can specify the target sheet, starting cell, and whether to clear existing data first.
+
+The CSV string is parsed and written to the sheet, enabling data import from external sources or API responses.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | The spreadsheet to import into | Spreadsheet | No |
+| csv_data | CSV data to import | str | Yes |
+| sheet_name | Name of the sheet. Defaults to first sheet. | str | No |
+| start_cell | Cell to start importing at (e.g., A1, B2) | str | No |
+| clear_existing | Clear existing data before importing | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if import failed | str |
+| result | Import result | Dict[str, Any] |
+| rows_imported | Number of rows imported | int |
+| spreadsheet | The spreadsheet for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Data Import**: Import CSV data from external APIs or file uploads into Google Sheets.
+
+**Bulk Updates**: Replace sheet data with fresh CSV exports from other systems.
+
+**Migration**: Transfer data from CSV-based systems into Google Sheets.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Insert Row
+
+### What it is
+Insert a single row at a specific position. Existing rows shift down.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block inserts a row at a specific position in a Google Sheet using the Google Sheets API. Existing rows at and below the insertion point shift down to make room.
+
+Use value_input_option to control whether values are parsed (USER_ENTERED) or stored as-is (RAW).
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+| row | Row values to insert (e.g., ['Alice', 'alice@example.com', '25']) | List[str] | Yes |
+| row_index | 1-based row index where to insert (existing rows shift down) | int | Yes |
+| sheet_name | Sheet name (optional, defaults to first sheet) | str | No |
+| value_input_option | How values are interpreted. USER_ENTERED: parsed like typed input (e.g., '=SUM(A1:A5)' becomes a formula, '1/2/2024' becomes a date). RAW: stored as-is without parsing. | "RAW" \| "USER_ENTERED" | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | Result of the insert operation | Dict[str, Any] |
+| spreadsheet | The spreadsheet for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Priority Insertion**: Insert high-priority items at the top of lists.
+
+**Ordered Data Entry**: Add new records at specific positions to maintain sorting.
+
+**Template Rows**: Insert pre-formatted rows at designated positions.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets List Named Ranges
+
+### What it is
+List all named ranges in a spreadsheet.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves all named ranges defined in a Google Spreadsheet using the Google Sheets API. Returns each range's name, ID, and the cell range it references.
+
+Useful for discovering available named ranges or auditing spreadsheet configuration.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| named_ranges | List of named ranges with name, id, and range info | List[Dict[str, Any]] |
+| count | Number of named ranges | int |
+| spreadsheet | The spreadsheet for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Configuration Discovery**: List available named ranges to understand spreadsheet structure.
+
+**Formula Building**: Get named range names for building formulas programmatically.
+
+**Audit Documentation**: Generate documentation of named ranges for spreadsheet templates.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Lookup Row
+
+### What it is
+Look up a row by finding a value in a specific column. Returns the first matching row and optionally specific columns.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block performs a lookup operation similar to VLOOKUP—it finds a row where a specific column matches your search value, then returns that row's data. You can return all columns or just specific ones.
+
+This is useful for database-style lookups where you need to find a record by ID, email, or any unique identifier.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+| sheet_name | Sheet name (optional, defaults to first sheet) | str | No |
+| lookup_column | Column to search in (header name or column letter) | str | Yes |
+| lookup_value | Value to search for | str | Yes |
+| return_columns | Columns to return (header names or letters). Empty = all columns. | List[str] | No |
+| match_case | Whether to match case | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| row | The matching row (all or selected columns) | List[str] |
+| row_dict | The matching row as a dictionary (header: value) | Dict[str, str] |
+| row_index | 1-based row index of the match | int |
+| found | Whether a match was found | bool |
+| spreadsheet | The spreadsheet for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Customer Lookup**: Find customer details by email address or customer ID.
+
+**Inventory Check**: Look up product information by SKU or product name.
+
+**Configuration Retrieval**: Fetch settings for a specific entity from a configuration sheet.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Manage Sheet
+
+### What it is
+Create, delete, or copy sheets (sheet optional)
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block manages sheets (tabs) within a Google Spreadsheet using the Google Sheets API. Operations include creating new sheets, deleting existing sheets, or copying sheets within the same spreadsheet.
+
+Use this to dynamically organize spreadsheet structure as part of workflows.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+| operation | Operation to perform | "create" \| "delete" \| "copy" | Yes |
+| sheet_name | Target sheet name (defaults to first sheet for delete) | str | No |
+| source_sheet_id | Source sheet ID for copy | int | No |
+| destination_sheet_name | New sheet name for copy | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | Operation result | Dict[str, Any] |
+| spreadsheet | The spreadsheet as a GoogleDriveFile (for chaining to other blocks) | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Dynamic Structure**: Create new sheets for each month, project, or category as needed.
+
+**Template Duplication**: Copy template sheets for new data entry cycles.
+
+**Cleanup Operations**: Delete outdated or temporary sheets after processing.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Metadata
+
+### What it is
+This block retrieves metadata about a Google Sheets spreadsheet including sheet names and properties.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves spreadsheet metadata using the Google Sheets API, including title, sheet names, sheet IDs, and properties like row/column counts and frozen rows.
+
+Useful for understanding spreadsheet structure before performing operations.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | The metadata of the spreadsheet including sheets info | Dict[str, Any] |
+| spreadsheet | The spreadsheet as a GoogleDriveFile (for chaining to other blocks) | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Structure Discovery**: Get sheet names and IDs before performing sheet-specific operations.
+
+**Validation**: Verify spreadsheet structure matches expectations before data operations.
+
+**Dynamic Routing**: Determine which sheets exist to route data appropriately.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Protect Range
+
+### What it is
+Protect a cell range or entire sheet from editing.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block adds protection to cell ranges or entire sheets using the Google Sheets API. Protected ranges can either block editing completely or show warnings while still allowing edits.
+
+Use this to prevent accidental changes to important formulas, headers, or reference data.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+| sheet_name | Sheet name (optional, defaults to first sheet) | str | No |
+| range | Cell range to protect (e.g., 'A1:D10'). Leave empty to protect entire sheet. | str | No |
+| description | Description for the protected range | str | No |
+| warning_only | Show warning but allow editing (vs blocking completely) | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | Result of the operation | Dict[str, Any] |
+| protection_id | ID of the protection | int |
+| spreadsheet | The spreadsheet for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Formula Protection**: Protect cells containing critical formulas from accidental modification.
+
+**Header Lock**: Prevent changes to header rows that could break data processing.
+
+**Reference Data**: Protect lookup tables or configuration values from unauthorized changes.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Read
+
+### What it is
+A block that reads data from a Google Sheets spreadsheet using A1 notation range selection.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block connects to Google Sheets using provided credentials, then fetches data from the specified spreadsheet and range.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+| range | The A1 notation of the range to read | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | The data read from the spreadsheet | List[List[str]] |
+| spreadsheet | The spreadsheet as a GoogleDriveFile (for chaining to other blocks) | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+A marketing team could use this block to automatically retrieve the latest campaign performance data from a shared Google Sheets document for analysis and reporting.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Remove Duplicates
+
+### What it is
+Remove duplicate rows based on specified columns. Keeps either the first or last occurrence.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block identifies and removes duplicate rows from a Google Sheet using the Google Sheets API. You can specify which columns to check for duplicates and whether to keep the first or last occurrence.
+
+Case sensitivity is configurable for text comparisons.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+| sheet_name | Sheet name (optional, defaults to first sheet) | str | No |
+| columns | Columns to check for duplicates (header names or letters). Empty = all columns. | List[str] | No |
+| keep | Which duplicate to keep: 'first' or 'last' | str | No |
+| match_case | Whether to match case when comparing | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | Result of the operation | Dict[str, Any] |
+| removed_count | Number of duplicate rows removed | int |
+| remaining_rows | Number of rows remaining | int |
+| spreadsheet | The spreadsheet for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Data Deduplication**: Clean up sheets containing duplicate entries from multiple data sources.
+
+**Import Cleanup**: Remove duplicates after importing data from external systems.
+
+**List Maintenance**: Keep email lists or contact lists free of duplicate entries.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Set Public Access
+
+### What it is
+Make a Google Spreadsheet public or private
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block modifies the sharing settings of a Google Spreadsheet using the Google Drive API to make it publicly accessible or private. You can set the access level to reader or commenter.
+
+When made public, anyone with the link can access the spreadsheet. The share link is returned for distribution.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | The spreadsheet to modify access for | Spreadsheet | No |
+| public | True to make public, False to make private | bool | No |
+| role | Permission role for public access | "reader" \| "commenter" | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if operation failed | str |
+| result | Result of the operation | Dict[str, Any] |
+| share_link | Link to the spreadsheet | str |
+| spreadsheet | The spreadsheet for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Public Dashboards**: Make report spreadsheets publicly viewable for stakeholders.
+
+**Resource Sharing**: Publish reference data or templates for public access.
+
+**Access Control**: Toggle between public and private access based on workflow stages.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Share Spreadsheet
+
+### What it is
+Share a Google Spreadsheet with users or get shareable link
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block shares a Google Spreadsheet with specific users by email address using the Google Drive API. You can set permission levels (reader, writer, commenter) and optionally send notification emails with custom messages.
+
+Leave the email blank to just generate a shareable link.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | The spreadsheet to share | Spreadsheet | No |
+| email | Email address to share with. Leave empty for link sharing. | str | No |
+| role | Permission role for the user | "reader" \| "writer" \| "commenter" | No |
+| send_notification | Send notification email to the user | bool | No |
+| message | Optional message to include in notification email | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if share failed | str |
+| result | Result of the share operation | Dict[str, Any] |
+| share_link | Link to the spreadsheet | str |
+| spreadsheet | The spreadsheet for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Automated Collaboration**: Share generated reports with stakeholders automatically.
+
+**Team Onboarding**: Grant access to project spreadsheets for new team members.
+
+**Client Delivery**: Share completed deliverables with clients including notification messages.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Sort
+
+### What it is
+Sort a Google Sheet by one or two columns. The sheet is sorted in-place.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block sorts data in a Google Sheet by one or two columns using the Google Sheets API. You can specify ascending or descending order for each column and whether to preserve a header row.
+
+Sorting is performed in-place, modifying the sheet directly.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+| sheet_name | Sheet name (optional, defaults to first sheet) | str | No |
+| sort_column | Primary column to sort by (header name or column letter) | str | Yes |
+| sort_order | Sort order for primary column | "ascending" \| "descending" | No |
+| secondary_column | Secondary column to sort by (optional) | str | No |
+| secondary_order | Sort order for secondary column | "ascending" \| "descending" | No |
+| has_header | Whether the data has a header row (header won't be sorted) | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | Result of the sort operation | Dict[str, Any] |
+| spreadsheet | The spreadsheet for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Report Organization**: Sort data by date, priority, or status before generating reports.
+
+**Data Presentation**: Organize data alphabetically or numerically for better readability.
+
+**Processing Order**: Sort items by priority to process high-priority items first.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Update Cell
+
+### What it is
+Update a single cell in a Google Sheets spreadsheet.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block updates a single cell in a Google Sheet using the Google Sheets API. Use A1 notation to specify the cell (e.g., "A1" or "Sheet1!B2").
+
+Use value_input_option to control whether values are parsed (USER_ENTERED) or stored as-is (RAW).
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+| cell | Cell address in A1 notation (e.g., 'A1', 'Sheet1!B2') | str | Yes |
+| value | Value to write to the cell | str | Yes |
+| value_input_option | How input data should be interpreted | "RAW" \| "USER_ENTERED" | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | The result of the update operation | Dict[str, Any] |
+| spreadsheet | The spreadsheet as a GoogleDriveFile (for chaining to other blocks) | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Status Updates**: Update a status cell when processing completes.
+
+**Timestamp Recording**: Write timestamps to cells marking when records were processed.
+
+**Single Value Updates**: Change individual values like totals, flags, or configuration settings.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Update Row
+
+### What it is
+Update a specific row by its index. Can use list or dict format for values.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block updates an entire row in a Google Sheet by its 1-based row index using the Google Sheets API. You can provide values as an ordered list or as a dictionary with header names as keys.
+
+The dictionary format is convenient when you only need to update specific columns.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+| sheet_name | Sheet name (optional, defaults to first sheet) | str | No |
+| row_index | 1-based row index to update | int | Yes |
+| values | New values for the row (in column order) | List[str] | No |
+| dict_values | Values as dict with column headers as keys (alternative to values) | Dict[str, str] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | Result of the update operation | Dict[str, Any] |
+| spreadsheet | The spreadsheet for chaining | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Record Updates**: Update specific records identified by row index after lookup.
+
+**Batch Field Updates**: Change multiple fields in a row simultaneously.
+
+**Processing Results**: Write results back to source rows after processing.
+<!-- END MANUAL -->
+
+---
+
+## Google Sheets Write
+
+### What it is
+A block that writes data to a Google Sheets spreadsheet at a specified A1 notation range.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block authenticates with Google Sheets using provided credentials, then updates the specified spreadsheet range with the given data.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| spreadsheet | Select a Google Sheets spreadsheet | Spreadsheet | No |
+| range | The A1 notation of the range to write | str | Yes |
+| values | The data to write to the spreadsheet | List[List[str]] | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if any | str |
+| result | The result of the write operation | Dict[str, Any] |
+| spreadsheet | The spreadsheet as a GoogleDriveFile (for chaining to other blocks) | GoogleDriveFile |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+An automated inventory system could use this block to update stock levels in a Google Sheets spreadsheet whenever products are sold or restocked, ensuring real-time inventory tracking.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/content/platform/blocks/google_maps.md b/docs/integrations/block-integrations/google_maps.md
similarity index 100%
rename from docs/content/platform/blocks/google_maps.md
rename to docs/integrations/block-integrations/google_maps.md
diff --git a/docs/content/platform/blocks/http.md b/docs/integrations/block-integrations/http.md
similarity index 100%
rename from docs/content/platform/blocks/http.md
rename to docs/integrations/block-integrations/http.md
diff --git a/docs/integrations/block-integrations/hubspot/company.md b/docs/integrations/block-integrations/hubspot/company.md
new file mode 100644
index 0000000000..7502a6bbfe
--- /dev/null
+++ b/docs/integrations/block-integrations/hubspot/company.md
@@ -0,0 +1,43 @@
+# HubSpot Company
+<!-- MANUAL: file_description -->
+Blocks for managing HubSpot company records in the CRM.
+<!-- END MANUAL -->
+
+## Hub Spot Company
+
+### What it is
+Manages HubSpot companies - create, update, and retrieve company information
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block interacts with the HubSpot CRM API to manage company records. It supports three operations: create new companies, update existing companies, and retrieve company information by domain.
+
+Company data is passed as a dictionary with standard HubSpot company properties like name, domain, industry, and custom properties.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| operation | Operation to perform (create, update, get) | str | No |
+| company_data | Company data for create/update operations | Dict[str, Any] | No |
+| domain | Company domain for get/update operations | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| company | Company information | Dict[str, Any] |
+| status | Operation status | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Lead Enrichment**: Create or update company records when new leads come in from forms or integrations.
+
+**Data Sync**: Keep company information synchronized between HubSpot and other business systems.
+
+**Account Management**: Retrieve company details to personalize communications or trigger workflows.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/hubspot/contact.md b/docs/integrations/block-integrations/hubspot/contact.md
new file mode 100644
index 0000000000..5958e45a78
--- /dev/null
+++ b/docs/integrations/block-integrations/hubspot/contact.md
@@ -0,0 +1,43 @@
+# HubSpot Contact
+<!-- MANUAL: file_description -->
+Blocks for managing HubSpot contact records in the CRM.
+<!-- END MANUAL -->
+
+## Hub Spot Contact
+
+### What it is
+Manages HubSpot contacts - create, update, and retrieve contact information
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block interacts with the HubSpot CRM API to manage contact records. It supports creating new contacts, updating existing contacts, and retrieving contacts by email address.
+
+Contact data includes standard properties like email, first name, last name, phone, and any custom properties defined in your HubSpot account.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| operation | Operation to perform (create, update, get) | str | No |
+| contact_data | Contact data for create/update operations | Dict[str, Any] | No |
+| email | Email address for get/update operations | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| contact | Contact information | Dict[str, Any] |
+| status | Operation status | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Lead Capture**: Create contacts automatically from form submissions or integrations.
+
+**Contact Updates**: Update contact information when customers change their details.
+
+**CRM Lookup**: Retrieve contact details for personalization or workflow decisions.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/hubspot/engagement.md b/docs/integrations/block-integrations/hubspot/engagement.md
new file mode 100644
index 0000000000..46b93b5ed5
--- /dev/null
+++ b/docs/integrations/block-integrations/hubspot/engagement.md
@@ -0,0 +1,44 @@
+# HubSpot Engagement
+<!-- MANUAL: file_description -->
+Blocks for managing HubSpot engagements like emails and tracking metrics.
+<!-- END MANUAL -->
+
+## Hub Spot Engagement
+
+### What it is
+Manages HubSpot engagements - sends emails and tracks engagement metrics
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block manages HubSpot engagements including sending emails and tracking engagement metrics. Use send_email to send emails through HubSpot, or track_engagement to retrieve engagement history for a contact.
+
+Engagement tracking returns metrics like email opens, clicks, and other interactions within a specified timeframe.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| operation | Operation to perform (send_email, track_engagement) | str | No |
+| email_data | Email data including recipient, subject, content | Dict[str, Any] | No |
+| contact_id | Contact ID for engagement tracking | str | No |
+| timeframe_days | Number of days to look back for engagement | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| result | Operation result | Dict[str, Any] |
+| status | Operation status | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Automated Outreach**: Send personalized emails to contacts based on triggers or workflows.
+
+**Engagement Scoring**: Track contact engagement to prioritize outreach efforts.
+
+**Follow-Up Automation**: Trigger follow-up actions based on engagement metrics.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/content/platform/blocks/ideogram.md b/docs/integrations/block-integrations/ideogram.md
similarity index 100%
rename from docs/content/platform/blocks/ideogram.md
rename to docs/integrations/block-integrations/ideogram.md
diff --git a/docs/content/platform/blocks/iteration.md b/docs/integrations/block-integrations/iteration.md
similarity index 100%
rename from docs/content/platform/blocks/iteration.md
rename to docs/integrations/block-integrations/iteration.md
diff --git a/docs/integrations/block-integrations/jina/chunking.md b/docs/integrations/block-integrations/jina/chunking.md
new file mode 100644
index 0000000000..ecfc78ff6f
--- /dev/null
+++ b/docs/integrations/block-integrations/jina/chunking.md
@@ -0,0 +1,43 @@
+# Jina Chunking
+<!-- MANUAL: file_description -->
+Blocks for splitting text into semantic chunks using Jina AI.
+<!-- END MANUAL -->
+
+## Jina Chunking
+
+### What it is
+Chunks texts using Jina AI's segmentation service
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Jina AI's segmentation service to split texts into semantically meaningful chunks. Unlike simple splitting by character count, Jina's chunking preserves semantic coherence, making it ideal for RAG applications.
+
+Configure maximum chunk length and optionally return token information for each chunk.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| texts | List of texts to chunk | List[Any] | Yes |
+| max_chunk_length | Maximum length of each chunk | int | No |
+| return_tokens | Whether to return token information | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| chunks | List of chunked texts | List[Any] |
+| tokens | List of token information for each chunk | List[Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**RAG Preprocessing**: Chunk documents for retrieval-augmented generation systems.
+
+**Embedding Preparation**: Split long texts into optimal chunks for embedding generation.
+
+**Document Processing**: Break down large documents for analysis or storage in vector databases.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/jina/embeddings.md b/docs/integrations/block-integrations/jina/embeddings.md
new file mode 100644
index 0000000000..c0b217ee92
--- /dev/null
+++ b/docs/integrations/block-integrations/jina/embeddings.md
@@ -0,0 +1,41 @@
+# Jina Embeddings
+<!-- MANUAL: file_description -->
+Blocks for generating text embeddings using Jina AI.
+<!-- END MANUAL -->
+
+## Jina Embedding
+
+### What it is
+Generates embeddings using Jina AI
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block generates vector embeddings for text using Jina AI's embedding models. Embeddings are numerical representations that capture semantic meaning, enabling similarity search and clustering.
+
+Optionally specify which Jina model to use for embedding generation.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| texts | List of texts to embed | List[Any] | Yes |
+| model | Jina embedding model to use | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| embeddings | List of embeddings | List[Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Semantic Search**: Generate embeddings to enable semantic similarity search over documents.
+
+**Vector Database**: Create embeddings for storage in vector databases like Pinecone or Weaviate.
+
+**Document Clustering**: Embed documents to cluster similar content or find related items.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/jina/fact_checker.md b/docs/integrations/block-integrations/jina/fact_checker.md
new file mode 100644
index 0000000000..a1c85d3adf
--- /dev/null
+++ b/docs/integrations/block-integrations/jina/fact_checker.md
@@ -0,0 +1,43 @@
+# Jina Fact Checker
+<!-- MANUAL: file_description -->
+Blocks for verifying statement factuality using Jina AI's Grounding API.
+<!-- END MANUAL -->
+
+## Fact Checker
+
+### What it is
+This block checks the factuality of a given statement using Jina AI's Grounding API.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Jina AI's Grounding API to verify the factuality of statements. It analyzes the statement against reliable sources and returns a factuality score, result, reasoning, and supporting references.
+
+The API searches for evidence and determines whether the statement is supported, contradicted, or uncertain based on available information.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| statement | The statement to check for factuality | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| factuality | The factuality score of the statement | float |
+| result | The result of the factuality check | bool |
+| reason | The reason for the factuality result | str |
+| references | List of references supporting or contradicting the statement | List[Reference] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Verification**: Verify claims in articles or social media posts before publishing.
+
+**AI Output Validation**: Check factuality of AI-generated content to ensure accuracy.
+
+**Research Support**: Validate statements in research or journalism with supporting references.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/jina/search.md b/docs/integrations/block-integrations/jina/search.md
new file mode 100644
index 0000000000..9ce7db9a6f
--- /dev/null
+++ b/docs/integrations/block-integrations/jina/search.md
@@ -0,0 +1,65 @@
+# Jina Search
+<!-- MANUAL: file_description -->
+Blocks for extracting website content and performing web searches using Jina AI.
+<!-- END MANUAL -->
+
+## Extract Website Content
+
+### What it is
+This block scrapes the content from the given web URL.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block sends a request to the given URL, downloads the HTML content, and uses content extraction algorithms to identify and extract the main text content of the page.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| url | The URL to scrape the content from | str | Yes |
+| raw_content | Whether to do a raw scrape of the content or use Jina-ai Reader to scrape the content | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the content cannot be retrieved | str |
+| content | The scraped content from the given URL | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+A data analyst could use this block to automatically extract article content from news websites for sentiment analysis or topic modeling.
+<!-- END MANUAL -->
+
+---
+
+## Search The Web
+
+### What it is
+This block searches the internet for the given search query.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block sends the search query to a search engine API, processes the results, and returns them in a structured format.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| query | The search query to search the web for | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| results | The search results including content from top 5 URLs | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+A content creator could use this block to research trending topics in their field, gathering ideas for new articles or videos.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/linear/comment.md b/docs/integrations/block-integrations/linear/comment.md
new file mode 100644
index 0000000000..ef76c91a75
--- /dev/null
+++ b/docs/integrations/block-integrations/linear/comment.md
@@ -0,0 +1,42 @@
+# Linear Comment
+<!-- MANUAL: file_description -->
+Blocks for creating and managing comments on Linear issues.
+<!-- END MANUAL -->
+
+## Linear Create Comment
+
+### What it is
+Creates a new comment on a Linear issue
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a new comment on a Linear issue using the Linear GraphQL API. Provide the issue ID and comment text, and the block posts the comment and returns its ID.
+
+Comments appear in the issue's activity timeline and notify relevant team members.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| issue_id | ID of the issue to comment on | str | Yes |
+| comment | Comment text to add to the issue | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| comment_id | ID of the created comment | str |
+| comment_body | Text content of the created comment | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Automated Updates**: Post status updates or progress reports to issues automatically.
+
+**Integration Comments**: Add comments when external systems (CI/CD, monitoring) detect relevant changes.
+
+**Cross-Tool Communication**: Post comments from chatbots or customer support integrations.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/linear/issues.md b/docs/integrations/block-integrations/linear/issues.md
new file mode 100644
index 0000000000..fffd1a97c7
--- /dev/null
+++ b/docs/integrations/block-integrations/linear/issues.md
@@ -0,0 +1,122 @@
+# Linear Issues
+<!-- MANUAL: file_description -->
+Blocks for creating and managing Linear issues.
+<!-- END MANUAL -->
+
+## Linear Create Issue
+
+### What it is
+Creates a new issue on Linear
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a new issue in Linear using the GraphQL API. Specify the team, title, description, and optionally priority and project. The issue is created immediately and assigned to the specified team's workflow.
+
+Returns the created issue's ID and title for tracking or further operations.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| title | Title of the issue | str | Yes |
+| description | Description of the issue | str | Yes |
+| team_name | Name of the team to create the issue on | str | Yes |
+| priority | Priority of the issue | int | No |
+| project_name | Name of the project to create the issue on | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| issue_id | ID of the created issue | str |
+| issue_title | Title of the created issue | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Bug Reporting**: Automatically create issues from error monitoring or customer reports.
+
+**Feature Requests**: Convert feature requests from forms or support tickets into Linear issues.
+
+**Task Automation**: Create issues based on scheduled events or external triggers.
+<!-- END MANUAL -->
+
+---
+
+## Linear Get Project Issues
+
+### What it is
+Gets issues from a Linear project filtered by status and assignee
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves issues from a Linear project with optional filtering by status and assignee. It queries the Linear GraphQL API and returns matching issues with their details.
+
+Optionally include comments in the response for comprehensive issue data.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| project | Name of the project to get issues from | str | Yes |
+| status | Status/state name to filter issues by (e.g., 'In Progress', 'Done') | str | Yes |
+| is_assigned | Filter by assignee status - True to get assigned issues, False to get unassigned issues | bool | No |
+| include_comments | Whether to include comments in the response | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| issues | List of issues matching the criteria | List[Issue] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Sprint Reports**: Generate reports of issues in specific states for sprint reviews.
+
+**Workload Analysis**: Find unassigned or overdue issues across projects.
+
+**Status Dashboards**: Build dashboards showing issue distribution by status.
+<!-- END MANUAL -->
+
+---
+
+## Linear Search Issues
+
+### What it is
+Searches for issues on Linear
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block searches for issues in Linear using a text query. It searches across issue titles, descriptions, and other fields to find matching issues. You can limit the number of results returned using the `max_results` parameter (default: 10, max: 100) to control token consumption and response size.
+
+Optionally filter results by team name to narrow searches to specific workspaces. If a team name is provided, the block resolves it to a team ID before searching. Returns matching issues with their state, creation date, project, and assignee information. If the search or team resolution fails, an error message is returned.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| term | Term to search for issues | str | Yes |
+| max_results | Maximum number of results to return | int | No |
+| team_name | Optional team name to filter results (e.g., 'Internal', 'Open Source') | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the search failed | str |
+| issues | List of issues | List[Issue] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Duplicate Detection**: Search for existing issues before creating new ones.
+
+**Related Issues**: Find issues related to a specific topic or feature.
+
+**Quick Lookup**: Search for issues by keyword for customer support or research.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/linear/projects.md b/docs/integrations/block-integrations/linear/projects.md
new file mode 100644
index 0000000000..2df88fcd96
--- /dev/null
+++ b/docs/integrations/block-integrations/linear/projects.md
@@ -0,0 +1,40 @@
+# Linear Projects
+<!-- MANUAL: file_description -->
+Blocks for searching and managing Linear projects.
+<!-- END MANUAL -->
+
+## Linear Search Projects
+
+### What it is
+Searches for projects on Linear
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block searches for projects in Linear using a text query. It queries the Linear GraphQL API to find projects matching the search term.
+
+Returns a list of projects with their details for further use in workflows.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| term | Term to search for projects | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| projects | List of projects | List[Project] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Project Discovery**: Find projects by name to use in issue creation or queries.
+
+**Portfolio Overview**: Search for projects to build portfolio dashboards.
+
+**Dynamic Forms**: Populate project dropdowns in custom interfaces.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/llm.md b/docs/integrations/block-integrations/llm.md
new file mode 100644
index 0000000000..6a0a9e0987
--- /dev/null
+++ b/docs/integrations/block-integrations/llm.md
@@ -0,0 +1,833 @@
+# LLM
+<!-- MANUAL: file_description -->
+Blocks for interacting with Large Language Models including AI conversations, image generation, video creation, and intelligent condition evaluation.
+<!-- END MANUAL -->
+
+## AI Ad Maker Video Creator
+
+### What it is
+Creates an AI‑generated 30‑second advert (text + images)
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block generates video advertisements by combining AI-generated visuals with narrated scripts. Line breaks in the script create scene transitions. Choose from various voices and background music options.
+
+Optionally provide your own images via input_media_urls, or let the AI generate visuals. The finished video is returned as a URL for download or embedding.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| script | Short advertising copy. Line breaks create new scenes. | str | Yes |
+| ratio | Aspect ratio | str | No |
+| target_duration | Desired length of the ad in seconds. | int | No |
+| voice | Narration voice | "Lily" \| "Daniel" \| "Brian" \| "Jessica" \| "Charlotte" \| "Callum" \| "Eva" | No |
+| background_music | Background track | "Observer" \| "Futuristic Beat" \| "Science Documentary" \| "Hotline" \| "Bladerunner 2049" \| "A Future" \| "Elysian Embers" \| "Inspiring Cinematic" \| "Bladerunner Remix" \| "Izzamuzzic" \| "Nas" \| "Paris - Else" \| "Snowfall" \| "Burlesque" \| "Corny Candy" \| "Highway Nocturne" \| "I Don't Think So" \| "Losing Your Marbles" \| "Refresher" \| "Tourist" \| "Twin Tyches" \| "Dont Stop Me Abstract Future Bass" | No |
+| input_media_urls | List of image URLs to feature in the advert. | List[str] | No |
+| use_only_provided_media | Restrict visuals to supplied images only. | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| video_url | URL of the finished advert | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Product Marketing**: Create quick promotional videos for products or services.
+
+**Social Media Ads**: Generate short video ads for social media advertising campaigns.
+
+**Content Automation**: Automatically create video ads from product descriptions or scripts.
+<!-- END MANUAL -->
+
+---
+
+## AI Condition
+
+### What it is
+Uses AI to evaluate natural language conditions and provide conditional outputs
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses an LLM to evaluate natural language conditions that can't be expressed with simple comparisons. Describe the condition in plain English, and the AI determines if it's true or false for the given input.
+
+The result routes data to yes_output or no_output, enabling intelligent branching based on meaning, sentiment, or complex criteria.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| input_value | The input value to evaluate with the AI condition | Input Value | Yes |
+| condition | A plaintext English description of the condition to evaluate | str | Yes |
+| yes_value | (Optional) Value to output if the condition is true. If not provided, input_value will be used. | Yes Value | No |
+| no_value | (Optional) Value to output if the condition is false. If not provided, input_value will be used. | No Value | No |
+| model | The language model to use for evaluating the condition. | "o3-mini" \| "o3-2025-04-16" \| "o1" \| "o1-mini" \| "gpt-5.2-2025-12-11" \| "gpt-5.1-2025-11-13" \| "gpt-5-2025-08-07" \| "gpt-5-mini-2025-08-07" \| "gpt-5-nano-2025-08-07" \| "gpt-5-chat-latest" \| "gpt-4.1-2025-04-14" \| "gpt-4.1-mini-2025-04-14" \| "gpt-4o-mini" \| "gpt-4o" \| "gpt-4-turbo" \| "gpt-3.5-turbo" \| "claude-opus-4-1-20250805" \| "claude-opus-4-20250514" \| "claude-sonnet-4-20250514" \| "claude-opus-4-5-20251101" \| "claude-sonnet-4-5-20250929" \| "claude-haiku-4-5-20251001" \| "claude-3-haiku-20240307" \| "Qwen/Qwen2.5-72B-Instruct-Turbo" \| "nvidia/llama-3.1-nemotron-70b-instruct" \| "meta-llama/Llama-3.3-70B-Instruct-Turbo" \| "meta-llama/Meta-Llama-3.1-70B-Instruct-Turbo" \| "meta-llama/Llama-3.2-3B-Instruct-Turbo" \| "llama-3.3-70b-versatile" \| "llama-3.1-8b-instant" \| "llama3.3" \| "llama3.2" \| "llama3" \| "llama3.1:405b" \| "dolphin-mistral:latest" \| "openai/gpt-oss-120b" \| "openai/gpt-oss-20b" \| "google/gemini-2.5-pro-preview-03-25" \| "google/gemini-3-pro-preview" \| "google/gemini-2.5-flash" \| "google/gemini-2.0-flash-001" \| "google/gemini-2.5-flash-lite-preview-06-17" \| "google/gemini-2.0-flash-lite-001" \| "mistralai/mistral-nemo" \| "cohere/command-r-08-2024" \| "cohere/command-r-plus-08-2024" \| "deepseek/deepseek-chat" \| "deepseek/deepseek-r1-0528" \| "perplexity/sonar" \| "perplexity/sonar-pro" \| "perplexity/sonar-deep-research" \| "nousresearch/hermes-3-llama-3.1-405b" \| "nousresearch/hermes-3-llama-3.1-70b" \| "amazon/nova-lite-v1" \| "amazon/nova-micro-v1" \| "amazon/nova-pro-v1" \| "microsoft/wizardlm-2-8x22b" \| "gryphe/mythomax-l2-13b" \| "meta-llama/llama-4-scout" \| "meta-llama/llama-4-maverick" \| "x-ai/grok-4" \| "x-ai/grok-4-fast" \| "x-ai/grok-4.1-fast" \| "x-ai/grok-code-fast-1" \| "moonshotai/kimi-k2" \| "qwen/qwen3-235b-a22b-thinking-2507" \| "qwen/qwen3-coder" \| "Llama-4-Scout-17B-16E-Instruct-FP8" \| "Llama-4-Maverick-17B-128E-Instruct-FP8" \| "Llama-3.3-8B-Instruct" \| "Llama-3.3-70B-Instruct" \| "v0-1.5-md" \| "v0-1.5-lg" \| "v0-1.0-md" | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the AI evaluation is uncertain or fails | str |
+| result | The result of the AI condition evaluation (True or False) | bool |
+| yes_output | The output value if the condition is true | Yes Output |
+| no_output | The output value if the condition is false | No Output |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Sentiment Routing**: Route messages differently based on whether they express frustration or satisfaction.
+
+**Content Moderation**: Check if content contains inappropriate material or policy violations.
+
+**Intent Detection**: Determine if a user message is a question, complaint, or request.
+<!-- END MANUAL -->
+
+---
+
+## AI Conversation
+
+### What it is
+A block that facilitates multi-turn conversations with a Large Language Model (LLM), maintaining context across message exchanges.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block sends the entire conversation history to the chosen LLM, including system messages, user inputs, and previous responses. It then returns the LLM's response as the next part of the conversation.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| prompt | The prompt to send to the language model. | str | No |
+| messages | List of messages in the conversation. | List[Any] | Yes |
+| model | The language model to use for the conversation. | "o3-mini" \| "o3-2025-04-16" \| "o1" \| "o1-mini" \| "gpt-5.2-2025-12-11" \| "gpt-5.1-2025-11-13" \| "gpt-5-2025-08-07" \| "gpt-5-mini-2025-08-07" \| "gpt-5-nano-2025-08-07" \| "gpt-5-chat-latest" \| "gpt-4.1-2025-04-14" \| "gpt-4.1-mini-2025-04-14" \| "gpt-4o-mini" \| "gpt-4o" \| "gpt-4-turbo" \| "gpt-3.5-turbo" \| "claude-opus-4-1-20250805" \| "claude-opus-4-20250514" \| "claude-sonnet-4-20250514" \| "claude-opus-4-5-20251101" \| "claude-sonnet-4-5-20250929" \| "claude-haiku-4-5-20251001" \| "claude-3-haiku-20240307" \| "Qwen/Qwen2.5-72B-Instruct-Turbo" \| "nvidia/llama-3.1-nemotron-70b-instruct" \| "meta-llama/Llama-3.3-70B-Instruct-Turbo" \| "meta-llama/Meta-Llama-3.1-70B-Instruct-Turbo" \| "meta-llama/Llama-3.2-3B-Instruct-Turbo" \| "llama-3.3-70b-versatile" \| "llama-3.1-8b-instant" \| "llama3.3" \| "llama3.2" \| "llama3" \| "llama3.1:405b" \| "dolphin-mistral:latest" \| "openai/gpt-oss-120b" \| "openai/gpt-oss-20b" \| "google/gemini-2.5-pro-preview-03-25" \| "google/gemini-3-pro-preview" \| "google/gemini-2.5-flash" \| "google/gemini-2.0-flash-001" \| "google/gemini-2.5-flash-lite-preview-06-17" \| "google/gemini-2.0-flash-lite-001" \| "mistralai/mistral-nemo" \| "cohere/command-r-08-2024" \| "cohere/command-r-plus-08-2024" \| "deepseek/deepseek-chat" \| "deepseek/deepseek-r1-0528" \| "perplexity/sonar" \| "perplexity/sonar-pro" \| "perplexity/sonar-deep-research" \| "nousresearch/hermes-3-llama-3.1-405b" \| "nousresearch/hermes-3-llama-3.1-70b" \| "amazon/nova-lite-v1" \| "amazon/nova-micro-v1" \| "amazon/nova-pro-v1" \| "microsoft/wizardlm-2-8x22b" \| "gryphe/mythomax-l2-13b" \| "meta-llama/llama-4-scout" \| "meta-llama/llama-4-maverick" \| "x-ai/grok-4" \| "x-ai/grok-4-fast" \| "x-ai/grok-4.1-fast" \| "x-ai/grok-code-fast-1" \| "moonshotai/kimi-k2" \| "qwen/qwen3-235b-a22b-thinking-2507" \| "qwen/qwen3-coder" \| "Llama-4-Scout-17B-16E-Instruct-FP8" \| "Llama-4-Maverick-17B-128E-Instruct-FP8" \| "Llama-3.3-8B-Instruct" \| "Llama-3.3-70B-Instruct" \| "v0-1.5-md" \| "v0-1.5-lg" \| "v0-1.0-md" | No |
+| max_tokens | The maximum number of tokens to generate in the chat completion. | int | No |
+| ollama_host | Ollama host for local  models | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| response | The model's response to the conversation. | str |
+| prompt | The prompt sent to the language model. | List[Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Creating an interactive chatbot that can maintain context over multiple exchanges, such as a customer service assistant or a language learning companion.
+<!-- END MANUAL -->
+
+---
+
+## AI Image Customizer
+
+### What it is
+Generate and edit custom images using Google's Nano-Banana model from Gemini 2.5. Provide a prompt and optional reference images to create or modify images.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Google's Gemini Nano-Banana models for image generation and editing. Provide a text prompt describing the desired image, and optionally include reference images for style guidance or modification.
+
+Configure aspect ratio to match your needs and choose between JPG or PNG output format. The generated image is returned as a URL.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| prompt | A text description of the image you want to generate | str | Yes |
+| model | The AI model to use for image generation and editing | "google/nano-banana" \| "google/nano-banana-pro" | No |
+| images | Optional list of input images to reference or modify | List[str (file)] | No |
+| aspect_ratio | Aspect ratio of the generated image | "match_input_image" \| "1:1" \| "2:3" \| "3:2" \| "3:4" \| "4:3" \| "4:5" \| "5:4" \| "9:16" \| "16:9" \| "21:9" | No |
+| output_format | Format of the output image | "jpg" \| "png" | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| image_url | URL of the generated image | str (file) |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Product Visualization**: Generate product images with different backgrounds or settings.
+
+**Creative Content**: Create unique images for marketing, social media, or presentations.
+
+**Image Modification**: Edit existing images by providing them as references with modification prompts.
+<!-- END MANUAL -->
+
+---
+
+## AI Image Editor
+
+### What it is
+Edit images using BlackForest Labs' Flux Kontext models. Provide a prompt and optional reference image to generate a modified image.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses BlackForest Labs' Flux Kontext models for context-aware image editing. Describe the desired edit in the prompt, and optionally provide an input image to modify.
+
+Choose between Flux Kontext Pro or Max for different quality/speed tradeoffs. Set a seed for reproducible results across multiple runs.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| prompt | Text instruction describing the desired edit | str | Yes |
+| input_image | Reference image URI (jpeg, png, gif, webp) | str (file) | No |
+| aspect_ratio | Aspect ratio of the generated image | "match_input_image" \| "1:1" \| "16:9" \| "9:16" \| "4:3" \| "3:4" \| "3:2" \| "2:3" \| "4:5" \| "5:4" \| "21:9" \| "9:21" \| "2:1" \| "1:2" | No |
+| seed | Random seed. Set for reproducible generation | int | No |
+| model | Model variant to use | "Flux Kontext Pro" \| "Flux Kontext Max" | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| output_image | URL of the transformed image | str (file) |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Style Transfer**: Transform images to match different artistic styles or moods.
+
+**Object Editing**: Add, remove, or modify specific elements in existing images.
+
+**Background Changes**: Replace or modify image backgrounds while preserving subjects.
+<!-- END MANUAL -->
+
+---
+
+## AI Image Generator
+
+### What it is
+Generate images using various AI models through a unified interface
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block generates images from text prompts using your choice of AI models including Flux and Recraft. Select the image size (square, landscape, portrait, wide, or tall) and visual style to match your needs.
+
+The unified interface allows switching between models without changing your workflow, making it easy to compare results or adapt to different use cases.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| prompt | Text prompt for image generation | str | Yes |
+| model | The AI model to use for image generation | "Flux 1.1 Pro" \| "Flux 1.1 Pro Ultra" \| "Recraft v3" \| "Stable Diffusion 3.5 Medium" \| "Nano Banana Pro" | No |
+| size | Format of the generated image: - Square: Perfect for profile pictures, icons - Landscape: Traditional photo format - Portrait: Vertical photos, portraits - Wide: Cinematic format, desktop wallpapers - Tall: Mobile wallpapers, social media stories | "square" \| "landscape" \| "portrait" \| "wide" \| "tall" | No |
+| style | Visual style for the generated image | "any" \| "realistic_image" \| "realistic_image/b_and_w" \| "realistic_image/hdr" \| "realistic_image/natural_light" \| "realistic_image/studio_portrait" \| "realistic_image/enterprise" \| "realistic_image/hard_flash" \| "realistic_image/motion_blur" \| "digital_illustration" \| "digital_illustration/pixel_art" \| "digital_illustration/hand_drawn" \| "digital_illustration/grain" \| "digital_illustration/infantile_sketch" \| "digital_illustration/2d_art_poster" \| "digital_illustration/2d_art_poster_2" \| "digital_illustration/handmade_3d" \| "digital_illustration/hand_drawn_outline" \| "digital_illustration/engraving_color" | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| image_url | URL of the generated image | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Creation**: Generate images for blog posts, articles, or social media.
+
+**Marketing Visuals**: Create product images, banners, or promotional graphics.
+
+**Illustration**: Generate custom illustrations for presentations or documents.
+<!-- END MANUAL -->
+
+---
+
+## AI List Generator
+
+### What it is
+A block that creates lists of items based on prompts using a Large Language Model (LLM), with optional source data for context.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block formulates a prompt based on the given focus or source data, sends it to the chosen LLM, and then processes the response to ensure it's a valid Python list. It can retry multiple times if the initial attempts fail.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| focus | The focus of the list to generate. | str | No |
+| source_data | The data to generate the list from. | str | No |
+| model | The language model to use for generating the list. | "o3-mini" \| "o3-2025-04-16" \| "o1" \| "o1-mini" \| "gpt-5.2-2025-12-11" \| "gpt-5.1-2025-11-13" \| "gpt-5-2025-08-07" \| "gpt-5-mini-2025-08-07" \| "gpt-5-nano-2025-08-07" \| "gpt-5-chat-latest" \| "gpt-4.1-2025-04-14" \| "gpt-4.1-mini-2025-04-14" \| "gpt-4o-mini" \| "gpt-4o" \| "gpt-4-turbo" \| "gpt-3.5-turbo" \| "claude-opus-4-1-20250805" \| "claude-opus-4-20250514" \| "claude-sonnet-4-20250514" \| "claude-opus-4-5-20251101" \| "claude-sonnet-4-5-20250929" \| "claude-haiku-4-5-20251001" \| "claude-3-haiku-20240307" \| "Qwen/Qwen2.5-72B-Instruct-Turbo" \| "nvidia/llama-3.1-nemotron-70b-instruct" \| "meta-llama/Llama-3.3-70B-Instruct-Turbo" \| "meta-llama/Meta-Llama-3.1-70B-Instruct-Turbo" \| "meta-llama/Llama-3.2-3B-Instruct-Turbo" \| "llama-3.3-70b-versatile" \| "llama-3.1-8b-instant" \| "llama3.3" \| "llama3.2" \| "llama3" \| "llama3.1:405b" \| "dolphin-mistral:latest" \| "openai/gpt-oss-120b" \| "openai/gpt-oss-20b" \| "google/gemini-2.5-pro-preview-03-25" \| "google/gemini-3-pro-preview" \| "google/gemini-2.5-flash" \| "google/gemini-2.0-flash-001" \| "google/gemini-2.5-flash-lite-preview-06-17" \| "google/gemini-2.0-flash-lite-001" \| "mistralai/mistral-nemo" \| "cohere/command-r-08-2024" \| "cohere/command-r-plus-08-2024" \| "deepseek/deepseek-chat" \| "deepseek/deepseek-r1-0528" \| "perplexity/sonar" \| "perplexity/sonar-pro" \| "perplexity/sonar-deep-research" \| "nousresearch/hermes-3-llama-3.1-405b" \| "nousresearch/hermes-3-llama-3.1-70b" \| "amazon/nova-lite-v1" \| "amazon/nova-micro-v1" \| "amazon/nova-pro-v1" \| "microsoft/wizardlm-2-8x22b" \| "gryphe/mythomax-l2-13b" \| "meta-llama/llama-4-scout" \| "meta-llama/llama-4-maverick" \| "x-ai/grok-4" \| "x-ai/grok-4-fast" \| "x-ai/grok-4.1-fast" \| "x-ai/grok-code-fast-1" \| "moonshotai/kimi-k2" \| "qwen/qwen3-235b-a22b-thinking-2507" \| "qwen/qwen3-coder" \| "Llama-4-Scout-17B-16E-Instruct-FP8" \| "Llama-4-Maverick-17B-128E-Instruct-FP8" \| "Llama-3.3-8B-Instruct" \| "Llama-3.3-70B-Instruct" \| "v0-1.5-md" \| "v0-1.5-lg" \| "v0-1.0-md" | No |
+| max_retries | Maximum number of retries for generating a valid list. | int | No |
+| force_json_output | Whether to force the LLM to produce a JSON-only response. This can increase the block's reliability, but may also reduce the quality of the response because it prohibits the LLM from reasoning before providing its JSON response. | bool | No |
+| max_tokens | The maximum number of tokens to generate in the chat completion. | int | No |
+| ollama_host | Ollama host for local  models | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| generated_list | The generated list. | List[str] |
+| list_item | Each individual item in the list. | str |
+| prompt | The prompt sent to the language model. | List[Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Automatically generating a list of key points or action items from a long meeting transcript or summarizing the main topics discussed in a series of documents.
+<!-- END MANUAL -->
+
+---
+
+## AI Music Generator
+
+### What it is
+This block generates music using Meta's MusicGen model on Replicate.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Meta's MusicGen model to generate original music from text descriptions. Describe the desired music style, mood, and instruments in the prompt, and the AI creates a matching audio track.
+
+Configure duration, temperature (for variety), and output format. Higher temperature produces more diverse results, while lower values stay closer to typical patterns.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| prompt | A description of the music you want to generate | str | Yes |
+| music_gen_model_version | Model to use for generation | "stereo-large" \| "melody-large" \| "large" | No |
+| duration | Duration of the generated audio in seconds | int | No |
+| temperature | Controls the 'conservativeness' of the sampling process. Higher temperature means more diversity | float | No |
+| top_k | Reduces sampling to the k most likely tokens | int | No |
+| top_p | Reduces sampling to tokens with cumulative probability of p. When set to 0 (default), top_k sampling is used | float | No |
+| classifier_free_guidance | Increases the influence of inputs on the output. Higher values produce lower-variance outputs that adhere more closely to inputs | int | No |
+| output_format | Output format for generated audio | "wav" \| "mp3" | No |
+| normalization_strategy | Strategy for normalizing audio | "loudness" \| "clip" \| "peak" \| "rms" | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| result | URL of the generated audio file | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Video Soundtracks**: Generate background music for videos, podcasts, or presentations.
+
+**Content Creation**: Create original music for social media or marketing content.
+
+**Prototyping**: Quickly generate music concepts for creative projects.
+<!-- END MANUAL -->
+
+---
+
+## AI Screenshot To Video Ad
+
+### What it is
+Turns a screenshot into an engaging, avatar‑narrated video advert.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates video advertisements featuring a screenshot with AI-generated narration. Provide the screenshot URL and narration script, and the block generates a video with voice and background music.
+
+Choose from various voices and music tracks. The video showcases the screenshot while the AI narrator reads your script.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| script | Narration that will accompany the screenshot. | str | Yes |
+| screenshot_url | Screenshot or image URL to showcase. | str | Yes |
+| ratio | - | str | No |
+| target_duration | - | int | No |
+| voice | - | "Lily" \| "Daniel" \| "Brian" \| "Jessica" \| "Charlotte" \| "Callum" \| "Eva" | No |
+| background_music | - | "Observer" \| "Futuristic Beat" \| "Science Documentary" \| "Hotline" \| "Bladerunner 2049" \| "A Future" \| "Elysian Embers" \| "Inspiring Cinematic" \| "Bladerunner Remix" \| "Izzamuzzic" \| "Nas" \| "Paris - Else" \| "Snowfall" \| "Burlesque" \| "Corny Candy" \| "Highway Nocturne" \| "I Don't Think So" \| "Losing Your Marbles" \| "Refresher" \| "Tourist" \| "Twin Tyches" \| "Dont Stop Me Abstract Future Bass" | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| video_url | Rendered video URL | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**App Demos**: Create narrated demonstrations of software features from screenshots.
+
+**Product Tours**: Turn product screenshots into engaging video walkthroughs.
+
+**Tutorial Videos**: Generate instructional videos from step-by-step screenshots.
+<!-- END MANUAL -->
+
+---
+
+## AI Shortform Video Creator
+
+### What it is
+Creates a shortform video using revid.ai
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates short-form videos from scripts using revid.ai. Format scripts with line breaks for scene changes and use [brackets] to guide visual generation. Text outside brackets becomes narration.
+
+Choose video style (stock video, moving images, or AI-generated), voice, background music, and generation presets. The finished video URL is returned for download or sharing.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| script | 1. Use short and punctuated sentences  2. Use linebreaks to create a new clip  3. Text outside of brackets is spoken by the AI, and [text between brackets] will be used to guide the visual generation. For example, [close-up of a cat] will show a close-up of a cat. | str | Yes |
+| ratio | Aspect ratio of the video | str | No |
+| resolution | Resolution of the video | str | No |
+| frame_rate | Frame rate of the video | int | No |
+| generation_preset | Generation preset for visual style - only affects AI-generated visuals | "Default" \| "Anime" \| "Realist" \| "Illustration" \| "Sketch Color" \| "Sketch B&W" \| "Pixar" \| "Japanese Ink" \| "3D Render" \| "Lego" \| "Sci-Fi" \| "Retro Cartoon" \| "Pixel Art" \| "Creative" \| "Photography" \| "Raytraced" \| "Environment" \| "Fantasy" \| "Anime Realism" \| "Movie" \| "Stylized Illustration" \| "Manga" \| "DEFAULT" | No |
+| background_music | Background music track | "Observer" \| "Futuristic Beat" \| "Science Documentary" \| "Hotline" \| "Bladerunner 2049" \| "A Future" \| "Elysian Embers" \| "Inspiring Cinematic" \| "Bladerunner Remix" \| "Izzamuzzic" \| "Nas" \| "Paris - Else" \| "Snowfall" \| "Burlesque" \| "Corny Candy" \| "Highway Nocturne" \| "I Don't Think So" \| "Losing Your Marbles" \| "Refresher" \| "Tourist" \| "Twin Tyches" \| "Dont Stop Me Abstract Future Bass" | No |
+| voice | AI voice to use for narration | "Lily" \| "Daniel" \| "Brian" \| "Jessica" \| "Charlotte" \| "Callum" \| "Eva" | No |
+| video_style | Type of visual media to use for the video | "stockVideo" \| "movingImage" \| "aiVideo" | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| video_url | The URL of the created video | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Social Media Content**: Create TikTok, Reels, or Shorts content automatically.
+
+**Explainer Videos**: Generate short educational or promotional videos.
+
+**Content Repurposing**: Convert written content into engaging short-form video.
+<!-- END MANUAL -->
+
+---
+
+## AI Structured Response Generator
+
+### What it is
+A block that generates structured JSON responses using a Large Language Model (LLM), with schema validation and format enforcement.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block sends the input prompt to a chosen LLM, along with any system prompts and expected response format. It then processes the LLM's response, ensuring it matches the expected format, and returns the structured data.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| prompt | The prompt to send to the language model. | str | Yes |
+| expected_format | Expected format of the response. If provided, the response will be validated against this format. The keys should be the expected fields in the response, and the values should be the description of the field. | Dict[str, str] | Yes |
+| list_result | Whether the response should be a list of objects in the expected format. | bool | No |
+| model | The language model to use for answering the prompt. | "o3-mini" \| "o3-2025-04-16" \| "o1" \| "o1-mini" \| "gpt-5.2-2025-12-11" \| "gpt-5.1-2025-11-13" \| "gpt-5-2025-08-07" \| "gpt-5-mini-2025-08-07" \| "gpt-5-nano-2025-08-07" \| "gpt-5-chat-latest" \| "gpt-4.1-2025-04-14" \| "gpt-4.1-mini-2025-04-14" \| "gpt-4o-mini" \| "gpt-4o" \| "gpt-4-turbo" \| "gpt-3.5-turbo" \| "claude-opus-4-1-20250805" \| "claude-opus-4-20250514" \| "claude-sonnet-4-20250514" \| "claude-opus-4-5-20251101" \| "claude-sonnet-4-5-20250929" \| "claude-haiku-4-5-20251001" \| "claude-3-haiku-20240307" \| "Qwen/Qwen2.5-72B-Instruct-Turbo" \| "nvidia/llama-3.1-nemotron-70b-instruct" \| "meta-llama/Llama-3.3-70B-Instruct-Turbo" \| "meta-llama/Meta-Llama-3.1-70B-Instruct-Turbo" \| "meta-llama/Llama-3.2-3B-Instruct-Turbo" \| "llama-3.3-70b-versatile" \| "llama-3.1-8b-instant" \| "llama3.3" \| "llama3.2" \| "llama3" \| "llama3.1:405b" \| "dolphin-mistral:latest" \| "openai/gpt-oss-120b" \| "openai/gpt-oss-20b" \| "google/gemini-2.5-pro-preview-03-25" \| "google/gemini-3-pro-preview" \| "google/gemini-2.5-flash" \| "google/gemini-2.0-flash-001" \| "google/gemini-2.5-flash-lite-preview-06-17" \| "google/gemini-2.0-flash-lite-001" \| "mistralai/mistral-nemo" \| "cohere/command-r-08-2024" \| "cohere/command-r-plus-08-2024" \| "deepseek/deepseek-chat" \| "deepseek/deepseek-r1-0528" \| "perplexity/sonar" \| "perplexity/sonar-pro" \| "perplexity/sonar-deep-research" \| "nousresearch/hermes-3-llama-3.1-405b" \| "nousresearch/hermes-3-llama-3.1-70b" \| "amazon/nova-lite-v1" \| "amazon/nova-micro-v1" \| "amazon/nova-pro-v1" \| "microsoft/wizardlm-2-8x22b" \| "gryphe/mythomax-l2-13b" \| "meta-llama/llama-4-scout" \| "meta-llama/llama-4-maverick" \| "x-ai/grok-4" \| "x-ai/grok-4-fast" \| "x-ai/grok-4.1-fast" \| "x-ai/grok-code-fast-1" \| "moonshotai/kimi-k2" \| "qwen/qwen3-235b-a22b-thinking-2507" \| "qwen/qwen3-coder" \| "Llama-4-Scout-17B-16E-Instruct-FP8" \| "Llama-4-Maverick-17B-128E-Instruct-FP8" \| "Llama-3.3-8B-Instruct" \| "Llama-3.3-70B-Instruct" \| "v0-1.5-md" \| "v0-1.5-lg" \| "v0-1.0-md" | No |
+| force_json_output | Whether to force the LLM to produce a JSON-only response. This can increase the block's reliability, but may also reduce the quality of the response because it prohibits the LLM from reasoning before providing its JSON response. | bool | No |
+| sys_prompt | The system prompt to provide additional context to the model. | str | No |
+| conversation_history | The conversation history to provide context for the prompt. | List[Dict[str, Any]] | No |
+| retry | Number of times to retry the LLM call if the response does not match the expected format. | int | No |
+| prompt_values | Values used to fill in the prompt. The values can be used in the prompt by putting them in a double curly braces, e.g. {{variable_name}}. | Dict[str, str] | No |
+| max_tokens | The maximum number of tokens to generate in the chat completion. | int | No |
+| compress_prompt_to_fit | Whether to compress the prompt to fit within the model's context window. | bool | No |
+| ollama_host | Ollama host for local  models | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| response | The response object generated by the language model. | Dict[str, Any] \| List[Dict[str, Any]] |
+| prompt | The prompt sent to the language model. | List[Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Extracting specific information from unstructured text, such as generating a product description with predefined fields (name, features, price) from a lengthy product review.
+<!-- END MANUAL -->
+
+---
+
+## AI Text Generator
+
+### What it is
+A block that produces text responses using a Large Language Model (LLM) based on customizable prompts and system instructions.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block sends the input prompt to a chosen LLM, processes the response, and returns the generated text.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| prompt | The prompt to send to the language model. You can use any of the {keys} from Prompt Values to fill in the prompt with values from the prompt values dictionary by putting them in curly braces. | str | Yes |
+| model | The language model to use for answering the prompt. | "o3-mini" \| "o3-2025-04-16" \| "o1" \| "o1-mini" \| "gpt-5.2-2025-12-11" \| "gpt-5.1-2025-11-13" \| "gpt-5-2025-08-07" \| "gpt-5-mini-2025-08-07" \| "gpt-5-nano-2025-08-07" \| "gpt-5-chat-latest" \| "gpt-4.1-2025-04-14" \| "gpt-4.1-mini-2025-04-14" \| "gpt-4o-mini" \| "gpt-4o" \| "gpt-4-turbo" \| "gpt-3.5-turbo" \| "claude-opus-4-1-20250805" \| "claude-opus-4-20250514" \| "claude-sonnet-4-20250514" \| "claude-opus-4-5-20251101" \| "claude-sonnet-4-5-20250929" \| "claude-haiku-4-5-20251001" \| "claude-3-haiku-20240307" \| "Qwen/Qwen2.5-72B-Instruct-Turbo" \| "nvidia/llama-3.1-nemotron-70b-instruct" \| "meta-llama/Llama-3.3-70B-Instruct-Turbo" \| "meta-llama/Meta-Llama-3.1-70B-Instruct-Turbo" \| "meta-llama/Llama-3.2-3B-Instruct-Turbo" \| "llama-3.3-70b-versatile" \| "llama-3.1-8b-instant" \| "llama3.3" \| "llama3.2" \| "llama3" \| "llama3.1:405b" \| "dolphin-mistral:latest" \| "openai/gpt-oss-120b" \| "openai/gpt-oss-20b" \| "google/gemini-2.5-pro-preview-03-25" \| "google/gemini-3-pro-preview" \| "google/gemini-2.5-flash" \| "google/gemini-2.0-flash-001" \| "google/gemini-2.5-flash-lite-preview-06-17" \| "google/gemini-2.0-flash-lite-001" \| "mistralai/mistral-nemo" \| "cohere/command-r-08-2024" \| "cohere/command-r-plus-08-2024" \| "deepseek/deepseek-chat" \| "deepseek/deepseek-r1-0528" \| "perplexity/sonar" \| "perplexity/sonar-pro" \| "perplexity/sonar-deep-research" \| "nousresearch/hermes-3-llama-3.1-405b" \| "nousresearch/hermes-3-llama-3.1-70b" \| "amazon/nova-lite-v1" \| "amazon/nova-micro-v1" \| "amazon/nova-pro-v1" \| "microsoft/wizardlm-2-8x22b" \| "gryphe/mythomax-l2-13b" \| "meta-llama/llama-4-scout" \| "meta-llama/llama-4-maverick" \| "x-ai/grok-4" \| "x-ai/grok-4-fast" \| "x-ai/grok-4.1-fast" \| "x-ai/grok-code-fast-1" \| "moonshotai/kimi-k2" \| "qwen/qwen3-235b-a22b-thinking-2507" \| "qwen/qwen3-coder" \| "Llama-4-Scout-17B-16E-Instruct-FP8" \| "Llama-4-Maverick-17B-128E-Instruct-FP8" \| "Llama-3.3-8B-Instruct" \| "Llama-3.3-70B-Instruct" \| "v0-1.5-md" \| "v0-1.5-lg" \| "v0-1.0-md" | No |
+| sys_prompt | The system prompt to provide additional context to the model. | str | No |
+| retry | Number of times to retry the LLM call if the response does not match the expected format. | int | No |
+| prompt_values | Values used to fill in the prompt. The values can be used in the prompt by putting them in a double curly braces, e.g. {{variable_name}}. | Dict[str, str] | No |
+| ollama_host | Ollama host for local  models | str | No |
+| max_tokens | The maximum number of tokens to generate in the chat completion. | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| response | The response generated by the language model. | str |
+| prompt | The prompt sent to the language model. | List[Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Generating creative writing, such as short stories or poetry, based on a given theme or starting sentence.
+<!-- END MANUAL -->
+
+---
+
+## AI Text Summarizer
+
+### What it is
+A block that summarizes long texts using a Large Language Model (LLM), with configurable focus topics and summary styles.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block splits the input text into smaller chunks, sends each chunk to an LLM for summarization, and then combines these summaries. If the combined summary is still too long, it repeats the process until a concise summary is achieved.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| text | The text to summarize. | str | Yes |
+| model | The language model to use for summarizing the text. | "o3-mini" \| "o3-2025-04-16" \| "o1" \| "o1-mini" \| "gpt-5.2-2025-12-11" \| "gpt-5.1-2025-11-13" \| "gpt-5-2025-08-07" \| "gpt-5-mini-2025-08-07" \| "gpt-5-nano-2025-08-07" \| "gpt-5-chat-latest" \| "gpt-4.1-2025-04-14" \| "gpt-4.1-mini-2025-04-14" \| "gpt-4o-mini" \| "gpt-4o" \| "gpt-4-turbo" \| "gpt-3.5-turbo" \| "claude-opus-4-1-20250805" \| "claude-opus-4-20250514" \| "claude-sonnet-4-20250514" \| "claude-opus-4-5-20251101" \| "claude-sonnet-4-5-20250929" \| "claude-haiku-4-5-20251001" \| "claude-3-haiku-20240307" \| "Qwen/Qwen2.5-72B-Instruct-Turbo" \| "nvidia/llama-3.1-nemotron-70b-instruct" \| "meta-llama/Llama-3.3-70B-Instruct-Turbo" \| "meta-llama/Meta-Llama-3.1-70B-Instruct-Turbo" \| "meta-llama/Llama-3.2-3B-Instruct-Turbo" \| "llama-3.3-70b-versatile" \| "llama-3.1-8b-instant" \| "llama3.3" \| "llama3.2" \| "llama3" \| "llama3.1:405b" \| "dolphin-mistral:latest" \| "openai/gpt-oss-120b" \| "openai/gpt-oss-20b" \| "google/gemini-2.5-pro-preview-03-25" \| "google/gemini-3-pro-preview" \| "google/gemini-2.5-flash" \| "google/gemini-2.0-flash-001" \| "google/gemini-2.5-flash-lite-preview-06-17" \| "google/gemini-2.0-flash-lite-001" \| "mistralai/mistral-nemo" \| "cohere/command-r-08-2024" \| "cohere/command-r-plus-08-2024" \| "deepseek/deepseek-chat" \| "deepseek/deepseek-r1-0528" \| "perplexity/sonar" \| "perplexity/sonar-pro" \| "perplexity/sonar-deep-research" \| "nousresearch/hermes-3-llama-3.1-405b" \| "nousresearch/hermes-3-llama-3.1-70b" \| "amazon/nova-lite-v1" \| "amazon/nova-micro-v1" \| "amazon/nova-pro-v1" \| "microsoft/wizardlm-2-8x22b" \| "gryphe/mythomax-l2-13b" \| "meta-llama/llama-4-scout" \| "meta-llama/llama-4-maverick" \| "x-ai/grok-4" \| "x-ai/grok-4-fast" \| "x-ai/grok-4.1-fast" \| "x-ai/grok-code-fast-1" \| "moonshotai/kimi-k2" \| "qwen/qwen3-235b-a22b-thinking-2507" \| "qwen/qwen3-coder" \| "Llama-4-Scout-17B-16E-Instruct-FP8" \| "Llama-4-Maverick-17B-128E-Instruct-FP8" \| "Llama-3.3-8B-Instruct" \| "Llama-3.3-70B-Instruct" \| "v0-1.5-md" \| "v0-1.5-lg" \| "v0-1.0-md" | No |
+| focus | The topic to focus on in the summary | str | No |
+| style | The style of the summary to generate. | "concise" \| "detailed" \| "bullet points" \| "numbered list" | No |
+| max_tokens | The maximum number of tokens to generate in the chat completion. | int | No |
+| chunk_overlap | The number of overlapping tokens between chunks to maintain context. | int | No |
+| ollama_host | Ollama host for local  models | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| summary | The final summary of the text. | str |
+| prompt | The prompt sent to the language model. | List[Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Summarizing lengthy research papers or articles to quickly grasp the main points and key findings.
+<!-- END MANUAL -->
+
+---
+
+## Claude Code
+
+### What it is
+Execute tasks using Claude Code in an E2B sandbox. Claude Code can create files, install tools, run commands, and perform complex coding tasks autonomously.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+When activated, the block:
+1. Creates or connects to an E2B sandbox (a secure, isolated Linux environment)
+2. Installs the latest version of Claude Code in the sandbox
+3. Optionally runs setup commands to prepare the environment
+4. Executes your prompt using Claude Code, which can create/edit files, install dependencies, run terminal commands, and build applications
+5. Extracts all text files created/modified during execution
+6. Returns the response and files, optionally keeping the sandbox alive for follow-up tasks
+
+The block supports conversation continuation through three mechanisms:
+- **Same sandbox continuation** (via `session_id` + `sandbox_id`): Resume on the same live sandbox
+- **Fresh sandbox continuation** (via `conversation_history`): Restore context on a new sandbox if the previous one timed out
+- **Dispose control** (`dispose_sandbox` flag): Keep sandbox alive for multi-turn conversations
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| prompt | The task or instruction for Claude Code to execute. Claude Code can create files, install packages, run commands, and perform complex coding tasks. | str | No |
+| timeout | Sandbox timeout in seconds. Claude Code tasks can take a while, so set this appropriately for your task complexity. Note: This only applies when creating a new sandbox. When reconnecting to an existing sandbox via sandbox_id, the original timeout is retained. | int | No |
+| setup_commands | Optional shell commands to run before executing Claude Code. Useful for installing dependencies or setting up the environment. | List[str] | No |
+| working_directory | Working directory for Claude Code to operate in. | str | No |
+| session_id | Session ID to resume a previous conversation. Leave empty for a new conversation. Use the session_id from a previous run to continue that conversation. | str | No |
+| sandbox_id | Sandbox ID to reconnect to an existing sandbox. Required when resuming a session (along with session_id). Use the sandbox_id from a previous run where dispose_sandbox was False. | str | No |
+| conversation_history | Previous conversation history to continue from. Use this to restore context on a fresh sandbox if the previous one timed out. Pass the conversation_history output from a previous run. | str | No |
+| dispose_sandbox | Whether to dispose of the sandbox immediately after execution. Set to False if you want to continue the conversation later (you'll need both sandbox_id and session_id from the output). | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if execution failed | str |
+| response | The output/response from Claude Code execution | str |
+| files | List of text files created/modified by Claude Code during this execution. Each file has 'path', 'relative_path', 'name', and 'content' fields. | List[FileOutput] |
+| conversation_history | Full conversation history including this turn. Pass this to conversation_history input to continue on a fresh sandbox if the previous sandbox timed out. | str |
+| session_id | Session ID for this conversation. Pass this back along with sandbox_id to continue the conversation. | str |
+| sandbox_id | ID of the sandbox instance. Pass this back along with session_id to continue the conversation. This is None if dispose_sandbox was True (sandbox was disposed). | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**API Documentation to Full Application**: A product team wants to quickly prototype applications based on API documentation. They fetch API docs with Firecrawl, pass them to Claude Code with a prompt like "Create a web app that demonstrates all the key features of this API", and Claude Code builds a complete application with HTML/CSS/JS frontend, proper error handling, and example API calls. The Files output can then be pushed to GitHub.
+
+**Multi-turn Development**: A developer uses Claude Code to scaffold a new project iteratively - Turn 1: "Create a Python FastAPI project with user authentication" (dispose_sandbox=false), Turn 2: Uses the returned session_id + sandbox_id to ask "Add rate limiting middleware", Turn 3: Continues with "Add comprehensive tests". Each turn builds on the previous work in the same sandbox environment.
+
+**Automated Code Review and Fixes**: An agent receives code from a PR, sends it to Claude Code with "Review this code for bugs and security issues, then fix any problems you find", and Claude Code analyzes the code, makes fixes, and returns the corrected files ready to commit.
+<!-- END MANUAL -->
+
+---
+
+## Code Generation
+
+### What it is
+Generate or refactor code using OpenAI's Codex (Responses API).
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses OpenAI's Codex model optimized for code generation and refactoring. Provide a prompt describing the code you need, and optionally a system prompt with coding guidelines or context.
+
+Configure reasoning_effort to control how much the model "thinks" before responding. The block returns generated code along with any reasoning the model produced.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| prompt | Primary coding request passed to the Codex model. | str | Yes |
+| system_prompt | Optional instructions injected via the Responses API instructions field. | str | No |
+| model | Codex-optimized model served via the Responses API. | "gpt-5.1-codex" | No |
+| reasoning_effort | Controls the Responses API reasoning budget. Select 'none' to skip reasoning configs. | "none" \| "low" \| "medium" \| "high" | No |
+| max_output_tokens | Upper bound for generated tokens (hard limit 128,000). Leave blank to let OpenAI decide. | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| response | Code-focused response returned by the Codex model. | str |
+| reasoning | Reasoning summary returned by the model, if available. | str |
+| response_id | ID of the Responses API call for auditing/debugging. | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Code Automation**: Generate boilerplate code, functions, or entire modules from descriptions.
+
+**Refactoring**: Transform existing code to follow different patterns or conventions.
+
+**Code Completion**: Fill in missing implementation details based on signatures or comments.
+<!-- END MANUAL -->
+
+---
+
+## Create Talking Avatar Video
+
+### What it is
+This block integrates with D-ID to create video clips and retrieve their URLs.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block sends a request to the D-ID API with your specified parameters. It then regularly checks the status of the video creation process until it's complete or an error occurs.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| script_input | The text input for the script | str | Yes |
+| provider | The voice provider to use | "microsoft" \| "elevenlabs" \| "amazon" | No |
+| voice_id | The voice ID to use, see [available voice IDs](https://agpt.co/docs/platform/using-ai-services/d_id) | str | No |
+| presenter_id | The presenter ID to use | str | No |
+| driver_id | The driver ID to use | str | No |
+| result_format | The desired result format | "mp4" \| "gif" \| "wav" | No |
+| crop_type | The crop type for the presenter | "wide" \| "square" \| "vertical" | No |
+| subtitles | Whether to include subtitles | bool | No |
+| ssml | Whether the input is SSML | bool | No |
+| max_polling_attempts | Maximum number of polling attempts | int | No |
+| polling_interval | Interval between polling attempts in seconds | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| video_url | The URL of the created video | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+A marketing team could use this block to create engaging video content for social media. They could input a script promoting a new product, select a friendly-looking avatar, and generate a video that explains the product's features in an appealing way.
+<!-- END MANUAL -->
+
+---
+
+## Ideogram Model
+
+### What it is
+This block runs Ideogram models with both simple and advanced settings.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block generates images using Ideogram's models (V1, V2, V3) which excel at rendering text within images. Configure aspect ratio, style type, and optionally enable MagicPrompt for enhanced results.
+
+Advanced options include upscaling, custom color palettes, and negative prompts to exclude unwanted elements. Set a seed for reproducible generation.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| prompt | Text prompt for image generation | str | Yes |
+| ideogram_model_name | The name of the Image Generation Model, e.g., V_3 | "V_3" \| "V_2" \| "V_1" \| "V_1_TURBO" \| "V_2_TURBO" | No |
+| aspect_ratio | Aspect ratio for the generated image | "ASPECT_10_16" \| "ASPECT_16_10" \| "ASPECT_9_16" \| "ASPECT_16_9" \| "ASPECT_3_2" \| "ASPECT_2_3" \| "ASPECT_4_3" \| "ASPECT_3_4" \| "ASPECT_1_1" \| "ASPECT_1_3" \| "ASPECT_3_1" | No |
+| upscale | Upscale the generated image | "AI Upscale" \| "No Upscale" | No |
+| magic_prompt_option | Whether to use MagicPrompt for enhancing the request | "AUTO" \| "ON" \| "OFF" | No |
+| seed | Random seed. Set for reproducible generation | int | No |
+| style_type | Style type to apply, applicable for V_2 and above | "AUTO" \| "GENERAL" \| "REALISTIC" \| "DESIGN" \| "RENDER_3D" \| "ANIME" | No |
+| negative_prompt | Description of what to exclude from the image | str | No |
+| color_palette_name | Color palette preset name, choose 'None' to skip | "NONE" \| "EMBER" \| "FRESH" \| "JUNGLE" \| "MAGIC" \| "MELON" \| "MOSAIC" \| "PASTEL" \| "ULTRAMARINE" | No |
+| custom_color_palette | Only available for model version V_2 or V_2_TURBO. Provide one or more color hex codes (e.g., ['#000030', '#1C0C47', '#9900FF', '#4285F4', '#FFFFFF']) to define a custom color palette. Only used if 'color_palette_name' is 'NONE'. | List[str] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| result | Generated image URL | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Text-Heavy Graphics**: Create images with logos, signs, or text overlays.
+
+**Marketing Materials**: Generate promotional images with clear, readable text.
+
+**Social Media Graphics**: Create quote images, announcements, or branded content with text.
+<!-- END MANUAL -->
+
+---
+
+## Perplexity
+
+### What it is
+Query Perplexity's sonar models with real-time web search capabilities and receive annotated responses with source citations.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries Perplexity's sonar models which combine LLM capabilities with real-time web search. Responses include source citations as annotations, providing verifiable references for the information.
+
+Choose from different sonar model variants including deep-research for comprehensive analysis. The block returns both the response text and structured citation data.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| prompt | The query to send to the Perplexity model. | str | Yes |
+| model | The Perplexity sonar model to use. | "perplexity/sonar" \| "perplexity/sonar-pro" \| "perplexity/sonar-deep-research" | No |
+| system_prompt | Optional system prompt to provide context to the model. | str | No |
+| max_tokens | The maximum number of tokens to generate. | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| response | The response from the Perplexity model. | str |
+| annotations | List of URL citations and annotations from the response. | List[Dict[str, Any]] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Research Automation**: Get answers to questions with verifiable sources for fact-checking.
+
+**Current Events**: Query real-time information that LLMs with static training data can't provide.
+
+**Competitive Intelligence**: Research companies, products, or markets with cited sources.
+<!-- END MANUAL -->
+
+---
+
+## Smart Decision Maker
+
+### What it is
+Uses AI to intelligently decide what tool to use.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block enables agentic behavior by letting an LLM decide which tools to use based on the prompt. Connect tool outputs to feed back results, creating autonomous reasoning loops.
+
+Configure agent_mode_max_iterations to control loop behavior: 0 for single decisions, -1 for infinite looping, or a positive number for max iterations. The block outputs tool calls or a finished message.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| prompt | The prompt to send to the language model. | str | Yes |
+| model | The language model to use for answering the prompt. | "o3-mini" \| "o3-2025-04-16" \| "o1" \| "o1-mini" \| "gpt-5.2-2025-12-11" \| "gpt-5.1-2025-11-13" \| "gpt-5-2025-08-07" \| "gpt-5-mini-2025-08-07" \| "gpt-5-nano-2025-08-07" \| "gpt-5-chat-latest" \| "gpt-4.1-2025-04-14" \| "gpt-4.1-mini-2025-04-14" \| "gpt-4o-mini" \| "gpt-4o" \| "gpt-4-turbo" \| "gpt-3.5-turbo" \| "claude-opus-4-1-20250805" \| "claude-opus-4-20250514" \| "claude-sonnet-4-20250514" \| "claude-opus-4-5-20251101" \| "claude-sonnet-4-5-20250929" \| "claude-haiku-4-5-20251001" \| "claude-3-haiku-20240307" \| "Qwen/Qwen2.5-72B-Instruct-Turbo" \| "nvidia/llama-3.1-nemotron-70b-instruct" \| "meta-llama/Llama-3.3-70B-Instruct-Turbo" \| "meta-llama/Meta-Llama-3.1-70B-Instruct-Turbo" \| "meta-llama/Llama-3.2-3B-Instruct-Turbo" \| "llama-3.3-70b-versatile" \| "llama-3.1-8b-instant" \| "llama3.3" \| "llama3.2" \| "llama3" \| "llama3.1:405b" \| "dolphin-mistral:latest" \| "openai/gpt-oss-120b" \| "openai/gpt-oss-20b" \| "google/gemini-2.5-pro-preview-03-25" \| "google/gemini-3-pro-preview" \| "google/gemini-2.5-flash" \| "google/gemini-2.0-flash-001" \| "google/gemini-2.5-flash-lite-preview-06-17" \| "google/gemini-2.0-flash-lite-001" \| "mistralai/mistral-nemo" \| "cohere/command-r-08-2024" \| "cohere/command-r-plus-08-2024" \| "deepseek/deepseek-chat" \| "deepseek/deepseek-r1-0528" \| "perplexity/sonar" \| "perplexity/sonar-pro" \| "perplexity/sonar-deep-research" \| "nousresearch/hermes-3-llama-3.1-405b" \| "nousresearch/hermes-3-llama-3.1-70b" \| "amazon/nova-lite-v1" \| "amazon/nova-micro-v1" \| "amazon/nova-pro-v1" \| "microsoft/wizardlm-2-8x22b" \| "gryphe/mythomax-l2-13b" \| "meta-llama/llama-4-scout" \| "meta-llama/llama-4-maverick" \| "x-ai/grok-4" \| "x-ai/grok-4-fast" \| "x-ai/grok-4.1-fast" \| "x-ai/grok-code-fast-1" \| "moonshotai/kimi-k2" \| "qwen/qwen3-235b-a22b-thinking-2507" \| "qwen/qwen3-coder" \| "Llama-4-Scout-17B-16E-Instruct-FP8" \| "Llama-4-Maverick-17B-128E-Instruct-FP8" \| "Llama-3.3-8B-Instruct" \| "Llama-3.3-70B-Instruct" \| "v0-1.5-md" \| "v0-1.5-lg" \| "v0-1.0-md" | No |
+| multiple_tool_calls | Whether to allow multiple tool calls in a single response. | bool | No |
+| sys_prompt | The system prompt to provide additional context to the model. | str | No |
+| conversation_history | The conversation history to provide context for the prompt. | List[Dict[str, Any]] | No |
+| last_tool_output | The output of the last tool that was called. | Last Tool Output | No |
+| retry | Number of times to retry the LLM call if the response does not match the expected format. | int | No |
+| prompt_values | Values used to fill in the prompt. The values can be used in the prompt by putting them in a double curly braces, e.g. {{variable_name}}. | Dict[str, str] | No |
+| max_tokens | The maximum number of tokens to generate in the chat completion. | int | No |
+| ollama_host | Ollama host for local  models | str | No |
+| agent_mode_max_iterations | Maximum iterations for agent mode. 0 = traditional mode (single LLM call, yield tool calls for external execution), -1 = infinite agent mode (loop until finished), 1+ = agent mode with max iterations limit. | int | No |
+| conversation_compaction | Automatically compact the context window once it hits the limit | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| tools | The tools that are available to use. | Tools |
+| finished | The finished message to display to the user. | str |
+| conversations | The conversation history to provide context for the prompt. | List[Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Autonomous Agents**: Build agents that can independently decide which tools to use for tasks.
+
+**Dynamic Workflows**: Create workflows that adapt their execution path based on AI decisions.
+
+**Multi-Tool Orchestration**: Let AI coordinate multiple tools to accomplish complex goals.
+<!-- END MANUAL -->
+
+---
+
+## Unreal Text To Speech
+
+### What it is
+Converts text to speech using the Unreal Speech API
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block converts text into natural-sounding speech using Unreal Speech API. Provide the text content and optionally select a specific voice ID to customize the audio output.
+
+The generated audio is returned as an MP3 URL that can be downloaded, played, or used as input for video creation blocks.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| text | The text to be converted to speech | str | Yes |
+| voice_id | The voice ID to use for text-to-speech conversion | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| mp3_url | The URL of the generated MP3 file | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Voiceover Generation**: Create narration audio for videos, presentations, or tutorials.
+
+**Accessibility**: Convert written content to audio for visually impaired users.
+
+**Audio Content**: Generate podcast intros, announcements, or automated phone messages.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/logic.md b/docs/integrations/block-integrations/logic.md
new file mode 100644
index 0000000000..178ed252a3
--- /dev/null
+++ b/docs/integrations/block-integrations/logic.md
@@ -0,0 +1,351 @@
+# Logic
+<!-- MANUAL: file_description -->
+Blocks for conditional logic, comparisons, calculations, data sampling, and control flow operations in workflows.
+<!-- END MANUAL -->
+
+## Calculator
+
+### What it is
+Performs a mathematical operation on two numbers.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The Calculator block takes in two numbers and an operation choice. It then applies the chosen operation to the numbers and returns the result. If rounding is selected, it rounds the result to the nearest whole number.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| operation | Choose the math operation you want to perform | "Add" \| "Subtract" \| "Multiply" \| "Divide" \| "Power" | Yes |
+| a | Enter the first number (A) | float | Yes |
+| b | Enter the second number (B) | float | Yes |
+| round_result | Do you want to round the result to a whole number? | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| result | The result of your calculation | float |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+A user wants to quickly perform a calculation, such as adding two numbers or calculating a percentage. They can input the numbers and operation into this block and receive the result instantly.
+<!-- END MANUAL -->
+
+---
+
+## Condition
+
+### What it is
+Handles conditional logic based on comparison operators
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block compares two values using standard operators (==, !=, >, <, >=, <=) and routes data based on the result. The comparison result determines which output receives data: yes_output for true conditions, no_output for false.
+
+Optionally specify yes_value and no_value to output different data than the input values. If not specified, value1 is used as the output value.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| value1 | Enter the first value for comparison | Value1 | Yes |
+| operator | Choose the comparison operator | "==" \| "!=" \| ">" \| "<" \| ">=" \| "<=" | Yes |
+| value2 | Enter the second value for comparison | Value2 | Yes |
+| yes_value | (Optional) Value to output if the condition is true. If not provided, value1 will be used. | Yes Value | No |
+| no_value | (Optional) Value to output if the condition is false. If not provided, value1 will be used. | No Value | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| result | The result of the condition evaluation (True or False) | bool |
+| yes_output | The output value if the condition is true | Yes Output |
+| no_output | The output value if the condition is false | No Output |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Threshold Checks**: Route workflow differently when values exceed limits (e.g., order total > $100 triggers approval).
+
+**Status Validation**: Check if a status equals "complete" or "error" to branch workflow logic.
+
+**Numeric Comparisons**: Compare scores, counts, or metrics to conditionally trigger actions.
+<!-- END MANUAL -->
+
+---
+
+## Count Items
+
+### What it is
+Counts the number of items in a collection.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The Count Items block receives a collection as input. It then determines the type of collection and uses the appropriate method to count the items. For most collections, it uses the length function. For other iterable objects, it counts the items one by one.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| collection | Enter the collection you want to count. This can be a list, dictionary, string, or any other iterable. | Collection | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| count | The number of items in the collection | int |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+A user has a list of customer names and wants to quickly determine how many customers are in the list. They can input the list into this block and receive the total count immediately.
+<!-- END MANUAL -->
+
+---
+
+## Data Sampling
+
+### What it is
+This block samples data from a given dataset using various sampling methods.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block extracts a sample from a dataset using various methods: random sampling, systematic sampling (every nth item), or top-N selection. Advanced options include stratified sampling by key, weighted sampling, and cluster sampling.
+
+Configure sample_size to control how many items to select. Use random_seed for reproducible results. The accumulate option collects data before sampling, useful when processing streaming inputs.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| data | The dataset to sample from. Can be a single dictionary, a list of dictionaries, or a list of lists. | Dict[str, Any] \| List[Dict[str, Any] \| List[Any]] | Yes |
+| sample_size | The number of samples to take from the dataset. | int | No |
+| sampling_method | The method to use for sampling. | "random" \| "systematic" \| "top" \| "bottom" \| "stratified" \| "weighted" \| "reservoir" \| "cluster" | No |
+| accumulate | Whether to accumulate data before sampling. | bool | No |
+| random_seed | Seed for random number generator (optional). | int | No |
+| stratify_key | Key to use for stratified sampling (required for stratified sampling). | str | No |
+| weight_key | Key to use for weighted sampling (required for weighted sampling). | str | No |
+| cluster_key | Key to use for cluster sampling (required for cluster sampling). | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| sampled_data | The sampled subset of the input data. | List[Dict[str, Any] \| List[Any]] |
+| sample_indices | The indices of the sampled data in the original dataset. | List[int] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**A/B Testing**: Randomly sample users or records for testing different workflow paths.
+
+**Representative Subsets**: Extract stratified samples from large datasets for analysis or testing.
+
+**Performance Testing**: Select a smaller sample from large data for workflow development and debugging.
+<!-- END MANUAL -->
+
+---
+
+## If Input Matches
+
+### What it is
+Handles conditional logic based on comparison operators
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block checks if an input matches a specified value and routes data accordingly. When the input equals the value, data flows to yes_output; otherwise, it goes to no_output.
+
+Use yes_value and no_value to specify what data to output in each case. This provides a simple equality check for branching workflow logic.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| input | The input to match against | Input | Yes |
+| value | The value to output if the input matches | Value | Yes |
+| yes_value | The value to output if the input matches | Yes Value | No |
+| no_value | The value to output if the input does not match | No Value | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| result | The result of the condition evaluation (True or False) | bool |
+| yes_output | The output value if the condition is true | Yes Output |
+| no_output | The output value if the condition is false | No Output |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Category Routing**: Route items to different processing paths based on their category or type.
+
+**Feature Flags**: Check if a feature flag equals "enabled" to conditionally execute new functionality.
+
+**Status Handling**: Branch workflow based on specific status values like "pending", "approved", or "rejected".
+<!-- END MANUAL -->
+
+---
+
+## Pinecone Init
+
+### What it is
+Initializes a Pinecone index
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block initializes or connects to a Pinecone vector database index. Specify the index name, vector dimension, and distance metric (cosine, euclidean, or dot product) for new indexes.
+
+For serverless deployment, configure the cloud provider and region. The block returns the initialized index name for use with insert and query operations.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| index_name | Name of the Pinecone index | str | Yes |
+| dimension | Dimension of the vectors | int | No |
+| metric | Distance metric for the index | str | No |
+| cloud | Cloud provider for serverless | str | No |
+| region | Region for serverless | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| index | Name of the initialized Pinecone index | str |
+| message | Status message | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**RAG Pipeline Setup**: Initialize a vector index for storing document embeddings in retrieval-augmented generation.
+
+**Semantic Search**: Set up a vector database for similarity search across products, documents, or media.
+
+**Knowledge Base**: Create a searchable vector store for FAQ answers or support documentation.
+<!-- END MANUAL -->
+
+---
+
+## Pinecone Insert
+
+### What it is
+Upload data to a Pinecone index
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uploads vectors and associated text chunks to a Pinecone index. Each chunk is paired with its embedding vector, and optional metadata can be attached for filtering during queries.
+
+Use namespaces to organize vectors into logical groups within the same index. The upsert operation adds new vectors or updates existing ones with matching IDs.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| index | Initialized Pinecone index | str | Yes |
+| chunks | List of text chunks to ingest | List[Any] | Yes |
+| embeddings | List of embeddings corresponding to the chunks | List[Any] | Yes |
+| namespace | Namespace to use in Pinecone | str | No |
+| metadata | Additional metadata to store with each vector | Dict[str, Any] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| upsert_response | Response from Pinecone upsert operation | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Document Indexing**: Store document chunks with their embeddings for later semantic search.
+
+**Knowledge Ingestion**: Add FAQ entries, product descriptions, or support articles to a searchable index.
+
+**Memory Storage**: Store conversation history or agent memories as searchable vectors.
+<!-- END MANUAL -->
+
+---
+
+## Pinecone Query
+
+### What it is
+Queries a Pinecone index
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block searches a Pinecone index for vectors similar to a query vector. Specify top_k to control how many results to return, and use namespace to search within a specific partition.
+
+Results include similarity scores and optionally the vector values and metadata. Combined results aggregate the text chunks for easy use in RAG pipelines.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| query_vector | Query vector | List[Any] | Yes |
+| namespace | Namespace to query in Pinecone | str | No |
+| top_k | Number of top results to return | int | No |
+| include_values | Whether to include vector values in the response | bool | No |
+| include_metadata | Whether to include metadata in the response | bool | No |
+| host | Host for pinecone | str | No |
+| idx_name | Index name for pinecone | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| results | Query results from Pinecone | Results |
+| combined_results | Combined results from Pinecone | Combined Results |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Semantic Search**: Find the most relevant documents or answers based on meaning, not just keywords.
+
+**RAG Context**: Retrieve relevant context passages to augment LLM prompts with domain-specific knowledge.
+
+**Similar Content**: Find products, articles, or media similar to a reference item.
+<!-- END MANUAL -->
+
+---
+
+## Step Through Items
+
+### What it is
+Iterates over a list or dictionary and outputs each item.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+When given a list or dictionary, the block processes each item individually. For lists, it keeps track of the item's position (index). For dictionaries, it focuses on the values, using the value as both the item and the key in the output.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| items | The list or dictionary of items to iterate over | List[Any] | No |
+| items_object | The list or dictionary of items to iterate over | Dict[str, Any] | No |
+| items_str | The list or dictionary of items to iterate over | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| item | The current item in the iteration | Item |
+| key | The key or index of the current item in the iteration | Key |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Imagine you have a list of customer names and you want to perform a specific action for each customer, like sending a personalized email. This block could help you go through the list one by one, allowing you to process each customer individually.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/content/platform/blocks/maths.md b/docs/integrations/block-integrations/maths.md
similarity index 100%
rename from docs/content/platform/blocks/maths.md
rename to docs/integrations/block-integrations/maths.md
diff --git a/docs/content/platform/blocks/medium.md b/docs/integrations/block-integrations/medium.md
similarity index 100%
rename from docs/content/platform/blocks/medium.md
rename to docs/integrations/block-integrations/medium.md
diff --git a/docs/integrations/block-integrations/misc.md b/docs/integrations/block-integrations/misc.md
new file mode 100644
index 0000000000..4c199bebb4
--- /dev/null
+++ b/docs/integrations/block-integrations/misc.md
@@ -0,0 +1,1111 @@
+# Misc
+<!-- MANUAL: file_description -->
+Miscellaneous blocks including agent execution, scheduling, HTTP requests, webhooks, and other utility functions.
+<!-- END MANUAL -->
+
+## Agent Executor
+
+### What it is
+Executes an existing agent inside your agent
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block runs another agent as a sub-agent within your workflow. You provide the agent's graph ID, version, and input data, and the block executes that agent and returns its outputs.
+
+Input and output schemas define the expected data structure for communication between the parent and child agents, enabling modular, reusable agent composition.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| user_id | User ID | str | Yes |
+| graph_id | Graph ID | str | Yes |
+| graph_version | Graph Version | int | Yes |
+| agent_name | Name to display in the Builder UI | str | No |
+| inputs | Input data for the graph | Dict[str, Any] | Yes |
+| input_schema | Input schema for the graph | Dict[str, Any] | Yes |
+| output_schema | Output schema for the graph | Dict[str, Any] | Yes |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Modular Workflows**: Break complex workflows into smaller, reusable agents that can be composed together.
+
+**Specialized Agents**: Call domain-specific agents (like a research agent or formatter) from a main orchestration agent.
+
+**Dynamic Routing**: Execute different agents based on input type or user preferences.
+<!-- END MANUAL -->
+
+---
+
+## Create Reddit Post
+
+### What it is
+Create a new post on a subreddit. Can create text posts or link posts.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Reddit API via PRAW to create a new post in the specified subreddit. Provide the title and either text content for a self-post or a URL for a link post. Optionally apply flair using a flair ID from the GetSubredditFlairsBlock.
+
+The block returns the created post's ID and URL, which can be used for chaining with comment blocks or monitoring.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| subreddit | Subreddit to post to, excluding the /r/ prefix | str | Yes |
+| title | Title of the post | str | Yes |
+| content | Body text of the post (for text posts) | str | No |
+| url | URL to submit (for link posts). If provided, content is ignored. | str | No |
+| flair_id | Flair template ID to apply to the post (from GetSubredditFlairsBlock) | str | No |
+| flair_text | Custom flair text (only used if the flair template allows editing) | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| post_id | ID of the created post | str |
+| post_url | URL of the created post | str |
+| subreddit | The subreddit name (pass-through for chaining) | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Distribution**: Automatically share articles or content to relevant subreddits.
+
+**Community Engagement**: Post updates or announcements to subreddit communities.
+
+**Automated Posting**: Schedule and post content to Reddit based on workflow triggers.
+<!-- END MANUAL -->
+
+---
+
+## Delete Reddit Comment
+
+### What it is
+Delete a Reddit comment that you own.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Reddit API via PRAW to delete a comment you previously posted. The deletion is permanent and removes the comment from the post thread. You can only delete your own comments.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| comment_id | The ID of the comment to delete (must be your own comment) | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if deletion failed | str |
+| success | Whether the deletion was successful | bool |
+| comment_id | The comment ID (pass-through for chaining) | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Cleanup**: Remove outdated or incorrect comments from discussions.
+
+**Automated Moderation**: Delete comments that fail quality checks or receive negative feedback.
+<!-- END MANUAL -->
+
+---
+
+## Delete Reddit Post
+
+### What it is
+Delete a Reddit post that you own.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Reddit API via PRAW to delete a post you previously created. The deletion is permanent and removes the post from the subreddit. You can only delete your own posts.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| post_id | The ID of the post to delete (must be your own post) | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if deletion failed | str |
+| success | Whether the deletion was successful | bool |
+| post_id | The post ID (pass-through for chaining) | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Management**: Remove posts that are no longer relevant or contain errors.
+
+**Automated Cleanup**: Delete posts based on performance metrics or time-based rules.
+<!-- END MANUAL -->
+
+---
+
+## Edit Reddit Post
+
+### What it is
+Edit the body text of an existing Reddit post that you own. Only works for self/text posts.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Reddit API via PRAW to edit the body text of a self-post you created. Link posts cannot be edited. The new content replaces the existing post body.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| post_id | The ID of the post to edit (must be your own post) | str | Yes |
+| new_content | The new body text for the post | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the edit failed | str |
+| success | Whether the edit was successful | bool |
+| post_id | The post ID (pass-through for chaining) | str |
+| post_url | URL of the edited post | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Updates**: Update posts with new information or corrections.
+
+**Dynamic Content**: Modify post content based on changing data or feedback.
+<!-- END MANUAL -->
+
+---
+
+## Execute Code
+
+### What it is
+Executes code in a sandbox environment with internet access.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block executes Python, JavaScript, or Bash code in an isolated E2B sandbox with internet access. Use setup_commands to install dependencies before running your code.
+
+The sandbox includes pip and npm pre-installed. Set timeout to limit execution time, and use dispose_sandbox to clean up after execution or keep the sandbox running for follow-up steps.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| setup_commands | Shell commands to set up the sandbox before running the code. You can use `curl` or `git` to install your desired Debian based package manager. `pip` and `npm` are pre-installed.  These commands are executed with `sh`, in the foreground. | List[str] | No |
+| code | Code to execute in the sandbox | str | No |
+| language | Programming language to execute | "python" \| "js" \| "bash" \| "r" \| "java" | No |
+| timeout | Execution timeout in seconds | int | No |
+| dispose_sandbox | Whether to dispose of the sandbox immediately after execution. If disabled, the sandbox will run until its timeout expires. | bool | No |
+| template_id | You can use an E2B sandbox template by entering its ID here. Check out the E2B docs for more details: [E2B - Sandbox template](https://e2b.dev/docs/sandbox-template) | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| main_result | The main result from the code execution | Main Result |
+| results | List of results from the code execution | List[CodeExecutionResult] |
+| response | Text output (if any) of the main execution result | str |
+| stdout_logs | Standard output logs from execution | str |
+| stderr_logs | Standard error logs from execution | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Data Processing**: Run Python scripts to transform, analyze, or visualize data that can't be handled by standard blocks.
+
+**Custom Integrations**: Execute code to call APIs or services not covered by built-in blocks.
+
+**Dynamic Computation**: Generate and execute code based on AI suggestions for flexible problem-solving.
+<!-- END MANUAL -->
+
+---
+
+## Execute Code Step
+
+### What it is
+Execute code in a previously instantiated sandbox.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block executes additional code in a sandbox that was previously created with the Instantiate Code Sandbox block. The sandbox maintains state between steps, so variables and installed packages persist.
+
+Use this for multi-step code execution where each step builds on previous results. Set dispose_sandbox to true on the final step to clean up.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| sandbox_id | ID of the sandbox instance to execute the code in | str | Yes |
+| step_code | Code to execute in the sandbox | str | No |
+| language | Programming language to execute | "python" \| "js" \| "bash" \| "r" \| "java" | No |
+| dispose_sandbox | Whether to dispose of the sandbox after executing this code. | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| main_result | The main result from the code execution | Main Result |
+| results | List of results from the code execution | List[CodeExecutionResult] |
+| response | Text output (if any) of the main execution result | str |
+| stdout_logs | Standard output logs from execution | str |
+| stderr_logs | Standard error logs from execution | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Iterative Processing**: Load data in one step, transform it in another, and export in a third.
+
+**Stateful Computation**: Build up results across multiple code executions with shared variables.
+
+**Interactive Analysis**: Run exploratory data analysis steps sequentially in the same environment.
+<!-- END MANUAL -->
+
+---
+
+## Get Reddit Comment
+
+### What it is
+Get details about a specific Reddit comment by its ID.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Reddit API via PRAW to retrieve detailed information about a specific comment by its ID. Returns the comment content, author, score, timestamp, and other metadata.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| comment_id | The ID of the comment to fetch | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if comment couldn't be fetched | str |
+| comment | The comment details | RedditComment |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Comment Analysis**: Analyze specific comments for sentiment or content moderation.
+
+**Thread Tracking**: Monitor specific comments for engagement or replies.
+<!-- END MANUAL -->
+
+---
+
+## Get Reddit Comment Replies
+
+### What it is
+Get replies to a specific Reddit comment.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Reddit API via PRAW to fetch replies to a specific comment. Returns a list of direct replies with their content, authors, and metadata.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| comment_id | The ID of the comment to get replies from | str | Yes |
+| post_id | The ID of the post containing the comment | str | Yes |
+| limit | Maximum number of replies to fetch (max 50) | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if replies couldn't be fetched | str |
+| reply | A reply to the comment | RedditComment |
+| replies | All replies | List[RedditComment] |
+| comment_id | The parent comment ID (pass-through for chaining) | str |
+| post_id | The post ID (pass-through for chaining) | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Conversation Threading**: Build complete comment threads for analysis or display.
+
+**Response Monitoring**: Track replies to your comments for engagement purposes.
+<!-- END MANUAL -->
+
+---
+
+## Get Reddit Inbox
+
+### What it is
+Get messages, mentions, and comment replies from your Reddit inbox.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Reddit API via PRAW to fetch items from your Reddit inbox. Filter by type to get all items, unread only, direct messages, username mentions, or replies to your comments.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| inbox_type | Type of inbox items to fetch | "all" \| "unread" \| "messages" \| "mentions" \| "comment_replies" | No |
+| limit | Maximum number of items to fetch | int | No |
+| mark_read | Whether to mark fetched items as read | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if fetch failed | str |
+| item | An inbox item | RedditInboxItem |
+| items | All fetched items | List[RedditInboxItem] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Inbox Monitoring**: Check for new messages or mentions to respond to.
+
+**Engagement Tracking**: Monitor comment replies to stay engaged with discussions.
+<!-- END MANUAL -->
+
+---
+
+## Get Reddit Post
+
+### What it is
+Get detailed information about a specific Reddit post by its ID.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Reddit API via PRAW to retrieve complete details about a specific post by its ID. Returns the post title, content, author, score, comment count, and other metadata.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| post_id | The ID of the post to fetch (e.g., 'abc123' or full ID 't3_abc123') | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the post couldn't be fetched | str |
+| post | Detailed post information | RedditPostDetails |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Post Analysis**: Analyze specific posts for content quality or engagement metrics.
+
+**Content Verification**: Verify post details before interacting with it programmatically.
+<!-- END MANUAL -->
+
+---
+
+## Get Reddit Post Comments
+
+### What it is
+Get top-level comments on a Reddit post.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Reddit API via PRAW to fetch top-level comments on a post. Configure the sort order and limit to control which comments are returned.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| post_id | The ID of the post to get comments from | str | Yes |
+| limit | Maximum number of top-level comments to fetch (max 100) | int | No |
+| sort | Sort order for comments | "best" \| "top" \| "new" \| "controversial" \| "old" \| "qa" | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if comments couldn't be fetched | str |
+| comment | A comment on the post | RedditComment |
+| comments | All fetched comments | List[RedditComment] |
+| post_id | The post ID (pass-through for chaining) | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Sentiment Analysis**: Analyze comments to gauge community sentiment on a topic.
+
+**Content Moderation**: Review comments for compliance with community guidelines.
+<!-- END MANUAL -->
+
+---
+
+## Get Reddit Posts
+
+### What it is
+This block fetches Reddit posts from a defined subreddit name.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block connects to Reddit using provided credentials, accesses the specified subreddit, and retrieves posts based on the given parameters. It can limit the number of posts, stop at a specific post, or fetch posts within a certain time frame.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| subreddit | Subreddit name, excluding the /r/ prefix | str | No |
+| last_minutes | Post time to stop minutes ago while fetching posts | int | No |
+| last_post | Post ID to stop when reached while fetching posts | str | No |
+| post_limit | Number of posts to fetch | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| post | Reddit post | RedditPost |
+| posts | List of all Reddit posts | List[RedditPost] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+A content curator could use this block to gather recent posts from a specific subreddit for analysis, summarization, or inclusion in a newsletter.
+<!-- END MANUAL -->
+
+---
+
+## Get Reddit User Info
+
+### What it is
+Get information about a Reddit user including karma, account age, and verification status.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Reddit API via PRAW to retrieve public profile information about a Reddit user, including karma scores, account age, and verification status.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| username | The Reddit username to look up (without /u/ prefix) | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if user lookup failed | str |
+| user | User information | RedditUserInfo |
+| username | The username (pass-through for chaining) | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**User Verification**: Check user account age and karma before engaging.
+
+**User Research**: Gather user profile data for analysis or outreach decisions.
+<!-- END MANUAL -->
+
+---
+
+## Get Subreddit Flairs
+
+### What it is
+Get available link flair options for a subreddit.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Reddit API via PRAW to retrieve available link flair options for a subreddit. Use the flair IDs with the Create Reddit Post block to apply flair to your posts.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| subreddit | Subreddit name (without /r/ prefix) | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if fetch failed | str |
+| flair | A flair option | SubredditFlair |
+| flairs | All available flairs | List[SubredditFlair] |
+| subreddit | The subreddit name (pass-through for chaining) | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Post Preparation**: Get available flairs before creating posts to ensure proper categorization.
+
+**Flair Selection**: Present flair options to users or select appropriate flair programmatically.
+<!-- END MANUAL -->
+
+---
+
+## Get Subreddit Info
+
+### What it is
+Get information about a subreddit including subscriber count, description, and rules.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Reddit API via PRAW to retrieve metadata about a subreddit including subscriber count, description, creation date, and posting rules.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| subreddit | Subreddit name (without /r/ prefix) | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the subreddit couldn't be fetched | str |
+| info | Subreddit information | SubredditInfo |
+| subreddit | The subreddit name (pass-through for chaining) | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Subreddit Research**: Analyze subreddits before deciding to post or engage.
+
+**Community Analysis**: Compare subreddit sizes and activity for market research.
+<!-- END MANUAL -->
+
+---
+
+## Get Subreddit Rules
+
+### What it is
+Get the rules for a subreddit to ensure compliance before posting.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Reddit API via PRAW to retrieve the posting rules for a subreddit. Review these rules before posting to ensure compliance.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| subreddit | Subreddit name (without /r/ prefix) | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if fetch failed | str |
+| rule | A subreddit rule | SubredditRule |
+| rules | All subreddit rules | List[SubredditRule] |
+| subreddit | The subreddit name (pass-through for chaining) | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Compliance Check**: Review rules before automated posting to avoid violations.
+
+**Content Guidelines**: Display rules to users before they submit content to a subreddit.
+<!-- END MANUAL -->
+
+---
+
+## Get User Posts
+
+### What it is
+Fetch posts by a specific Reddit user.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Reddit API via PRAW to fetch posts submitted by a specific user. Configure sort order and limit to control which posts are returned.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| username | Reddit username to fetch posts from (without /u/ prefix) | str | Yes |
+| post_limit | Maximum number of posts to fetch | int | No |
+| sort | Sort order for user posts | "new" \| "hot" \| "top" \| "controversial" | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if posts couldn't be fetched | str |
+| post | A post by the user | RedditPost |
+| posts | All posts by the user | List[RedditPost] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**User Analysis**: Analyze a user's posting history for content patterns or topics.
+
+**Influencer Research**: Research prolific posters in specific communities.
+<!-- END MANUAL -->
+
+---
+
+## Instantiate Code Sandbox
+
+### What it is
+Instantiate a sandbox environment with internet access in which you can execute code with the Execute Code Step block.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a persistent E2B sandbox environment that can be used for multiple code execution steps. Run setup_commands and setup_code to prepare the environment with dependencies and initial state.
+
+The sandbox persists until its timeout expires or it's explicitly disposed. Use the returned sandbox_id with Execute Code Step blocks for subsequent code execution.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| setup_commands | Shell commands to set up the sandbox before running the code. You can use `curl` or `git` to install your desired Debian based package manager. `pip` and `npm` are pre-installed.  These commands are executed with `sh`, in the foreground. | List[str] | No |
+| setup_code | Code to execute in the sandbox | str | No |
+| language | Programming language to execute | "python" \| "js" \| "bash" \| "r" \| "java" | No |
+| timeout | Execution timeout in seconds | int | No |
+| template_id | You can use an E2B sandbox template by entering its ID here. Check out the E2B docs for more details: [E2B - Sandbox template](https://e2b.dev/docs/sandbox-template) | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| sandbox_id | ID of the sandbox instance | str |
+| response | Text result (if any) of the setup code execution | str |
+| stdout_logs | Standard output logs from execution | str |
+| stderr_logs | Standard error logs from execution | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Complex Pipelines**: Set up an environment with data science libraries for multi-step analysis.
+
+**Persistent State**: Create a sandbox with loaded models or data that multiple workflow branches can access.
+
+**Custom Environments**: Configure specialized environments with specific package versions for reproducible execution.
+<!-- END MANUAL -->
+
+---
+
+## Post Reddit Comment
+
+### What it is
+This block posts a Reddit comment on a specified Reddit post.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block connects to Reddit using the provided credentials, locates the specified post, and then adds the given comment to that post.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| post_id | The ID of the post to comment on | str | Yes |
+| comment | The content of the comment to post | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| comment_id | Posted comment ID | str |
+| post_id | The post ID (pass-through for chaining) | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+An automated moderation system could use this block to post pre-defined responses or warnings on Reddit posts that violate community guidelines.
+<!-- END MANUAL -->
+
+---
+
+## Publish To Medium
+
+### What it is
+Publishes a post to Medium.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block publishes articles to Medium using their API. Provide the content in HTML or Markdown format along with a title, tags, and publishing options. The author_id can be obtained from Medium's /me API endpoint.
+
+Configure publish_status to publish immediately, save as draft, or make unlisted. The block returns the published post's ID and URL.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| author_id | The Medium AuthorID of the user. You can get this by calling the /me endpoint of the Medium API.  curl -H "Authorization: Bearer YOUR_ACCESS_TOKEN" https://api.medium.com/v1/me  The response will contain the authorId field. | str | No |
+| title | The title of your Medium post | str | Yes |
+| content | The main content of your Medium post | str | Yes |
+| content_format | The format of the content: 'html' or 'markdown' | str | Yes |
+| tags | List of tags for your Medium post (up to 5) | List[str] | Yes |
+| canonical_url | The original home of this content, if it was originally published elsewhere | str | No |
+| publish_status | The publish status | "public" \| "draft" \| "unlisted" | Yes |
+| license | The license of the post: 'all-rights-reserved', 'cc-40-by', 'cc-40-by-sa', 'cc-40-by-nd', 'cc-40-by-nc', 'cc-40-by-nc-nd', 'cc-40-by-nc-sa', 'cc-40-zero', 'public-domain' | str | No |
+| notify_followers | Whether to notify followers that the user has published | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the post creation failed | str |
+| post_id | The ID of the created Medium post | str |
+| post_url | The URL of the created Medium post | str |
+| published_at | The timestamp when the post was published | int |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Syndication**: Automatically publish blog posts or newsletters to Medium to reach a wider audience.
+
+**AI Content Publishing**: Generate articles with AI and publish them directly to Medium.
+
+**Cross-Posting**: Republish existing content from other platforms to Medium with proper canonical URL attribution.
+<!-- END MANUAL -->
+
+---
+
+## Read RSS Feed
+
+### What it is
+Reads RSS feed entries from a given URL.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block fetches and parses RSS or Atom feeds from a URL. Filter entries by time_period to only get recent items. When run_continuously is enabled, the block polls the feed at the specified polling_rate interval.
+
+Each entry is output individually, enabling processing of new content as it appears. The block also outputs all entries as a list for batch processing.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| rss_url | The URL of the RSS feed to read | str | Yes |
+| time_period | The time period to check in minutes relative to the run block runtime, e.g. 60 would check for new entries in the last hour. | int | No |
+| polling_rate | The number of seconds to wait between polling attempts. | int | Yes |
+| run_continuously | Whether to run the block continuously or just once. | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| entry | The RSS item | RSSEntry |
+| entries | List of all RSS entries | List[RSSEntry] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**News Monitoring**: Track industry news feeds and process new articles for summarization or alerts.
+
+**Content Aggregation**: Collect posts from multiple RSS feeds for a curated digest or newsletter.
+
+**Blog Triggers**: Monitor a competitor's blog feed to trigger analysis or response workflows.
+<!-- END MANUAL -->
+
+---
+
+## Reddit Get My Posts
+
+### What it is
+Fetch posts created by the authenticated Reddit user (you).
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Reddit API via PRAW to fetch posts you've submitted to Reddit. Useful for managing or analyzing your own posting history.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| post_limit | Maximum number of posts to fetch | int | No |
+| sort | Sort order for posts | "new" \| "hot" \| "top" \| "controversial" | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if posts couldn't be fetched | str |
+| post | A post by you | RedditPost |
+| posts | All your posts | List[RedditPost] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Management**: Review and manage your Reddit posting history.
+
+**Performance Tracking**: Analyze the engagement of your previous posts.
+<!-- END MANUAL -->
+
+---
+
+## Reply To Reddit Comment
+
+### What it is
+Reply to a specific Reddit comment. Useful for threaded conversations.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Reddit API via PRAW to post a reply to an existing comment. The reply appears as a nested response in the comment thread.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| comment_id | The ID of the comment to reply to | str | Yes |
+| reply_text | The text content of the reply | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if reply failed | str |
+| comment_id | ID of the newly created reply | str |
+| parent_comment_id | The parent comment ID (pass-through for chaining) | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Automated Responses**: Reply to comments that mention your product or brand.
+
+**Conversation Engagement**: Participate in discussions by responding to relevant comments.
+<!-- END MANUAL -->
+
+---
+
+## Search Reddit
+
+### What it is
+Search Reddit for posts matching a query. Can search all of Reddit or a specific subreddit.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Reddit API via PRAW to search for posts matching your query. Optionally limit the search to a specific subreddit and configure sort order and time filters.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| query | Search query string | str | Yes |
+| subreddit | Limit search to a specific subreddit (without /r/ prefix) | str | No |
+| sort | Sort order for search results | "relevance" \| "hot" \| "top" \| "new" \| "comments" | No |
+| time_filter | Time filter for search results | "all" \| "day" \| "hour" \| "month" \| "week" \| "year" | No |
+| limit | Maximum number of results to return | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if search failed | str |
+| result | A search result | RedditSearchResult |
+| results | All search results | List[RedditSearchResult] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Brand Monitoring**: Search for mentions of your product or company across Reddit.
+
+**Topic Research**: Find discussions about specific topics or keywords.
+<!-- END MANUAL -->
+
+---
+
+## Send Authenticated Web Request
+
+### What it is
+Make an authenticated HTTP request with host-scoped credentials (JSON / form / multipart).
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block makes HTTP requests with automatic credential injection based on the request URL's host. Credentials are managed separately and applied when the URL matches a configured host pattern.
+
+Supports JSON, form-encoded, and multipart requests with file uploads. The response is parsed and returned along with separate error outputs for client (4xx) and server (5xx) errors.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| url | The URL to send the request to | str | Yes |
+| method | The HTTP method to use for the request | "GET" \| "POST" \| "PUT" \| "DELETE" \| "PATCH" \| "OPTIONS" \| "HEAD" | No |
+| headers | The headers to include in the request | Dict[str, str] | No |
+| json_format | If true, send the body as JSON (unless files are also present). | bool | No |
+| body | Form/JSON body payload. If files are supplied, this must be a mapping of form‑fields. | Dict[str, Any] | No |
+| files_name | The name of the file field in the form data. | str | No |
+| files | Mapping of *form field name* → Image url / path / base64 url. | List[str (file)] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Errors for all other exceptions | str |
+| response | The response from the server | Response |
+| client_error | Errors on 4xx status codes | Client Error |
+| server_error | Errors on 5xx status codes | Server Error |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Private API Access**: Call APIs that require authentication without exposing credentials in the workflow.
+
+**OAuth Integrations**: Access protected resources using pre-configured OAuth tokens.
+
+**Multi-Tenant APIs**: Make requests to APIs where credentials vary by host or endpoint.
+<!-- END MANUAL -->
+
+---
+
+## Send Email
+
+### What it is
+This block sends an email using the provided SMTP credentials.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block sends emails via SMTP using your configured email server credentials. Provide the recipient address, subject, and body content. The SMTP configuration includes server host, port, username, and password.
+
+The block handles connection, authentication, and message delivery, returning a status indicating success or failure.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| to_email | Recipient email address | str | Yes |
+| subject | Subject of the email | str | Yes |
+| body | Body of the email | str | Yes |
+| config | SMTP Config | SMTP Config | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the email sending failed | str |
+| status | Status of the email sending operation | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Notification Emails**: Send automated notifications when workflow events occur.
+
+**Report Delivery**: Email generated reports or summaries to stakeholders.
+
+**Alert System**: Send email alerts when monitoring workflows detect issues or thresholds.
+<!-- END MANUAL -->
+
+---
+
+## Send Reddit Message
+
+### What it is
+Send a private message (DM) to a Reddit user.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Reddit API via PRAW to send a private message to another Reddit user. The message appears in their inbox.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| username | The Reddit username to send a message to (without /u/ prefix) | str | Yes |
+| subject | The subject line of the message | str | Yes |
+| message | The body content of the message | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if sending failed | str |
+| success | Whether the message was sent | bool |
+| username | The username (pass-through for chaining) | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Outreach**: Send direct messages to users for collaboration or feedback requests.
+
+**Support**: Provide private support or follow-up to users who engaged with your content.
+<!-- END MANUAL -->
+
+---
+
+## Send Web Request
+
+### What it is
+Make an HTTP request (JSON / form / multipart).
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block makes HTTP requests to any URL. Configure the method (GET, POST, PUT, DELETE, PATCH), headers, and request body. Supports JSON, form-encoded, and multipart content types with file uploads.
+
+The response body is parsed and returned. Separate error outputs distinguish between client errors (4xx), server errors (5xx), and other failures.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| url | The URL to send the request to | str | Yes |
+| method | The HTTP method to use for the request | "GET" \| "POST" \| "PUT" \| "DELETE" \| "PATCH" \| "OPTIONS" \| "HEAD" | No |
+| headers | The headers to include in the request | Dict[str, str] | No |
+| json_format | If true, send the body as JSON (unless files are also present). | bool | No |
+| body | Form/JSON body payload. If files are supplied, this must be a mapping of form‑fields. | Dict[str, Any] | No |
+| files_name | The name of the file field in the form data. | str | No |
+| files | Mapping of *form field name* → Image url / path / base64 url. | List[str (file)] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Errors for all other exceptions | str |
+| response | The response from the server | Response |
+| client_error | Errors on 4xx status codes | Client Error |
+| server_error | Errors on 5xx status codes | Server Error |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**API Integration**: Call REST APIs to fetch data, trigger actions, or send updates.
+
+**Webhook Delivery**: Send webhook notifications to external services when events occur.
+
+**Custom Services**: Integrate with services that don't have dedicated blocks using their HTTP APIs.
+<!-- END MANUAL -->
+
+---
+
+## Transcribe Youtube Video
+
+### What it is
+Transcribes a YouTube video using a proxy.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block extracts transcripts from YouTube videos using a proxy service. It parses the YouTube URL to get the video ID and retrieves the available transcript, typically the auto-generated or manually uploaded captions.
+
+The transcript text is returned as a single string, suitable for summarization, analysis, or other text processing.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| youtube_url | The URL of the YouTube video to transcribe | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Any error message if the transcription fails | str |
+| video_id | The extracted YouTube video ID | str |
+| transcript | The transcribed text of the video | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Video Summarization**: Extract video transcripts for AI summarization or key point extraction.
+
+**Content Repurposing**: Convert YouTube content into written articles, social posts, or documentation.
+
+**Research Automation**: Transcribe educational or informational videos for analysis and note-taking.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/multimedia.md b/docs/integrations/block-integrations/multimedia.md
new file mode 100644
index 0000000000..6b8f261346
--- /dev/null
+++ b/docs/integrations/block-integrations/multimedia.md
@@ -0,0 +1,117 @@
+# Multimedia
+<!-- MANUAL: file_description -->
+Blocks for processing and manipulating video and audio files.
+<!-- END MANUAL -->
+
+## Add Audio To Video
+
+### What it is
+Block to attach an audio file to a video file using moviepy.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block combines a video file with an audio file using the moviepy library. The audio track is attached to the video, optionally with volume adjustment via the volume parameter (1.0 = original volume).
+
+Input files can be URLs, data URIs, or local paths. The output format is automatically determined: `workspace://` URLs in CoPilot, data URIs in graph executions.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| video_in | Video input (URL, data URI, or local path). | str (file) | Yes |
+| audio_in | Audio input (URL, data URI, or local path). | str (file) | Yes |
+| volume | Volume scale for the newly attached audio track (1.0 = original). | float | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| video_out | Final video (with attached audio), as a path or data URI. | str (file) |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Add Voiceover**: Combine generated voiceover audio with video content for narrated videos.
+
+**Background Music**: Add music tracks to silent videos or replace existing audio.
+
+**Audio Replacement**: Swap the audio track of a video for localization or accessibility.
+<!-- END MANUAL -->
+
+---
+
+## Loop Video
+
+### What it is
+Block to loop a video to a given duration or number of repeats.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block extends a video by repeating it to reach a target duration or number of loops. Set duration to specify the total length in seconds, or use n_loops to repeat the video a specific number of times.
+
+The looped video is seamlessly concatenated. The output format is automatically determined: `workspace://` URLs in CoPilot, data URIs in graph executions.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| video_in | The input video (can be a URL, data URI, or local path). | str (file) | Yes |
+| duration | Target duration (in seconds) to loop the video to. If omitted, defaults to no looping. | float | No |
+| n_loops | Number of times to repeat the video. If omitted, defaults to 1 (no repeat). | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| video_out | Looped video returned either as a relative path or a data URI. | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Background Videos**: Loop short clips to match the duration of longer audio or content.
+
+**GIF-Like Content**: Create seamlessly looping video content for social media.
+
+**Filler Content**: Extend short video clips to meet minimum duration requirements.
+<!-- END MANUAL -->
+
+---
+
+## Media Duration
+
+### What it is
+Block to get the duration of a media file.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block analyzes a media file and returns its duration in seconds. Set is_video to true for video files or false for audio files to ensure proper parsing.
+
+The input can be a URL, data URI, or local file path. The duration is returned as a float for precise timing calculations.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| media_in | Media input (URL, data URI, or local path). | str (file) | Yes |
+| is_video | Whether the media is a video (True) or audio (False). | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| duration | Duration of the media file (in seconds). | float |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Video Processing Prep**: Get video duration before deciding how to loop, trim, or synchronize it.
+
+**Audio Matching**: Determine audio length to generate matching-length video content.
+
+**Content Validation**: Verify that uploaded media meets duration requirements.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/notion/create_page.md b/docs/integrations/block-integrations/notion/create_page.md
new file mode 100644
index 0000000000..abcd919300
--- /dev/null
+++ b/docs/integrations/block-integrations/notion/create_page.md
@@ -0,0 +1,46 @@
+# Notion Create Page
+<!-- MANUAL: file_description -->
+Blocks for creating new pages in Notion workspaces and databases.
+<!-- END MANUAL -->
+
+## Notion Create Page
+
+### What it is
+Create a new page in Notion. Requires EITHER a parent_page_id OR parent_database_id. Supports markdown content.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a new page in Notion using the Notion API. You can create pages as children of existing pages or as entries in a database. The parent must be accessible to your integration.
+
+Content can be provided as markdown, which gets converted to Notion blocks. For database pages, you can set additional properties like Status or Priority. Optionally add an emoji icon to the page.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| parent_page_id | Parent page ID to create the page under. Either this OR parent_database_id is required. | str | No |
+| parent_database_id | Parent database ID to create the page in. Either this OR parent_page_id is required. | str | No |
+| title | Title of the new page | str | Yes |
+| content | Content for the page. Can be plain text or markdown - will be converted to Notion blocks. | str | No |
+| properties | Additional properties for database pages (e.g., {'Status': 'In Progress', 'Priority': 'High'}) | Dict[str, Any] | No |
+| icon_emoji | Emoji to use as the page icon (e.g., '📄', '🚀') | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| page_id | ID of the created page. | str |
+| page_url | URL of the created page. | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Meeting Notes**: Automatically create meeting notes pages from calendar events with template content.
+
+**Task Creation**: Add new entries to a task database when issues are created in other systems.
+
+**Content Publishing**: Create draft pages in a content calendar from AI-generated or imported content.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/notion/read_database.md b/docs/integrations/block-integrations/notion/read_database.md
new file mode 100644
index 0000000000..9d9b687015
--- /dev/null
+++ b/docs/integrations/block-integrations/notion/read_database.md
@@ -0,0 +1,50 @@
+# Notion Read Database
+<!-- MANUAL: file_description -->
+Blocks for querying and reading data from Notion databases.
+<!-- END MANUAL -->
+
+## Notion Read Database
+
+### What it is
+Query a Notion database with optional filtering and sorting, returning structured entries.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries a Notion database using the Notion API. It retrieves entries with optional filtering by property values and sorting. The block requires your Notion integration to have access to the database.
+
+Results include all property values for each entry, the entry IDs for further operations, and the total count. The database connection must be shared with your integration from Notion.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| database_id | Notion database ID. Must be accessible by the connected integration. | str | Yes |
+| filter_property | Property name to filter by (e.g., 'Status', 'Priority') | str | No |
+| filter_value | Value to filter for in the specified property | str | No |
+| sort_property | Property name to sort by | str | No |
+| sort_direction | Sort direction: 'ascending' or 'descending' | str | No |
+| limit | Maximum number of entries to retrieve | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| entries | List of database entries with their properties. | List[Dict[str, Any]] |
+| entry | Individual database entry (yields one per entry found). | Dict[str, Any] |
+| entry_ids | List of entry IDs for batch operations. | List[str] |
+| entry_id | Individual entry ID (yields one per entry found). | str |
+| count | Number of entries retrieved. | int |
+| database_title | Title of the database. | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Task Management**: Query a Notion task database to find items with a specific status or assigned to a particular person.
+
+**Content Pipeline**: Read entries from a content calendar database to identify posts scheduled for today or this week.
+
+**CRM Sync**: Fetch customer records from a Notion database to sync with other systems or trigger workflows.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/notion/read_page.md b/docs/integrations/block-integrations/notion/read_page.md
new file mode 100644
index 0000000000..acf65f5f2c
--- /dev/null
+++ b/docs/integrations/block-integrations/notion/read_page.md
@@ -0,0 +1,40 @@
+# Notion Read Page
+<!-- MANUAL: file_description -->
+Blocks for reading Notion pages and retrieving their raw JSON data.
+<!-- END MANUAL -->
+
+## Notion Read Page
+
+### What it is
+Read a Notion page by its ID and return its raw JSON.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves a Notion page by its ID using the Notion API. The page must be accessible to your connected integration, which requires sharing the page with your integration from within Notion.
+
+The block returns the raw JSON representation of the page, including all properties, metadata, and block IDs. This format is useful for programmatic processing or when you need full access to page data.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| page_id | Notion page ID. Must be accessible by the connected integration. You can get this from the page URL notion.so/A-Page-586edd711467478da59fe3ce29a1ffab would be 586edd711467478da59fe35e29a1ffab | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| page | Raw Notion page JSON. | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Data Extraction**: Read page properties and metadata for analysis or migration to other systems.
+
+**Automation Triggers**: Check page properties to decide what actions to take in a workflow.
+
+**Content Backup**: Retrieve full page data for archival or backup purposes.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/notion/read_page_markdown.md b/docs/integrations/block-integrations/notion/read_page_markdown.md
new file mode 100644
index 0000000000..120dc39144
--- /dev/null
+++ b/docs/integrations/block-integrations/notion/read_page_markdown.md
@@ -0,0 +1,42 @@
+# Notion Read Page Markdown
+<!-- MANUAL: file_description -->
+Blocks for reading Notion pages and converting them to Markdown format.
+<!-- END MANUAL -->
+
+## Notion Read Page Markdown
+
+### What it is
+Read a Notion page and convert it to Markdown format with proper formatting for headings, lists, links, and rich text.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block reads a Notion page and converts its content to Markdown format. It handles Notion's block structure and rich text, translating headings, lists, links, bold, italic, and other formatting into standard Markdown.
+
+The conversion preserves the document structure while making the content portable and usable in other contexts. Optionally include the page title as a top-level header in the output.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| page_id | Notion page ID. Must be accessible by the connected integration. You can get this from the page URL notion.so/A-Page-586edd711467478da59fe35e29a1ffab would be 586edd711467478da59fe35e29a1ffab | str | Yes |
+| include_title | Whether to include the page title as a header in the markdown | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| markdown | Page content in Markdown format. | str |
+| title | Page title. | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Export**: Export Notion pages as Markdown for use in static site generators or documentation tools.
+
+**AI Processing**: Convert Notion content to Markdown for LLM processing, summarization, or analysis.
+
+**Cross-Platform Publishing**: Use Notion as a CMS and export content as Markdown for blogs or wikis.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/notion/search.md b/docs/integrations/block-integrations/notion/search.md
new file mode 100644
index 0000000000..f77992ae4f
--- /dev/null
+++ b/docs/integrations/block-integrations/notion/search.md
@@ -0,0 +1,45 @@
+# Notion Search
+<!-- MANUAL: file_description -->
+Blocks for searching pages and databases in a Notion workspace.
+<!-- END MANUAL -->
+
+## Notion Search
+
+### What it is
+Search your Notion workspace for pages and databases by text query.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block searches across your Notion workspace using the Notion Search API. It finds pages and databases matching your query text, with optional filtering by type (page or database).
+
+Results include titles, types, URLs, and metadata for each match. Leave the query empty to retrieve all accessible pages and databases. Pagination is handled automatically up to the specified limit.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| query | Search query text. Leave empty to get all accessible pages/databases. | str | No |
+| filter_type | Filter results by type: 'page' or 'database'. Leave empty for both. | str | No |
+| limit | Maximum number of results to return | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| results | List of search results with title, type, URL, and metadata. | List[NotionSearchResult] |
+| result | Individual search result (yields one per result found). | NotionSearchResult |
+| result_ids | List of IDs from search results for batch operations. | List[str] |
+| count | Number of results found. | int |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Discovery**: Find relevant pages in your workspace based on keywords or topics.
+
+**Database Lookup**: Search for specific databases to use in subsequent operations.
+
+**Knowledge Retrieval**: Search your Notion workspace to find answers or related documentation.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/nvidia/deepfake.md b/docs/integrations/block-integrations/nvidia/deepfake.md
new file mode 100644
index 0000000000..72961a7b30
--- /dev/null
+++ b/docs/integrations/block-integrations/nvidia/deepfake.md
@@ -0,0 +1,43 @@
+# Nvidia Deepfake
+<!-- MANUAL: file_description -->
+Blocks for detecting deepfakes and synthetic image manipulation using Nvidia AI.
+<!-- END MANUAL -->
+
+## Nvidia Deepfake Detect
+
+### What it is
+Detects potential deepfakes in images using Nvidia's AI API
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block analyzes images using Nvidia's AI-powered deepfake detection model. It returns a probability score (0-1) indicating the likelihood that an image has been synthetically manipulated.
+
+Set return_image to true to receive a processed image with detection markings highlighting areas of concern.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| image_base64 | Image to analyze for deepfakes | str (file) | Yes |
+| return_image | Whether to return the processed image with markings | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| status | Detection status (SUCCESS, ERROR, CONTENT_FILTERED) | str |
+| image | Processed image with detection markings (if return_image=True) | str (file) |
+| is_deepfake | Probability that the image is a deepfake (0-1) | float |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Verification**: Verify authenticity of user-uploaded profile photos or identity documents.
+
+**Media Integrity**: Screen submitted images for signs of AI manipulation.
+
+**Trust & Safety**: Detect potentially misleading synthetic content in social or news platforms.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/content/platform/blocks/reddit.md b/docs/integrations/block-integrations/reddit.md
similarity index 100%
rename from docs/content/platform/blocks/reddit.md
rename to docs/integrations/block-integrations/reddit.md
diff --git a/docs/integrations/block-integrations/replicate/flux_advanced.md b/docs/integrations/block-integrations/replicate/flux_advanced.md
new file mode 100644
index 0000000000..0a9fa0544d
--- /dev/null
+++ b/docs/integrations/block-integrations/replicate/flux_advanced.md
@@ -0,0 +1,54 @@
+# Replicate Flux Advanced
+<!-- MANUAL: file_description -->
+Blocks for generating images using Flux models on Replicate with advanced settings.
+<!-- END MANUAL -->
+
+## Replicate Flux Advanced Model
+
+### What it is
+This block runs Flux models on Replicate with advanced settings.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block takes a text prompt and several customization options as input. It then sends this information to the selected Flux model on the Replicate platform. The AI model processes the input and generates an image based on the provided specifications. Finally, the block returns a URL to the generated image.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| prompt | Text prompt for image generation | str | Yes |
+| replicate_model_name | The name of the Image Generation Model, i.e Flux Schnell | "Flux Schnell" \| "Flux Pro" \| "Flux Pro 1.1" | No |
+| seed | Random seed. Set for reproducible generation | int | No |
+| steps | Number of diffusion steps | int | No |
+| guidance | Controls the balance between adherence to the text prompt and image quality/diversity. Higher values make the output more closely match the prompt but may reduce overall image quality. | float | No |
+| interval | Interval is a setting that increases the variance in possible outputs. Setting this value low will ensure strong prompt following with more consistent outputs. | float | No |
+| aspect_ratio | Aspect ratio for the generated image | str | No |
+| output_format | File format of the output image | "webp" \| "jpg" \| "png" | No |
+| output_quality | Quality when saving the output images, from 0 to 100. Not relevant for .png outputs | int | No |
+| safety_tolerance | Safety tolerance, 1 is most strict and 5 is most permissive | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| result | Generated output | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+A graphic designer could use this block to quickly generate concept art for a sci-fi game. They might input a prompt like "A futuristic spaceport on a distant planet with multiple moons in the sky" and adjust the settings to get the desired style and quality. The generated image could then serve as inspiration or a starting point for further design work.
+- API Key: Your Replicate API key for authentication
+- Prompt: A text description of the image you want to generate (e.g., "A futuristic cityscape at sunset")
+- Image Generation Model: Choose from Flux Schnell, Flux Pro, or Flux Pro 1.1
+- Seed: An optional number for reproducible image generation
+- Steps: The number of diffusion steps in the image generation process
+- Guidance: Controls how closely the image follows the text prompt
+- Interval: Affects the variety of possible outputs
+- Aspect Ratio: The width-to-height ratio of the generated image
+- Output Format: Choose between WEBP, JPG, or PNG file formats
+- Output Quality: Image quality setting (0-100) for JPG and WEBP formats
+- Safety Tolerance: Content safety setting, from 1 (strictest) to 5 (most permissive)
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/replicate/replicate_block.md b/docs/integrations/block-integrations/replicate/replicate_block.md
new file mode 100644
index 0000000000..16505741f2
--- /dev/null
+++ b/docs/integrations/block-integrations/replicate/replicate_block.md
@@ -0,0 +1,44 @@
+# Replicate Replicate Block
+<!-- MANUAL: file_description -->
+Blocks for running any AI model hosted on the Replicate platform.
+<!-- END MANUAL -->
+
+## Replicate Model
+
+### What it is
+Run Replicate models synchronously
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block runs any model hosted on Replicate using their API. Specify the model name in owner/model format, provide inputs as a dictionary, and optionally pin to a specific version.
+
+The block waits for completion and returns the model output along with status information.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| model_name | The Replicate model name (format: 'owner/model-name') | str | Yes |
+| model_inputs | Dictionary of inputs to pass to the model | Dict[str, str \| int] | No |
+| version | Specific version hash of the model (optional) | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| result | The output from the Replicate model | str |
+| status | Status of the prediction | str |
+| model_name | Name of the model used | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Model Flexibility**: Access thousands of open-source AI models from a single interface.
+
+**Custom Models**: Run your own models deployed on Replicate in workflows.
+
+**Specialized AI Tasks**: Use best-of-breed models for specific tasks like upscaling, segmentation, or captioning.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/content/platform/blocks/replicate_flux_advanced.md b/docs/integrations/block-integrations/replicate_flux_advanced.md
similarity index 100%
rename from docs/content/platform/blocks/replicate_flux_advanced.md
rename to docs/integrations/block-integrations/replicate_flux_advanced.md
diff --git a/docs/content/platform/blocks/rss.md b/docs/integrations/block-integrations/rss.md
similarity index 100%
rename from docs/content/platform/blocks/rss.md
rename to docs/integrations/block-integrations/rss.md
diff --git a/docs/content/platform/blocks/sampling.md b/docs/integrations/block-integrations/sampling.md
similarity index 100%
rename from docs/content/platform/blocks/sampling.md
rename to docs/integrations/block-integrations/sampling.md
diff --git a/docs/integrations/block-integrations/search.md b/docs/integrations/block-integrations/search.md
new file mode 100644
index 0000000000..bc6e775233
--- /dev/null
+++ b/docs/integrations/block-integrations/search.md
@@ -0,0 +1,72 @@
+# Search
+<!-- MANUAL: file_description -->
+Blocks for web searching, content extraction, and information retrieval from various search engines and APIs.
+<!-- END MANUAL -->
+
+## Get Wikipedia Summary
+
+### What it is
+This block fetches the summary of a given topic from Wikipedia.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block sends a request to Wikipedia's API with the provided topic. It then extracts the summary from the response and returns it. If there's an error during this process, it will return an error message instead.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| topic | The topic to fetch the summary for | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the summary cannot be retrieved | str |
+| summary | The summary of the given topic | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+A student researching for a project could use this block to quickly get overviews of various topics, helping them decide which areas to focus on for more in-depth study.
+<!-- END MANUAL -->
+
+---
+
+## Google Maps Search
+
+### What it is
+This block searches for local businesses using Google Maps API.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Google Maps Places API to search for businesses and locations based on a query. Configure radius (up to 50km) to limit the search area and max_results (up to 60) to control how many places are returned.
+
+Each place result includes name, address, rating, reviews, and geographic coordinates for integration with mapping or navigation workflows.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| query | Search query for local businesses | str | Yes |
+| radius | Search radius in meters (max 50000) | int | No |
+| max_results | Maximum number of results to return (max 60) | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| place | Place found | Place |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Lead Generation**: Find businesses in a specific area for sales outreach.
+
+**Competitive Analysis**: Search for competitors in target locations to analyze their presence and ratings.
+
+**Local SEO**: Gather data on local businesses for market research or directory building.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/slant3d/filament.md b/docs/integrations/block-integrations/slant3d/filament.md
new file mode 100644
index 0000000000..d6a39b112b
--- /dev/null
+++ b/docs/integrations/block-integrations/slant3d/filament.md
@@ -0,0 +1,34 @@
+# Slant3D Filament
+<!-- MANUAL: file_description -->
+Blocks for getting available filament options from Slant3D.
+<!-- END MANUAL -->
+
+## Slant3D Filament
+
+### What it is
+Get list of available filaments
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries the Slant3D API to retrieve a list of all available filament options for 3D printing. Each filament includes details like color, material type, and availability.
+
+Use this to populate filament selection dropdowns or validate filament choices before placing orders.
+<!-- END MANUAL -->
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| filaments | List of available filaments | List[Filament] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Product Configurator**: Display available filament options in a custom 3D printing order form.
+
+**Inventory Display**: Show current filament availability to customers before they place orders.
+
+**Material Validation**: Verify that requested filaments are available before processing orders.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/slant3d/order.md b/docs/integrations/block-integrations/slant3d/order.md
new file mode 100644
index 0000000000..0d82191c70
--- /dev/null
+++ b/docs/integrations/block-integrations/slant3d/order.md
@@ -0,0 +1,224 @@
+# Slant3D Order
+<!-- MANUAL: file_description -->
+Blocks for managing 3D print orders through Slant3D.
+<!-- END MANUAL -->
+
+## Slant3D Cancel Order
+
+### What it is
+Cancel an existing order
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block cancels an existing order in the Slant3D system using the order ID. The cancellation request is sent to the Slant3D API and returns a status message confirming the cancellation.
+
+Orders can only be cancelled before they enter production. Check order status before attempting cancellation.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| order_id | Slant3D order ID to cancel | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| status | Cancellation status message | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Customer Cancellations**: Allow customers to cancel orders through your interface.
+
+**Error Recovery**: Cancel orders placed with incorrect details or specifications.
+
+**Order Management**: Implement cancellation functionality in order management dashboards.
+<!-- END MANUAL -->
+
+---
+
+## Slant3D Create Order
+
+### What it is
+Create a new print order
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a new 3D print order through the Slant3D API. Provide customer shipping details and a list of items to print (STL files with specifications). Each item includes file URL, quantity, and filament selection.
+
+The block returns the Slant3D order ID which you can use for tracking and status updates.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| order_number | Your custom order number (or leave blank for a random one) | str | No |
+| customer | Customer details for where to ship the item | CustomerDetails | Yes |
+| items | List of items to print | List[OrderItem] | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| order_id | Slant3D order ID | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**E-Commerce Integration**: Automatically submit 3D print orders from your online store.
+
+**Custom Product Fulfillment**: Create orders for on-demand 3D printed products.
+
+**Automated Manufacturing**: Trigger print orders based on inventory levels or customer requests.
+<!-- END MANUAL -->
+
+---
+
+## Slant3D Estimate Order
+
+### What it is
+Get order cost estimate
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block calculates a cost estimate for a potential order without actually placing it. Provide the same details as a create order request, and receive a breakdown of printing and shipping costs.
+
+Use this for price quotes before customers commit to orders.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| order_number | Your custom order number (or leave blank for a random one) | str | No |
+| customer | Customer details for where to ship the item | CustomerDetails | Yes |
+| items | List of items to print | List[OrderItem] | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| total_price | Total price in USD | float |
+| shipping_cost | Shipping cost | float |
+| printing_cost | Printing cost | float |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Price Quoting**: Provide customers with accurate pricing before they commit to orders.
+
+**Budget Planning**: Calculate costs for batch orders or production runs.
+
+**Comparison Shopping**: Get estimates to compare with other printing services.
+<!-- END MANUAL -->
+
+---
+
+## Slant3D Estimate Shipping
+
+### What it is
+Get shipping cost estimate
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block calculates shipping costs for a potential order based on the destination and items. It provides an estimate before placing the full order.
+
+Use this to display shipping costs at checkout or calculate delivery options for customers.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| order_number | Your custom order number (or leave blank for a random one) | str | No |
+| customer | Customer details for where to ship the item | CustomerDetails | Yes |
+| items | List of items to print | List[OrderItem] | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| shipping_cost | Estimated shipping cost | float |
+| currency_code | Currency code (e.g., 'usd') | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Checkout Display**: Show shipping costs to customers before they complete orders.
+
+**International Pricing**: Calculate shipping for different destinations to optimize pricing.
+
+**Cost Breakdown**: Provide transparent shipping cost breakdowns to customers.
+<!-- END MANUAL -->
+
+---
+
+## Slant3D Get Orders
+
+### What it is
+Get all orders for the account
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves all orders associated with your Slant3D account. It returns a list of orders with their current status and details.
+
+Use this for order management dashboards or to sync order data with your systems.
+<!-- END MANUAL -->
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| orders | List of orders with their details | List[str] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Order Dashboard**: Build dashboards showing all orders and their current status.
+
+**Sync Operations**: Regularly sync Slant3D orders with your internal order management system.
+
+**Reporting**: Generate reports on order volume and status distribution.
+<!-- END MANUAL -->
+
+---
+
+## Slant3D Tracking
+
+### What it is
+Track order status and shipping
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves the current status and shipping tracking information for a specific order. It returns the order status and any available tracking numbers.
+
+Use this to provide customers with real-time order status updates.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| order_id | Slant3D order ID to track | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| status | Order status | str |
+| tracking_numbers | List of tracking numbers | List[str] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Order Status Page**: Display current order status to customers on your website.
+
+**Shipping Notifications**: Get tracking numbers to send shipping notifications to customers.
+
+**Customer Support**: Look up order status quickly for customer service inquiries.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/slant3d/slicing.md b/docs/integrations/block-integrations/slant3d/slicing.md
new file mode 100644
index 0000000000..a008379480
--- /dev/null
+++ b/docs/integrations/block-integrations/slant3d/slicing.md
@@ -0,0 +1,41 @@
+# Slant3D Slicing
+<!-- MANUAL: file_description -->
+Blocks for slicing 3D models and getting pricing information from Slant3D.
+<!-- END MANUAL -->
+
+## Slant3D Slicer
+
+### What it is
+Slice a 3D model file and get pricing information
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block sends an STL file to Slant3D's slicing service to analyze the 3D model. The slicer calculates print parameters and returns pricing information based on the model's complexity, size, and material requirements.
+
+Provide the URL to your STL file, and the block returns the calculated price for printing the model.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| file_url | URL of the 3D model file to slice (STL) | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| message | Response message | str |
+| price | Calculated price for printing | float |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Price Quoting**: Get instant price quotes for 3D models uploaded by customers.
+
+**Model Validation**: Verify that STL files are printable before accepting orders.
+
+**Cost Estimation**: Calculate printing costs as part of an automated quoting system.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/slant3d/webhook.md b/docs/integrations/block-integrations/slant3d/webhook.md
new file mode 100644
index 0000000000..9d5a9d7d47
--- /dev/null
+++ b/docs/integrations/block-integrations/slant3d/webhook.md
@@ -0,0 +1,44 @@
+# Slant3D Webhook
+<!-- MANUAL: file_description -->
+Blocks for receiving webhook notifications about Slant3D order status updates.
+<!-- END MANUAL -->
+
+## Slant3D Order Webhook
+
+### What it is
+This block triggers on Slant3D order status updates and outputs the event details, including tracking information when orders are shipped.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block subscribes to Slant3D webhook events for order status updates. When an order's status changes (e.g., printing, shipped, delivered), Slant3D sends a webhook notification that triggers your workflow.
+
+The payload includes order details and, when applicable, shipping information like tracking numbers and carrier codes for fulfillment tracking.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| events | Order status events to subscribe to | Events | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if payload processing failed | str |
+| payload | The complete webhook payload received from Slant3D | Dict[str, Any] |
+| order_id | The ID of the affected order | str |
+| status | The new status of the order | str |
+| tracking_number | The tracking number for the shipment | str |
+| carrier_code | The carrier code (e.g., 'usps') | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Customer Notifications**: Automatically notify customers via email or SMS when their 3D print order ships.
+
+**Order Tracking**: Update your internal systems with shipping information when orders are fulfilled.
+
+**Inventory Management**: Trigger restocking workflows when orders are completed.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/smartlead/campaign.md b/docs/integrations/block-integrations/smartlead/campaign.md
new file mode 100644
index 0000000000..738d244cf2
--- /dev/null
+++ b/docs/integrations/block-integrations/smartlead/campaign.md
@@ -0,0 +1,124 @@
+# Smartlead Campaign
+<!-- MANUAL: file_description -->
+Blocks for managing email outreach campaigns in SmartLead.
+<!-- END MANUAL -->
+
+## Add Lead To Campaign
+
+### What it is
+Add a lead to a campaign in SmartLead
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block adds up to 100 leads to an existing SmartLead campaign using the SmartLead API. Each lead includes contact details and optional custom fields for personalization.
+
+Configure upload settings to control duplicate handling and campaign status. The response includes counts for successful uploads, duplicates, and invalid entries.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| campaign_id | The ID of the campaign to add the lead to | int | Yes |
+| lead_list | An array of JSON objects, each representing a lead's details. Can hold max 100 leads. | List[LeadInput] | No |
+| settings | Settings for lead upload | LeadUploadSettings | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the lead was not added to the campaign | str |
+| campaign_id | The ID of the campaign the lead was added to (passed through) | int |
+| upload_count | The number of leads added to the campaign | int |
+| already_added_to_campaign | The number of leads that were already added to the campaign | int |
+| duplicate_count | The number of emails that were duplicates | int |
+| invalid_email_count | The number of emails that were invalidly formatted | int |
+| is_lead_limit_exhausted | Whether the lead limit was exhausted | bool |
+| lead_import_stopped_count | The number of leads that were not added to the campaign because the lead import was stopped | int |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Lead Import**: Bulk import leads from CRM exports, web forms, or enrichment services.
+
+**Campaign Automation**: Automatically add qualifying leads to outreach campaigns.
+
+**Multi-Source Aggregation**: Consolidate leads from multiple sources into unified campaigns.
+<!-- END MANUAL -->
+
+---
+
+## Create Campaign
+
+### What it is
+Create a campaign in SmartLead
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block creates a new email campaign in SmartLead using the SmartLead API. Provide a campaign name and the block returns the created campaign's ID and metadata.
+
+Use the campaign ID with other SmartLead blocks to add leads, configure sequences, and manage the campaign.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| name | The name of the campaign | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the search failed | str |
+| id | The ID of the created campaign | int |
+| name | The name of the created campaign | str |
+| created_at | The date and time the campaign was created | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Dynamic Campaigns**: Create campaigns programmatically for different products or segments.
+
+**Workflow Automation**: Spin up new outreach campaigns as part of sales or marketing workflows.
+
+**Campaign Templating**: Create campaigns from templates with standardized configurations.
+<!-- END MANUAL -->
+
+---
+
+## Save Campaign Sequences
+
+### What it is
+Save sequences within a campaign
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block saves email sequences to an existing SmartLead campaign. Sequences define the email content, timing, and follow-up structure for the campaign's outreach.
+
+Each sequence includes the email subject, body, and delay settings for automated follow-up emails.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| campaign_id | The ID of the campaign to save sequences for | int | Yes |
+| sequences | The sequences to save | List[Sequence] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the sequences were not saved | str |
+| data | Data from the API | Dict[str, Any] \| str |
+| message | Message from the API | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Email Automation**: Define multi-step email sequences for nurturing leads.
+
+**A/B Testing**: Create variant sequences to test different messaging approaches.
+
+**Campaign Configuration**: Set up complete outreach flows programmatically.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/stagehand/blocks.md b/docs/integrations/block-integrations/stagehand/blocks.md
new file mode 100644
index 0000000000..cc201d092b
--- /dev/null
+++ b/docs/integrations/block-integrations/stagehand/blocks.md
@@ -0,0 +1,134 @@
+# Stagehand Blocks
+<!-- MANUAL: file_description -->
+Blocks for AI-powered browser automation using Stagehand and Browserbase.
+<!-- END MANUAL -->
+
+## Stagehand Act
+
+### What it is
+Interact with a web page by performing actions on a web page. Use it to build self-healing and deterministic automations that adapt to website chang.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Stagehand with Browserbase to perform web actions using AI-powered element detection. Actions like click, fill, type, scroll, and select are described in natural language and executed reliably even if the page structure changes.
+
+Configure timeouts for DOM settlement and page loading. Variables can be passed to actions for dynamic data entry.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| browserbase_project_id | Browserbase project ID (required if using Browserbase) | str | Yes |
+| model | LLM to use for Stagehand (provider is inferred) | "gpt-4.1-2025-04-14" \| "gpt-4.1-mini-2025-04-14" \| "claude-sonnet-4-5-20250929" | No |
+| url | URL to navigate to. | str | Yes |
+| action | Action to perform. Suggested actions are: click, fill, type, press, scroll, select from dropdown. For multi-step actions, add an entry for each step. | List[str] | Yes |
+| variables | Variables to use in the action. Variables contains data you want the action to use. | Dict[str, str] | No |
+| iframes | Whether to search within iframes. If True, Stagehand will search for actions within iframes. | bool | No |
+| domSettleTimeoutMs | Timeout in milliseconds for DOM settlement.Wait longer for dynamic content | int | No |
+| timeoutMs | Timeout in milliseconds for DOM ready. Extended timeout for slow-loading forms | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the action was completed successfully | bool |
+| message | Details about the action’s execution. | str |
+| action | Action performed | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Form Automation**: Fill out web forms, submit applications, or complete checkout flows.
+
+**Self-Healing Scrapers**: Build automations that adapt to website changes without breaking.
+
+**Testing Workflows**: Automate testing of web applications with resilient element targeting.
+<!-- END MANUAL -->
+
+---
+
+## Stagehand Extract
+
+### What it is
+Extract structured data from a webpage.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses Stagehand with Browserbase to extract data from web pages using natural language instructions. Describe what data you want to extract, and the AI identifies and returns the matching content.
+
+Supports searching within iframes and configurable timeouts for dynamic content that loads after the initial page render.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| browserbase_project_id | Browserbase project ID (required if using Browserbase) | str | Yes |
+| model | LLM to use for Stagehand (provider is inferred) | "gpt-4.1-2025-04-14" \| "gpt-4.1-mini-2025-04-14" \| "claude-sonnet-4-5-20250929" | No |
+| url | URL to navigate to. | str | Yes |
+| instruction | Natural language description of elements or actions to discover. | str | Yes |
+| iframes | Whether to search within iframes. If True, Stagehand will search for actions within iframes. | bool | No |
+| domSettleTimeoutMs | Timeout in milliseconds for DOM settlement.Wait longer for dynamic content | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| extraction | Extracted data from the page. | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Data Scraping**: Extract product details, prices, or contact information from websites.
+
+**Competitive Intelligence**: Pull data from competitor pages for analysis and monitoring.
+
+**Research Automation**: Gather information from multiple web sources for research workflows.
+<!-- END MANUAL -->
+
+---
+
+## Stagehand Observe
+
+### What it is
+Find suggested actions for your workflows
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block analyzes a web page to discover available actions based on natural language instructions. It returns XPath selectors, action methods, and descriptions for elements matching your query.
+
+Use this to explore a page's interactive elements before building automated workflows.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| browserbase_project_id | Browserbase project ID (required if using Browserbase) | str | Yes |
+| model | LLM to use for Stagehand (provider is inferred) | "gpt-4.1-2025-04-14" \| "gpt-4.1-mini-2025-04-14" \| "claude-sonnet-4-5-20250929" | No |
+| url | URL to navigate to. | str | Yes |
+| instruction | Natural language description of elements or actions to discover. | str | Yes |
+| iframes | Whether to search within iframes. If True, Stagehand will search for actions within iframes. | bool | No |
+| domSettleTimeoutMs | Timeout in milliseconds for DOM settlement.Wait longer for dynamic content | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| selector | XPath selector to locate element. | str |
+| description | Human-readable description | str |
+| method | Suggested action method | str |
+| arguments | Additional action parameters | List[str] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Workflow Discovery**: Identify available actions on a page before building automations.
+
+**Dynamic Navigation**: Discover clickable elements for pages with changing layouts.
+
+**Automation Development**: Build robust automation workflows by understanding page structure.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/system/library_operations.md b/docs/integrations/block-integrations/system/library_operations.md
new file mode 100644
index 0000000000..6e58ca3066
--- /dev/null
+++ b/docs/integrations/block-integrations/system/library_operations.md
@@ -0,0 +1,88 @@
+# System Library Operations
+<!-- MANUAL: file_description -->
+Blocks for managing agents in your personal AutoGPT library.
+<!-- END MANUAL -->
+
+## Add To Library From Store
+
+### What it is
+Add an agent from the store to your personal library
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block copies an agent from the public store into your personal library using its store_listing_version_id. Optionally provide a custom agent_name to rename it in your library.
+
+The block returns the library entry ID and agent graph ID, which can be used to execute the agent or manage your library.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| store_listing_version_id | The ID of the store listing version to add to library | str | Yes |
+| agent_name | Optional custom name for the agent in your library | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the agent was successfully added to library | bool |
+| library_agent_id | The ID of the library agent entry | str |
+| agent_id | The ID of the agent graph | str |
+| agent_version | The version number of the agent graph | int |
+| agent_name | The name of the agent | str |
+| message | Success or error message | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Agent Provisioning**: Automatically add recommended agents to a user's library.
+
+**Onboarding Flows**: Set up a user's library with starter agents during onboarding.
+
+**Dynamic Agent Access**: Add agents on-demand when users request specific capabilities.
+<!-- END MANUAL -->
+
+---
+
+## List Library Agents
+
+### What it is
+List all agents in your personal library
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves all agents stored in your personal library. Use search_query to filter by name, and limit/page for pagination through large libraries.
+
+Results include each agent's metadata and are output both as a complete list and individually for iteration.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| search_query | Optional search query to filter agents | str | No |
+| limit | Maximum number of agents to return | int | No |
+| page | Page number for pagination | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| agents | List of agents in the library | List[LibraryAgent] |
+| agent | Individual library agent (yielded for each agent) | LibraryAgent |
+| total_count | Total number of agents in library | int |
+| page | Current page number | int |
+| total_pages | Total number of pages | int |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Agent Selection**: Display available agents for users to choose from in a workflow.
+
+**Library Management**: Build interfaces for users to manage and organize their agent library.
+
+**Agent Inventory**: Check what agents are available before deciding which to execute.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/system/store_operations.md b/docs/integrations/block-integrations/system/store_operations.md
new file mode 100644
index 0000000000..6ff47daca9
--- /dev/null
+++ b/docs/integrations/block-integrations/system/store_operations.md
@@ -0,0 +1,89 @@
+# System Store Operations
+<!-- MANUAL: file_description -->
+Blocks for browsing and retrieving agent details from the AutoGPT store.
+<!-- END MANUAL -->
+
+## Get Store Agent Details
+
+### What it is
+Get detailed information about an agent from the store
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves detailed metadata about a specific agent from the AutoGPT store using the creator's username and agent slug. It returns the agent's name, description, categories, run count, and average rating.
+
+The store_listing_version_id can be used with other blocks to add the agent to your library or execute it.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| creator | The username of the agent creator | str | Yes |
+| slug | The name of the agent | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| found | Whether the agent was found in the store | bool |
+| store_listing_version_id | The store listing version ID | str |
+| agent_name | Name of the agent | str |
+| description | Description of the agent | str |
+| creator | Creator of the agent | str |
+| categories | Categories the agent belongs to | List[str] |
+| runs | Number of times the agent has been run | int |
+| rating | Average rating of the agent | float |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Agent Discovery**: Fetch details about a specific agent before adding it to your library.
+
+**Agent Validation**: Check an agent's ratings and run count to assess quality and popularity.
+
+**Dynamic Agent Selection**: Get agent metadata to decide which version or variant to use.
+<!-- END MANUAL -->
+
+---
+
+## Search Store Agents
+
+### What it is
+Search for agents in the store
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block searches the AutoGPT agent store using a query string. Filter results by category and sort by rating, runs, or name. Limit controls the maximum number of results returned.
+
+Results include basic agent information and are output both as a list and individually for workflow iteration.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| query | Search query to find agents | str | No |
+| category | Filter by category | str | No |
+| sort_by | How to sort the results | "rating" \| "runs" \| "name" \| "updated_at" | No |
+| limit | Maximum number of results to return | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| agents | List of agents matching the search criteria | List[StoreAgent] |
+| agent | Basic information of the agent | StoreAgent |
+| total_count | Total number of agents found | int |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Agent Recommendation**: Search for agents that match user needs and recommend the best options.
+
+**Marketplace Browse**: Allow users to explore available agents by category or keyword.
+
+**Agent Orchestration**: Find and compose multiple specialized agents for complex workflows.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/content/platform/blocks/talking_head.md b/docs/integrations/block-integrations/talking_head.md
similarity index 100%
rename from docs/content/platform/blocks/talking_head.md
rename to docs/integrations/block-integrations/talking_head.md
diff --git a/docs/integrations/block-integrations/text.md b/docs/integrations/block-integrations/text.md
new file mode 100644
index 0000000000..e47375196c
--- /dev/null
+++ b/docs/integrations/block-integrations/text.md
@@ -0,0 +1,494 @@
+# Text
+<!-- MANUAL: file_description -->
+Blocks for text processing including formatting, extraction, transformation, splitting, combining, and template rendering.
+<!-- END MANUAL -->
+
+## Code Extraction
+
+### What it is
+Extracts code blocks from text and identifies their programming languages
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block parses text content (typically from AI responses) and extracts code blocks enclosed in markdown-style triple backticks. It identifies the programming language from the code fence annotation (e.g., ```python) and routes each extracted code block to the appropriate language-specific output.
+
+The block supports 16 programming languages including Python, JavaScript, HTML, CSS, SQL, and more. Any text that remains after extracting all code blocks is output as "remaining_text", allowing you to process both the code and surrounding context separately.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| text | Text containing code blocks to extract (e.g., AI response) | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| html | Extracted HTML code | str |
+| css | Extracted CSS code | str |
+| javascript | Extracted JavaScript code | str |
+| python | Extracted Python code | str |
+| sql | Extracted SQL code | str |
+| java | Extracted Java code | str |
+| cpp | Extracted C++ code | str |
+| csharp | Extracted C# code | str |
+| json_code | Extracted JSON code | str |
+| bash | Extracted Bash code | str |
+| php | Extracted PHP code | str |
+| ruby | Extracted Ruby code | str |
+| yaml | Extracted YAML code | str |
+| markdown | Extracted Markdown code | str |
+| typescript | Extracted TypeScript code | str |
+| xml | Extracted XML code | str |
+| remaining_text | Remaining text after code extraction | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**AI Code Generation Pipeline**: When an AI model generates a response containing multiple code blocks (HTML, CSS, JavaScript), use this block to separate each language into individual files for a complete web component.
+
+**Code Review Automation**: Extract Python code from documentation or chat logs to run automated linting, testing, or security scanning on the code portions only.
+
+**Technical Documentation Processing**: Parse developer tutorials or README files to extract executable code samples while preserving the explanatory text for different processing paths.
+<!-- END MANUAL -->
+
+---
+
+## Combine Texts
+
+### What it is
+This block combines multiple input texts into a single output text.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block concatenates all the input texts in the order they are provided, inserting the specified delimiter (if any) between each text.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| input | text input to combine | List[str] | Yes |
+| delimiter | Delimiter to combine texts | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| output | Combined text | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Merging multiple parts of an address (street, city, state, zip code) into a single, formatted address string.
+<!-- END MANUAL -->
+
+---
+
+## Countdown Timer
+
+### What it is
+This block triggers after a specified duration.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The Countdown Timer block pauses workflow execution for a specified duration before continuing. You can set the delay using any combination of seconds, minutes, hours, and days. When the timer completes, it outputs your specified message (or "timer finished" by default).
+
+The block supports a repeat parameter, allowing the timer to fire multiple times in sequence—useful for creating periodic triggers within your workflow. The timer uses async sleep, so it doesn't block other concurrent operations in the system.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| input_message | Message to output after the timer finishes | Input Message | No |
+| seconds | Duration in seconds | int \| str | No |
+| minutes | Duration in minutes | int \| str | No |
+| hours | Duration in hours | int \| str | No |
+| days | Duration in days | int \| str | No |
+| repeat | Number of times to repeat the timer | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| output_message | Message after the timer finishes | Output Message |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Rate Limiting**: Add a delay between API calls to respect rate limits when processing large batches of data through external services.
+
+**Scheduled Notifications**: Create a workflow that waits a specific time after an event (like a form submission) before sending a follow-up email or notification.
+
+**Polling Workflows**: Use the repeat feature to periodically check for updates, such as monitoring a file location or checking an API endpoint every few minutes.
+<!-- END MANUAL -->
+
+---
+
+## Extract Text Information
+
+### What it is
+This block extracts the text from the given text using the pattern (regex).
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block uses regular expressions to find the specified pattern in the text. It then extracts a particular group from the match, which can be the entire match or a specific captured group.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| text | Text to parse | Text | Yes |
+| pattern | Pattern (Regex) to parse | str | Yes |
+| group | Group number to extract | int | No |
+| case_sensitive | Case sensitive match | bool | No |
+| dot_all | Dot matches all | bool | No |
+| find_all | Find all matches | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| positive | Extracted text | str |
+| negative | Original text | str |
+| matched_results | List of matched results | List[str] |
+| matched_count | Number of matched results | int |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Extracting phone numbers or email addresses from a large body of text, such as a customer database.
+<!-- END MANUAL -->
+
+---
+
+## Fill Text Template
+
+### What it is
+This block formats the given texts using the format template.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block uses a template engine to replace placeholders in the format string with the provided values. It supports both simple placeholder replacement and more complex operations like loops.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| values | Values (dict) to be used in format. These values can be used by putting them in double curly braces in the format template. e.g. {{value_name}}. | Dict[str, Any] | Yes |
+| format | Template to format the text using `values`. Use Jinja2 syntax. | str | Yes |
+| escape_html | Whether to escape special characters in the inserted values to be HTML-safe. Enable for HTML output, disable for plain text. | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| output | Formatted text | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Generating personalized email messages by filling a template with customer-specific information like name, order details, or account status.
+<!-- END MANUAL -->
+
+---
+
+## Get Current Date
+
+### What it is
+This block outputs the current date with an optional offset.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves the current date from the system clock and formats it according to your preferences. You can specify an offset in days to get past or future dates (negative values for past dates, positive for future).
+
+The block supports two format types: strftime (customizable format strings like "%Y-%m-%d" or "%B %d, %Y") and ISO 8601 (standard format YYYY-MM-DD). You can also configure the timezone—either specify a specific timezone or use the user's profile timezone setting.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| trigger | Trigger any data to output the current date | str | Yes |
+| offset | Offset in days from the current date | int \| str | No |
+| format_type | Format type for date output (strftime with custom format or ISO 8601) | Format Type | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| date | Current date in the specified format (default: YYYY-MM-DD) | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Daily Report Generation**: Use the current date as a filename suffix or report header when generating automated daily summaries or exports.
+
+**Deadline Tracking**: Calculate dates relative to today using the offset feature—for example, find the date 30 days from now for payment due dates or project milestones.
+
+**Date-Based Filtering**: Get today's date to filter records, events, or tasks that are relevant to the current day in your workflow.
+<!-- END MANUAL -->
+
+---
+
+## Get Current Date And Time
+
+### What it is
+This block outputs the current date and time.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block outputs the current date and time from the system clock, formatted according to your specifications. It supports both strftime custom formats (like "%Y-%m-%d %H:%M:%S") and ISO 8601/RFC 3339 format for maximum compatibility with APIs and databases.
+
+You can configure the timezone to use either a specific timezone (e.g., "America/New_York") or the user's profile timezone. The ISO 8601 format option includes an optional microseconds precision setting for applications requiring high-resolution timestamps.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| trigger | Trigger any data to output the current date and time | str | Yes |
+| format_type | Format type for date and time output (strftime with custom format or ISO 8601/RFC 3339) | Format Type | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| date_time | Current date and time in the specified format (default: YYYY-MM-DD HH:MM:SS) | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Audit Logging**: Add precise timestamps to records when logging user actions, system events, or data changes in your workflow.
+
+**API Requests**: Generate ISO 8601 formatted timestamps required by many REST APIs for request authentication or data submission.
+
+**Scheduling Logic**: Compare the current date/time against scheduled events to trigger time-sensitive automations like sending reminders or processing batch jobs.
+<!-- END MANUAL -->
+
+---
+
+## Get Current Time
+
+### What it is
+This block outputs the current time.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block outputs just the current time (without date) from the system clock. It supports strftime custom formats (like "%H:%M:%S" for 24-hour time or "%I:%M %p" for 12-hour time with AM/PM) and ISO 8601 time format.
+
+The timezone can be configured to a specific timezone or to use the user's profile timezone setting. When using ISO 8601 format, the output includes the timezone offset and an optional microseconds component for precision timing needs.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| trigger | Trigger any data to output the current time | str | Yes |
+| format_type | Format type for time output (strftime with custom format or ISO 8601) | Format Type | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| time | Current time in the specified format (default: %H:%M:%S) | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Business Hours Check**: Get the current time to determine if a request falls within business hours and route it accordingly (live support vs. after-hours message).
+
+**Time-Based Greetings**: Generate personalized greetings ("Good morning", "Good afternoon") based on the current time of day.
+
+**Shift Scheduling**: Determine which team or process should handle a task based on the current time and configured shift schedules.
+<!-- END MANUAL -->
+
+---
+
+## Match Text Pattern
+
+### What it is
+Matches text against a regex pattern and forwards data to positive or negative output based on the match.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+The block uses regular expressions to search for the specified pattern within the input text. It considers options like case sensitivity and whether the dot should match all characters.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| text | Text to match | Text | Yes |
+| match | Pattern (Regex) to match | str | Yes |
+| data | Data to be forwarded to output | Data | Yes |
+| case_sensitive | Case sensitive match | bool | No |
+| dot_all | Dot matches all | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| positive | Output data if match is found | Positive |
+| negative | Output data if match is not found | Negative |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Filtering customer feedback messages based on specific keywords or phrases to categorize them as positive or negative reviews.
+<!-- END MANUAL -->
+
+---
+
+## Text Decoder
+
+### What it is
+Decodes a string containing escape sequences into actual text
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block processes a text string and converts escape sequences (like \n, \t, \\, \uXXXX) into their actual character representations. For example, the literal text "Hello\nWorld" becomes "Hello" followed by an actual newline, then "World".
+
+This is useful when working with data from APIs or files where escape sequences are stored as literal text rather than being interpreted as special characters. The block handles standard escape sequences including newlines, tabs, Unicode characters, and more.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| text | A string containing escaped characters to be decoded | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| decoded_text | The decoded text with escape sequences processed | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**JSON Data Processing**: When parsing JSON strings that contain escaped characters (like "\n" for newlines in a message field), decode them to display properly formatted text to users.
+
+**Log File Processing**: Process log entries where special characters are escaped, converting them to their actual representations for proper parsing or display.
+
+**API Response Handling**: Decode text from APIs that return escaped content, ensuring special characters like tabs and newlines render correctly in your output.
+<!-- END MANUAL -->
+
+---
+
+## Text Replace
+
+### What it is
+This block is used to replace a text with a new text.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block performs a simple find-and-replace operation on text. It searches for all occurrences of the "old" string within your input text and replaces each one with the "new" string. The replacement is case-sensitive and matches exact strings.
+
+Unlike regex-based replacements, this block performs literal string matching, making it straightforward and predictable for common text substitution tasks. All instances of the target string are replaced in a single operation.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| text | The text to replace. | str | Yes |
+| old | The old text to replace. | str | Yes |
+| new | The new text to replace with. | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| output | The text with the replaced text. | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Data Sanitization**: Replace sensitive information like placeholder tokens with actual values, or redact personal information before displaying or storing text.
+
+**Template Customization**: Swap out placeholder text in templates (like "[COMPANY_NAME]" or "{{user}}") with actual values before sending emails or generating documents.
+
+**URL Manipulation**: Modify URLs by replacing domain names, query parameters, or path segments to redirect requests or update links dynamically.
+<!-- END MANUAL -->
+
+---
+
+## Text Split
+
+### What it is
+This block is used to split a text into a list of strings.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block takes a text string and divides it into a list of substrings based on a specified delimiter. For example, splitting "apple,banana,cherry" by comma results in ["apple", "banana", "cherry"].
+
+By default, the block also strips whitespace from each resulting substring (controlled by the "strip" option). If your input text is empty, the block returns an empty list. This is useful for parsing structured text data like CSV values, tags, or any delimited content.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| text | The text to split. | str | Yes |
+| delimiter | The delimiter to split the text by. | str | Yes |
+| strip | Whether to strip the text. | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| texts | The text split into a list of strings. | List[str] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Tag Processing**: Split a comma-separated list of tags or keywords into individual items for processing, filtering, or database storage.
+
+**Line-by-Line Processing**: Split a multi-line text file by newline characters to process each line independently in your workflow.
+
+**Parsing User Input**: Break apart user-submitted lists (like email addresses separated by semicolons) into individual items for validation and processing.
+<!-- END MANUAL -->
+
+---
+
+## Word Character Count
+
+### What it is
+Counts the number of words and characters in a given text.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block analyzes input text and returns two metrics: the total number of words and the total number of characters. Words are counted by splitting the text on whitespace, so "Hello World" counts as 2 words. Characters include all characters in the text, including spaces and punctuation.
+
+This provides a quick way to measure text length for validation, summarization checks, or content analysis without needing custom logic.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| text | Input text to count words and characters | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the counting operation failed | str |
+| word_count | Number of words in the input text | int |
+| character_count | Number of characters in the input text | int |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Validation**: Check if user-submitted text (like reviews or comments) meets minimum or maximum length requirements before accepting it.
+
+**AI Prompt Optimization**: Measure prompt length to ensure it fits within token limits before sending to language models, potentially triggering summarization if too long.
+
+**Social Media Preparation**: Verify that text content fits within platform character limits (like Twitter's 280 characters) before attempting to post.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/content/platform/blocks/text_to_speech_block.md b/docs/integrations/block-integrations/text_to_speech_block.md
similarity index 100%
rename from docs/content/platform/blocks/text_to_speech_block.md
rename to docs/integrations/block-integrations/text_to_speech_block.md
diff --git a/docs/content/platform/blocks/time_blocks.md b/docs/integrations/block-integrations/time_blocks.md
similarity index 100%
rename from docs/content/platform/blocks/time_blocks.md
rename to docs/integrations/block-integrations/time_blocks.md
diff --git a/docs/content/platform/blocks/todoist.md b/docs/integrations/block-integrations/todoist.md
similarity index 100%
rename from docs/content/platform/blocks/todoist.md
rename to docs/integrations/block-integrations/todoist.md
diff --git a/docs/integrations/block-integrations/todoist/comments.md b/docs/integrations/block-integrations/todoist/comments.md
new file mode 100644
index 0000000000..b11859ad63
--- /dev/null
+++ b/docs/integrations/block-integrations/todoist/comments.md
@@ -0,0 +1,166 @@
+# Todoist Comments
+<!-- MANUAL: file_description -->
+Blocks for creating and managing comments on Todoist tasks and projects.
+<!-- END MANUAL -->
+
+## Todoist Create Comment
+
+### What it is
+Creates a new comment on a Todoist task or project
+
+### How it works
+<!-- MANUAL: how_it_works -->
+Takes comment content and task/project ID, creates comment via Todoist API.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| content | Comment content | str | Yes |
+| id_type | Specify either task_id or project_id to comment on | Id Type | No |
+| attachment | Optional file attachment | Dict[str, Any] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| id | ID of created comment | str |
+| content | Comment content | str |
+| posted_at | Comment timestamp | str |
+| task_id | Associated task ID | str |
+| project_id | Associated project ID | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Adding notes and comments to tasks or projects automatically.
+<!-- END MANUAL -->
+
+---
+
+## Todoist Delete Comment
+
+### What it is
+Deletes a Todoist comment
+
+### How it works
+<!-- MANUAL: how_it_works -->
+Uses comment ID to delete via Todoist API.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| comment_id | Comment ID to delete | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the deletion was successful | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Removing outdated or incorrect comments from tasks/projects.
+<!-- END MANUAL -->
+
+---
+
+## Todoist Get Comment
+
+### What it is
+Get a single comment from Todoist
+
+### How it works
+<!-- MANUAL: how_it_works -->
+Uses comment ID to retrieve details via Todoist API.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| comment_id | Comment ID to retrieve | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| content | Comment content | str |
+| id | Comment ID | str |
+| posted_at | Comment timestamp | str |
+| project_id | Associated project ID | str |
+| task_id | Associated task ID | str |
+| attachment | Optional file attachment | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Looking up specific comment details for reference.
+<!-- END MANUAL -->
+
+---
+
+## Todoist Get Comments
+
+### What it is
+Get all comments for a Todoist task or project
+
+### How it works
+<!-- MANUAL: how_it_works -->
+Uses task/project ID to get comments list via Todoist API.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| id_type | Specify either task_id or project_id to get comments for | Id Type | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| comments | List of comments | List[Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Reviewing comment history on tasks or projects.
+<!-- END MANUAL -->
+
+---
+
+## Todoist Update Comment
+
+### What it is
+Updates a Todoist comment
+
+### How it works
+<!-- MANUAL: how_it_works -->
+Takes comment ID and new content, updates via Todoist API.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| comment_id | Comment ID to update | str | Yes |
+| content | New content for the comment | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the update was successful | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Modifying existing comments to fix errors or update information.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/todoist/labels.md b/docs/integrations/block-integrations/todoist/labels.md
new file mode 100644
index 0000000000..2a31a6418e
--- /dev/null
+++ b/docs/integrations/block-integrations/todoist/labels.md
@@ -0,0 +1,280 @@
+# Todoist Labels
+<!-- MANUAL: file_description -->
+Blocks for creating and managing labels in Todoist.
+<!-- END MANUAL -->
+
+## Todoist Create Label
+
+### What it is
+Creates a new label in Todoist, It will not work if same name already exists
+
+### How it works
+<!-- MANUAL: how_it_works -->
+It takes label details as input, connects to Todoist API, creates the label and returns the created label's details.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| name | Name of the label | str | Yes |
+| order | Label order | int | No |
+| color | The color of the label icon | "berry_red" \| "red" \| "orange" \| "yellow" \| "olive_green" \| "lime_green" \| "green" \| "mint_green" \| "teal" \| "sky_blue" \| "light_blue" \| "blue" \| "grape" \| "violet" \| "lavender" \| "magenta" \| "salmon" \| "charcoal" \| "grey" \| "taupe" | No |
+| is_favorite | Whether the label is a favorite | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| id | ID of the created label | str |
+| name | Name of the label | str |
+| color | Color of the label | str |
+| order | Label order | int |
+| is_favorite | Favorite status | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Creating new labels to organize and categorize tasks in Todoist.
+<!-- END MANUAL -->
+
+---
+
+## Todoist Delete Label
+
+### What it is
+Deletes a personal label in Todoist
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block permanently removes a personal label from Todoist using the label's unique ID. The deletion is processed through the Todoist REST API and removes the label from all tasks it was assigned to.
+
+The operation is irreversible, so any tasks previously tagged with this label will lose that categorization after deletion.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| label_id | ID of the label to delete | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the deletion was successful | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Label Cleanup**: Remove obsolete labels when reorganizing your task management system.
+
+**Workflow Automation**: Delete temporary labels after a project phase is complete.
+
+**Bulk Management**: Remove labels as part of a larger cleanup workflow.
+<!-- END MANUAL -->
+
+---
+
+## Todoist Get Label
+
+### What it is
+Gets a personal label from Todoist by ID
+
+### How it works
+<!-- MANUAL: how_it_works -->
+Uses the label ID to retrieve label details from Todoist API.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| label_id | ID of the label to retrieve | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| id | ID of the label | str |
+| name | Name of the label | str |
+| color | Color of the label | str |
+| order | Label order | int |
+| is_favorite | Favorite status | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Looking up details of a specific label for editing or verification.
+<!-- END MANUAL -->
+
+---
+
+## Todoist Get Shared Labels
+
+### What it is
+Gets all shared labels from Todoist
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves all shared labels that exist across collaborative projects in your Todoist account. Shared labels are labels that appear on tasks in projects shared with other users.
+
+The API returns a list of label names that are currently in use across shared projects, enabling cross-project label management.
+<!-- END MANUAL -->
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| labels | List of shared label names | List[Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Collaboration Audit**: Review which labels are being used across shared projects.
+
+**Label Consistency**: Ensure consistent labeling conventions across team projects.
+
+**Cross-Project Analytics**: Analyze label usage patterns in collaborative workspaces.
+<!-- END MANUAL -->
+
+---
+
+## Todoist List Labels
+
+### What it is
+Gets all personal labels from Todoist
+
+### How it works
+<!-- MANUAL: how_it_works -->
+Connects to Todoist API using provided credentials and retrieves all labels.
+<!-- END MANUAL -->
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| labels | List of complete label data | List[Any] |
+| label_ids | List of label IDs | List[Any] |
+| label_names | List of label names | List[Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Getting an overview of all labels to organize tasks or find specific labels.
+<!-- END MANUAL -->
+
+---
+
+## Todoist Remove Shared Labels
+
+### What it is
+Removes all instances of a shared label
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block removes a shared label by name from all tasks across all shared projects. Unlike deleting a personal label, this operation targets labels by name rather than ID since shared labels are name-based.
+
+The removal affects all instances of the label across collaborative projects, untagging every task that had this label applied.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| name | The name of the label to remove | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the removal was successful | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Deprecate Labels**: Remove labels that are no longer part of your workflow conventions.
+
+**Team Cleanup**: Remove shared labels when reorganizing cross-project categorization.
+
+**Merge Labels**: Remove a duplicate label after migrating tasks to a standardized label.
+<!-- END MANUAL -->
+
+---
+
+## Todoist Rename Shared Labels
+
+### What it is
+Renames all instances of a shared label
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block renames a shared label across all tasks in all shared projects. It takes the existing label name and a new name, then updates every instance where that label appears.
+
+The rename is atomic across the entire account, ensuring consistent label naming in collaborative environments.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| name | The name of the existing label to rename | str | Yes |
+| new_name | The new name for the label | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the rename was successful | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Standardize Naming**: Rename labels to follow consistent naming conventions.
+
+**Rebrand Categories**: Update label names when workflow terminology changes.
+
+**Fix Typos**: Correct misspelled labels across all shared projects.
+<!-- END MANUAL -->
+
+---
+
+## Todoist Update Label
+
+### What it is
+Updates a personal label in Todoist
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block modifies an existing personal label's properties using the Todoist API. You can update the label's name, display order, color, and favorite status.
+
+Only the fields you provide are updated; omitted fields retain their current values. The label ID is required to identify which label to modify.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| label_id | ID of the label to update | str | Yes |
+| name | New name of the label | str | No |
+| order | Label order | int | No |
+| color | The color of the label icon | "berry_red" \| "red" \| "orange" \| "yellow" \| "olive_green" \| "lime_green" \| "green" \| "mint_green" \| "teal" \| "sky_blue" \| "light_blue" \| "blue" \| "grape" \| "violet" \| "lavender" \| "magenta" \| "salmon" \| "charcoal" \| "grey" \| "taupe" | No |
+| is_favorite | Whether the label is a favorite (true/false) | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the update was successful | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Visual Organization**: Change label colors to create visual groupings of related labels.
+
+**Priority Adjustment**: Update favorite status to surface frequently used labels.
+
+**Reorganization**: Modify label order to reflect current workflow priorities.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/todoist/projects.md b/docs/integrations/block-integrations/todoist/projects.md
new file mode 100644
index 0000000000..fbc94ab503
--- /dev/null
+++ b/docs/integrations/block-integrations/todoist/projects.md
@@ -0,0 +1,195 @@
+# Todoist Projects
+<!-- MANUAL: file_description -->
+Blocks for creating and managing projects in Todoist.
+<!-- END MANUAL -->
+
+## Todoist Create Project
+
+### What it is
+Creates a new project in Todoist
+
+### How it works
+<!-- MANUAL: how_it_works -->
+Takes project details and creates via Todoist API.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| name | Name of the project | str | Yes |
+| parent_id | Parent project ID | str | No |
+| color | Color of the project icon | "berry_red" \| "red" \| "orange" \| "yellow" \| "olive_green" \| "lime_green" \| "green" \| "mint_green" \| "teal" \| "sky_blue" \| "light_blue" \| "blue" \| "grape" \| "violet" \| "lavender" \| "magenta" \| "salmon" \| "charcoal" \| "grey" \| "taupe" | No |
+| is_favorite | Whether the project is a favorite | bool | No |
+| view_style | Display style (list or board) | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the creation was successful | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Creating new projects programmatically for workflow automation.
+<!-- END MANUAL -->
+
+---
+
+## Todoist Delete Project
+
+### What it is
+Deletes a Todoist project and all its contents
+
+### How it works
+<!-- MANUAL: how_it_works -->
+Uses project ID to delete via Todoist API.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| project_id | ID of project to delete | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the deletion was successful | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Removing completed or obsolete projects.
+<!-- END MANUAL -->
+
+---
+
+## Todoist Get Project
+
+### What it is
+Gets details for a specific Todoist project
+
+### How it works
+<!-- MANUAL: how_it_works -->
+Uses project ID to retrieve details via Todoist API.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| project_id | ID of the project to get details for | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| project_id | ID of project | str |
+| project_name | Name of project | str |
+| project_url | URL of project | str |
+| complete_data | Complete project data including all fields | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Looking up project details for verification or editing.
+<!-- END MANUAL -->
+
+---
+
+## Todoist List Collaborators
+
+### What it is
+Gets all collaborators for a specific Todoist project
+
+### How it works
+<!-- MANUAL: how_it_works -->
+Uses project ID to get collaborator list via Todoist API.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| project_id | ID of the project to get collaborators for | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| collaborator_ids | List of collaborator IDs | List[str] |
+| collaborator_names | List of collaborator names | List[str] |
+| collaborator_emails | List of collaborator email addresses | List[str] |
+| complete_data | Complete collaborator data including all fields | List[Dict[str, Any]] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Managing project sharing and collaboration.
+<!-- END MANUAL -->
+
+---
+
+## Todoist List Projects
+
+### What it is
+Gets all projects and their details from Todoist
+
+### How it works
+<!-- MANUAL: how_it_works -->
+Connects to Todoist API using provided credentials and retrieves all projects.
+<!-- END MANUAL -->
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| names_list | List of project names | List[str] |
+| ids_list | List of project IDs | List[str] |
+| url_list | List of project URLs | List[str] |
+| complete_data | Complete project data including all fields | List[Dict[str, Any]] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Getting an overview of all projects for organization or automation.
+<!-- END MANUAL -->
+
+---
+
+## Todoist Update Project
+
+### What it is
+Updates an existing project in Todoist
+
+### How it works
+<!-- MANUAL: how_it_works -->
+Takes project ID and updated fields, applies via Todoist API.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| project_id | ID of project to update | str | Yes |
+| name | New name for the project | str | No |
+| color | New color for the project icon | "berry_red" \| "red" \| "orange" \| "yellow" \| "olive_green" \| "lime_green" \| "green" \| "mint_green" \| "teal" \| "sky_blue" \| "light_blue" \| "blue" \| "grape" \| "violet" \| "lavender" \| "magenta" \| "salmon" \| "charcoal" \| "grey" \| "taupe" | No |
+| is_favorite | Whether the project should be a favorite | bool | No |
+| view_style | Display style (list or board) | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the update was successful | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Modifying project settings or reorganizing projects.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/todoist/sections.md b/docs/integrations/block-integrations/todoist/sections.md
new file mode 100644
index 0000000000..1c0d9da19b
--- /dev/null
+++ b/docs/integrations/block-integrations/todoist/sections.md
@@ -0,0 +1,99 @@
+# Todoist Sections
+<!-- MANUAL: file_description -->
+Blocks for managing sections within Todoist projects.
+<!-- END MANUAL -->
+
+## Todoist Delete Section
+
+### What it is
+Deletes a section and all its tasks from Todoist
+
+### How it works
+<!-- MANUAL: how_it_works -->
+Uses section ID to delete via Todoist API.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| section_id | ID of section to delete | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether section was successfully deleted | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Removing unused sections or reorganizing projects.
+<!-- END MANUAL -->
+
+---
+
+## Todoist Get Section
+
+### What it is
+Gets a single section by ID from Todoist
+
+### How it works
+<!-- MANUAL: how_it_works -->
+Uses section ID to retrieve details via Todoist API.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| section_id | ID of section to fetch | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| id | ID of section | str |
+| project_id | Project ID the section belongs to | str |
+| order | Order of the section | int |
+| name | Name of the section | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Looking up section details for task management.
+<!-- END MANUAL -->
+
+---
+
+## Todoist List Sections
+
+### What it is
+Gets all sections and their details from Todoist
+
+### How it works
+<!-- MANUAL: how_it_works -->
+Connects to Todoist API to retrieve sections list.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| project_id | Optional project ID to filter sections | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| names_list | List of section names | List[str] |
+| ids_list | List of section IDs | List[str] |
+| complete_data | Complete section data including all fields | List[Dict[str, Any]] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Getting section information for task organization.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/todoist/tasks.md b/docs/integrations/block-integrations/todoist/tasks.md
new file mode 100644
index 0000000000..a09e5d960e
--- /dev/null
+++ b/docs/integrations/block-integrations/todoist/tasks.md
@@ -0,0 +1,256 @@
+# Todoist Tasks
+<!-- MANUAL: file_description -->
+Blocks for creating, updating, and managing tasks in Todoist.
+<!-- END MANUAL -->
+
+## Todoist Close Task
+
+### What it is
+Closes a task in Todoist
+
+### How it works
+<!-- MANUAL: how_it_works -->
+Uses task ID to mark it complete via Todoist API.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| task_id | Task ID to close | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the task was successfully closed | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Marking tasks as done in automated workflows.
+<!-- END MANUAL -->
+
+---
+
+## Todoist Create Task
+
+### What it is
+Creates a new task in a Todoist project
+
+### How it works
+<!-- MANUAL: how_it_works -->
+Takes task details and creates a new task via Todoist API.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| content | Task content | str | Yes |
+| description | Task description | str | No |
+| project_id | Project ID this task should belong to | str | No |
+| section_id | Section ID this task should belong to | str | No |
+| parent_id | Parent task ID | str | No |
+| order | Optional order among other tasks,[Non-zero integer value used by clients to sort tasks under the same parent] | int | No |
+| labels | Task labels | List[str] | No |
+| priority | Task priority from 1 (normal) to 4 (urgent) | int | No |
+| due_date | Due date in YYYY-MM-DD format | str (date-time) | No |
+| deadline_date | Specific date in YYYY-MM-DD format relative to user's timezone | str (date-time) | No |
+| assignee_id | Responsible user ID | str | No |
+| duration_unit | Task duration unit (minute/day) | str | No |
+| duration | Task duration amount, You need to selecct the duration unit first | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| id | Task ID | str |
+| url | Task URL | str |
+| complete_data | Complete task data as dictionary | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Creating new tasks with full customization of parameters.
+<!-- END MANUAL -->
+
+---
+
+## Todoist Delete Task
+
+### What it is
+Deletes a task in Todoist
+
+### How it works
+<!-- MANUAL: how_it_works -->
+Uses task ID to delete via Todoist API.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| task_id | Task ID to delete | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the task was successfully deleted | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Removing unwanted or obsolete tasks from the system.
+<!-- END MANUAL -->
+
+---
+
+## Todoist Get Task
+
+### What it is
+Get an active task from Todoist
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block retrieves a single active task from Todoist using the task's unique ID. It queries the Todoist REST API and returns comprehensive task details including content, description, due dates, labels, and project association.
+
+Only active (uncompleted) tasks can be retrieved; closed tasks are not accessible through this endpoint.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| task_id | Task ID to retrieve | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| project_id | Project ID containing the task | str |
+| url | Task URL | str |
+| complete_data | Complete task data as dictionary | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Task Details Retrieval**: Fetch complete information about a specific task for display or processing in workflows.
+
+**Workflow Branching**: Get task details to make decisions based on due dates, labels, or priority levels.
+
+**Task Auditing**: Retrieve individual tasks to verify their current state before performing updates or other operations.
+<!-- END MANUAL -->
+
+---
+
+## Todoist Get Tasks
+
+### What it is
+Get active tasks from Todoist
+
+### How it works
+<!-- MANUAL: how_it_works -->
+Queries Todoist API with provided filters to get matching tasks.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| project_id | Filter tasks by project ID | str | No |
+| section_id | Filter tasks by section ID | str | No |
+| label | Filter tasks by label name | str | No |
+| filter | Filter by any supported filter, You can see How to use filters or create one of your one here - https://todoist.com/help/articles/introduction-to-filters-V98wIH | str | No |
+| lang | IETF language tag for filter language | str | No |
+| ids | List of task IDs to retrieve | List[str] | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| ids | Task IDs | List[str] |
+| urls | Task URLs | List[str] |
+| complete_data | Complete task data as dictionary | List[Dict[str, Any]] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Retrieving tasks matching specific criteria for review or processing.
+<!-- END MANUAL -->
+
+---
+
+## Todoist Reopen Task
+
+### What it is
+Reopens a task in Todoist
+
+### How it works
+<!-- MANUAL: how_it_works -->
+Uses task ID to reactivate via Todoist API.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| task_id | Task ID to reopen | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the task was successfully reopened | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Reactivating tasks that were closed accidentally or need to be repeated.
+<!-- END MANUAL -->
+
+---
+
+## Todoist Update Task
+
+### What it is
+Updates an existing task in Todoist
+
+### How it works
+<!-- MANUAL: how_it_works -->
+Takes task ID and updated fields, applies changes via Todoist API.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| task_id | Task ID to update | str | Yes |
+| content | Task content | str | Yes |
+| description | Task description | str | No |
+| project_id | Project ID this task should belong to | str | No |
+| section_id | Section ID this task should belong to | str | No |
+| parent_id | Parent task ID | str | No |
+| order | Optional order among other tasks,[Non-zero integer value used by clients to sort tasks under the same parent] | int | No |
+| labels | Task labels | List[str] | No |
+| priority | Task priority from 1 (normal) to 4 (urgent) | int | No |
+| due_date | Due date in YYYY-MM-DD format | str (date-time) | No |
+| deadline_date | Specific date in YYYY-MM-DD format relative to user's timezone | str (date-time) | No |
+| assignee_id | Responsible user ID | str | No |
+| duration_unit | Task duration unit (minute/day) | str | No |
+| duration | Task duration amount, You need to selecct the duration unit first | int | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the update was successful | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+Modifying task details like due dates, priority etc.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/twitter/blocks.md b/docs/integrations/block-integrations/twitter/blocks.md
new file mode 100644
index 0000000000..b63084caaf
--- /dev/null
+++ b/docs/integrations/block-integrations/twitter/blocks.md
@@ -0,0 +1,48 @@
+# Twitter Blocks
+<!-- MANUAL: file_description -->
+Blocks for managing blocked users on Twitter/X.
+<!-- END MANUAL -->
+
+## Twitter Get Blocked Users
+
+### What it is
+This block retrieves a list of users blocked by the authenticating user.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Twitter API v2 via Tweepy to retrieve a paginated list of users that the authenticated account has blocked. It authenticates using OAuth 2.0 with the required scopes (users.read, block.read) and sends a request to Twitter's blocked users endpoint.
+
+The response includes user IDs and usernames by default, with optional expansions to include additional data like pinned tweets. Pagination is supported through tokens, allowing retrieval of large block lists in batches of up to 1,000 users per request.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| expansions | Choose what extra information you want to get with user data. Currently only 'pinned_tweet_id' is available to see a user's pinned tweet. | UserExpansionsFilter | No |
+| tweet_fields | Select what tweet information you want to see in pinned tweets. This only works if you select 'pinned_tweet_id' in expansions above. | TweetFieldsFilter | No |
+| user_fields | Select what user information you want to see, like username, bio, profile picture, etc. | TweetUserFieldsFilter | No |
+| max_results | Maximum number of results to return (1-1000, default 100) | int | No |
+| pagination_token | Token for retrieving next/previous page of results | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| user_ids | List of blocked user IDs | List[str] |
+| usernames_ | List of blocked usernames | List[str] |
+| included | Additional data requested via expansions | Dict[str, Any] |
+| meta | Metadata including pagination info | Dict[str, Any] |
+| next_token | Next token for pagination | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Block List Audit**: Review your block list periodically to identify accounts you may want to unblock or to analyze blocking patterns.
+
+**Safety Monitoring**: Track blocked accounts as part of a harassment monitoring workflow, documenting problematic accounts.
+
+**Account Migration**: Export your block list when setting up a new account or for backup purposes.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/twitter/bookmark.md b/docs/integrations/block-integrations/twitter/bookmark.md
new file mode 100644
index 0000000000..a27022fdfb
--- /dev/null
+++ b/docs/integrations/block-integrations/twitter/bookmark.md
@@ -0,0 +1,126 @@
+# Twitter Bookmark
+<!-- MANUAL: file_description -->
+Blocks for managing Twitter/X bookmarks.
+<!-- END MANUAL -->
+
+## Twitter Bookmark Tweet
+
+### What it is
+This block bookmarks a tweet on Twitter.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Twitter API v2 via Tweepy to add a tweet to the authenticated user's bookmarks. The bookmark is private and only visible to you—the tweet author is not notified.
+
+The block authenticates using OAuth 2.0 with bookmark write permissions and sends a POST request to add the specified tweet ID to your bookmarks. Returns a success indicator confirming the bookmark was added.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| tweet_id | ID of the tweet to bookmark | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the bookmark was successful | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Curation**: Save interesting tweets for later reading or to compile into a newsletter or blog post.
+
+**Research Collection**: Bookmark tweets containing valuable information or sources for ongoing research projects.
+
+**Reference Library**: Build a collection of useful tips, tutorials, or resource links shared on Twitter.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Get Bookmarked Tweets
+
+### What it is
+This block retrieves bookmarked tweets from Twitter.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries the Twitter API v2 to retrieve tweets that the authenticated user has bookmarked. Results are returned in reverse chronological order (most recently bookmarked first) with pagination support.
+
+The block uses Tweepy with OAuth 2.0 authentication and supports extensive expansions to include additional data like media, author information, and location details. Returns tweet IDs, text content, author information, and complete tweet data objects.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| expansions | Choose what extra information you want to get with your tweets. For example: - Select 'Media_Keys' to get media details - Select 'Author_User_ID' to get user information - Select 'Place_ID' to get location details | ExpansionFilter | No |
+| media_fields | Select what media information you want to see (images, videos, etc). To use this, you must first select 'Media_Keys' in the expansions above. | TweetMediaFieldsFilter | No |
+| place_fields | Select what location information you want to see (country, coordinates, etc). To use this, you must first select 'Place_ID' in the expansions above. | TweetPlaceFieldsFilter | No |
+| poll_fields | Select what poll information you want to see (options, voting status, etc). To use this, you must first select 'Poll_IDs' in the expansions above. | TweetPollFieldsFilter | No |
+| tweet_fields | Select what tweet information you want to see. For referenced tweets (like retweets), select 'Referenced_Tweet_ID' in the expansions above. | TweetFieldsFilter | No |
+| user_fields | Select what user information you want to see. To use this, you must first select one of these in expansions above: - 'Author_User_ID' for tweet authors - 'Mentioned_Usernames' for mentioned users - 'Reply_To_User_ID' for users being replied to - 'Referenced_Tweet_Author_ID' for authors of referenced tweets | TweetUserFieldsFilter | No |
+| max_results | Maximum number of results to return (1-100) | int | No |
+| pagination_token | Token for pagination | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| id | All Tweet IDs | List[str] |
+| text | All Tweet texts | List[str] |
+| userId | IDs of the tweet authors | List[str] |
+| userName | Usernames of the tweet authors | List[str] |
+| data | Complete Tweet data | List[Dict[str, Any]] |
+| included | Additional data that you have requested (Optional) via Expansions field | Dict[str, Any] |
+| meta | Provides metadata such as pagination info (next_token) or result counts | Dict[str, Any] |
+| next_token | Next token for pagination | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Review**: Process your bookmarked tweets to extract and organize information you've saved.
+
+**Bookmark Cleanup**: Review and categorize bookmarks to identify content to keep, share, or remove.
+
+**Reading List Management**: Retrieve bookmarked tweets to create a structured reading list or export to another system.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Remove Bookmark Tweet
+
+### What it is
+This block removes a bookmark from a tweet on Twitter.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Twitter API v2 via Tweepy to remove a tweet from the authenticated user's bookmarks. The operation is private—no one else is notified that you unbookmarked the tweet.
+
+The block authenticates using OAuth 2.0 with bookmark write permissions and sends a DELETE request to remove the specified tweet ID from your bookmarks. Returns a success indicator confirming the bookmark was removed.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| tweet_id | ID of the tweet to remove bookmark from | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the bookmark removal failed | str |
+| success | Whether the bookmark was successfully removed | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Bookmark Cleanup**: Remove tweets you've already read or that are no longer relevant from your bookmarks.
+
+**Content Processing**: Automatically remove bookmarks after extracting or processing the content.
+
+**List Management**: Maintain a manageable bookmark collection by removing older or processed items.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/twitter/follows.md b/docs/integrations/block-integrations/twitter/follows.md
new file mode 100644
index 0000000000..f19023ae2b
--- /dev/null
+++ b/docs/integrations/block-integrations/twitter/follows.md
@@ -0,0 +1,168 @@
+# Twitter Follows
+<!-- MANUAL: file_description -->
+Blocks for following and unfollowing users on Twitter/X.
+<!-- END MANUAL -->
+
+## Twitter Follow User
+
+### What it is
+This block follows a specified Twitter user.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Twitter API v2 via Tweepy to create a follow relationship from the authenticated user to the specified target user. The follow action is public—the target user will be notified and can see that you followed them.
+
+The block authenticates using OAuth 2.0 with follow write permissions. If the target user has a protected account, a follow request is sent instead of an immediate follow. Returns a success indicator confirming the action.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| target_user_id | The user ID of the user that you would like to follow | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the follow action was successful | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Influencer Engagement**: Automatically follow industry influencers or thought leaders you want to engage with.
+
+**Community Building**: Follow users who interact with your content to build reciprocal relationships.
+
+**Network Expansion**: Follow users in specific niches or communities to expand your network strategically.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Get Followers
+
+### What it is
+This block retrieves followers of a specified Twitter user.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries the Twitter API v2 to retrieve a paginated list of users who follow a specified account. Results include user IDs, usernames, and optionally expanded profile data.
+
+The block uses Tweepy with OAuth 2.0 authentication. Followers are returned in reverse chronological order (most recent first), with pagination support for accounts with many followers. Expansions can include pinned tweet data for each follower.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| expansions | Choose what extra information you want to get with user data. Currently only 'pinned_tweet_id' is available to see a user's pinned tweet. | UserExpansionsFilter | No |
+| tweet_fields | Select what tweet information you want to see in pinned tweets. This only works if you select 'pinned_tweet_id' in expansions above. | TweetFieldsFilter | No |
+| user_fields | Select what user information you want to see, like username, bio, profile picture, etc. | TweetUserFieldsFilter | No |
+| target_user_id | The user ID whose followers you would like to retrieve | str | Yes |
+| max_results | Maximum number of results to return (1-1000, default 100) | int | No |
+| pagination_token | Token for retrieving next/previous page of results | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| ids | List of follower user IDs | List[str] |
+| usernames | List of follower usernames | List[str] |
+| next_token | Next token for pagination | str |
+| data | Complete user data for followers | List[Dict[str, Any]] |
+| includes | Additional data requested via expansions | Dict[str, Any] |
+| meta | Metadata including pagination info | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Audience Analysis**: Analyze the followers of a competitor or influencer to understand their audience demographics.
+
+**Follower Monitoring**: Track new followers over time to identify growth patterns or notable new followers.
+
+**Engagement Targeting**: Identify active followers for targeted engagement or outreach campaigns.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Get Following
+
+### What it is
+This block retrieves the users that a specified Twitter user is following.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries the Twitter API v2 to retrieve a paginated list of users that a specified account follows. Results include user IDs, usernames, and optionally expanded profile data.
+
+The block uses Tweepy with OAuth 2.0 authentication. Following lists are returned with pagination support for accounts following many users. Expansions can include pinned tweet data for each followed account.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| expansions | Choose what extra information you want to get with user data. Currently only 'pinned_tweet_id' is available to see a user's pinned tweet. | UserExpansionsFilter | No |
+| tweet_fields | Select what tweet information you want to see in pinned tweets. This only works if you select 'pinned_tweet_id' in expansions above. | TweetFieldsFilter | No |
+| user_fields | Select what user information you want to see, like username, bio, profile picture, etc. | TweetUserFieldsFilter | No |
+| target_user_id | The user ID whose following you would like to retrieve | str | Yes |
+| max_results | Maximum number of results to return (1-1000, default 100) | int | No |
+| pagination_token | Token for retrieving next/previous page of results | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| ids | List of following user IDs | List[str] |
+| usernames | List of following usernames | List[str] |
+| next_token | Next token for pagination | str |
+| data | Complete user data for following | List[Dict[str, Any]] |
+| includes | Additional data requested via expansions | Dict[str, Any] |
+| meta | Metadata including pagination info | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Interest Analysis**: Analyze who an influencer or competitor follows to understand their interests and network.
+
+**Discover Accounts**: Find relevant accounts to follow by examining the following lists of users in your niche.
+
+**Relationship Mapping**: Map professional networks by analyzing mutual follows and connections.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Unfollow User
+
+### What it is
+This block unfollows a specified Twitter user.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Twitter API v2 via Tweepy to remove a follow relationship from the authenticated user to the specified target user. The unfollow is processed silently—the target user is not notified.
+
+The block authenticates using OAuth 2.0 with follow write permissions and sends a DELETE request to remove the follow relationship. Returns a success indicator confirming the unfollow was processed.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| target_user_id | The user ID of the user that you would like to unfollow | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the unfollow action was successful | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Account Cleanup**: Unfollow inactive accounts or accounts that no longer post relevant content.
+
+**Feed Curation**: Unfollow accounts to reduce noise in your timeline and focus on important content.
+
+**Following List Management**: Maintain a manageable following count by periodically unfollowing accounts.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/twitter/hide.md b/docs/integrations/block-integrations/twitter/hide.md
new file mode 100644
index 0000000000..8daa0e19e1
--- /dev/null
+++ b/docs/integrations/block-integrations/twitter/hide.md
@@ -0,0 +1,76 @@
+# Twitter Hide
+<!-- MANUAL: file_description -->
+Blocks for hiding and unhiding tweet replies on Twitter/X.
+<!-- END MANUAL -->
+
+## Twitter Hide Reply
+
+### What it is
+This block hides a reply to a tweet.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Twitter API v2 via Tweepy to hide a reply to one of your tweets. Hidden replies are not deleted—they're moved behind a "View hidden replies" option that viewers can click to see. Only the original tweet author can hide replies.
+
+The block authenticates using OAuth 2.0 and sends a PUT request to change the reply's hidden status. This is useful for managing conversation threads and reducing visibility of off-topic or inappropriate replies.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| tweet_id | ID of the tweet reply to hide | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the operation was successful | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Conversation Moderation**: Hide off-topic or spam replies to keep your tweet threads focused and readable.
+
+**Brand Protection**: Hide inappropriate or offensive replies to maintain a professional appearance on brand accounts.
+
+**Community Management**: Moderate discussions by hiding replies that violate community guidelines without deleting them entirely.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Unhide Reply
+
+### What it is
+This block unhides a reply to a tweet.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Twitter API v2 via Tweepy to restore visibility of a previously hidden reply. The reply will appear normally in the conversation thread again.
+
+The block authenticates using OAuth 2.0 and sends a PUT request to change the reply's hidden status back to visible. Only the original tweet author can unhide replies they previously hid.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| tweet_id | ID of the tweet reply to unhide | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the operation was successful | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Moderation Review**: Restore replies after reviewing them and determining they were hidden incorrectly.
+
+**Context Restoration**: Unhide replies that provide important context that was initially overlooked.
+
+**User Appeals**: Restore hidden replies after a user explains their intent or edits problematic content.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/twitter/like.md b/docs/integrations/block-integrations/twitter/like.md
new file mode 100644
index 0000000000..a0dd4ffdc6
--- /dev/null
+++ b/docs/integrations/block-integrations/twitter/like.md
@@ -0,0 +1,173 @@
+# Twitter Like
+<!-- MANUAL: file_description -->
+Blocks for liking tweets and retrieving liked tweets on Twitter/X.
+<!-- END MANUAL -->
+
+## Twitter Get Liked Tweets
+
+### What it is
+This block gets information about tweets liked by a user.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries the Twitter API v2 to retrieve tweets that a specified user has liked. Results are returned in reverse chronological order (most recently liked first) with pagination support.
+
+The block uses Tweepy with OAuth 2.0 authentication and supports extensive expansions to include additional data like media, author information, and location details. Returns tweet IDs, text content, author information, and complete tweet data objects.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| expansions | Choose what extra information you want to get with your tweets. For example: - Select 'Media_Keys' to get media details - Select 'Author_User_ID' to get user information - Select 'Place_ID' to get location details | ExpansionFilter | No |
+| media_fields | Select what media information you want to see (images, videos, etc). To use this, you must first select 'Media_Keys' in the expansions above. | TweetMediaFieldsFilter | No |
+| place_fields | Select what location information you want to see (country, coordinates, etc). To use this, you must first select 'Place_ID' in the expansions above. | TweetPlaceFieldsFilter | No |
+| poll_fields | Select what poll information you want to see (options, voting status, etc). To use this, you must first select 'Poll_IDs' in the expansions above. | TweetPollFieldsFilter | No |
+| tweet_fields | Select what tweet information you want to see. For referenced tweets (like retweets), select 'Referenced_Tweet_ID' in the expansions above. | TweetFieldsFilter | No |
+| user_fields | Select what user information you want to see. To use this, you must first select one of these in expansions above: - 'Author_User_ID' for tweet authors - 'Mentioned_Usernames' for mentioned users - 'Reply_To_User_ID' for users being replied to - 'Referenced_Tweet_Author_ID' for authors of referenced tweets | TweetUserFieldsFilter | No |
+| user_id | ID of the user to get liked tweets for | str | Yes |
+| max_results | Maximum number of results to return (5-100) | int | No |
+| pagination_token | Token for getting next/previous page of results | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| ids | All Tweet IDs | List[str] |
+| texts | All Tweet texts | List[str] |
+| userIds | List of user ids that authored the tweets | List[str] |
+| userNames | List of user names that authored the tweets | List[str] |
+| next_token | Next token for pagination | str |
+| data | Complete Tweet data | List[Dict[str, Any]] |
+| included | Additional data that you have requested (Optional) via Expansions field | Dict[str, Any] |
+| meta | Provides metadata such as pagination info (next_token) or result counts | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Interest Analysis**: Analyze a user's liked tweets to understand their interests, preferences, and sentiment.
+
+**Content Discovery**: Find high-quality content by examining tweets liked by influencers in your niche.
+
+**Engagement Research**: Study what types of content resonate with your target audience based on their likes.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Get Liking Users
+
+### What it is
+This block gets information about users who liked a tweet.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries the Twitter API v2 to retrieve a paginated list of users who have liked a specific tweet. Results include user IDs, usernames, and optionally expanded profile data.
+
+The block uses Tweepy with OAuth 2.0 authentication. Users are returned with pagination support for tweets with many likes. Expansions can include pinned tweet data for each user who liked the tweet.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| expansions | Choose what extra information you want to get with user data. Currently only 'pinned_tweet_id' is available to see a user's pinned tweet. | UserExpansionsFilter | No |
+| tweet_fields | Select what tweet information you want to see in pinned tweets. This only works if you select 'pinned_tweet_id' in expansions above. | TweetFieldsFilter | No |
+| user_fields | Select what user information you want to see, like username, bio, profile picture, etc. | TweetUserFieldsFilter | No |
+| tweet_id | ID of the tweet to get liking users for | str | Yes |
+| max_results | Maximum number of results to return (1-100) | int | No |
+| pagination_token | Token for getting next/previous page of results | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| id | All User IDs who liked the tweet | List[str] |
+| username | All User usernames who liked the tweet | List[str] |
+| next_token | Next token for pagination | str |
+| data | Complete Tweet data | List[Dict[str, Any]] |
+| included | Additional data that you have requested (Optional) via Expansions field | Dict[str, Any] |
+| meta | Provides metadata such as pagination info (next_token) or result counts | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Engagement Analysis**: Identify who is engaging with your content to understand your audience better.
+
+**Influencer Identification**: Find influential users who liked your tweet for potential outreach or collaboration.
+
+**Community Discovery**: Discover potential community members or customers by analyzing who engages with relevant content.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Like Tweet
+
+### What it is
+This block likes a tweet.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Twitter API v2 via Tweepy to like a tweet on behalf of the authenticated user. The like is public—the tweet author and others can see that you liked the tweet.
+
+The block authenticates using OAuth 2.0 with like write permissions and sends a POST request to add a like to the specified tweet. Returns a success indicator confirming the like was added.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| tweet_id | ID of the tweet to like | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the operation was successful | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Engagement Automation**: Like tweets from accounts you want to engage with to increase visibility and interaction.
+
+**Content Appreciation**: Automatically like tweets that mention your brand positively or use specific hashtags.
+
+**Community Building**: Like tweets from community members to acknowledge their contributions and encourage further engagement.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Unlike Tweet
+
+### What it is
+This block unlikes a tweet.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Twitter API v2 via Tweepy to remove a like from a tweet. The unlike action is processed silently—the tweet author is not specifically notified that you unliked.
+
+The block authenticates using OAuth 2.0 with like write permissions and sends a DELETE request to remove the like from the specified tweet. Returns a success indicator confirming the like was removed.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| tweet_id | ID of the tweet to unlike | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the operation was successful | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Like Cleanup**: Remove likes from tweets you no longer want associated with your account.
+
+**Content Review**: Unlike tweets after reviewing them and determining they don't align with your values.
+
+**Engagement Adjustment**: Adjust your like history as part of curating your public engagement profile.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/twitter/list_follows.md b/docs/integrations/block-integrations/twitter/list_follows.md
new file mode 100644
index 0000000000..2aef98c549
--- /dev/null
+++ b/docs/integrations/block-integrations/twitter/list_follows.md
@@ -0,0 +1,76 @@
+# Twitter List Follows
+<!-- MANUAL: file_description -->
+Blocks for following and unfollowing Twitter/X lists.
+<!-- END MANUAL -->
+
+## Twitter Follow List
+
+### What it is
+This block follows a specified Twitter list for the authenticated user.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Twitter API v2 via Tweepy to follow a Twitter List. Following a list adds it to your Lists tab and shows tweets from list members in your timeline when viewing that list.
+
+The block authenticates using OAuth 2.0 with list write permissions and sends a POST request to add the follow relationship. Returns a success indicator confirming the list was followed.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| list_id | The ID of the List to follow | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the follow was successful | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Curated Content Discovery**: Follow lists curated by industry experts to access filtered content streams.
+
+**Topic Monitoring**: Follow lists focused on specific topics to stay informed without following individual accounts.
+
+**Research Organization**: Follow competitor or industry lists to monitor activity without cluttering your main timeline.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Unfollow List
+
+### What it is
+This block unfollows a specified Twitter list for the authenticated user.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Twitter API v2 via Tweepy to unfollow a Twitter List. The list is removed from your Lists tab but remains accessible if it's public.
+
+The block authenticates using OAuth 2.0 with list write permissions and sends a DELETE request to remove the follow relationship. Returns a success indicator confirming the list was unfollowed.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| list_id | The ID of the List to unfollow | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the unfollow was successful | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**List Cleanup**: Unfollow lists that are no longer relevant or useful to your interests.
+
+**Focus Management**: Reduce information overload by unfollowing less important lists.
+
+**Account Organization**: Clean up your followed lists as part of regular account maintenance.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/twitter/list_lookup.md b/docs/integrations/block-integrations/twitter/list_lookup.md
new file mode 100644
index 0000000000..d8ba82c8df
--- /dev/null
+++ b/docs/integrations/block-integrations/twitter/list_lookup.md
@@ -0,0 +1,95 @@
+# Twitter List Lookup
+<!-- MANUAL: file_description -->
+Blocks for retrieving information about Twitter/X lists.
+<!-- END MANUAL -->
+
+## Twitter Get List
+
+### What it is
+This block retrieves information about a specified Twitter List.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries the Twitter API v2 to retrieve detailed information about a specific Twitter List by its ID. Returns list metadata including name, description, member count, follower count, and privacy status.
+
+The block uses Tweepy with OAuth 2.0 authentication and supports expansions to include owner profile data. Works for both public lists and private lists you own or follow.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| expansions | Choose what extra information you want to get with your Twitter Lists: - Select 'List_Owner_ID' to get details about who owns the list  This will let you see more details about the list owner when you also select user fields below. | ListExpansionsFilter | No |
+| user_fields | Choose what information you want to see about list owners. This only works when you select 'List_Owner_ID' in expansions above.  You can see things like: - Their username - Profile picture - Account details - And more | TweetUserFieldsFilter | No |
+| list_fields | Choose what information you want to see about the Twitter Lists themselves, such as: - List name - Description - Number of followers - Number of members - Whether it's private - Creation date - And more | ListFieldsFilter | No |
+| list_id | The ID of the List to lookup | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| id | ID of the Twitter List | str |
+| name | Name of the Twitter List | str |
+| owner_id | ID of the List owner | str |
+| owner_username | Username of the List owner | str |
+| data | Complete list data | Dict[str, Any] |
+| included | Additional data requested via expansions | Dict[str, Any] |
+| meta | Metadata about the response | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**List Verification**: Verify a list exists and check its current details before performing operations on it.
+
+**List Discovery**: Retrieve information about interesting lists to decide whether to follow them.
+
+**Analytics Preparation**: Gather list metadata for reporting or analysis purposes.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Get Owned Lists
+
+### What it is
+This block retrieves all Lists owned by a specified Twitter user.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries the Twitter API v2 to retrieve all Twitter Lists created by a specific user. Results include list IDs, names, and detailed metadata with pagination support for users with many lists.
+
+The block uses Tweepy with OAuth 2.0 authentication and supports expansions to include owner profile data. Only returns public lists unless querying your own account.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| expansions | Choose what extra information you want to get with your Twitter Lists: - Select 'List_Owner_ID' to get details about who owns the list  This will let you see more details about the list owner when you also select user fields below. | ListExpansionsFilter | No |
+| user_fields | Choose what information you want to see about list owners. This only works when you select 'List_Owner_ID' in expansions above.  You can see things like: - Their username - Profile picture - Account details - And more | TweetUserFieldsFilter | No |
+| list_fields | Choose what information you want to see about the Twitter Lists themselves, such as: - List name - Description - Number of followers - Number of members - Whether it's private - Creation date - And more | ListFieldsFilter | No |
+| user_id | The user ID whose owned Lists to retrieve | str | Yes |
+| max_results | Maximum number of results per page (1-100) | int | No |
+| pagination_token | Token for pagination | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| list_ids | List ids of the owned lists | List[str] |
+| list_names | List names of the owned lists | List[str] |
+| next_token | Token for next page of results | str |
+| data | Complete owned lists data | List[Dict[str, Any]] |
+| included | Additional data requested via expansions | Dict[str, Any] |
+| meta | Metadata about the response | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**List Discovery**: Find all public lists created by influencers or thought leaders in your industry.
+
+**Account Audit**: Review all lists you own to identify ones to update or delete.
+
+**Competitive Analysis**: Discover how competitors organize their Twitter following through their public lists.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/twitter/list_members.md b/docs/integrations/block-integrations/twitter/list_members.md
new file mode 100644
index 0000000000..357ab4fa9d
--- /dev/null
+++ b/docs/integrations/block-integrations/twitter/list_members.md
@@ -0,0 +1,169 @@
+# Twitter List Members
+<!-- MANUAL: file_description -->
+Blocks for managing members of Twitter/X lists.
+<!-- END MANUAL -->
+
+## Twitter Add List Member
+
+### What it is
+This block adds a specified user to a Twitter List owned by the authenticated user.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Twitter API v2 via Tweepy to add a user to a Twitter List that you own. The added user will appear in the list's member roster and their tweets will show in the list timeline.
+
+The block authenticates using OAuth 2.0 with list write permissions. Only the list owner can add members. The target user does not need to approve being added to public lists.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| list_id | The ID of the List to add the member to | str | Yes |
+| user_id | The ID of the user to add to the List | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the member was successfully added | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**List Curation**: Build curated lists by adding relevant accounts you discover.
+
+**Community Organization**: Add new community members or contributors to tracking lists.
+
+**Research Lists**: Add accounts to research lists for ongoing monitoring projects.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Get List Members
+
+### What it is
+This block retrieves the members of a specified Twitter List.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries the Twitter API v2 to retrieve all members of a specific Twitter List. Results include user IDs, usernames, and optionally expanded profile data with pagination support.
+
+The block uses Tweepy with OAuth 2.0 authentication. Works for public lists and private lists you own or are a member of. Returns member data in batches of up to 100 users.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| expansions | Choose what extra information you want to get with user data. Currently only 'pinned_tweet_id' is available to see a user's pinned tweet. | UserExpansionsFilter | No |
+| tweet_fields | Select what tweet information you want to see in pinned tweets. This only works if you select 'pinned_tweet_id' in expansions above. | TweetFieldsFilter | No |
+| user_fields | Select what user information you want to see, like username, bio, profile picture, etc. | TweetUserFieldsFilter | No |
+| list_id | The ID of the List to get members from | str | Yes |
+| max_results | Maximum number of results per page (1-100) | int | No |
+| pagination_token | Token for pagination of results | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| ids | List of member user IDs | List[str] |
+| usernames | List of member usernames | List[str] |
+| next_token | Next token for pagination | str |
+| data | Complete user data for list members | List[Dict[str, Any]] |
+| included | Additional data requested via expansions | Dict[str, Any] |
+| meta | Metadata including pagination info | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Audience Analysis**: Analyze the composition of curated lists to understand target audiences.
+
+**List Export**: Export list members for analysis or to recreate lists on other platforms.
+
+**Member Verification**: Check if specific users are members of a particular list.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Get List Memberships
+
+### What it is
+This block retrieves all Lists that a specified user is a member of.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries the Twitter API v2 to retrieve all Lists that include a specific user as a member. This shows which curated lists have added this account.
+
+The block uses Tweepy with OAuth 2.0 authentication and supports expansions for list owner data. Returns paginated results with list IDs and metadata. Only returns public lists unless querying your own memberships.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| expansions | Choose what extra information you want to get with your Twitter Lists: - Select 'List_Owner_ID' to get details about who owns the list  This will let you see more details about the list owner when you also select user fields below. | ListExpansionsFilter | No |
+| user_fields | Choose what information you want to see about list owners. This only works when you select 'List_Owner_ID' in expansions above.  You can see things like: - Their username - Profile picture - Account details - And more | TweetUserFieldsFilter | No |
+| list_fields | Choose what information you want to see about the Twitter Lists themselves, such as: - List name - Description - Number of followers - Number of members - Whether it's private - Creation date - And more | ListFieldsFilter | No |
+| user_id | The ID of the user whose List memberships to retrieve | str | Yes |
+| max_results | Maximum number of results per page (1-100) | int | No |
+| pagination_token | Token for pagination of results | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| list_ids | List of list IDs | List[str] |
+| next_token | Next token for pagination | str |
+| data | List membership data | List[Dict[str, Any]] |
+| included | Additional data requested via expansions | Dict[str, Any] |
+| meta | Metadata about pagination | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Influence Analysis**: Discover what curated lists include an influencer or competitor.
+
+**Profile Research**: Understand how others categorize a specific account.
+
+**Visibility Assessment**: See which lists feature your own account for reputation tracking.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Remove List Member
+
+### What it is
+This block removes a specified user from a Twitter List owned by the authenticated user.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Twitter API v2 via Tweepy to remove a user from a Twitter List that you own. The removed user will no longer appear in the list and their tweets won't show in the list timeline.
+
+The block authenticates using OAuth 2.0 with list write permissions. Only the list owner can remove members. The removed user is not notified.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| list_id | The ID of the List to remove the member from | str | Yes |
+| user_id | The ID of the user to remove from the List | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the member was successfully removed | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**List Maintenance**: Remove inactive or irrelevant accounts from your curated lists.
+
+**Quality Control**: Remove accounts that no longer meet the list's criteria or purpose.
+
+**List Cleanup**: Periodically clean up lists by removing accounts that have changed focus.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/twitter/list_tweets_lookup.md b/docs/integrations/block-integrations/twitter/list_tweets_lookup.md
new file mode 100644
index 0000000000..9eebc930c4
--- /dev/null
+++ b/docs/integrations/block-integrations/twitter/list_tweets_lookup.md
@@ -0,0 +1,53 @@
+# Twitter List Tweets Lookup
+<!-- MANUAL: file_description -->
+Blocks for retrieving tweets from Twitter/X lists.
+<!-- END MANUAL -->
+
+## Twitter Get List Tweets
+
+### What it is
+This block retrieves tweets from a specified Twitter list.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries the Twitter API v2 to retrieve tweets posted by members of a specific Twitter List. Results include all tweets from list members in reverse chronological order, providing a curated timeline based on the list's membership.
+
+The block uses Tweepy with OAuth 2.0 authentication and supports extensive expansions to include additional data like media, author profiles, and referenced tweets. Pagination allows retrieving large volumes of list content in batches of up to 100 tweets.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| expansions | Choose what extra information you want to get with your tweets. For example: - Select 'Media_Keys' to get media details - Select 'Author_User_ID' to get user information - Select 'Place_ID' to get location details | ExpansionFilter | No |
+| media_fields | Select what media information you want to see (images, videos, etc). To use this, you must first select 'Media_Keys' in the expansions above. | TweetMediaFieldsFilter | No |
+| place_fields | Select what location information you want to see (country, coordinates, etc). To use this, you must first select 'Place_ID' in the expansions above. | TweetPlaceFieldsFilter | No |
+| poll_fields | Select what poll information you want to see (options, voting status, etc). To use this, you must first select 'Poll_IDs' in the expansions above. | TweetPollFieldsFilter | No |
+| tweet_fields | Select what tweet information you want to see. For referenced tweets (like retweets), select 'Referenced_Tweet_ID' in the expansions above. | TweetFieldsFilter | No |
+| user_fields | Select what user information you want to see. To use this, you must first select one of these in expansions above: - 'Author_User_ID' for tweet authors - 'Mentioned_Usernames' for mentioned users - 'Reply_To_User_ID' for users being replied to - 'Referenced_Tweet_Author_ID' for authors of referenced tweets | TweetUserFieldsFilter | No |
+| list_id | The ID of the List whose Tweets you would like to retrieve | str | Yes |
+| max_results | Maximum number of results per page (1-100) | int | No |
+| pagination_token | Token for paginating through results | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| tweet_ids | List of tweet IDs | List[str] |
+| texts | List of tweet texts | List[str] |
+| next_token | Token for next page of results | str |
+| data | Complete list tweets data | List[Dict[str, Any]] |
+| included | Additional data requested via expansions | Dict[str, Any] |
+| meta | Response metadata including pagination tokens | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Industry News Aggregation**: Retrieve tweets from curated industry expert lists to create automated news digests.
+
+**Topic Monitoring**: Monitor tweets from lists focused on specific topics like AI, crypto, or sports for trend analysis.
+
+**Content Curation**: Pull tweets from influencer lists to identify high-quality content for sharing or engagement.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/twitter/manage.md b/docs/integrations/block-integrations/twitter/manage.md
new file mode 100644
index 0000000000..00957bf5b3
--- /dev/null
+++ b/docs/integrations/block-integrations/twitter/manage.md
@@ -0,0 +1,136 @@
+# Twitter Manage
+<!-- MANUAL: file_description -->
+Blocks for posting, deleting, and managing tweets on Twitter/X.
+<!-- END MANUAL -->
+
+## Twitter Delete Tweet
+
+### What it is
+This block deletes a tweet on Twitter.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Twitter API v2 via Tweepy to permanently delete a tweet from the authenticated user's account. The deletion is immediate and cannot be undone.
+
+The block authenticates using OAuth 2.0 with tweet write permissions and sends a DELETE request for the specified tweet ID. Only the tweet's author can delete their own tweets. Returns a success indicator confirming the deletion.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| tweet_id | ID of the tweet to delete | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the tweet deletion failed | str |
+| success | Whether the tweet was successfully deleted | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Cleanup**: Remove outdated tweets that contain incorrect information or expired promotions.
+
+**Error Correction**: Delete tweets with typos or mistakes before reposting corrected versions.
+
+**Reputation Management**: Remove tweets that may no longer align with your brand messaging or values.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Post Tweet
+
+### What it is
+This block posts a tweet on Twitter.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Twitter API v2 via Tweepy to publish a new tweet from the authenticated user's account. The tweet can include text, media attachments, polls, location tags, and quote references.
+
+The block supports advanced features like restricting replies to mentioned users or followers only, posting exclusively for Super Followers, and threading by replying to existing tweets. Returns the created tweet's ID and URL on success.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| tweet_text | Text of the tweet to post | str | No |
+| for_super_followers_only | Tweet exclusively for Super Followers | bool | No |
+| attachment | Additional tweet data (media, deep link, poll, place or quote) | Any | No |
+| exclude_reply_user_ids | User IDs to exclude from reply Tweet thread. [ex - 6253282] | List[str] | No |
+| in_reply_to_tweet_id | Tweet ID being replied to. Please note that in_reply_to_tweet_id needs to be in the request if exclude_reply_user_ids is present | str | No |
+| reply_settings | Who can reply to the Tweet (mentionedUsers or following) | TweetReplySettingsFilter | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the tweet posting failed | str |
+| tweet_id | ID of the created tweet | str |
+| tweet_url | URL to the tweet | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Automated Publishing**: Schedule and post tweets automatically based on content calendars or triggers.
+
+**Bot Responses**: Create bots that post helpful information or automated responses.
+
+**Content Distribution**: Automatically share new blog posts, product updates, or announcements on Twitter.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Search Recent Tweets
+
+### What it is
+This block searches all public Tweets in Twitter history.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Twitter API v2 via Tweepy to search for public tweets matching a query. The search supports Twitter's advanced query syntax including boolean operators, hashtags, mentions, and filters for engagement metrics.
+
+Results can be filtered by time range (start/end times), sorted by recency or relevance, and paginated for retrieving large result sets. The block supports expansions to include additional data like media, author information, and referenced tweets.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| start_time | Start time in YYYY-MM-DDTHH:mm:ssZ format. If set to a time less than 10 seconds ago, it will be automatically adjusted to 10 seconds ago (Twitter API requirement). | str (date-time) | No |
+| end_time | End time in YYYY-MM-DDTHH:mm:ssZ format | str (date-time) | No |
+| since_id | Returns results with Tweet ID  greater than this (more recent than), we give priority to since_id over start_time | str | No |
+| until_id | Returns results with Tweet ID less than this (that is, older than), and used with since_id | str | No |
+| sort_order | Order of returned tweets (recency or relevancy) | str | No |
+| expansions | Choose what extra information you want to get with your tweets. For example: - Select 'Media_Keys' to get media details - Select 'Author_User_ID' to get user information - Select 'Place_ID' to get location details | ExpansionFilter | No |
+| media_fields | Select what media information you want to see (images, videos, etc). To use this, you must first select 'Media_Keys' in the expansions above. | TweetMediaFieldsFilter | No |
+| place_fields | Select what location information you want to see (country, coordinates, etc). To use this, you must first select 'Place_ID' in the expansions above. | TweetPlaceFieldsFilter | No |
+| poll_fields | Select what poll information you want to see (options, voting status, etc). To use this, you must first select 'Poll_IDs' in the expansions above. | TweetPollFieldsFilter | No |
+| tweet_fields | Select what tweet information you want to see. For referenced tweets (like retweets), select 'Referenced_Tweet_ID' in the expansions above. | TweetFieldsFilter | No |
+| user_fields | Select what user information you want to see. To use this, you must first select one of these in expansions above: - 'Author_User_ID' for tweet authors - 'Mentioned_Usernames' for mentioned users - 'Reply_To_User_ID' for users being replied to - 'Referenced_Tweet_Author_ID' for authors of referenced tweets | TweetUserFieldsFilter | No |
+| query | Search query (up to 1024 characters) | str | Yes |
+| max_results | Maximum number of results per page (10-500) | int | No |
+| pagination | Token for pagination | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| tweet_ids | All Tweet IDs | List[str] |
+| tweet_texts | All Tweet texts | List[str] |
+| next_token | Next token for pagination | str |
+| data | Complete Tweet data | List[Dict[str, Any]] |
+| included | Additional data that you have requested (Optional) via Expansions field | Dict[str, Any] |
+| meta | Provides metadata such as pagination info (next_token) or result counts | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Brand Monitoring**: Search for mentions of your brand, products, or key terms to monitor sentiment and engagement.
+
+**Competitor Analysis**: Track competitor mentions and campaigns to understand market positioning.
+
+**Trend Research**: Search for trending topics or hashtags to identify opportunities for engagement or content creation.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/twitter/manage_lists.md b/docs/integrations/block-integrations/twitter/manage_lists.md
new file mode 100644
index 0000000000..fce3a1a2c2
--- /dev/null
+++ b/docs/integrations/block-integrations/twitter/manage_lists.md
@@ -0,0 +1,117 @@
+# Twitter Manage Lists
+<!-- MANUAL: file_description -->
+Blocks for creating, updating, and deleting Twitter/X lists.
+<!-- END MANUAL -->
+
+## Twitter Create List
+
+### What it is
+This block creates a new Twitter List for the authenticated user.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Twitter API v2 via Tweepy to create a new Twitter List under your account. You can specify the list name, description, and whether it should be public or private.
+
+The block authenticates using OAuth 2.0 with list write permissions and sends a POST request to create the list. Returns the new list's ID and URL upon successful creation.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| name | The name of the List to be created | str | No |
+| description | Description of the List | str | No |
+| private | Whether the List should be private | bool | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| url | URL of the created list | str |
+| list_id | ID of the created list | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Automated List Setup**: Programmatically create lists as part of onboarding workflows or project initialization.
+
+**Campaign Organization**: Create dedicated lists for tracking accounts related to specific marketing campaigns.
+
+**Research Projects**: Set up new lists to organize accounts for research or monitoring initiatives.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Delete List
+
+### What it is
+This block deletes a specified Twitter List owned by the authenticated user.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Twitter API v2 via Tweepy to permanently delete a Twitter List that you own. The list and all its member associations are removed and cannot be recovered.
+
+The block authenticates using OAuth 2.0 with list write permissions and sends a DELETE request. Only lists you own can be deleted. Returns a success indicator confirming the deletion.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| list_id | The ID of the List to be deleted | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the deletion was successful | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Account Cleanup**: Remove outdated or unused lists as part of regular account maintenance.
+
+**Project Completion**: Delete temporary lists created for campaigns or projects that have concluded.
+
+**Privacy Management**: Remove lists that are no longer needed to reduce your public profile footprint.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Update List
+
+### What it is
+This block updates a specified Twitter List owned by the authenticated user.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Twitter API v2 via Tweepy to update the metadata of a Twitter List you own. You can modify the list name and description without affecting the list's members.
+
+The block authenticates using OAuth 2.0 with list write permissions and sends a PUT request with the updated fields. Returns a success indicator confirming the changes were applied.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| list_id | The ID of the List to be updated | str | Yes |
+| name | New name for the List | str | No |
+| description | New description for the List | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the update was successful | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**List Rebranding**: Update list names and descriptions to better reflect their evolving purpose.
+
+**Seasonal Updates**: Modify list descriptions to indicate current focus areas or time periods.
+
+**Organization Improvement**: Rename lists to follow consistent naming conventions across your account.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/twitter/mutes.md b/docs/integrations/block-integrations/twitter/mutes.md
new file mode 100644
index 0000000000..d7db2ebd09
--- /dev/null
+++ b/docs/integrations/block-integrations/twitter/mutes.md
@@ -0,0 +1,121 @@
+# Twitter Mutes
+<!-- MANUAL: file_description -->
+Blocks for managing muted users on Twitter/X.
+<!-- END MANUAL -->
+
+## Twitter Get Muted Users
+
+### What it is
+This block gets a list of users muted by the authenticating user.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block connects to the Twitter API v2 via Tweepy to retrieve all users that the authenticated account has muted. It uses OAuth 2.0 authentication with appropriate scopes and returns paginated results with user IDs, usernames, and optional expanded data.
+
+The mute list is returned in batches (default 100, up to 1,000 per page), with pagination tokens for navigating large lists. Unlike blocking, muted users can still see and interact with your content—they're simply hidden from your timeline.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| expansions | Choose what extra information you want to get with user data. Currently only 'pinned_tweet_id' is available to see a user's pinned tweet. | UserExpansionsFilter | No |
+| tweet_fields | Select what tweet information you want to see in pinned tweets. This only works if you select 'pinned_tweet_id' in expansions above. | TweetFieldsFilter | No |
+| user_fields | Select what user information you want to see, like username, bio, profile picture, etc. | TweetUserFieldsFilter | No |
+| max_results | The maximum number of results to be returned per page (1-1000). Default is 100. | int | No |
+| pagination_token | Token to request next/previous page of results | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| ids | List of muted user IDs | List[str] |
+| usernames | List of muted usernames | List[str] |
+| next_token | Next token for pagination | str |
+| data | Complete user data for muted users | List[Dict[str, Any]] |
+| includes | Additional data requested via expansions | Dict[str, Any] |
+| meta | Metadata including pagination info | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Timeline Cleanup**: Review which accounts you've muted to decide if you want to unmute any or convert mutes to blocks.
+
+**Noise Reduction Audit**: Analyze your mute list to understand what types of content you're filtering from your feed.
+
+**Account Management**: Export your mute list for backup or to apply similar muting patterns to another account.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Mute User
+
+### What it is
+This block mutes a specified Twitter user.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block sends a mute request to the Twitter API v2 for a specified user ID. The authenticated user will no longer see tweets from the muted account in their timeline, but the muted user is not notified and can still view and interact with your content.
+
+The mute action is performed using Tweepy's client interface with OAuth 2.0 authentication. The block returns a success indicator confirming whether the mute was applied.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| target_user_id | The user ID of the user that you would like to mute | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the mute action was successful | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Automated Filtering**: Mute accounts that post frequently about topics you want to temporarily avoid without unfollowing.
+
+**Event Management**: Mute accounts live-tweeting events you can't attend to avoid spoilers.
+
+**Conversation Management**: Mute accounts during heated discussions without blocking them permanently.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Unmute User
+
+### What it is
+This block unmutes a specified Twitter user.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block sends an unmute request to the Twitter API v2 for a specified user ID. Once unmuted, tweets from that account will appear in your timeline again as normal.
+
+The unmute action uses Tweepy's client interface with OAuth 2.0 authentication. The block returns a success indicator confirming whether the mute was removed.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| target_user_id | The user ID of the user that you would like to unmute | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the unmute action was successful | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Post-Event Restore**: Unmute accounts after an event ends that you were avoiding spoilers for.
+
+**Periodic Review**: Unmute accounts as part of a scheduled review of your mute list.
+
+**Relationship Repair**: Restore visibility of accounts after cooling-off periods from disagreements.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/twitter/pinned_lists.md b/docs/integrations/block-integrations/twitter/pinned_lists.md
new file mode 100644
index 0000000000..e40a570faa
--- /dev/null
+++ b/docs/integrations/block-integrations/twitter/pinned_lists.md
@@ -0,0 +1,118 @@
+# Twitter Pinned Lists
+<!-- MANUAL: file_description -->
+Blocks for managing pinned lists on Twitter/X.
+<!-- END MANUAL -->
+
+## Twitter Get Pinned Lists
+
+### What it is
+This block returns the Lists pinned by the authenticated user.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries the Twitter API v2 to retrieve all Lists that the authenticated user has pinned for quick access. Pinned lists appear prominently in the user's Lists tab on Twitter.
+
+The block uses Tweepy with OAuth 2.0 authentication and supports expansions to include owner profile data and detailed list metadata. Returns list IDs, names, and complete list data objects.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| expansions | Choose what extra information you want to get with your Twitter Lists: - Select 'List_Owner_ID' to get details about who owns the list  This will let you see more details about the list owner when you also select user fields below. | ListExpansionsFilter | No |
+| user_fields | Choose what information you want to see about list owners. This only works when you select 'List_Owner_ID' in expansions above.  You can see things like: - Their username - Profile picture - Account details - And more | TweetUserFieldsFilter | No |
+| list_fields | Choose what information you want to see about the Twitter Lists themselves, such as: - List name - Description - Number of followers - Number of members - Whether it's private - Creation date - And more | ListFieldsFilter | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| list_ids | List IDs of the pinned lists | List[str] |
+| list_names | List names of the pinned lists | List[str] |
+| data | Response data containing pinned lists | List[Dict[str, Any]] |
+| included | Additional data requested via expansions | Dict[str, Any] |
+| meta | Metadata about the response | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Workflow Configuration**: Retrieve pinned lists to understand which lists are prioritized in user workflows.
+
+**Settings Backup**: Export pinned list configurations for backup or account migration purposes.
+
+**Dashboard Setup**: Identify pinned lists to build monitoring dashboards around priority content sources.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Pin List
+
+### What it is
+This block allows the authenticated user to pin a specified List.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Twitter API v2 via Tweepy to pin a Twitter List for quick access. Pinned lists appear at the top of your Lists tab on Twitter for easy navigation.
+
+The block authenticates using OAuth 2.0 with list write permissions and sends a POST request to create the pin relationship. You can pin both your own lists and lists created by others.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| list_id | The ID of the List to pin | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the pin was successful | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Priority Organization**: Pin important lists to ensure they're easily accessible for daily monitoring.
+
+**Workflow Setup**: Automatically pin newly created lists as part of project initialization workflows.
+
+**Quick Access Configuration**: Pin frequently used lists to streamline content discovery.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Unpin List
+
+### What it is
+This block allows the authenticated user to unpin a specified List.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Twitter API v2 via Tweepy to unpin a Twitter List from your quick access area. The list remains followed but no longer appears in your pinned section.
+
+The block authenticates using OAuth 2.0 with list write permissions and sends a DELETE request to remove the pin relationship. Returns a success indicator confirming the list was unpinned.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| list_id | The ID of the List to unpin | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the unpin was successful | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Pin Management**: Unpin lists that are no longer priorities to make room for more relevant ones.
+
+**Workflow Cleanup**: Remove pins from project-specific lists after campaigns or initiatives conclude.
+
+**Organization Maintenance**: Periodically unpin outdated lists to keep your pinned section focused.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/twitter/quote.md b/docs/integrations/block-integrations/twitter/quote.md
new file mode 100644
index 0000000000..7c144b63ca
--- /dev/null
+++ b/docs/integrations/block-integrations/twitter/quote.md
@@ -0,0 +1,54 @@
+# Twitter Quote
+<!-- MANUAL: file_description -->
+Blocks for retrieving quote tweets on Twitter/X.
+<!-- END MANUAL -->
+
+## Twitter Get Quote Tweets
+
+### What it is
+This block gets quote tweets for a specific tweet.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries the Twitter API v2 to retrieve tweets that quote a specific tweet. Quote tweets are retweets with added commentary, allowing users to share the original tweet while adding their own thoughts.
+
+The block uses Tweepy with OAuth 2.0 authentication and supports extensive expansions to include additional data like media, author information, and location details. Returns paginated results with tweet IDs, text content, and complete tweet data.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| expansions | Choose what extra information you want to get with your tweets. For example: - Select 'Media_Keys' to get media details - Select 'Author_User_ID' to get user information - Select 'Place_ID' to get location details | ExpansionFilter | No |
+| media_fields | Select what media information you want to see (images, videos, etc). To use this, you must first select 'Media_Keys' in the expansions above. | TweetMediaFieldsFilter | No |
+| place_fields | Select what location information you want to see (country, coordinates, etc). To use this, you must first select 'Place_ID' in the expansions above. | TweetPlaceFieldsFilter | No |
+| poll_fields | Select what poll information you want to see (options, voting status, etc). To use this, you must first select 'Poll_IDs' in the expansions above. | TweetPollFieldsFilter | No |
+| tweet_fields | Select what tweet information you want to see. For referenced tweets (like retweets), select 'Referenced_Tweet_ID' in the expansions above. | TweetFieldsFilter | No |
+| user_fields | Select what user information you want to see. To use this, you must first select one of these in expansions above: - 'Author_User_ID' for tweet authors - 'Mentioned_Usernames' for mentioned users - 'Reply_To_User_ID' for users being replied to - 'Referenced_Tweet_Author_ID' for authors of referenced tweets | TweetUserFieldsFilter | No |
+| tweet_id | ID of the tweet to get quotes for | str | Yes |
+| max_results | Number of results to return (max 100) | int | No |
+| exclude | Types of tweets to exclude | TweetExcludesFilter | No |
+| pagination_token | Token for pagination | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| ids | All Tweet IDs  | List[Any] |
+| texts | All Tweet texts | List[Any] |
+| next_token | Next token for pagination | str |
+| data | Complete Tweet data | List[Dict[str, Any]] |
+| included | Additional data that you have requested (Optional) via Expansions field | Dict[str, Any] |
+| meta | Provides metadata such as pagination info (next_token) or result counts | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Sentiment Analysis**: Analyze how users are commenting on your tweets through quote tweets to understand sentiment.
+
+**Engagement Monitoring**: Track quote tweets to identify discussions and conversations sparked by your content.
+
+**Influencer Discovery**: Find users who quote-tweet your content to identify potential advocates or collaborators.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/twitter/retweet.md b/docs/integrations/block-integrations/twitter/retweet.md
new file mode 100644
index 0000000000..26b87180a2
--- /dev/null
+++ b/docs/integrations/block-integrations/twitter/retweet.md
@@ -0,0 +1,123 @@
+# Twitter Retweet
+<!-- MANUAL: file_description -->
+Blocks for retweeting and getting retweet information on Twitter/X.
+<!-- END MANUAL -->
+
+## Twitter Get Retweeters
+
+### What it is
+This block gets information about who has retweeted a tweet.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries the Twitter API v2 to retrieve a paginated list of users who have retweeted a specific tweet. Results include user IDs, usernames, display names, and optionally expanded profile data.
+
+The block uses Tweepy with OAuth 2.0 authentication. Users are returned with pagination support for tweets with many retweets. Expansions can include pinned tweet data for each user who retweeted.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| expansions | Choose what extra information you want to get with user data. Currently only 'pinned_tweet_id' is available to see a user's pinned tweet. | UserExpansionsFilter | No |
+| tweet_fields | Select what tweet information you want to see in pinned tweets. This only works if you select 'pinned_tweet_id' in expansions above. | TweetFieldsFilter | No |
+| user_fields | Select what user information you want to see, like username, bio, profile picture, etc. | TweetUserFieldsFilter | No |
+| tweet_id | ID of the tweet to get retweeters for | str | Yes |
+| max_results | Maximum number of results per page (1-100) | int | No |
+| pagination_token | Token for pagination | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| ids | List of user ids who retweeted | List[Any] |
+| names | List of user names who retweeted | List[Any] |
+| usernames | List of user usernames who retweeted | List[Any] |
+| next_token | Token for next page of results | str |
+| data | Complete Tweet data | List[Dict[str, Any]] |
+| included | Additional data that you have requested (Optional) via Expansions field | Dict[str, Any] |
+| meta | Provides metadata such as pagination info (next_token) or result counts | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Reach Analysis**: Identify who is amplifying your content to understand your audience's network.
+
+**Influencer Identification**: Find influential users who retweet your content for potential partnerships.
+
+**Campaign Tracking**: Monitor retweets during campaigns to measure virality and engagement.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Remove Retweet
+
+### What it is
+This block removes a retweet on Twitter.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Twitter API v2 via Tweepy to remove a retweet from the authenticated user's account. The original tweet remains unaffected—only your retweet is removed.
+
+The block authenticates using OAuth 2.0 with tweet write permissions and sends a DELETE request to undo the retweet. Returns a success indicator confirming the retweet was removed.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| tweet_id | ID of the tweet to remove retweet | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the retweet was successfully removed | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Curation**: Remove retweets that are no longer relevant or that you no longer want to amplify.
+
+**Account Cleanup**: Undo accidental retweets or clean up your timeline.
+
+**Brand Alignment**: Remove retweets of content that no longer aligns with your messaging or values.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Retweet
+
+### What it is
+This block retweets a tweet on Twitter.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the Twitter API v2 via Tweepy to retweet a tweet on behalf of the authenticated user. The retweet shares the original tweet with your followers without adding commentary.
+
+The block authenticates using OAuth 2.0 with tweet write permissions and sends a POST request to create the retweet. Returns a success indicator confirming the retweet was created.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| tweet_id | ID of the tweet to retweet | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| success | Whether the retweet was successful | bool |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Amplification**: Automatically retweet content from partner accounts or industry news sources.
+
+**Community Engagement**: Retweet positive mentions or user-generated content to show appreciation.
+
+**Information Sharing**: Amplify important announcements or breaking news to your followers.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/twitter/search_spaces.md b/docs/integrations/block-integrations/twitter/search_spaces.md
new file mode 100644
index 0000000000..d89c5f5246
--- /dev/null
+++ b/docs/integrations/block-integrations/twitter/search_spaces.md
@@ -0,0 +1,51 @@
+# Twitter Search Spaces
+<!-- MANUAL: file_description -->
+Blocks for searching Twitter/X Spaces live audio conversations.
+<!-- END MANUAL -->
+
+## Twitter Search Spaces
+
+### What it is
+This block searches for Twitter Spaces based on specified terms.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries the Twitter API v2 to search for Twitter Spaces (live audio conversations) matching a search term. Results can be filtered by state (live, scheduled, or all) and include Space metadata like title, host information, and participant counts.
+
+The block uses Tweepy with OAuth 2.0 authentication and supports expansions to include additional data about creators, hosts, speakers, invited users, and topics. Returns paginated results with Space IDs, titles, and host information.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| expansions | Choose additional information you want to get with your Twitter Spaces: - Select 'Invited_Users' to see who was invited - Select 'Speakers' to see who can speak - Select 'Creator' to get details about who made the Space - Select 'Hosts' to see who's hosting - Select 'Topics' to see Space topics | SpaceExpansionsFilter | No |
+| space_fields | Choose what Space details you want to see, such as: - Title - Start/End times - Number of participants - Language - State (live/scheduled) - And more | SpaceFieldsFilter | No |
+| user_fields | Choose what user information you want to see. This works when you select any of these in expansions above: - 'Creator' for Space creator details - 'Hosts' for host information - 'Speakers' for speaker details - 'Invited_Users' for invited user information | TweetUserFieldsFilter | No |
+| query | Search term to find in Space titles | str | Yes |
+| max_results | Maximum number of results to return (1-100) | int | No |
+| state | Type of Spaces to return (live, scheduled, or all) | "live" \| "scheduled" \| "all" | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| ids | List of space IDs | List[str] |
+| titles | List of space titles | List[str] |
+| host_ids | List of host IDs | List[Any] |
+| next_token | Next token for pagination | str |
+| data | Complete space data | List[Dict[str, Any]] |
+| includes | Additional data requested via expansions | Dict[str, Any] |
+| meta | Metadata including pagination info | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Event Discovery**: Find live or upcoming Spaces about topics you're interested in to join or monitor.
+
+**Industry Monitoring**: Track Spaces related to your industry to stay informed about discussions and trends.
+
+**Competitor Analysis**: Search for Spaces hosted by competitors to understand their community engagement strategies.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/twitter/spaces_lookup.md b/docs/integrations/block-integrations/twitter/spaces_lookup.md
new file mode 100644
index 0000000000..58311c19ac
--- /dev/null
+++ b/docs/integrations/block-integrations/twitter/spaces_lookup.md
@@ -0,0 +1,177 @@
+# Twitter Spaces Lookup
+<!-- MANUAL: file_description -->
+Blocks for retrieving information about Twitter/X Spaces.
+<!-- END MANUAL -->
+
+## Twitter Get Space Buyers
+
+### What it is
+This block retrieves a list of users who purchased tickets to a Twitter Space.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries the Twitter API v2 to retrieve a list of users who purchased tickets to a ticketed Twitter Space. Only the Space creator or hosts can access buyer information.
+
+The block uses Tweepy with OAuth 2.0 authentication and returns buyer user IDs, usernames, and optionally expanded profile data. This is useful for managing ticketed events and understanding your paying audience.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| expansions | Choose what extra information you want to get with user data. Currently only 'pinned_tweet_id' is available to see a user's pinned tweet. | UserExpansionsFilter | No |
+| tweet_fields | Select what tweet information you want to see in pinned tweets. This only works if you select 'pinned_tweet_id' in expansions above. | TweetFieldsFilter | No |
+| user_fields | Select what user information you want to see, like username, bio, profile picture, etc. | TweetUserFieldsFilter | No |
+| space_id | Space ID to lookup buyers for | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| buyer_ids | List of buyer IDs | List[str] |
+| usernames | List of buyer usernames | List[str] |
+| data | Complete space buyers data | List[Dict[str, Any]] |
+| includes | Additional data requested via expansions | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Audience Management**: Track who purchased tickets to manage attendee lists and send follow-ups.
+
+**Revenue Tracking**: Monitor ticket buyers for ticketed Spaces to understand revenue and audience composition.
+
+**Exclusive Content Delivery**: Identify ticket buyers to provide exclusive content or resources to paid attendees.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Get Space By Id
+
+### What it is
+This block retrieves information about a single Twitter Space.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries the Twitter API v2 to retrieve detailed information about a specific Twitter Space by its ID. Returns Space metadata including title, state, host information, and timing details.
+
+The block uses Tweepy with OAuth 2.0 authentication and supports expansions for additional data about creators, hosts, speakers, and topics. Works for both live and scheduled Spaces.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| expansions | Choose additional information you want to get with your Twitter Spaces: - Select 'Invited_Users' to see who was invited - Select 'Speakers' to see who can speak - Select 'Creator' to get details about who made the Space - Select 'Hosts' to see who's hosting - Select 'Topics' to see Space topics | SpaceExpansionsFilter | No |
+| space_fields | Choose what Space details you want to see, such as: - Title - Start/End times - Number of participants - Language - State (live/scheduled) - And more | SpaceFieldsFilter | No |
+| user_fields | Choose what user information you want to see. This works when you select any of these in expansions above: - 'Creator' for Space creator details - 'Hosts' for host information - 'Speakers' for speaker details - 'Invited_Users' for invited user information | TweetUserFieldsFilter | No |
+| space_id | Space ID to lookup | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| id | Space ID | str |
+| title | Space title | str |
+| host_ids | Host ID | List[str] |
+| data | Complete space data | Dict[str, Any] |
+| includes | Additional data requested via expansions | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Space Monitoring**: Check the status and details of a specific Space you're interested in or hosting.
+
+**Event Tracking**: Monitor when a scheduled Space goes live or verify its current state.
+
+**Analytics Preparation**: Gather Space metadata before or after an event for reporting and analysis.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Get Space Tweets
+
+### What it is
+This block retrieves tweets shared in a Twitter Space.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries the Twitter API v2 to retrieve tweets that were shared during a Twitter Space. This includes tweets pinned or shared by hosts and speakers during the live audio session.
+
+The block uses Tweepy with OAuth 2.0 authentication and supports extensive expansions to include additional data like media, author information, and referenced tweets. Returns tweet IDs, text content, and complete tweet data.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| expansions | Choose what extra information you want to get with your tweets. For example: - Select 'Media_Keys' to get media details - Select 'Author_User_ID' to get user information - Select 'Place_ID' to get location details | ExpansionFilter | No |
+| media_fields | Select what media information you want to see (images, videos, etc). To use this, you must first select 'Media_Keys' in the expansions above. | TweetMediaFieldsFilter | No |
+| place_fields | Select what location information you want to see (country, coordinates, etc). To use this, you must first select 'Place_ID' in the expansions above. | TweetPlaceFieldsFilter | No |
+| poll_fields | Select what poll information you want to see (options, voting status, etc). To use this, you must first select 'Poll_IDs' in the expansions above. | TweetPollFieldsFilter | No |
+| tweet_fields | Select what tweet information you want to see. For referenced tweets (like retweets), select 'Referenced_Tweet_ID' in the expansions above. | TweetFieldsFilter | No |
+| user_fields | Select what user information you want to see. To use this, you must first select one of these in expansions above: - 'Author_User_ID' for tweet authors - 'Mentioned_Usernames' for mentioned users - 'Reply_To_User_ID' for users being replied to - 'Referenced_Tweet_Author_ID' for authors of referenced tweets | TweetUserFieldsFilter | No |
+| space_id | Space ID to lookup tweets for | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| tweet_ids | List of tweet IDs | List[str] |
+| texts | List of tweet texts | List[str] |
+| data | Complete space tweets data | List[Dict[str, Any]] |
+| includes | Additional data requested via expansions | Dict[str, Any] |
+| meta | Response metadata | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Curation**: Collect tweets shared during a Space to create summaries or follow-up content.
+
+**Resource Compilation**: Gather links and resources shared during educational or informational Spaces.
+
+**Event Documentation**: Archive tweets from important Spaces for reference or community sharing.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Get Spaces
+
+### What it is
+This block retrieves information about multiple Twitter Spaces.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries the Twitter API v2 to retrieve information about multiple Twitter Spaces in a single request. You can look up Spaces by their IDs or by creator user IDs, making it efficient for batch operations.
+
+The block uses Tweepy with OAuth 2.0 authentication and supports expansions for additional data about creators, hosts, speakers, and topics. Returns arrays of Space IDs, titles, and complete Space data objects.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| expansions | Choose additional information you want to get with your Twitter Spaces: - Select 'Invited_Users' to see who was invited - Select 'Speakers' to see who can speak - Select 'Creator' to get details about who made the Space - Select 'Hosts' to see who's hosting - Select 'Topics' to see Space topics | SpaceExpansionsFilter | No |
+| space_fields | Choose what Space details you want to see, such as: - Title - Start/End times - Number of participants - Language - State (live/scheduled) - And more | SpaceFieldsFilter | No |
+| user_fields | Choose what user information you want to see. This works when you select any of these in expansions above: - 'Creator' for Space creator details - 'Hosts' for host information - 'Speakers' for speaker details - 'Invited_Users' for invited user information | TweetUserFieldsFilter | No |
+| identifier | Choose whether to lookup spaces by their IDs or by creator user IDs | Identifier | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| ids | List of space IDs | List[str] |
+| titles | List of space titles | List[str] |
+| data | Complete space data | List[Dict[str, Any]] |
+| includes | Additional data requested via expansions | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Creator Monitoring**: Track all Spaces hosted by specific creators or influencers you follow.
+
+**Batch Analysis**: Retrieve information about multiple Spaces at once for comparative analysis.
+
+**Schedule Tracking**: Monitor upcoming Spaces from multiple accounts to plan your participation.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/twitter/timeline.md b/docs/integrations/block-integrations/twitter/timeline.md
new file mode 100644
index 0000000000..3ad5a0d5ef
--- /dev/null
+++ b/docs/integrations/block-integrations/twitter/timeline.md
@@ -0,0 +1,171 @@
+# Twitter Timeline
+<!-- MANUAL: file_description -->
+Blocks for retrieving Twitter/X timelines and user tweets.
+<!-- END MANUAL -->
+
+## Twitter Get Home Timeline
+
+### What it is
+This block retrieves the authenticated user's home timeline.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries the Twitter API v2 to retrieve the authenticated user's home timeline—tweets from accounts they follow and their own tweets. Results are returned in reverse chronological order with optional filtering by time range.
+
+The block uses Tweepy with OAuth 2.0 authentication and supports extensive expansions to include additional data like media, author information, and referenced tweets. Pagination allows retrieving large timelines in batches of up to 100 tweets.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| start_time | Start time in YYYY-MM-DDTHH:mm:ssZ format. If set to a time less than 10 seconds ago, it will be automatically adjusted to 10 seconds ago (Twitter API requirement). | str (date-time) | No |
+| end_time | End time in YYYY-MM-DDTHH:mm:ssZ format | str (date-time) | No |
+| since_id | Returns results with Tweet ID  greater than this (more recent than), we give priority to since_id over start_time | str | No |
+| until_id | Returns results with Tweet ID less than this (that is, older than), and used with since_id | str | No |
+| sort_order | Order of returned tweets (recency or relevancy) | str | No |
+| expansions | Choose what extra information you want to get with your tweets. For example: - Select 'Media_Keys' to get media details - Select 'Author_User_ID' to get user information - Select 'Place_ID' to get location details | ExpansionFilter | No |
+| media_fields | Select what media information you want to see (images, videos, etc). To use this, you must first select 'Media_Keys' in the expansions above. | TweetMediaFieldsFilter | No |
+| place_fields | Select what location information you want to see (country, coordinates, etc). To use this, you must first select 'Place_ID' in the expansions above. | TweetPlaceFieldsFilter | No |
+| poll_fields | Select what poll information you want to see (options, voting status, etc). To use this, you must first select 'Poll_IDs' in the expansions above. | TweetPollFieldsFilter | No |
+| tweet_fields | Select what tweet information you want to see. For referenced tweets (like retweets), select 'Referenced_Tweet_ID' in the expansions above. | TweetFieldsFilter | No |
+| user_fields | Select what user information you want to see. To use this, you must first select one of these in expansions above: - 'Author_User_ID' for tweet authors - 'Mentioned_Usernames' for mentioned users - 'Reply_To_User_ID' for users being replied to - 'Referenced_Tweet_Author_ID' for authors of referenced tweets | TweetUserFieldsFilter | No |
+| max_results | Number of tweets to retrieve (5-100) | int | No |
+| pagination_token | Token for pagination | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| ids | List of Tweet IDs | List[str] |
+| texts | All Tweet texts | List[str] |
+| userIds | List of user ids that authored the tweets | List[str] |
+| userNames | List of user names that authored the tweets | List[str] |
+| next_token | Next token for pagination | str |
+| data | Complete Tweet data | List[Dict[str, Any]] |
+| included | Additional data that you have requested (Optional) via Expansions field | Dict[str, Any] |
+| meta | Provides metadata such as pagination info (next_token) or result counts | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Digest**: Create automated summaries of your timeline for daily or weekly review.
+
+**Trend Detection**: Monitor your timeline for emerging topics or conversations among accounts you follow.
+
+**Engagement Automation**: Process timeline content to identify tweets worth engaging with or responding to.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Get User Mentions
+
+### What it is
+This block retrieves Tweets mentioning a specific user.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries the Twitter API v2 to retrieve tweets that @mention a specific user. Results include replies to the user's tweets, direct mentions, and tagged responses from other accounts.
+
+The block uses Tweepy with OAuth 2.0 authentication and supports time-based filtering and pagination. Expansions allow including additional data like media, author information, and referenced tweets. Returns tweet IDs, text, author information, and complete tweet data.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| start_time | Start time in YYYY-MM-DDTHH:mm:ssZ format. If set to a time less than 10 seconds ago, it will be automatically adjusted to 10 seconds ago (Twitter API requirement). | str (date-time) | No |
+| end_time | End time in YYYY-MM-DDTHH:mm:ssZ format | str (date-time) | No |
+| since_id | Returns results with Tweet ID  greater than this (more recent than), we give priority to since_id over start_time | str | No |
+| until_id | Returns results with Tweet ID less than this (that is, older than), and used with since_id | str | No |
+| sort_order | Order of returned tweets (recency or relevancy) | str | No |
+| expansions | Choose what extra information you want to get with your tweets. For example: - Select 'Media_Keys' to get media details - Select 'Author_User_ID' to get user information - Select 'Place_ID' to get location details | ExpansionFilter | No |
+| media_fields | Select what media information you want to see (images, videos, etc). To use this, you must first select 'Media_Keys' in the expansions above. | TweetMediaFieldsFilter | No |
+| place_fields | Select what location information you want to see (country, coordinates, etc). To use this, you must first select 'Place_ID' in the expansions above. | TweetPlaceFieldsFilter | No |
+| poll_fields | Select what poll information you want to see (options, voting status, etc). To use this, you must first select 'Poll_IDs' in the expansions above. | TweetPollFieldsFilter | No |
+| tweet_fields | Select what tweet information you want to see. For referenced tweets (like retweets), select 'Referenced_Tweet_ID' in the expansions above. | TweetFieldsFilter | No |
+| user_fields | Select what user information you want to see. To use this, you must first select one of these in expansions above: - 'Author_User_ID' for tweet authors - 'Mentioned_Usernames' for mentioned users - 'Reply_To_User_ID' for users being replied to - 'Referenced_Tweet_Author_ID' for authors of referenced tweets | TweetUserFieldsFilter | No |
+| user_id | Unique identifier of the user for whom to return Tweets mentioning the user | str | Yes |
+| max_results | Number of tweets to retrieve (5-100) | int | No |
+| pagination_token | Token for pagination | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| ids | List of Tweet IDs | List[str] |
+| texts | All Tweet texts | List[str] |
+| userIds | List of user ids that mentioned the user | List[str] |
+| userNames | List of user names that mentioned the user | List[str] |
+| next_token | Next token for pagination | str |
+| data | Complete Tweet data | List[Dict[str, Any]] |
+| included | Additional data that you have requested (Optional) via Expansions field | Dict[str, Any] |
+| meta | Provides metadata such as pagination info (next_token) or result counts | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Mention Monitoring**: Track all mentions of your account for customer service or community management.
+
+**Engagement Response**: Identify mentions that require responses or engagement for timely replies.
+
+**Sentiment Analysis**: Analyze mentions to understand how users are talking about you or your brand.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Get User Tweets
+
+### What it is
+This block retrieves Tweets composed by a single user.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries the Twitter API v2 to retrieve tweets posted by a specific user. Results include original tweets, replies, and retweets from that user's timeline in reverse chronological order.
+
+The block uses Tweepy with OAuth 2.0 authentication and supports time-based filtering and pagination. Expansions allow including additional data like media, mentioned users, and referenced tweets. Returns tweet IDs, text content, and complete tweet data.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| start_time | Start time in YYYY-MM-DDTHH:mm:ssZ format. If set to a time less than 10 seconds ago, it will be automatically adjusted to 10 seconds ago (Twitter API requirement). | str (date-time) | No |
+| end_time | End time in YYYY-MM-DDTHH:mm:ssZ format | str (date-time) | No |
+| since_id | Returns results with Tweet ID  greater than this (more recent than), we give priority to since_id over start_time | str | No |
+| until_id | Returns results with Tweet ID less than this (that is, older than), and used with since_id | str | No |
+| sort_order | Order of returned tweets (recency or relevancy) | str | No |
+| expansions | Choose what extra information you want to get with your tweets. For example: - Select 'Media_Keys' to get media details - Select 'Author_User_ID' to get user information - Select 'Place_ID' to get location details | ExpansionFilter | No |
+| media_fields | Select what media information you want to see (images, videos, etc). To use this, you must first select 'Media_Keys' in the expansions above. | TweetMediaFieldsFilter | No |
+| place_fields | Select what location information you want to see (country, coordinates, etc). To use this, you must first select 'Place_ID' in the expansions above. | TweetPlaceFieldsFilter | No |
+| poll_fields | Select what poll information you want to see (options, voting status, etc). To use this, you must first select 'Poll_IDs' in the expansions above. | TweetPollFieldsFilter | No |
+| tweet_fields | Select what tweet information you want to see. For referenced tweets (like retweets), select 'Referenced_Tweet_ID' in the expansions above. | TweetFieldsFilter | No |
+| user_fields | Select what user information you want to see. To use this, you must first select one of these in expansions above: - 'Author_User_ID' for tweet authors - 'Mentioned_Usernames' for mentioned users - 'Reply_To_User_ID' for users being replied to - 'Referenced_Tweet_Author_ID' for authors of referenced tweets | TweetUserFieldsFilter | No |
+| user_id | Unique identifier of the Twitter account (user ID) for whom to return results | str | Yes |
+| max_results | Number of tweets to retrieve (5-100) | int | No |
+| pagination_token | Token for pagination | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| ids | List of Tweet IDs | List[str] |
+| texts | All Tweet texts | List[str] |
+| userIds | List of user ids that authored the tweets | List[str] |
+| userNames | List of user names that authored the tweets | List[str] |
+| next_token | Next token for pagination | str |
+| data | Complete Tweet data | List[Dict[str, Any]] |
+| included | Additional data that you have requested (Optional) via Expansions field | Dict[str, Any] |
+| meta | Provides metadata such as pagination info (next_token) or result counts | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Competitor Monitoring**: Track tweets from competitor accounts to understand their messaging and strategy.
+
+**Content Archiving**: Archive tweets from specific accounts for research or compliance purposes.
+
+**Influencer Analysis**: Analyze posting patterns and content from influencers in your industry.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/twitter/tweet_lookup.md b/docs/integrations/block-integrations/twitter/tweet_lookup.md
new file mode 100644
index 0000000000..c1deebfde7
--- /dev/null
+++ b/docs/integrations/block-integrations/twitter/tweet_lookup.md
@@ -0,0 +1,100 @@
+# Twitter Tweet Lookup
+<!-- MANUAL: file_description -->
+Blocks for retrieving information about specific tweets on Twitter/X.
+<!-- END MANUAL -->
+
+## Twitter Get Tweet
+
+### What it is
+This block retrieves information about a specific Tweet.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries the Twitter API v2 to retrieve detailed information about a specific tweet by its ID. Returns tweet content, author information, engagement metrics, and any requested expanded data.
+
+The block uses Tweepy with OAuth 2.0 authentication and supports extensive expansions to include additional data like media, author profile, location, poll results, and referenced tweets. Useful for analyzing individual tweets or verifying tweet content.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| expansions | Choose what extra information you want to get with your tweets. For example: - Select 'Media_Keys' to get media details - Select 'Author_User_ID' to get user information - Select 'Place_ID' to get location details | ExpansionFilter | No |
+| media_fields | Select what media information you want to see (images, videos, etc). To use this, you must first select 'Media_Keys' in the expansions above. | TweetMediaFieldsFilter | No |
+| place_fields | Select what location information you want to see (country, coordinates, etc). To use this, you must first select 'Place_ID' in the expansions above. | TweetPlaceFieldsFilter | No |
+| poll_fields | Select what poll information you want to see (options, voting status, etc). To use this, you must first select 'Poll_IDs' in the expansions above. | TweetPollFieldsFilter | No |
+| tweet_fields | Select what tweet information you want to see. For referenced tweets (like retweets), select 'Referenced_Tweet_ID' in the expansions above. | TweetFieldsFilter | No |
+| user_fields | Select what user information you want to see. To use this, you must first select one of these in expansions above: - 'Author_User_ID' for tweet authors - 'Mentioned_Usernames' for mentioned users - 'Reply_To_User_ID' for users being replied to - 'Referenced_Tweet_Author_ID' for authors of referenced tweets | TweetUserFieldsFilter | No |
+| tweet_id | Unique identifier of the Tweet to request (ex: 1460323737035677698) | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| id | Tweet ID | str |
+| text | Tweet text | str |
+| userId | ID of the tweet author | str |
+| userName | Username of the tweet author | str |
+| data | Tweet data | Dict[str, Any] |
+| included | Additional data that you have requested (Optional) via Expansions field | Dict[str, Any] |
+| meta | Metadata about the tweet | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Content Verification**: Retrieve a specific tweet to verify its content, author, or current engagement metrics.
+
+**Thread Analysis**: Look up individual tweets in a thread to analyze specific parts of a conversation.
+
+**Link Processing**: Fetch tweet details when processing shared Twitter links in your workflows.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Get Tweets
+
+### What it is
+This block retrieves information about multiple Tweets.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries the Twitter API v2 to retrieve detailed information about multiple tweets in a single request. Accepts up to 100 tweet IDs and returns comprehensive data for all of them efficiently.
+
+The block uses Tweepy with OAuth 2.0 authentication and supports extensive expansions to include additional data like media, author profiles, and referenced tweets. Returns arrays of tweet IDs, text content, author information, and complete tweet data objects.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| expansions | Choose what extra information you want to get with your tweets. For example: - Select 'Media_Keys' to get media details - Select 'Author_User_ID' to get user information - Select 'Place_ID' to get location details | ExpansionFilter | No |
+| media_fields | Select what media information you want to see (images, videos, etc). To use this, you must first select 'Media_Keys' in the expansions above. | TweetMediaFieldsFilter | No |
+| place_fields | Select what location information you want to see (country, coordinates, etc). To use this, you must first select 'Place_ID' in the expansions above. | TweetPlaceFieldsFilter | No |
+| poll_fields | Select what poll information you want to see (options, voting status, etc). To use this, you must first select 'Poll_IDs' in the expansions above. | TweetPollFieldsFilter | No |
+| tweet_fields | Select what tweet information you want to see. For referenced tweets (like retweets), select 'Referenced_Tweet_ID' in the expansions above. | TweetFieldsFilter | No |
+| user_fields | Select what user information you want to see. To use this, you must first select one of these in expansions above: - 'Author_User_ID' for tweet authors - 'Mentioned_Usernames' for mentioned users - 'Reply_To_User_ID' for users being replied to - 'Referenced_Tweet_Author_ID' for authors of referenced tweets | TweetUserFieldsFilter | No |
+| tweet_ids | List of Tweet IDs to request (up to 100) | List[str] | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| ids | All Tweet IDs | List[str] |
+| texts | All Tweet texts | List[str] |
+| userIds | List of user ids that authored the tweets | List[str] |
+| userNames | List of user names that authored the tweets | List[str] |
+| data | Complete Tweet data | List[Dict[str, Any]] |
+| included | Additional data that you have requested (Optional) via Expansions field | Dict[str, Any] |
+| meta | Metadata about the tweets | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Batch Processing**: Efficiently retrieve data for multiple tweets at once, such as all tweets in a thread.
+
+**Content Analysis**: Analyze multiple tweets for sentiment, engagement patterns, or content classification.
+
+**Report Generation**: Gather data on multiple tweets for creating engagement reports or content audits.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/content/platform/blocks/twitter/twitter.md b/docs/integrations/block-integrations/twitter/twitter.md
similarity index 100%
rename from docs/content/platform/blocks/twitter/twitter.md
rename to docs/integrations/block-integrations/twitter/twitter.md
diff --git a/docs/integrations/block-integrations/twitter/user_lookup.md b/docs/integrations/block-integrations/twitter/user_lookup.md
new file mode 100644
index 0000000000..5826e73727
--- /dev/null
+++ b/docs/integrations/block-integrations/twitter/user_lookup.md
@@ -0,0 +1,90 @@
+# Twitter User Lookup
+<!-- MANUAL: file_description -->
+Blocks for looking up Twitter/X user profiles and information.
+<!-- END MANUAL -->
+
+## Twitter Get User
+
+### What it is
+This block retrieves information about a specified Twitter user.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries the Twitter API v2 to retrieve detailed information about a single user. You can look up users either by their unique Twitter ID or by their username (handle). The block uses Tweepy with OAuth 2.0 authentication.
+
+Optional expansions allow you to include additional data such as the user's pinned tweet. The response includes profile information like display name, bio, follower count, and profile image URL based on the user_fields selected.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| expansions | Choose what extra information you want to get with user data. Currently only 'pinned_tweet_id' is available to see a user's pinned tweet. | UserExpansionsFilter | No |
+| tweet_fields | Select what tweet information you want to see in pinned tweets. This only works if you select 'pinned_tweet_id' in expansions above. | TweetFieldsFilter | No |
+| user_fields | Select what user information you want to see, like username, bio, profile picture, etc. | TweetUserFieldsFilter | No |
+| identifier | Choose whether to identify the user by their unique Twitter ID or by their username | Identifier | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| id | User ID | str |
+| username_ | User username | str |
+| name_ | User name | str |
+| data | Complete user data | Dict[str, Any] |
+| included | Additional data requested via expansions | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Profile Verification**: Look up a user's profile to verify their identity or check their account details before engaging.
+
+**User Research**: Gather information about a specific account for competitive analysis or influencer research.
+
+**Account Validation**: Verify that a username or user ID exists and is active before performing other operations.
+<!-- END MANUAL -->
+
+---
+
+## Twitter Get Users
+
+### What it is
+This block retrieves information about multiple Twitter users.
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries the Twitter API v2 to retrieve detailed information about multiple users in a single request. You can look up users by their Twitter IDs or usernames (handles), making it efficient for batch operations.
+
+The block uses Tweepy with OAuth 2.0 authentication and supports expansions for additional data like pinned tweets. Returns arrays of user IDs, usernames, display names, and complete user data objects.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| expansions | Choose what extra information you want to get with user data. Currently only 'pinned_tweet_id' is available to see a user's pinned tweet. | UserExpansionsFilter | No |
+| tweet_fields | Select what tweet information you want to see in pinned tweets. This only works if you select 'pinned_tweet_id' in expansions above. | TweetFieldsFilter | No |
+| user_fields | Select what user information you want to see, like username, bio, profile picture, etc. | TweetUserFieldsFilter | No |
+| identifier | Choose whether to identify users by their unique Twitter IDs or by their usernames | Identifier | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| ids | User IDs | List[str] |
+| usernames_ | User usernames | List[str] |
+| names_ | User names | List[str] |
+| data | Complete users data | List[Dict[str, Any]] |
+| included | Additional data requested via expansions | Dict[str, Any] |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Batch Profile Lookup**: Retrieve profile information for a list of users at once, such as all participants in a conversation.
+
+**Influencer Analysis**: Gather profile data for multiple influencers in a specific niche for comparison.
+
+**Follow List Enrichment**: Get detailed information about accounts in your following or followers list.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/block-integrations/wolfram/llm_api.md b/docs/integrations/block-integrations/wolfram/llm_api.md
new file mode 100644
index 0000000000..2771268db9
--- /dev/null
+++ b/docs/integrations/block-integrations/wolfram/llm_api.md
@@ -0,0 +1,40 @@
+# Wolfram LLM API
+<!-- MANUAL: file_description -->
+Blocks for querying Wolfram Alpha's computational knowledge engine.
+<!-- END MANUAL -->
+
+## Ask Wolfram
+
+### What it is
+Ask Wolfram Alpha a question
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block queries Wolfram Alpha's LLM API with a natural language question and returns a computed answer. It leverages Wolfram's computational knowledge engine for math, science, geography, and factual queries.
+
+The answer is returned as a string suitable for display or further processing in your workflow.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| question | The question to ask | str | Yes |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the operation failed | str |
+| answer | The answer to the question | str |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**Factual Queries**: Get accurate answers to math, science, or geography questions.
+
+**Calculations**: Perform complex mathematical or unit conversion calculations.
+
+**Data Lookups**: Retrieve factual data like population statistics, chemical properties, or historical dates.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/content/platform/blocks/youtube.md b/docs/integrations/block-integrations/youtube.md
similarity index 100%
rename from docs/content/platform/blocks/youtube.md
rename to docs/integrations/block-integrations/youtube.md
diff --git a/docs/integrations/block-integrations/zerobounce/validate_emails.md b/docs/integrations/block-integrations/zerobounce/validate_emails.md
new file mode 100644
index 0000000000..ba99216373
--- /dev/null
+++ b/docs/integrations/block-integrations/zerobounce/validate_emails.md
@@ -0,0 +1,41 @@
+# Zerobounce Validate Emails
+<!-- MANUAL: file_description -->
+Blocks for validating email deliverability using ZeroBounce.
+<!-- END MANUAL -->
+
+## Validate Emails
+
+### What it is
+Validate emails
+
+### How it works
+<!-- MANUAL: how_it_works -->
+This block uses the ZeroBounce API to validate email addresses for deliverability. It checks if an email is valid, invalid, catch-all, spamtrap, abuse, or disposable. Optionally provide an IP address for additional validation context.
+
+The response includes detailed status information, SMTP provider, and recommendation on whether to send emails to that address.
+<!-- END MANUAL -->
+
+### Inputs
+
+| Input | Description | Type | Required |
+|-------|-------------|------|----------|
+| email | Email to validate | str | Yes |
+| ip_address | IP address to validate | str | No |
+
+### Outputs
+
+| Output | Description | Type |
+|--------|-------------|------|
+| error | Error message if the search failed | str |
+| response | Response from ZeroBounce | Response |
+
+### Possible use case
+<!-- MANUAL: use_case -->
+**List Cleaning**: Validate email lists before campaigns to reduce bounce rates.
+
+**Lead Qualification**: Verify lead email addresses as part of intake workflows.
+
+**Form Validation**: Check email validity in real-time during user registration or contact form submissions.
+<!-- END MANUAL -->
+
+---
diff --git a/docs/integrations/guides/llm-providers.md b/docs/integrations/guides/llm-providers.md
new file mode 100644
index 0000000000..73d789b479
--- /dev/null
+++ b/docs/integrations/guides/llm-providers.md
@@ -0,0 +1,16 @@
+# LLM Providers
+
+There are several providers that AutoGPT users can use for running inference with LLM models.
+
+## Llama API
+
+Llama API is a Meta-hosted API service that helps you integrate Llama models quickly and efficiently. Using OpenAI compatibility endpoints, you can easily access the power of Llama models without the need for complex setup or configuration!
+
+Join the [waitlist](https://llama.developer.meta.com/?utm_source=partner-autogpt&utm_medium=readme) to get access!
+
+Try the Llama API provider by selecting any of the following LLM Model names from the AI blocks:
+
+* Llama-4-Scout-17B-16E-Instruct-FP8
+* Llama-4-Maverick-17B-128E-Instruct-FP8
+* Llama-3.3-8B-Instruct
+* Llama-3-70B-Instruct
diff --git a/docs/integrations/guides/voice-providers.md b/docs/integrations/guides/voice-providers.md
new file mode 100644
index 0000000000..450bed0676
--- /dev/null
+++ b/docs/integrations/guides/voice-providers.md
@@ -0,0 +1,22 @@
+# Voice Providers for D-ID
+
+This guide covers the voice providers you can use with the D-ID Create Talking Avatar Video block.
+
+## ElevenLabs
+
+1. Select any voice from the voice list: [https://api.elevenlabs.io/v1/voices](https://api.elevenlabs.io/v1/voices)
+2. Copy the `voice_id`
+3. Use it as a string in the `voice_id` field in the CreateTalkingAvatarClip Block
+
+## Microsoft Azure Voices
+
+1. Select any voice from the voice gallery: [https://speech.microsoft.com/portal/voicegallery](https://speech.microsoft.com/portal/voicegallery)
+2. Click on the "Sample code" tab on the right
+3. Copy the voice name, for example: `config.SpeechSynthesisVoiceName = "en-GB-AbbiNeural"`
+4. Use this string `en-GB-AbbiNeural` in the `voice_id` field in the CreateTalkingAvatarClip Block
+
+## Amazon Polly Voices
+
+1. Select any voice from the voice list: [https://docs.aws.amazon.com/polly/latest/dg/available-voices.html](https://docs.aws.amazon.com/polly/latest/dg/available-voices.html)
+2. Copy the voice name / ID
+3. Use it as string in the `voice_id` field in the CreateTalkingAvatarClip Block
diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
deleted file mode 100644
index 876467633e..0000000000
--- a/docs/mkdocs.yml
+++ /dev/null
@@ -1,194 +0,0 @@
-site_name: AutoGPT Documentation
-site_url: https://docs.agpt.co/
-repo_url: https://github.com/Significant-Gravitas/AutoGPT
-repo_name: AutoGPT
-edit_uri: edit/master/docs/content
-docs_dir: content
-nav:
-  - Home: index.md
-
-  - The AutoGPT Platform 🆕:
-    - Getting Started:
-        - Setup AutoGPT (Local-Host): platform/getting-started.md
-        - Edit an Agent: platform/edit-agent.md
-        - Delete an Agent: platform/delete-agent.md
-        - Download & Import and Agent: platform/download-agent-from-marketplace-local.md
-        - Create a Basic Agent: platform/create-basic-agent.md
-        - Submit an Agent to the Marketplace: platform/submit-agent-to-marketplace.md
-    - Advanced Setup: platform/advanced_setup.md
-    - Agent Blocks: platform/agent-blocks.md
-    - Build your own Blocks: platform/new_blocks.md
-    - Block SDK Guide: platform/block-sdk-guide.md
-    - Using Ollama: platform/ollama.md
-    - Using AI/ML API: platform/aimlapi.md
-    - Using D-ID: platform/d_id.md
-    - Blocks: platform/blocks/blocks.md
-    - API:
-      - Introduction: platform/integrating/api-guide.md
-      - OAuth & SSO: platform/integrating/oauth-guide.md
-    - Contributing:
-        - Tests: platform/contributing/tests.md
-        - OAuth Flows: platform/contributing/oauth-integration-flow.md
-  - AutoGPT Classic:
-      - Introduction: classic/index.md
-      - Setup:
-          - Setting up AutoGPT: classic/setup/index.md
-          - Set up with Docker: classic/setup/docker.md
-          - For Developers: classic/setup/for-developers.md
-          - Configuration:
-              - Options: classic/configuration/options.md
-              - Search: classic/configuration/search.md
-              - Voice: classic/configuration/voice.md
-      - Usage: classic/usage.md
-      - Help us improve AutoGPT:
-          - Share your debug logs with us: classic/share-your-logs.md
-          - Contribution guide: contributing.md
-          - Running tests: classic/testing.md
-          - Code of Conduct: code-of-conduct.md
-      - Benchmark:
-          - Readme: https://github.com/Significant-Gravitas/AutoGPT/blob/master/classic/benchmark/README.md
-      - Forge:
-         - Introduction: forge/get-started.md
-         - Components:
-             - Introduction: forge/components/introduction.md
-             - Agents: forge/components/agents.md
-             - Components: forge/components/components.md
-             - Protocols: forge/components/protocols.md
-             - Commands: forge/components/commands.md
-             - Built in Components: forge/components/built-in-components.md
-             - Creating Components: forge/components/creating-components.md
-      - Frontend:
-         - Readme: https://github.com/Significant-Gravitas/AutoGPT/blob/master/classic/frontend/README.md
-
-  - Contribute: 
-        - Introduction: contribute/index.md
-        - Testing: ../../autogpt_platform/backend/TESTING.md
-    
-  # - Challenges:
-  #     - Introduction: challenges/introduction.md
-  #     - List of Challenges:
-  #         - Memory:
-  #             - Introduction: challenges/memory/introduction.md
-  #             - Memory Challenge A: challenges/memory/challenge_a.md
-  #             - Memory Challenge B: challenges/memory/challenge_b.md
-  #             - Memory Challenge C: challenges/memory/challenge_c.md
-  #             - Memory Challenge D: challenges/memory/challenge_d.md
-  #         - Information retrieval:
-  #             - Introduction: challenges/information_retrieval/introduction.md
-  #             - Information Retrieval Challenge A: challenges/information_retrieval/challenge_a.md
-  #             - Information Retrieval Challenge B: challenges/information_retrieval/challenge_b.md
-  # - Submit a Challenge: challenges/submit.md
-  # - Beat a Challenge: challenges/beat.md
-
-  - License: https://github.com/Significant-Gravitas/AutoGPT/blob/master/LICENSE
-
-theme:
-  name: material
-  custom_dir: overrides
-  language: en
-  icon:
-    repo: fontawesome/brands/github
-    logo: material/book-open-variant
-    edit: material/pencil
-    view: material/eye
-  favicon: assets/favicon.png
-  features:
-    - navigation.sections
-    - navigation.footer
-    - navigation.top
-    - navigation.tracking
-    - navigation.tabs
-    # - navigation.path
-    - toc.follow
-    - toc.integrate
-    - content.action.edit
-    - content.action.view
-    - content.code.copy
-    - content.code.annotate
-    - content.tabs.link
-  palette:
-    # Palette toggle for light mode
-    - media: "(prefers-color-scheme: light)"
-      scheme: default
-      toggle:
-        icon: material/weather-night
-        name: Switch to dark mode
-
-    # Palette toggle for dark mode
-    - media: "(prefers-color-scheme: dark)"
-      scheme: slate
-      toggle:
-        icon: material/weather-sunny
-        name: Switch to light mode
-
-markdown_extensions:
-  # Python Markdown
-  - abbr
-  - admonition
-  - attr_list
-  - def_list
-  - footnotes
-  - md_in_html
-  - toc:
-      permalink: true
-  - tables
-
-  # Python Markdown Extensions
-  - pymdownx.arithmatex:
-      generic: true
-  - pymdownx.betterem:
-      smart_enable: all
-  - pymdownx.critic
-  - pymdownx.caret
-  - pymdownx.details
-  - pymdownx.emoji:
-      emoji_index: !!python/name:material.extensions.emoji.twemoji
-      emoji_generator: !!python/name:material.extensions.emoji.to_svg
-  - pymdownx.highlight
-  - pymdownx.inlinehilite
-  - pymdownx.keys
-  - pymdownx.mark
-  - pymdownx.smartsymbols
-  - pymdownx.snippets:
-      base_path: ['.','../']
-      check_paths: true
-      dedent_subsections: true
-  - pymdownx.superfences:
-      custom_fences:
-        - name: mermaid
-          class: mermaid
-          format: !!python/name:pymdownx.superfences.fence_code_format
-  - pymdownx.tabbed:
-      alternate_style: true
-  - pymdownx.tasklist:
-      custom_checkbox: true
-  - pymdownx.tilde
-
-plugins:
-  - table-reader
-  - search
-  - git-revision-date-localized:
-      enable_creation_date: true
-
-extra:
-  social:
-    - icon: fontawesome/brands/github
-      link: https://github.com/Significant-Gravitas/AutoGPT
-    - icon: fontawesome/brands/x-twitter
-      link: https://x.com/Auto_GPT
-    - icon: fontawesome/brands/instagram
-      link: https://www.instagram.com/autogpt/
-    - icon: fontawesome/brands/discord
-      link: https://discord.gg/autogpt
-      
-extra:
-  analytics:
-    provider: google
-    property: G-XKPNKB9XG6
-
-extra_javascript:
-  - https://unpkg.com/tablesort@5.3.0/dist/tablesort.min.js
-  - _javascript/tablesort.js
-  - _javascript/mathjax.js
-  - https://cdnjs.cloudflare.com/polyfill/v3/polyfill.min.js?features=es6
-  - https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js
diff --git a/docs/netlify.toml b/docs/netlify.toml
deleted file mode 100644
index c07b733a57..0000000000
--- a/docs/netlify.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-# Netlify config for AutoGPT docs
-
-[build]
-  publish = "public/"
-  command = "mkdocs build -d public"
diff --git a/docs/overrides/assets/favicon.png b/docs/overrides/assets/favicon.png
deleted file mode 100644
index 69bded6abf..0000000000
Binary files a/docs/overrides/assets/favicon.png and /dev/null differ
diff --git a/docs/overrides/main.html b/docs/overrides/main.html
deleted file mode 100644
index b376724b8b..0000000000
--- a/docs/overrides/main.html
+++ /dev/null
@@ -1,61 +0,0 @@
-{% extends "base.html" %}
-
-
-{% block extrahead %}
-<style>
-  svg.ms-w-12 {
-    width: 2rem !important;
-  }
-  svg.ms-h-12 {
-    height: 2rem !important;
-  }
-  /* Temporary solution for the font sizes  */
-  #headlessui-dialog-panel-2 p{
-    font-size: 16px;
-  }
-  #headlessui-dialog-panel-2 textarea{
-    font-size: 16px;
-  }
-  #headlessui-dialog-panel-2 span{
-    font-size: 14px;
-
-  }
-  #headlessui-dialog-panel-2 div{
-    font-size: 16px;
-  }
-  #headlessui-dialog-panel-2 a{
-    font-size: 14px;
-    line-height: 1rem;
-  }
-  #headlessui-dialog-panel-2 button{
-    border: 1px solid #0000001d;
-    line-height: 1rem;
-
-}
-  /* Temporary solution for the font size  */
-  #headlessui-dialog-panel-2 > div > div > div > div.ms-w-full.ms-rounded-xl.ms-flex.ms-flex-col.ms-relative > div > div > div > div > div.ms-flex.ms-flex-row.ms-items-center.ms-justify-between.ms-gap-1 > p{
-    font-size: 14px;
-    line-height: 1rem;
-  }
-
-</style>
-
-<div id="my-component-root" class="mendable-search"></div>
-
-<script src="https://unpkg.com/@mendable/search@0.0.155/dist/umd/mendable-bundle.min.js"></script>
-{% raw %}
-<script>
-    Mendable.initialize({
-      anon_key: 'a0bd44db-eb3b-412f-8924-b31c58244a64',
-      type: 'floatingButton',
-      style : { accentColor: '#3F51B5', darkMode: false },
-      floatingButtonStyle:{
-        backgroundColor: '#3F51B5',
-        color: '#fff',
-      },
-      icon: "https://mendable-storage.s3.amazonaws.com/autoGPT.gif",
-      botIcon: "https://mendable-storage.s3.amazonaws.com/autoGPTbot.gif",
-    })
-  </script>
-{% endraw %}
-{% endblock %}
\ No newline at end of file
diff --git a/docs/platform/SUMMARY.md b/docs/platform/SUMMARY.md
new file mode 100644
index 0000000000..b71f6dc929
--- /dev/null
+++ b/docs/platform/SUMMARY.md
@@ -0,0 +1,34 @@
+# Table of contents
+
+* [What is the AutoGPT Platform?](what-is-autogpt-platform.md)
+
+## Getting Started
+
+* [Setting Up Auto-GPT (Local Host)](getting-started.md)
+* [AutoGPT Platform Installer](installer.md)
+* [Edit an Agent](edit-agent.md)
+* [Delete an Agent](delete-agent.md)
+* [Download & Import an Agent](download-agent-from-marketplace-local.md)
+* [Create a Basic Agent](create-basic-agent.md)
+* [Submit an Agent to the Marketplace](submit-agent-to-marketplace.md)
+
+## Advanced Setup
+
+* [Advanced Setup](advanced_setup.md)
+
+## Building Blocks
+
+* [Agent Blocks Overview](agent-blocks.md)
+* [Build your own Blocks](new_blocks.md)
+* [Block SDK Guide](block-sdk-guide.md)
+
+## Using AI Services
+
+* [Using Ollama](ollama.md)
+* [Using AI/ML API](aimlapi.md)
+* [Using D-ID](d_id.md)
+
+## API & Integrations
+
+* [API Introduction](integrating/api-guide.md)
+* [OAuth & SSO](integrating/oauth-guide.md)
diff --git a/docs/content/platform/advanced_setup.md b/docs/platform/advanced_setup.md
similarity index 100%
rename from docs/content/platform/advanced_setup.md
rename to docs/platform/advanced_setup.md
diff --git a/docs/content/platform/agent-blocks.md b/docs/platform/agent-blocks.md
similarity index 100%
rename from docs/content/platform/agent-blocks.md
rename to docs/platform/agent-blocks.md
diff --git a/docs/content/platform/aimlapi.md b/docs/platform/aimlapi.md
similarity index 100%
rename from docs/content/platform/aimlapi.md
rename to docs/platform/aimlapi.md
diff --git a/docs/content/platform/block-sdk-guide.md b/docs/platform/block-sdk-guide.md
similarity index 83%
rename from docs/content/platform/block-sdk-guide.md
rename to docs/platform/block-sdk-guide.md
index 1f8fc545e9..42fd883251 100644
--- a/docs/content/platform/block-sdk-guide.md
+++ b/docs/platform/block-sdk-guide.md
@@ -227,7 +227,7 @@ backend/blocks/my_provider/
 
 ## Best Practices
 
-1. **Error Handling**: Error output pin is already defined on BlockSchemaOutput
+1. **Error Handling**: Use `BlockInputError` for validation failures and `BlockExecutionError` for runtime errors (import from `backend.util.exceptions`). These inherit from `ValueError` so the executor treats them as user-fixable. See [Error Handling in new_blocks.md](new_blocks.md#error-handling) for details.
 2. **Credentials**: Use the provider's `credentials_field()` method
 3. **Validation**: Use SchemaField constraints (ge, le, min_length, etc.)
 4. **Categories**: Choose appropriate categories for discoverability
@@ -277,6 +277,50 @@ async def run(
         token = credentials.api_key.get_secret_value()
 ```
 
+### Handling Files
+
+When your block works with files (images, videos, documents), use `store_media_file()`:
+
+```python
+from backend.data.execution import ExecutionContext
+from backend.util.file import store_media_file
+from backend.util.type import MediaFileType
+
+async def run(
+    self,
+    input_data: Input,
+    *,
+    execution_context: ExecutionContext,
+    **kwargs,
+):
+    # PROCESSING: Need local file path for tools like ffmpeg, MoviePy, PIL
+    local_path = await store_media_file(
+        file=input_data.video,
+        execution_context=execution_context,
+        return_format="for_local_processing",
+    )
+
+    # EXTERNAL API: Need base64 content for APIs like Replicate, OpenAI
+    image_b64 = await store_media_file(
+        file=input_data.image,
+        execution_context=execution_context,
+        return_format="for_external_api",
+    )
+
+    # OUTPUT: Return to user/next block (auto-adapts to context)
+    result = await store_media_file(
+        file=generated_url,
+        execution_context=execution_context,
+        return_format="for_block_output",  # workspace:// in CoPilot, data URI in graphs
+    )
+    yield "image_url", result
+```
+
+**Return format options:**
+- `"for_local_processing"` - Local file path for processing tools
+- `"for_external_api"` - Data URI for external APIs needing base64
+- `"for_block_output"` - **Always use for outputs** - automatically picks best format
+
 ## Testing Your Block
 
 ```bash
diff --git a/docs/content/platform/contributing/oauth-integration-flow.md b/docs/platform/contributing/oauth-integration-flow.md
similarity index 99%
rename from docs/content/platform/contributing/oauth-integration-flow.md
rename to docs/platform/contributing/oauth-integration-flow.md
index dbc7a54be5..f6c3f7fd17 100644
--- a/docs/content/platform/contributing/oauth-integration-flow.md
+++ b/docs/platform/contributing/oauth-integration-flow.md
@@ -25,7 +25,7 @@ This document focuses on the **API Integration OAuth flow** used for connecting
 ### 2. Backend API Trust Boundary
 - **Location**: Server-side FastAPI application
 - **Components**:
-  - Integration router (`/backend/backend/server/integrations/router.py`)
+  - Integration router (`/backend/backend/api/features/integrations/router.py`)
   - OAuth handlers (`/backend/backend/integrations/oauth/`)
   - Credentials store (`/backend/backend/integrations/credentials_store.py`)
 - **Trust Level**: Trusted - server-controlled environment
diff --git a/docs/content/platform/contributing/tests.md b/docs/platform/contributing/tests.md
similarity index 100%
rename from docs/content/platform/contributing/tests.md
rename to docs/platform/contributing/tests.md
diff --git a/docs/content/platform/create-basic-agent.md b/docs/platform/create-basic-agent.md
similarity index 81%
rename from docs/content/platform/create-basic-agent.md
rename to docs/platform/create-basic-agent.md
index 7721fb9b9c..ffe654ba99 100644
--- a/docs/content/platform/create-basic-agent.md
+++ b/docs/platform/create-basic-agent.md
@@ -4,6 +4,28 @@
 
 This guide walks through creating a simple question-answer AI agent using AutoGPT's visual builder. This is a basic example that can be expanded into more complex agents.
 
+## **Prerequisites**
+
+### **Cloud-Hosted AutoGPT**
+If you're using the cloud-hosted version at [agpt.co](https://agpt.co), you're ready to go! AI blocks come with **built-in credits** — no API keys required to get started. If you'd prefer to use your own API keys, you can add them via **Profile → Integrations**.
+
+### **Self-Hosted (Docker)**
+If you're running AutoGPT locally with Docker, you'll need to add your own API keys to `autogpt_platform/backend/.env`:
+
+```bash
+# Create or edit backend/.env
+OPENAI_API_KEY=sk-your-key-here
+ANTHROPIC_API_KEY=sk-ant-your-key-here
+# Add other provider keys as needed
+```
+
+After adding keys, restart the services:
+```bash
+docker compose down && docker compose up -d
+```
+
+**Note:** The Calculator example below doesn't require any API credentials — it's a good way to test your setup before adding AI blocks.
+
 ## **Example Agent: Q&A (with AI)**
 
 A step-by-step guide to creating a simple Q&A agent using input and output blocks.
diff --git a/docs/content/platform/d_id.md b/docs/platform/d_id.md
similarity index 100%
rename from docs/content/platform/d_id.md
rename to docs/platform/d_id.md
diff --git a/docs/content/platform/delete-agent.md b/docs/platform/delete-agent.md
similarity index 100%
rename from docs/content/platform/delete-agent.md
rename to docs/platform/delete-agent.md
diff --git a/docs/content/platform/download-agent-from-marketplace-local.md b/docs/platform/download-agent-from-marketplace-local.md
similarity index 100%
rename from docs/content/platform/download-agent-from-marketplace-local.md
rename to docs/platform/download-agent-from-marketplace-local.md
diff --git a/docs/content/platform/edit-agent.md b/docs/platform/edit-agent.md
similarity index 100%
rename from docs/content/platform/edit-agent.md
rename to docs/platform/edit-agent.md
diff --git a/docs/content/platform/getting-started.md b/docs/platform/getting-started.md
similarity index 100%
rename from docs/content/platform/getting-started.md
rename to docs/platform/getting-started.md
diff --git a/docs/content/platform/installer.md b/docs/platform/installer.md
similarity index 100%
rename from docs/content/platform/installer.md
rename to docs/platform/installer.md
diff --git a/docs/content/platform/integrating/api-guide.md b/docs/platform/integrating/api-guide.md
similarity index 100%
rename from docs/content/platform/integrating/api-guide.md
rename to docs/platform/integrating/api-guide.md
diff --git a/docs/content/platform/integrating/oauth-guide.md b/docs/platform/integrating/oauth-guide.md
similarity index 100%
rename from docs/content/platform/integrating/oauth-guide.md
rename to docs/platform/integrating/oauth-guide.md
diff --git a/docs/content/platform/new_blocks.md b/docs/platform/new_blocks.md
similarity index 85%
rename from docs/content/platform/new_blocks.md
rename to docs/platform/new_blocks.md
index 8e6324b937..114ff8d9a4 100644
--- a/docs/content/platform/new_blocks.md
+++ b/docs/platform/new_blocks.md
@@ -111,6 +111,71 @@ Follow these steps to create and test a new block:
      - `graph_exec_id`: The ID of the execution of the agent. This changes every time the agent has a new "run"
      - `node_exec_id`: The ID of the execution of the node. This changes every time the node is executed
      - `node_id`: The ID of the node that is being executed. It changes every version of the graph, but not every time the node is executed.
+     - `execution_context`: An `ExecutionContext` object containing user_id, graph_exec_id, workspace_id, and session_id. Required for file handling.
+
+### Handling Files in Blocks
+
+When your block needs to work with files (images, videos, documents), use `store_media_file()` from `backend.util.file`. This function handles downloading, validation, virus scanning, and storage.
+
+**Import:**
+```python
+from backend.data.execution import ExecutionContext
+from backend.util.file import store_media_file
+from backend.util.type import MediaFileType
+```
+
+**The `return_format` parameter determines what you get back:**
+
+| Format | Use When | Returns |
+|--------|----------|---------|
+| `"for_local_processing"` | Processing with local tools (ffmpeg, MoviePy, PIL) | Local file path (e.g., `"image.png"`) |
+| `"for_external_api"` | Sending content to external APIs (Replicate, OpenAI) | Data URI (e.g., `"data:image/png;base64,..."`) |
+| `"for_block_output"` | Returning output from your block | Smart: `workspace://` in CoPilot, data URI in graphs |
+
+**Examples:**
+
+```python
+async def run(
+    self,
+    input_data: Input,
+    *,
+    execution_context: ExecutionContext,
+    **kwargs,
+) -> BlockOutput:
+    # PROCESSING: Need to work with file locally (ffmpeg, MoviePy, PIL)
+    local_path = await store_media_file(
+        file=input_data.video,
+        execution_context=execution_context,
+        return_format="for_local_processing",
+    )
+    # local_path = "video.mp4" - use with Path, ffmpeg, subprocess, etc.
+    full_path = get_exec_file_path(execution_context.graph_exec_id, local_path)
+
+    # EXTERNAL API: Need to send content to an API like Replicate
+    image_b64 = await store_media_file(
+        file=input_data.image,
+        execution_context=execution_context,
+        return_format="for_external_api",
+    )
+    # image_b64 = "data:image/png;base64,iVBORw0..." - send to external API
+
+    # OUTPUT: Returning result from block to user/next block
+    result_url = await store_media_file(
+        file=generated_image_url,
+        execution_context=execution_context,
+        return_format="for_block_output",
+    )
+    yield "image_url", result_url
+    # In CoPilot: result_url = "workspace://abc123" (persistent, context-efficient)
+    # In graphs:  result_url = "data:image/png;base64,..." (for next block/display)
+```
+
+**Key points:**
+
+- `for_block_output` is the **only** format that auto-adapts to execution context
+- Always use `for_block_output` for block outputs unless you have a specific reason not to
+- Never manually check for `workspace_id` - let `for_block_output` handle the logic
+- The function handles URLs, data URIs, `workspace://` references, and local paths as input
 
 ### Field Types
 
@@ -616,7 +681,59 @@ custom_requests = Requests(
 
 ### Error Handling
 
-All blocks should have an error output that catches all reasonable errors that a user can handle, wrap them in a ValueError, and re-raise. Don't catch things the system admin would need to fix like being out of money or unreachable addresses.  
+Blocks should raise appropriate exceptions for errors that users can fix. The executor classifies errors based on whether they inherit from `ValueError` - these are treated as "expected failures" (user-fixable) rather than system errors.
+
+#### Block Exception Classes
+
+Import from `backend.util.exceptions`:
+
+```python
+from backend.util.exceptions import BlockInputError, BlockExecutionError
+```
+
+| Exception | Use Case | Example |
+|-----------|----------|---------|
+| `BlockInputError` | Invalid user input, validation failures, missing required fields | Bad API key format, invalid URL, missing credentials |
+| `BlockExecutionError` | Runtime failures the user can address | API errors, auth failures, resource not found, rate limits |
+| `ValueError` | Simple cases (auto-wrapped to `BlockExecutionError`) | Basic validation errors |
+
+#### Raising Exceptions
+
+```python
+from backend.util.exceptions import BlockInputError, BlockExecutionError
+
+class MyBlock(Block):
+    async def run(self, input_data: Input, **kwargs) -> BlockOutput:
+        # Input validation - use BlockInputError
+        if not input_data.api_key:
+            raise BlockInputError(
+                message="API key is required",
+                block_name=self.name,
+                block_id=self.id,
+            )
+
+        try:
+            result = await self.call_api(input_data)
+            yield "result", result
+        except AuthenticationError as e:
+            # API/runtime errors - use BlockExecutionError
+            raise BlockExecutionError(
+                message=f"Authentication failed: {e}",
+                block_name=self.name,
+                block_id=self.id,
+            ) from e
+```
+
+#### What NOT to Catch
+
+Don't catch errors that require system admin intervention:
+
+- Out of money/credits
+- Unreachable infrastructure
+- Database connection failures
+- Internal server errors from your own services
+
+Let these propagate as unexpected errors so they get proper attention.  
 
 ### Data Models
 
diff --git a/docs/content/platform/ollama.md b/docs/platform/ollama.md
similarity index 99%
rename from docs/content/platform/ollama.md
rename to docs/platform/ollama.md
index 392bfabfe8..ecab9b8ae1 100644
--- a/docs/content/platform/ollama.md
+++ b/docs/platform/ollama.md
@@ -246,7 +246,7 @@ If you encounter any issues, verify that:
   ```bash
   ollama pull llama3.2
   ```
-- If using a custom model, ensure it's added to the model list in `backend/server/model.py`
+- If using a custom model, ensure it's added to the model list in `backend/api/model.py`
 
 #### Docker Issues
 - Ensure Docker daemon is running:
diff --git a/docs/content/platform/submit-agent-to-marketplace.md b/docs/platform/submit-agent-to-marketplace.md
similarity index 100%
rename from docs/content/platform/submit-agent-to-marketplace.md
rename to docs/platform/submit-agent-to-marketplace.md
diff --git a/docs/platform/what-is-autogpt-platform.md b/docs/platform/what-is-autogpt-platform.md
new file mode 100644
index 0000000000..b0d1ff0f74
--- /dev/null
+++ b/docs/platform/what-is-autogpt-platform.md
@@ -0,0 +1,82 @@
+# What is the AutoGPT Platform?
+
+The AutoGPT Platform is a groundbreaking system that revolutionizes AI utilization for businesses and individuals. It enables the creation, deployment, and management of continuous agents that work tirelessly on your behalf, bringing unprecedented efficiency and innovation to your workflows.
+
+## Key Features
+
+* **Seamless Integration and Low-Code Workflows**: Rapidly create complex workflows without extensive coding knowledge.
+* **Autonomous Operation and Continuous Agents**: Deploy cloud-based assistants that run indefinitely, activating on relevant triggers.
+* **Intelligent Automation and Maximum Efficiency**: Streamline workflows by automating repetitive processes.
+* **Reliable Performance and Predictable Execution**: Enjoy consistent and dependable long-running processes.
+
+## Platform Architecture
+
+The AutoGPT Platform consists of two main components:
+
+### 1. AutoGPT Server
+
+The powerhouse of our platform, containing:
+
+* **Source Code**: Core logic driving agents and automation processes.
+* **Infrastructure**: Robust systems ensuring reliable and scalable performance.
+* **Marketplace**: A comprehensive marketplace for pre-built agents.
+
+### 2. AutoGPT Frontend
+
+The user interface where you interact with the platform:
+
+* **Agent Builder**: Design and configure your own AI agents.
+* **Workflow Management**: Build, modify, and optimize automation workflows.
+* **Deployment Controls**: Manage the lifecycle of your agents.
+* **Ready-to-Use Agents**: Select from pre-configured agents.
+* **Agent Interaction**: Run and interact with agents through a user-friendly interface.
+* **Monitoring and Analytics**: Track agent performance and gain insights.
+
+## Platform Components
+
+### Agents and Workflows
+
+In the platform, you can create highly customized workflows to build agents. An agent is essentially an automated workflow that you design to perform specific tasks or processes. Create customized workflows to build agents for various tasks, including:
+
+* Data processing and analysis
+* Task scheduling and management
+* Communication and notification systems
+* Integration between different software tools
+* AI-powered decision making and content generation
+
+### Blocks as Integrations
+
+Blocks represent actions and are the building blocks of your workflows, including:
+
+* Connections to external services
+* Data processing tools
+* AI models for various tasks
+* Custom scripts or functions
+* Conditional logic and decision-making components
+
+You can learn more under: [Build your own Blocks](new_blocks.md)
+
+## Available Language Models
+
+The platform comes pre-integrated with cutting-edge LLM providers:
+
+* OpenAI - <https://openai.com/>
+* Anthropic - <https://www.anthropic.com/>
+* Groq - <https://groq.com/>
+* Llama - <https://llamaindex.ai/>
+* AI/ML API - <https://aimlapi.com/>
+  * AI/ML API provides 300+ AI models including Deepseek, Gemini, ChatGPT. The models run at enterprise-grade rate limits and uptimes.
+
+## License Overview
+
+We've adopted a dual-license approach to balance open collaboration with sustainable development:
+
+* **MIT License**: The majority of the AutoGPT repository remains under this license.
+* **Polyform Shield License**: Applies to the new `autogpt_platform` folder.
+
+This strategy allows us to share previously closed-source components, fostering a vibrant ecosystem of developers and users.
+
+## Ready to Get Started?
+
+* Read the [Getting Started docs](getting-started.md) to self-host.
+* [Join the waitlist](https://agpt.co/waitlist) for the cloud-hosted beta.
diff --git a/docs/requirements.txt b/docs/requirements.txt
deleted file mode 100644
index ea0eab8c2a..0000000000
--- a/docs/requirements.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-mkdocs
-mkdocs-material
-mkdocs-table-reader-plugin
-pymdown-extensions
-mkdocs-git-revision-date-localized-plugin
-zipp>=3.19.1 # not directly required, pinned by Snyk to avoid a vulnerability
-urllib3>=2.2.2 # not directly required, pinned by Snyk to avoid a vulnerability
-requests>=2.32.4 # not directly required, pinned by Snyk to avoid a vulnerability