fix: add explicit types to avoid implicit any errors

fix(frontend): use singleton shiki highlighter for code blocks
Fixes SENTRY-1051: shiki warning about too many instances. @streamdown/code creates a new highlighter per language, causing memory bloat and warnings when chats have multiple code blocks. This adds a custom code plugin that: - Uses a single shiki highlighter instance - Dynamically loads languages on demand - Pre-loads common languages (js, ts, python, json, etc.) - Caches results like the original plugin Drop-in replacement - same interface as @streamdown/code.
2026-02-13 16:25:05 -05:00 · 2026-02-13 09:15:35 +00:00 · 2026-02-13 09:14:48 +00:00
55 changed files with 1004 additions and 4758 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -5,13 +5,42 @@
 !docs/

 # Platform - Libs
-!autogpt_platform/autogpt_libs/
+!autogpt_platform/autogpt_libs/autogpt_libs/
+!autogpt_platform/autogpt_libs/pyproject.toml
+!autogpt_platform/autogpt_libs/poetry.lock
+!autogpt_platform/autogpt_libs/README.md

 # Platform - Backend
-!autogpt_platform/backend/
+!autogpt_platform/backend/backend/
+!autogpt_platform/backend/test/e2e_test_data.py
+!autogpt_platform/backend/migrations/
+!autogpt_platform/backend/schema.prisma
+!autogpt_platform/backend/pyproject.toml
+!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/
+!autogpt_platform/market/scripts.py
+!autogpt_platform/market/schema.prisma
+!autogpt_platform/market/pyproject.toml
+!autogpt_platform/market/poetry.lock
+!autogpt_platform/market/README.md

 # Platform - Frontend
-!autogpt_platform/frontend/
+!autogpt_platform/frontend/src/
+!autogpt_platform/frontend/public/
+!autogpt_platform/frontend/scripts/
+!autogpt_platform/frontend/package.json
+!autogpt_platform/frontend/pnpm-lock.yaml
+!autogpt_platform/frontend/tsconfig.json
+!autogpt_platform/frontend/README.md
+## config
+!autogpt_platform/frontend/*.config.*
+!autogpt_platform/frontend/.env.*
+!autogpt_platform/frontend/.env

 # Classic - AutoGPT
 !classic/original_autogpt/autogpt/
@@ -35,38 +64,6 @@
 # Classic - Frontend
 !classic/frontend/build/web/

-# Explicitly re-ignore unwanted files from whitelisted directories
-# Note: These patterns MUST come after the whitelist rules to take effect
-
-# Hidden files and directories (but keep frontend .env files needed for build)
-**/.*
-!autogpt_platform/frontend/.env
-!autogpt_platform/frontend/.env.default
-!autogpt_platform/frontend/.env.production
-
-# Python artifacts
-**/__pycache__/
-**/*.pyc
-**/*.pyo
-**/.venv/
-**/.ruff_cache/
-**/.pytest_cache/
-**/.coverage
-**/htmlcov/
-
-# Node artifacts
-**/node_modules/
-**/.next/
-**/storybook-static/
-**/playwright-report/
-**/test-results/
-
-# Build artifacts
-**/dist/
-**/build/
-!autogpt_platform/frontend/src/**/build/
-**/target/
-
-# Logs and temp files
-**/*.log
-**/*.tmp
+# Explicitly re-ignore some folders
+.*
+**/__pycache__
--- a/.github/workflows/claude-ci-failure-auto-fix.yml
+++ b/.github/workflows/claude-ci-failure-auto-fix.yml
@@ -40,48 +40,6 @@ jobs:
          git checkout -b "$BRANCH_NAME"
          echo "branch_name=$BRANCH_NAME" >> $GITHUB_OUTPUT

-      # Backend Python/Poetry setup (so Claude can run linting/tests)
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
-
-      - name: Set up Python dependency cache
-        uses: actions/cache@v5
-        with:
-          path: ~/.cache/pypoetry
-          key: poetry-${{ runner.os }}-${{ hashFiles('autogpt_platform/backend/poetry.lock') }}
-
-      - 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 Python dependencies
-        working-directory: autogpt_platform/backend
-        run: poetry install
-
-      - name: Generate Prisma Client
-        working-directory: autogpt_platform/backend
-        run: poetry run prisma generate && poetry run gen-prisma-stub
-
-      # Frontend Node.js/pnpm setup (so Claude can run linting/tests)
-      - name: Enable corepack
-        run: corepack enable
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v6
-        with:
-          node-version: "22"
-          cache: "pnpm"
-          cache-dependency-path: autogpt_platform/frontend/pnpm-lock.yaml
-
-      - name: Install JavaScript dependencies
-        working-directory: autogpt_platform/frontend
-        run: pnpm install --frozen-lockfile
-
      - name: Get CI failure details
        id: failure_details
        uses: actions/github-script@v8
--- a/.github/workflows/claude-dependabot.yml
+++ b/.github/workflows/claude-dependabot.yml
@@ -77,15 +77,27 @@ jobs:
        run: poetry run prisma generate && poetry run gen-prisma-stub

      # Frontend Node.js/pnpm setup (mirrors platform-frontend-ci.yml)
-      - name: Enable corepack
-        run: corepack enable
-
      - name: Set up Node.js
        uses: actions/setup-node@v6
        with:
          node-version: "22"
-          cache: "pnpm"
-          cache-dependency-path: autogpt_platform/frontend/pnpm-lock.yaml
+
+      - name: Enable corepack
+        run: corepack enable
+
+      - name: Set pnpm store directory
+        run: |
+          pnpm config set store-dir ~/.pnpm-store
+          echo "PNPM_HOME=$HOME/.pnpm-store" >> $GITHUB_ENV
+
+      - name: Cache frontend dependencies
+        uses: actions/cache@v5
+        with:
+          path: ~/.pnpm-store
+          key: ${{ runner.os }}-pnpm-${{ hashFiles('autogpt_platform/frontend/pnpm-lock.yaml', 'autogpt_platform/frontend/package.json') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-${{ hashFiles('autogpt_platform/frontend/pnpm-lock.yaml') }}
+            ${{ runner.os }}-pnpm-

      - name: Install JavaScript dependencies
        working-directory: autogpt_platform/frontend
--- a/.github/workflows/claude.yml
+++ b/.github/workflows/claude.yml
@@ -93,15 +93,27 @@ jobs:
        run: poetry run prisma generate && poetry run gen-prisma-stub

      # Frontend Node.js/pnpm setup (mirrors platform-frontend-ci.yml)
-      - name: Enable corepack
-        run: corepack enable
-
      - name: Set up Node.js
        uses: actions/setup-node@v6
        with:
          node-version: "22"
-          cache: "pnpm"
-          cache-dependency-path: autogpt_platform/frontend/pnpm-lock.yaml
+
+      - name: Enable corepack
+        run: corepack enable
+
+      - name: Set pnpm store directory
+        run: |
+          pnpm config set store-dir ~/.pnpm-store
+          echo "PNPM_HOME=$HOME/.pnpm-store" >> $GITHUB_ENV
+
+      - name: Cache frontend dependencies
+        uses: actions/cache@v5
+        with:
+          path: ~/.pnpm-store
+          key: ${{ runner.os }}-pnpm-${{ hashFiles('autogpt_platform/frontend/pnpm-lock.yaml', 'autogpt_platform/frontend/package.json') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-${{ hashFiles('autogpt_platform/frontend/pnpm-lock.yaml') }}
+            ${{ runner.os }}-pnpm-

      - name: Install JavaScript dependencies
        working-directory: autogpt_platform/frontend
--- a/.github/workflows/platform-frontend-ci.yml
+++ b/.github/workflows/platform-frontend-ci.yml
@@ -26,6 +26,7 @@ jobs:
  setup:
    runs-on: ubuntu-latest
    outputs:
+      cache-key: ${{ steps.cache-key.outputs.key }}
      components-changed: ${{ steps.filter.outputs.components }}

    steps:
@@ -40,17 +41,28 @@ jobs:
            components:
              - 'autogpt_platform/frontend/src/components/**'

-      - name: Enable corepack
-        run: corepack enable
-
-      - name: Set up Node
+      - name: Set up Node.js
        uses: actions/setup-node@v6
        with:
          node-version: "22.18.0"
-          cache: "pnpm"
-          cache-dependency-path: autogpt_platform/frontend/pnpm-lock.yaml

-      - name: Install dependencies to populate cache
+      - name: Enable corepack
+        run: corepack enable
+
+      - name: Generate cache key
+        id: cache-key
+        run: echo "key=${{ runner.os }}-pnpm-${{ hashFiles('autogpt_platform/frontend/pnpm-lock.yaml', 'autogpt_platform/frontend/package.json') }}" >> $GITHUB_OUTPUT
+
+      - name: Cache dependencies
+        uses: actions/cache@v5
+        with:
+          path: ~/.pnpm-store
+          key: ${{ steps.cache-key.outputs.key }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-${{ hashFiles('autogpt_platform/frontend/pnpm-lock.yaml') }}
+            ${{ runner.os }}-pnpm-
+
+      - name: Install dependencies
        run: pnpm install --frozen-lockfile

  lint:
@@ -61,15 +73,22 @@ jobs:
      - name: Checkout repository
        uses: actions/checkout@v6

-      - name: Enable corepack
-        run: corepack enable
-
-      - name: Set up Node
+      - name: Set up Node.js
        uses: actions/setup-node@v6
        with:
          node-version: "22.18.0"
-          cache: "pnpm"
-          cache-dependency-path: autogpt_platform/frontend/pnpm-lock.yaml
+
+      - name: Enable corepack
+        run: corepack enable
+
+      - name: Restore dependencies cache
+        uses: actions/cache@v5
+        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
@@ -92,15 +111,22 @@ jobs:
        with:
          fetch-depth: 0

-      - name: Enable corepack
-        run: corepack enable
-
-      - name: Set up Node
+      - name: Set up Node.js
        uses: actions/setup-node@v6
        with:
          node-version: "22.18.0"
-          cache: "pnpm"
-          cache-dependency-path: autogpt_platform/frontend/pnpm-lock.yaml
+
+      - name: Enable corepack
+        run: corepack enable
+
+      - name: Restore dependencies cache
+        uses: actions/cache@v5
+        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
@@ -115,8 +141,10 @@ jobs:
          exitOnceUploaded: true

  e2e_test:
-    name: end-to-end tests
    runs-on: big-boi
+    needs: setup
+    strategy:
+      fail-fast: false

    steps:
      - name: Checkout repository
@@ -124,11 +152,19 @@ jobs:
        with:
          submodules: recursive

-      - name: Set up Platform - Copy default supabase .env
+      - name: Set up Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version: "22.18.0"
+
+      - name: Enable corepack
+        run: corepack enable
+
+      - name: Copy default supabase .env
        run: |
          cp ../.env.default ../.env

-      - name: Set up Platform - Copy backend .env and set OpenAI API key
+      - 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
@@ -136,125 +172,77 @@ jobs:
          # Used by E2E test data script to generate embeddings for approved store agents
          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}

-      - name: Set up Platform - Set up Docker Buildx
+      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v3
-        with:
-          driver: docker-container
-          driver-opts: network=host

-      - name: Set up Platform - Expose GHA cache to docker buildx CLI
-        uses: crazy-max/ghaction-github-runtime@v3
-
-      - name: Set up Platform - Build Docker images (with cache)
-        working-directory: autogpt_platform
-        run: |
-          pip install pyyaml
-
-          # Resolve extends and generate a flat compose file that bake can understand
-          docker compose -f docker-compose.yml config > docker-compose.resolved.yml
-
-          # Add cache configuration to the resolved compose file
-          python ../.github/workflows/scripts/docker-ci-fix-compose-build-cache.py \
-            --source docker-compose.resolved.yml \
-            --cache-from "type=gha" \
-            --cache-to "type=gha,mode=max" \
-            --backend-hash "${{ hashFiles('autogpt_platform/backend/Dockerfile', 'autogpt_platform/backend/poetry.lock', 'autogpt_platform/backend/backend') }}" \
-            --frontend-hash "${{ hashFiles('autogpt_platform/frontend/Dockerfile', 'autogpt_platform/frontend/pnpm-lock.yaml', 'autogpt_platform/frontend/src') }}" \
-            --git-ref "${{ github.ref }}"
-
-          # Build with bake using the resolved compose file (now includes cache config)
-          docker buildx bake --allow=fs.read=.. -f docker-compose.resolved.yml --load
-        env:
-          NEXT_PUBLIC_PW_TEST: true
-
-      - name: Set up tests - Cache E2E test data
-        id: e2e-data-cache
+      - name: Cache Docker layers
        uses: actions/cache@v5
        with:
-          path: /tmp/e2e_test_data.sql
-          key: e2e-test-data-${{ hashFiles('autogpt_platform/backend/test/e2e_test_data.py', 'autogpt_platform/backend/migrations/**', '.github/workflows/platform-frontend-ci.yml') }}
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-frontend-test-${{ hashFiles('autogpt_platform/docker-compose.yml', 'autogpt_platform/backend/Dockerfile', 'autogpt_platform/backend/pyproject.toml', 'autogpt_platform/backend/poetry.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-frontend-test-

-      - name: Set up Platform - Start Supabase DB + Auth
+      - name: Run docker compose
        run: |
-          docker compose -f ../docker-compose.resolved.yml up -d db auth --no-build
-          echo "Waiting for database to be ready..."
-          timeout 60 sh -c 'until docker compose -f ../docker-compose.resolved.yml exec -T db pg_isready -U postgres 2>/dev/null; do sleep 2; done'
-          echo "Waiting for auth service to be ready..."
-          timeout 60 sh -c 'until docker compose -f ../docker-compose.resolved.yml exec -T db psql -U postgres -d postgres -c "SELECT 1 FROM auth.users LIMIT 1" 2>/dev/null; do sleep 2; done' || echo "Auth schema check timeout, continuing..."
-
-      - name: Set up Platform - Run migrations
-        run: |
-          echo "Running migrations..."
-          docker compose -f ../docker-compose.resolved.yml run --rm migrate
-          echo "✅ Migrations completed"
+          NEXT_PUBLIC_PW_TEST=true docker compose -f ../docker-compose.yml up -d
        env:
-          NEXT_PUBLIC_PW_TEST: true
+          DOCKER_BUILDKIT: 1
+          BUILDX_CACHE_FROM: type=local,src=/tmp/.buildx-cache
+          BUILDX_CACHE_TO: type=local,dest=/tmp/.buildx-cache-new,mode=max

-      - name: Set up tests - Load cached E2E test data
-        if: steps.e2e-data-cache.outputs.cache-hit == 'true'
+      - name: Move cache
        run: |
-          echo "✅ Found cached E2E test data, restoring..."
-          {
-            echo "SET session_replication_role = 'replica';"
-            cat /tmp/e2e_test_data.sql
-            echo "SET session_replication_role = 'origin';"
-          } | docker compose -f ../docker-compose.resolved.yml exec -T db psql -U postgres -d postgres -b
-          # Refresh materialized views after restore
-          docker compose -f ../docker-compose.resolved.yml exec -T db \
-            psql -U postgres -d postgres -b -c "SET search_path TO platform; SELECT refresh_store_materialized_views();" || true
+          rm -rf /tmp/.buildx-cache
+          if [ -d "/tmp/.buildx-cache-new" ]; then
+            mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+          fi

-          echo "✅ E2E test data restored from cache"
-
-      - name: Set up Platform - Start (all other services)
+      - name: Wait for services to be ready
        run: |
-          docker compose -f ../docker-compose.resolved.yml up -d --no-build
          echo "Waiting for rest_server to be ready..."
          timeout 60 sh -c 'until curl -f http://localhost:8006/health 2>/dev/null; do sleep 2; done' || echo "Rest server health check timeout, continuing..."
-        env:
-          NEXT_PUBLIC_PW_TEST: true
+          echo "Waiting for database to be ready..."
+          timeout 60 sh -c 'until docker compose -f ../docker-compose.yml exec -T db pg_isready -U postgres 2>/dev/null; do sleep 2; done' || echo "Database ready check timeout, continuing..."

-      - name: Set up tests - Create E2E test data
-        if: steps.e2e-data-cache.outputs.cache-hit != 'true'
+      - name: Create E2E test data
        run: |
          echo "Creating E2E test data..."
-          docker cp ../backend/test/e2e_test_data.py $(docker compose -f ../docker-compose.resolved.yml ps -q rest_server):/tmp/e2e_test_data.py
-          docker compose -f ../docker-compose.resolved.yml exec -T rest_server sh -c "cd /app/autogpt_platform && python /tmp/e2e_test_data.py" || {
-            echo "❌ E2E test data creation failed!"
-            docker compose -f ../docker-compose.resolved.yml logs --tail=50 rest_server
-            exit 1
-          }
+          # First try to run the script from inside the container
+          if docker compose -f ../docker-compose.yml exec -T rest_server test -f /app/autogpt_platform/backend/test/e2e_test_data.py; then
+            echo "✅ Found e2e_test_data.py in container, running it..."
+            docker compose -f ../docker-compose.yml exec -T rest_server sh -c "cd /app/autogpt_platform && python backend/test/e2e_test_data.py" || {
+              echo "❌ E2E test data creation failed!"
+              docker compose -f ../docker-compose.yml logs --tail=50 rest_server
+              exit 1
+            }
+          else
+            echo "⚠️ e2e_test_data.py not found in container, copying and running..."
+            # Copy the script into the container and run it
+            docker cp ../backend/test/e2e_test_data.py $(docker compose -f ../docker-compose.yml ps -q rest_server):/tmp/e2e_test_data.py || {
+              echo "❌ Failed to copy script to container"
+              exit 1
+            }
+            docker compose -f ../docker-compose.yml exec -T rest_server sh -c "cd /app/autogpt_platform && python /tmp/e2e_test_data.py" || {
+              echo "❌ E2E test data creation failed!"
+              docker compose -f ../docker-compose.yml logs --tail=50 rest_server
+              exit 1
+            }
+          fi

-          # Dump auth.users + platform schema for cache (two separate dumps)
-          echo "Dumping database for cache..."
-          {
-            docker compose -f ../docker-compose.resolved.yml exec -T db \
-              pg_dump -U postgres --data-only --column-inserts \
-              --table='auth.users' postgres
-            docker compose -f ../docker-compose.resolved.yml exec -T db \
-              pg_dump -U postgres --data-only --column-inserts \
-              --schema=platform \
-              --exclude-table='platform._prisma_migrations' \
-              --exclude-table='platform.apscheduler_jobs' \
-              --exclude-table='platform.apscheduler_jobs_batched_notifications' \
-              postgres
-          } > /tmp/e2e_test_data.sql
-
-          echo "✅ Database dump created for caching ($(wc -l < /tmp/e2e_test_data.sql) lines)"
-
-      - name: Set up tests - Enable corepack
-        run: corepack enable
-
-      - name: Set up tests - Set up Node
-        uses: actions/setup-node@v6
+      - name: Restore dependencies cache
+        uses: actions/cache@v5
        with:
-          node-version: "22.18.0"
-          cache: "pnpm"
-          cache-dependency-path: autogpt_platform/frontend/pnpm-lock.yaml
+          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: Set up tests - Install dependencies
+      - name: Install dependencies
        run: pnpm install --frozen-lockfile

-      - name: Set up tests - Install browser 'chromium'
+      - name: Install Browser 'chromium'
        run: pnpm playwright install --with-deps chromium

      - name: Run Playwright tests
@@ -281,7 +269,7 @@ jobs:

      - name: Print Final Docker Compose logs
        if: always()
-        run: docker compose -f ../docker-compose.resolved.yml logs
+        run: docker compose -f ../docker-compose.yml logs

  integration_test:
    runs-on: ubuntu-latest
@@ -293,15 +281,22 @@ jobs:
        with:
          submodules: recursive

-      - name: Enable corepack
-        run: corepack enable
-
-      - name: Set up Node
+      - name: Set up Node.js
        uses: actions/setup-node@v6
        with:
          node-version: "22.18.0"
-          cache: "pnpm"
-          cache-dependency-path: autogpt_platform/frontend/pnpm-lock.yaml
+
+      - name: Enable corepack
+        run: corepack enable
+
+      - name: Restore dependencies cache
+        uses: actions/cache@v5
+        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
--- a/.github/workflows/scripts/docker-ci-fix-compose-build-cache.py
+++ b/.github/workflows/scripts/docker-ci-fix-compose-build-cache.py
@@ -1,195 +0,0 @@
-#!/usr/bin/env python3
-"""
-Add cache configuration to a resolved docker-compose file for all services
-that have a build key, and ensure image names match what docker compose expects.
-"""
-
-import argparse
-
-import yaml
-
-
-DEFAULT_BRANCH = "dev"
-CACHE_BUILDS_FOR_COMPONENTS = ["backend", "frontend"]
-
-
-def main():
-    parser = argparse.ArgumentParser(
-        description="Add cache config to a resolved compose file"
-    )
-    parser.add_argument(
-        "--source",
-        required=True,
-        help="Source compose file to read (should be output of `docker compose config`)",
-    )
-    parser.add_argument(
-        "--cache-from",
-        default="type=gha",
-        help="Cache source configuration",
-    )
-    parser.add_argument(
-        "--cache-to",
-        default="type=gha,mode=max",
-        help="Cache destination configuration",
-    )
-    for component in CACHE_BUILDS_FOR_COMPONENTS:
-        parser.add_argument(
-            f"--{component}-hash",
-            default="",
-            help=f"Hash for {component} cache scope (e.g., from hashFiles())",
-        )
-    parser.add_argument(
-        "--git-ref",
-        default="",
-        help="Git ref for branch-based cache scope (e.g., refs/heads/master)",
-    )
-    args = parser.parse_args()
-
-    # Normalize git ref to a safe scope name (e.g., refs/heads/master -> master)
-    git_ref_scope = ""
-    if args.git_ref:
-        git_ref_scope = args.git_ref.replace("refs/heads/", "").replace("/", "-")
-
-    with open(args.source, "r") as f:
-        compose = yaml.safe_load(f)
-
-    # Get project name from compose file or default
-    project_name = compose.get("name", "autogpt_platform")
-
-    def get_image_name(dockerfile: str, target: str) -> str:
-        """Generate image name based on Dockerfile folder and build target."""
-        dockerfile_parts = dockerfile.replace("\\", "/").split("/")
-        if len(dockerfile_parts) >= 2:
-            folder_name = dockerfile_parts[-2]  # e.g., "backend" or "frontend"
-        else:
-            folder_name = "app"
-        return f"{project_name}-{folder_name}:{target}"
-
-    def get_build_key(dockerfile: str, target: str) -> str:
-        """Generate a unique key for a Dockerfile+target combination."""
-        return f"{dockerfile}:{target}"
-
-    def get_component(dockerfile: str) -> str | None:
-        """Get component name (frontend/backend) from dockerfile path."""
-        for component in CACHE_BUILDS_FOR_COMPONENTS:
-            if component in dockerfile:
-                return component
-        return None
-
-    # First pass: collect all services with build configs and identify duplicates
-    # Track which (dockerfile, target) combinations we've seen
-    build_key_to_first_service: dict[str, str] = {}
-    services_to_build: list[str] = []
-    services_to_dedupe: list[str] = []
-
-    for service_name, service_config in compose.get("services", {}).items():
-        if "build" not in service_config:
-            continue
-
-        build_config = service_config["build"]
-        dockerfile = build_config.get("dockerfile", "Dockerfile")
-        target = build_config.get("target", "default")
-        build_key = get_build_key(dockerfile, target)
-
-        if build_key not in build_key_to_first_service:
-            # First service with this build config - it will do the actual build
-            build_key_to_first_service[build_key] = service_name
-            services_to_build.append(service_name)
-        else:
-            # Duplicate - will just use the image from the first service
-            services_to_dedupe.append(service_name)
-
-    # Second pass: configure builds and deduplicate
-    modified_services = []
-    for service_name, service_config in compose.get("services", {}).items():
-        if "build" not in service_config:
-            continue
-
-        build_config = service_config["build"]
-        dockerfile = build_config.get("dockerfile", "Dockerfile")
-        target = build_config.get("target", "latest")
-        image_name = get_image_name(dockerfile, target)
-
-        # Set image name for all services (needed for both builders and deduped)
-        service_config["image"] = image_name
-
-        if service_name in services_to_dedupe:
-            # Remove build config - this service will use the pre-built image
-            del service_config["build"]
-            continue
-
-        # This service will do the actual build - add cache config
-        cache_from_list = []
-        cache_to_list = []
-
-        component = get_component(dockerfile)
-        if not component:
-            # Skip services that don't clearly match frontend/backend
-            continue
-
-        # Get the hash for this component
-        component_hash = getattr(args, f"{component}_hash")
-
-        # Scope format: platform-{component}-{target}-{hash|ref}
-        # Example: platform-backend-server-abc123
-
-        if "type=gha" in args.cache_from:
-            # 1. Primary: exact hash match (most specific)
-            if component_hash:
-                hash_scope = f"platform-{component}-{target}-{component_hash}"
-                cache_from_list.append(f"{args.cache_from},scope={hash_scope}")
-
-            # 2. Fallback: branch-based cache
-            if git_ref_scope:
-                ref_scope = f"platform-{component}-{target}-{git_ref_scope}"
-                cache_from_list.append(f"{args.cache_from},scope={ref_scope}")
-
-            # 3. Fallback: dev branch cache (for PRs/feature branches)
-            if git_ref_scope and git_ref_scope != DEFAULT_BRANCH:
-                master_scope = f"platform-{component}-{target}-{DEFAULT_BRANCH}"
-                cache_from_list.append(f"{args.cache_from},scope={master_scope}")
-
-        if "type=gha" in args.cache_to:
-            # Write to both hash-based and branch-based scopes
-            if component_hash:
-                hash_scope = f"platform-{component}-{target}-{component_hash}"
-                cache_to_list.append(f"{args.cache_to},scope={hash_scope}")
-
-            if git_ref_scope:
-                ref_scope = f"platform-{component}-{target}-{git_ref_scope}"
-                cache_to_list.append(f"{args.cache_to},scope={ref_scope}")
-
-        # Ensure we have at least one cache source/target
-        if not cache_from_list:
-            cache_from_list.append(args.cache_from)
-        if not cache_to_list:
-            cache_to_list.append(args.cache_to)
-
-        build_config["cache_from"] = cache_from_list
-        build_config["cache_to"] = cache_to_list
-        modified_services.append(service_name)
-
-    # Write back to the same file
-    with open(args.source, "w") as f:
-        yaml.dump(compose, f, default_flow_style=False, sort_keys=False)
-
-    print(f"Added cache config to {len(modified_services)} services in {args.source}:")
-    for svc in modified_services:
-        svc_config = compose["services"][svc]
-        build_cfg = svc_config.get("build", {})
-        cache_from_list = build_cfg.get("cache_from", ["none"])
-        cache_to_list = build_cfg.get("cache_to", ["none"])
-        print(f"  - {svc}")
-        print(f"      image: {svc_config.get('image', 'N/A')}")
-        print(f"      cache_from: {cache_from_list}")
-        print(f"      cache_to: {cache_to_list}")
-    if services_to_dedupe:
-        print(
-            f"Deduplicated {len(services_to_dedupe)} services (will use pre-built images):"
-        )
-        for svc in services_to_dedupe:
-            print(f"  - {svc} -> {compose['services'][svc].get('image', 'N/A')}")
-
-
-if __name__ == "__main__":
-    main()
--- a/autogpt_platform/CLAUDE.md
+++ b/autogpt_platform/CLAUDE.md
@@ -45,11 +45,6 @@ AutoGPT Platform is a monorepo containing:
 - Backend/Frontend services use YAML anchors for consistent configuration
 - Supabase services (`db/docker/docker-compose.yml`) follow the same pattern

-### Branching Strategy
-
- **`dev`** is the main development branch. All PRs should target `dev`.
- **`master`** is the production branch. Only used for production releases.
-
 ### Creating Pull Requests

 - Create the PR against the `dev` branch of the repository.
--- a/autogpt_platform/autogpt_libs/poetry.lock
+++ b/autogpt_platform/autogpt_libs/poetry.lock
@@ -448,61 +448,61 @@ toml = ["tomli ; python_full_version <= \"3.11.0a6\""]

 [[package]]
 name = "cryptography"
-version = "46.0.5"
+version = "46.0.4"
 description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
 optional = false
 python-versions = "!=3.9.0,!=3.9.1,>=3.8"
 groups = ["main"]
 files = [
-    {file = "cryptography-46.0.5-cp311-abi3-macosx_10_9_universal2.whl", hash = "sha256:351695ada9ea9618b3500b490ad54c739860883df6c1f555e088eaf25b1bbaad"},
-    {file = "cryptography-46.0.5-cp311-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:c18ff11e86df2e28854939acde2d003f7984f721eba450b56a200ad90eeb0e6b"},
-    {file = "cryptography-46.0.5-cp311-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:4d7e3d356b8cd4ea5aff04f129d5f66ebdc7b6f8eae802b93739ed520c47c79b"},
-    {file = "cryptography-46.0.5-cp311-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:50bfb6925eff619c9c023b967d5b77a54e04256c4281b0e21336a130cd7fc263"},
-    {file = "cryptography-46.0.5-cp311-abi3-manylinux_2_28_ppc64le.whl", hash = "sha256:803812e111e75d1aa73690d2facc295eaefd4439be1023fefc4995eaea2af90d"},
-    {file = "cryptography-46.0.5-cp311-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:3ee190460e2fbe447175cda91b88b84ae8322a104fc27766ad09428754a618ed"},
-    {file = "cryptography-46.0.5-cp311-abi3-manylinux_2_31_armv7l.whl", hash = "sha256:f145bba11b878005c496e93e257c1e88f154d278d2638e6450d17e0f31e558d2"},
-    {file = "cryptography-46.0.5-cp311-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:e9251e3be159d1020c4030bd2e5f84d6a43fe54b6c19c12f51cde9542a2817b2"},
-    {file = "cryptography-46.0.5-cp311-abi3-manylinux_2_34_ppc64le.whl", hash = "sha256:47fb8a66058b80e509c47118ef8a75d14c455e81ac369050f20ba0d23e77fee0"},
-    {file = "cryptography-46.0.5-cp311-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:4c3341037c136030cb46e4b1e17b7418ea4cbd9dd207e4a6f3b2b24e0d4ac731"},
-    {file = "cryptography-46.0.5-cp311-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:890bcb4abd5a2d3f852196437129eb3667d62630333aacc13dfd470fad3aaa82"},
-    {file = "cryptography-46.0.5-cp311-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:80a8d7bfdf38f87ca30a5391c0c9ce4ed2926918e017c29ddf643d0ed2778ea1"},
-    {file = "cryptography-46.0.5-cp311-abi3-win32.whl", hash = "sha256:60ee7e19e95104d4c03871d7d7dfb3d22ef8a9b9c6778c94e1c8fcc8365afd48"},
-    {file = "cryptography-46.0.5-cp311-abi3-win_amd64.whl", hash = "sha256:38946c54b16c885c72c4f59846be9743d699eee2b69b6988e0a00a01f46a61a4"},
-    {file = "cryptography-46.0.5-cp314-cp314t-macosx_10_9_universal2.whl", hash = "sha256:94a76daa32eb78d61339aff7952ea819b1734b46f73646a07decb40e5b3448e2"},
-    {file = "cryptography-46.0.5-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:5be7bf2fb40769e05739dd0046e7b26f9d4670badc7b032d6ce4db64dddc0678"},
-    {file = "cryptography-46.0.5-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:fe346b143ff9685e40192a4960938545c699054ba11d4f9029f94751e3f71d87"},
-    {file = "cryptography-46.0.5-cp314-cp314t-manylinux_2_28_aarch64.whl", hash = "sha256:c69fd885df7d089548a42d5ec05be26050ebcd2283d89b3d30676eb32ff87dee"},
-    {file = "cryptography-46.0.5-cp314-cp314t-manylinux_2_28_ppc64le.whl", hash = "sha256:8293f3dea7fc929ef7240796ba231413afa7b68ce38fd21da2995549f5961981"},
-    {file = "cryptography-46.0.5-cp314-cp314t-manylinux_2_28_x86_64.whl", hash = "sha256:1abfdb89b41c3be0365328a410baa9df3ff8a9110fb75e7b52e66803ddabc9a9"},
-    {file = "cryptography-46.0.5-cp314-cp314t-manylinux_2_31_armv7l.whl", hash = "sha256:d66e421495fdb797610a08f43b05269e0a5ea7f5e652a89bfd5a7d3c1dee3648"},
-    {file = "cryptography-46.0.5-cp314-cp314t-manylinux_2_34_aarch64.whl", hash = "sha256:4e817a8920bfbcff8940ecfd60f23d01836408242b30f1a708d93198393a80b4"},
-    {file = "cryptography-46.0.5-cp314-cp314t-manylinux_2_34_ppc64le.whl", hash = "sha256:68f68d13f2e1cb95163fa3b4db4bf9a159a418f5f6e7242564fc75fcae667fd0"},
-    {file = "cryptography-46.0.5-cp314-cp314t-manylinux_2_34_x86_64.whl", hash = "sha256:a3d1fae9863299076f05cb8a778c467578262fae09f9dc0ee9b12eb4268ce663"},
-    {file = "cryptography-46.0.5-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:c4143987a42a2397f2fc3b4d7e3a7d313fbe684f67ff443999e803dd75a76826"},
-    {file = "cryptography-46.0.5-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:7d731d4b107030987fd61a7f8ab512b25b53cef8f233a97379ede116f30eb67d"},
-    {file = "cryptography-46.0.5-cp314-cp314t-win32.whl", hash = "sha256:c3bcce8521d785d510b2aad26ae2c966092b7daa8f45dd8f44734a104dc0bc1a"},
-    {file = "cryptography-46.0.5-cp314-cp314t-win_amd64.whl", hash = "sha256:4d8ae8659ab18c65ced284993c2265910f6c9e650189d4e3f68445ef82a810e4"},
-    {file = "cryptography-46.0.5-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:4108d4c09fbbf2789d0c926eb4152ae1760d5a2d97612b92d508d96c861e4d31"},
-    {file = "cryptography-46.0.5-cp38-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:7d1f30a86d2757199cb2d56e48cce14deddf1f9c95f1ef1b64ee91ea43fe2e18"},
-    {file = "cryptography-46.0.5-cp38-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:039917b0dc418bb9f6edce8a906572d69e74bd330b0b3fea4f79dab7f8ddd235"},
-    {file = "cryptography-46.0.5-cp38-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:ba2a27ff02f48193fc4daeadf8ad2590516fa3d0adeeb34336b96f7fa64c1e3a"},
-    {file = "cryptography-46.0.5-cp38-abi3-manylinux_2_28_ppc64le.whl", hash = "sha256:61aa400dce22cb001a98014f647dc21cda08f7915ceb95df0c9eaf84b4b6af76"},
-    {file = "cryptography-46.0.5-cp38-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:3ce58ba46e1bc2aac4f7d9290223cead56743fa6ab94a5d53292ffaac6a91614"},
-    {file = "cryptography-46.0.5-cp38-abi3-manylinux_2_31_armv7l.whl", hash = "sha256:420d0e909050490d04359e7fdb5ed7e667ca5c3c402b809ae2563d7e66a92229"},
-    {file = "cryptography-46.0.5-cp38-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:582f5fcd2afa31622f317f80426a027f30dc792e9c80ffee87b993200ea115f1"},
-    {file = "cryptography-46.0.5-cp38-abi3-manylinux_2_34_ppc64le.whl", hash = "sha256:bfd56bb4b37ed4f330b82402f6f435845a5f5648edf1ad497da51a8452d5d62d"},
-    {file = "cryptography-46.0.5-cp38-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:a3d507bb6a513ca96ba84443226af944b0f7f47dcc9a399d110cd6146481d24c"},
-    {file = "cryptography-46.0.5-cp38-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:9f16fbdf4da055efb21c22d81b89f155f02ba420558db21288b3d0035bafd5f4"},
-    {file = "cryptography-46.0.5-cp38-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:ced80795227d70549a411a4ab66e8ce307899fad2220ce5ab2f296e687eacde9"},
-    {file = "cryptography-46.0.5-cp38-abi3-win32.whl", hash = "sha256:02f547fce831f5096c9a567fd41bc12ca8f11df260959ecc7c3202555cc47a72"},
-    {file = "cryptography-46.0.5-cp38-abi3-win_amd64.whl", hash = "sha256:556e106ee01aa13484ce9b0239bca667be5004efb0aabbed28d353df86445595"},
-    {file = "cryptography-46.0.5-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:3b4995dc971c9fb83c25aa44cf45f02ba86f71ee600d81091c2f0cbae116b06c"},
-    {file = "cryptography-46.0.5-pp311-pypy311_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:bc84e875994c3b445871ea7181d424588171efec3e185dced958dad9e001950a"},
-    {file = "cryptography-46.0.5-pp311-pypy311_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:2ae6971afd6246710480e3f15824ed3029a60fc16991db250034efd0b9fb4356"},
-    {file = "cryptography-46.0.5-pp311-pypy311_pp73-manylinux_2_34_aarch64.whl", hash = "sha256:d861ee9e76ace6cf36a6a89b959ec08e7bc2493ee39d07ffe5acb23ef46d27da"},
-    {file = "cryptography-46.0.5-pp311-pypy311_pp73-manylinux_2_34_x86_64.whl", hash = "sha256:2b7a67c9cd56372f3249b39699f2ad479f6991e62ea15800973b956f4b73e257"},
-    {file = "cryptography-46.0.5-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:8456928655f856c6e1533ff59d5be76578a7157224dbd9ce6872f25055ab9ab7"},
-    {file = "cryptography-46.0.5.tar.gz", hash = "sha256:abace499247268e3757271b2f1e244b36b06f8515cf27c4d49468fc9eb16e93d"},
+    {file = "cryptography-46.0.4-cp311-abi3-macosx_10_9_universal2.whl", hash = "sha256:281526e865ed4166009e235afadf3a4c4cba6056f99336a99efba65336fd5485"},
+    {file = "cryptography-46.0.4-cp311-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:5f14fba5bf6f4390d7ff8f086c566454bff0411f6d8aa7af79c88b6f9267aecc"},
+    {file = "cryptography-46.0.4-cp311-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:47bcd19517e6389132f76e2d5303ded6cf3f78903da2158a671be8de024f4cd0"},
+    {file = "cryptography-46.0.4-cp311-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:01df4f50f314fbe7009f54046e908d1754f19d0c6d3070df1e6268c5a4af09fa"},
+    {file = "cryptography-46.0.4-cp311-abi3-manylinux_2_28_ppc64le.whl", hash = "sha256:5aa3e463596b0087b3da0dbe2b2487e9fc261d25da85754e30e3b40637d61f81"},
+    {file = "cryptography-46.0.4-cp311-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:0a9ad24359fee86f131836a9ac3bffc9329e956624a2d379b613f8f8abaf5255"},
+    {file = "cryptography-46.0.4-cp311-abi3-manylinux_2_31_armv7l.whl", hash = "sha256:dc1272e25ef673efe72f2096e92ae39dea1a1a450dd44918b15351f72c5a168e"},
+    {file = "cryptography-46.0.4-cp311-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:de0f5f4ec8711ebc555f54735d4c673fc34b65c44283895f1a08c2b49d2fd99c"},
+    {file = "cryptography-46.0.4-cp311-abi3-manylinux_2_34_ppc64le.whl", hash = "sha256:eeeb2e33d8dbcccc34d64651f00a98cb41b2dc69cef866771a5717e6734dfa32"},
+    {file = "cryptography-46.0.4-cp311-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:3d425eacbc9aceafd2cb429e42f4e5d5633c6f873f5e567077043ef1b9bbf616"},
+    {file = "cryptography-46.0.4-cp311-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:91627ebf691d1ea3976a031b61fb7bac1ccd745afa03602275dda443e11c8de0"},
+    {file = "cryptography-46.0.4-cp311-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:2d08bc22efd73e8854b0b7caff402d735b354862f1145d7be3b9c0f740fef6a0"},
+    {file = "cryptography-46.0.4-cp311-abi3-win32.whl", hash = "sha256:82a62483daf20b8134f6e92898da70d04d0ef9a75829d732ea1018678185f4f5"},
+    {file = "cryptography-46.0.4-cp311-abi3-win_amd64.whl", hash = "sha256:6225d3ebe26a55dbc8ead5ad1265c0403552a63336499564675b29eb3184c09b"},
+    {file = "cryptography-46.0.4-cp314-cp314t-macosx_10_9_universal2.whl", hash = "sha256:485e2b65d25ec0d901bca7bcae0f53b00133bf3173916d8e421f6fddde103908"},
+    {file = "cryptography-46.0.4-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:078e5f06bd2fa5aea5a324f2a09f914b1484f1d0c2a4d6a8a28c74e72f65f2da"},
+    {file = "cryptography-46.0.4-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:dce1e4f068f03008da7fa51cc7abc6ddc5e5de3e3d1550334eaf8393982a5829"},
+    {file = "cryptography-46.0.4-cp314-cp314t-manylinux_2_28_aarch64.whl", hash = "sha256:2067461c80271f422ee7bdbe79b9b4be54a5162e90345f86a23445a0cf3fd8a2"},
+    {file = "cryptography-46.0.4-cp314-cp314t-manylinux_2_28_ppc64le.whl", hash = "sha256:c92010b58a51196a5f41c3795190203ac52edfd5dc3ff99149b4659eba9d2085"},
+    {file = "cryptography-46.0.4-cp314-cp314t-manylinux_2_28_x86_64.whl", hash = "sha256:829c2b12bbc5428ab02d6b7f7e9bbfd53e33efd6672d21341f2177470171ad8b"},
+    {file = "cryptography-46.0.4-cp314-cp314t-manylinux_2_31_armv7l.whl", hash = "sha256:62217ba44bf81b30abaeda1488686a04a702a261e26f87db51ff61d9d3510abd"},
+    {file = "cryptography-46.0.4-cp314-cp314t-manylinux_2_34_aarch64.whl", hash = "sha256:9c2da296c8d3415b93e6053f5a728649a87a48ce084a9aaf51d6e46c87c7f2d2"},
+    {file = "cryptography-46.0.4-cp314-cp314t-manylinux_2_34_ppc64le.whl", hash = "sha256:9b34d8ba84454641a6bf4d6762d15847ecbd85c1316c0a7984e6e4e9f748ec2e"},
+    {file = "cryptography-46.0.4-cp314-cp314t-manylinux_2_34_x86_64.whl", hash = "sha256:df4a817fa7138dd0c96c8c8c20f04b8aaa1fac3bbf610913dcad8ea82e1bfd3f"},
+    {file = "cryptography-46.0.4-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:b1de0ebf7587f28f9190b9cb526e901bf448c9e6a99655d2b07fff60e8212a82"},
+    {file = "cryptography-46.0.4-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:9b4d17bc7bd7cdd98e3af40b441feaea4c68225e2eb2341026c84511ad246c0c"},
+    {file = "cryptography-46.0.4-cp314-cp314t-win32.whl", hash = "sha256:c411f16275b0dea722d76544a61d6421e2cc829ad76eec79280dbdc9ddf50061"},
+    {file = "cryptography-46.0.4-cp314-cp314t-win_amd64.whl", hash = "sha256:728fedc529efc1439eb6107b677f7f7558adab4553ef8669f0d02d42d7b959a7"},
+    {file = "cryptography-46.0.4-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:a9556ba711f7c23f77b151d5798f3ac44a13455cc68db7697a1096e6d0563cab"},
+    {file = "cryptography-46.0.4-cp38-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:8bf75b0259e87fa70bddc0b8b4078b76e7fd512fd9afae6c1193bcf440a4dbef"},
+    {file = "cryptography-46.0.4-cp38-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:3c268a3490df22270955966ba236d6bc4a8f9b6e4ffddb78aac535f1a5ea471d"},
+    {file = "cryptography-46.0.4-cp38-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:812815182f6a0c1d49a37893a303b44eaac827d7f0d582cecfc81b6427f22973"},
+    {file = "cryptography-46.0.4-cp38-abi3-manylinux_2_28_ppc64le.whl", hash = "sha256:a90e43e3ef65e6dcf969dfe3bb40cbf5aef0d523dff95bfa24256be172a845f4"},
+    {file = "cryptography-46.0.4-cp38-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:a05177ff6296644ef2876fce50518dffb5bcdf903c85250974fc8bc85d54c0af"},
+    {file = "cryptography-46.0.4-cp38-abi3-manylinux_2_31_armv7l.whl", hash = "sha256:daa392191f626d50f1b136c9b4cf08af69ca8279d110ea24f5c2700054d2e263"},
+    {file = "cryptography-46.0.4-cp38-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:e07ea39c5b048e085f15923511d8121e4a9dc45cee4e3b970ca4f0d338f23095"},
+    {file = "cryptography-46.0.4-cp38-abi3-manylinux_2_34_ppc64le.whl", hash = "sha256:d5a45ddc256f492ce42a4e35879c5e5528c09cd9ad12420828c972951d8e016b"},
+    {file = "cryptography-46.0.4-cp38-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:6bb5157bf6a350e5b28aee23beb2d84ae6f5be390b2f8ee7ea179cda077e1019"},
+    {file = "cryptography-46.0.4-cp38-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:dd5aba870a2c40f87a3af043e0dee7d9eb02d4aff88a797b48f2b43eff8c3ab4"},
+    {file = "cryptography-46.0.4-cp38-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:93d8291da8d71024379ab2cb0b5c57915300155ad42e07f76bea6ad838d7e59b"},
+    {file = "cryptography-46.0.4-cp38-abi3-win32.whl", hash = "sha256:0563655cb3c6d05fb2afe693340bc050c30f9f34e15763361cf08e94749401fc"},
+    {file = "cryptography-46.0.4-cp38-abi3-win_amd64.whl", hash = "sha256:fa0900b9ef9c49728887d1576fd8d9e7e3ea872fa9b25ef9b64888adc434e976"},
+    {file = "cryptography-46.0.4-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:766330cce7416c92b5e90c3bb71b1b79521760cdcfc3a6a1a182d4c9fab23d2b"},
+    {file = "cryptography-46.0.4-pp311-pypy311_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:c236a44acfb610e70f6b3e1c3ca20ff24459659231ef2f8c48e879e2d32b73da"},
+    {file = "cryptography-46.0.4-pp311-pypy311_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:8a15fb869670efa8f83cbffbc8753c1abf236883225aed74cd179b720ac9ec80"},
+    {file = "cryptography-46.0.4-pp311-pypy311_pp73-manylinux_2_34_aarch64.whl", hash = "sha256:fdc3daab53b212472f1524d070735b2f0c214239df131903bae1d598016fa822"},
+    {file = "cryptography-46.0.4-pp311-pypy311_pp73-manylinux_2_34_x86_64.whl", hash = "sha256:44cc0675b27cadb71bdbb96099cca1fa051cd11d2ade09e5cd3a2edb929ed947"},
+    {file = "cryptography-46.0.4-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:be8c01a7d5a55f9a47d1888162b76c8f49d62b234d88f0ff91a9fbebe32ffbc3"},
+    {file = "cryptography-46.0.4.tar.gz", hash = "sha256:bfd019f60f8abc2ed1b9be4ddc21cfef059c841d86d710bb69909a688cbb8f59"},
 ]

 [package.dependencies]
@@ -516,7 +516,7 @@ nox = ["nox[uv] (>=2024.4.15)"]
 pep8test = ["check-sdist", "click (>=8.0.1)", "mypy (>=1.14)", "ruff (>=0.11.11)"]
 sdist = ["build (>=1.0.0)"]
 ssh = ["bcrypt (>=3.1.5)"]
-test = ["certifi (>=2024)", "cryptography-vectors (==46.0.5)", "pretend (>=0.7)", "pytest (>=7.4.0)", "pytest-benchmark (>=4.0)", "pytest-cov (>=2.10.1)", "pytest-xdist (>=3.5.0)"]
+test = ["certifi (>=2024)", "cryptography-vectors (==46.0.4)", "pretend (>=0.7)", "pytest (>=7.4.0)", "pytest-benchmark (>=4.0)", "pytest-cov (>=2.10.1)", "pytest-xdist (>=3.5.0)"]
 test-randomorder = ["pytest-randomly"]

 [[package]]
@@ -570,25 +570,24 @@ tests = ["coverage", "coveralls", "dill", "mock", "nose"]

 [[package]]
 name = "fastapi"
-version = "0.128.7"
+version = "0.128.0"
 description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production"
 optional = false
 python-versions = ">=3.9"
 groups = ["main"]
 files = [
-    {file = "fastapi-0.128.7-py3-none-any.whl", hash = "sha256:6bd9bd31cb7047465f2d3fa3ba3f33b0870b17d4eaf7cdb36d1576ab060ad662"},
-    {file = "fastapi-0.128.7.tar.gz", hash = "sha256:783c273416995486c155ad2c0e2b45905dedfaf20b9ef8d9f6a9124670639a24"},
+    {file = "fastapi-0.128.0-py3-none-any.whl", hash = "sha256:aebd93f9716ee3b4f4fcfe13ffb7cf308d99c9f3ab5622d8877441072561582d"},
+    {file = "fastapi-0.128.0.tar.gz", hash = "sha256:1cc179e1cef10a6be60ffe429f79b829dce99d8de32d7acb7e6c8dfdf7f2645a"},
 ]

 [package.dependencies]
 annotated-doc = ">=0.0.2"
 pydantic = ">=2.7.0"
-starlette = ">=0.40.0,<1.0.0"
+starlette = ">=0.40.0,<0.51.0"
 typing-extensions = ">=4.8.0"
-typing-inspection = ">=0.4.2"

 [package.extras]
-all = ["email-validator (>=2.0.0)", "fastapi-cli[standard] (>=0.0.8)", "httpx (>=0.23.0,<1.0.0)", "itsdangerous (>=1.1.0)", "jinja2 (>=3.1.5)", "orjson (>=3.9.3)", "pydantic-extra-types (>=2.0.0)", "pydantic-settings (>=2.0.0)", "python-multipart (>=0.0.18)", "pyyaml (>=5.3.1)", "ujson (>=5.8.0)", "uvicorn[standard] (>=0.12.0)"]
+all = ["email-validator (>=2.0.0)", "fastapi-cli[standard] (>=0.0.8)", "httpx (>=0.23.0,<1.0.0)", "itsdangerous (>=1.1.0)", "jinja2 (>=3.1.5)", "orjson (>=3.2.1)", "pydantic-extra-types (>=2.0.0)", "pydantic-settings (>=2.0.0)", "python-multipart (>=0.0.18)", "pyyaml (>=5.3.1)", "ujson (>=4.0.1,!=4.0.2,!=4.1.0,!=4.2.0,!=4.3.0,!=5.0.0,!=5.1.0)", "uvicorn[standard] (>=0.12.0)"]
 standard = ["email-validator (>=2.0.0)", "fastapi-cli[standard] (>=0.0.8)", "httpx (>=0.23.0,<1.0.0)", "jinja2 (>=3.1.5)", "pydantic-extra-types (>=2.0.0)", "pydantic-settings (>=2.0.0)", "python-multipart (>=0.0.18)", "uvicorn[standard] (>=0.12.0)"]
 standard-no-fastapi-cloud-cli = ["email-validator (>=2.0.0)", "fastapi-cli[standard-no-fastapi-cloud-cli] (>=0.0.8)", "httpx (>=0.23.0,<1.0.0)", "jinja2 (>=3.1.5)", "pydantic-extra-types (>=2.0.0)", "pydantic-settings (>=2.0.0)", "python-multipart (>=0.0.18)", "uvicorn[standard] (>=0.12.0)"]

@@ -1063,14 +1062,14 @@ urllib3 = ">=1.26.0,<3"

 [[package]]
 name = "launchdarkly-server-sdk"
-version = "9.15.0"
+version = "9.14.1"
 description = "LaunchDarkly SDK for Python"
 optional = false
-python-versions = ">=3.10"
+python-versions = ">=3.9"
 groups = ["main"]
 files = [
-    {file = "launchdarkly_server_sdk-9.15.0-py3-none-any.whl", hash = "sha256:c267e29bfa3fb5e2a06a208448ada6ed5557a2924979b8d79c970b45d227c668"},
-    {file = "launchdarkly_server_sdk-9.15.0.tar.gz", hash = "sha256:f31441b74bc1a69c381db57c33116509e407a2612628ad6dff0a7dbb39d5020b"},
+    {file = "launchdarkly_server_sdk-9.14.1-py3-none-any.whl", hash = "sha256:a9e2bd9ecdef845cd631ae0d4334a1115e5b44257c42eb2349492be4bac7815c"},
+    {file = "launchdarkly_server_sdk-9.14.1.tar.gz", hash = "sha256:1df44baf0a0efa74d8c1dad7a00592b98bce7d19edded7f770da8dbc49922213"},
 ]

 [package.dependencies]
@@ -1479,14 +1478,14 @@ testing = ["coverage", "pytest", "pytest-benchmark"]

 [[package]]
 name = "postgrest"
-version = "2.28.0"
+version = "2.27.2"
 description = "PostgREST client for Python. This library provides an ORM interface to PostgREST."
 optional = false
 python-versions = ">=3.9"
 groups = ["main"]
 files = [
-    {file = "postgrest-2.28.0-py3-none-any.whl", hash = "sha256:7bca2f24dd1a1bf8a3d586c7482aba6cd41662da6733045fad585b63b7f7df75"},
-    {file = "postgrest-2.28.0.tar.gz", hash = "sha256:c36b38646d25ea4255321d3d924ce70f8d20ec7799cb42c1221d6a818d4f6515"},
+    {file = "postgrest-2.27.2-py3-none-any.whl", hash = "sha256:1666fef3de05ca097a314433dd5ae2f2d71c613cb7b233d0f468c4ffe37277da"},
+    {file = "postgrest-2.27.2.tar.gz", hash = "sha256:55407d530b5af3d64e883a71fec1f345d369958f723ce4a8ab0b7d169e313242"},
 ]

 [package.dependencies]
@@ -2249,14 +2248,14 @@ cli = ["click (>=5.0)"]

 [[package]]
 name = "realtime"
-version = "2.28.0"
+version = "2.27.2"
 description = ""
 optional = false
 python-versions = ">=3.9"
 groups = ["main"]
 files = [
-    {file = "realtime-2.28.0-py3-none-any.whl", hash = "sha256:db1bd59bab9b1fcc9f9d3b1a073bed35bf4994d720e6751f10031a58d57a3836"},
-    {file = "realtime-2.28.0.tar.gz", hash = "sha256:d18cedcebd6a8f22fcd509bc767f639761eb218b7b2b6f14fc4205b6259b50fc"},
+    {file = "realtime-2.27.2-py3-none-any.whl", hash = "sha256:34a9cbb26a274e707e8fc9e3ee0a66de944beac0fe604dc336d1e985db2c830f"},
+    {file = "realtime-2.27.2.tar.gz", hash = "sha256:b960a90294d2cea1b3f1275ecb89204304728e08fff1c393cc1b3150739556b3"},
 ]

 [package.dependencies]
@@ -2437,14 +2436,14 @@ full = ["httpx (>=0.27.0,<0.29.0)", "itsdangerous", "jinja2", "python-multipart

 [[package]]
 name = "storage3"
-version = "2.28.0"
+version = "2.27.2"
 description = "Supabase Storage client for Python."
 optional = false
 python-versions = ">=3.9"
 groups = ["main"]
 files = [
-    {file = "storage3-2.28.0-py3-none-any.whl", hash = "sha256:ecb50efd2ac71dabbdf97e99ad346eafa630c4c627a8e5a138ceb5fbbadae716"},
-    {file = "storage3-2.28.0.tar.gz", hash = "sha256:bc1d008aff67de7a0f2bd867baee7aadbcdb6f78f5a310b4f7a38e8c13c19865"},
+    {file = "storage3-2.27.2-py3-none-any.whl", hash = "sha256:e6f16e7a260729e7b1f46e9bf61746805a02e30f5e419ee1291007c432e3ec63"},
+    {file = "storage3-2.27.2.tar.gz", hash = "sha256:cb4807b7f86b4bb1272ac6fdd2f3cfd8ba577297046fa5f88557425200275af5"},
 ]

 [package.dependencies]
@@ -2488,35 +2487,35 @@ python-dateutil = ">=2.6.0"

 [[package]]
 name = "supabase"
-version = "2.28.0"
+version = "2.27.2"
 description = "Supabase client for Python."
 optional = false
 python-versions = ">=3.9"
 groups = ["main"]
 files = [
-    {file = "supabase-2.28.0-py3-none-any.whl", hash = "sha256:42776971c7d0ccca16034df1ab96a31c50228eb1eb19da4249ad2f756fc20272"},
-    {file = "supabase-2.28.0.tar.gz", hash = "sha256:aea299aaab2a2eed3c57e0be7fc035c6807214194cce795a3575add20268ece1"},
+    {file = "supabase-2.27.2-py3-none-any.whl", hash = "sha256:d4dce00b3a418ee578017ec577c0e5be47a9a636355009c76f20ed2faa15bc54"},
+    {file = "supabase-2.27.2.tar.gz", hash = "sha256:2aed40e4f3454438822442a1e94a47be6694c2c70392e7ae99b51a226d4293f7"},
 ]

 [package.dependencies]
 httpx = ">=0.26,<0.29"
-postgrest = "2.28.0"
-realtime = "2.28.0"
-storage3 = "2.28.0"
-supabase-auth = "2.28.0"
-supabase-functions = "2.28.0"
+postgrest = "2.27.2"
+realtime = "2.27.2"
+storage3 = "2.27.2"
+supabase-auth = "2.27.2"
+supabase-functions = "2.27.2"
 yarl = ">=1.22.0"

 [[package]]
 name = "supabase-auth"
-version = "2.28.0"
+version = "2.27.2"
 description = "Python Client Library for Supabase Auth"
 optional = false
 python-versions = ">=3.9"
 groups = ["main"]
 files = [
-    {file = "supabase_auth-2.28.0-py3-none-any.whl", hash = "sha256:2ac85026cc285054c7fa6d41924f3a333e9ec298c013e5b5e1754039ba7caec9"},
-    {file = "supabase_auth-2.28.0.tar.gz", hash = "sha256:2bb8f18ff39934e44b28f10918db965659f3735cd6fbfcc022fe0b82dbf8233e"},
+    {file = "supabase_auth-2.27.2-py3-none-any.whl", hash = "sha256:78ec25b11314d0a9527a7205f3b1c72560dccdc11b38392f80297ef98664ee91"},
+    {file = "supabase_auth-2.27.2.tar.gz", hash = "sha256:0f5bcc79b3677cb42e9d321f3c559070cfa40d6a29a67672cc8382fb7dc2fe97"},
 ]

 [package.dependencies]
@@ -2526,14 +2525,14 @@ pyjwt = {version = ">=2.10.1", extras = ["crypto"]}

 [[package]]
 name = "supabase-functions"
-version = "2.28.0"
+version = "2.27.2"
 description = "Library for Supabase Functions"
 optional = false
 python-versions = ">=3.9"
 groups = ["main"]
 files = [
-    {file = "supabase_functions-2.28.0-py3-none-any.whl", hash = "sha256:30bf2d586f8df285faf0621bb5d5bb3ec3157234fc820553ca156f009475e4ae"},
-    {file = "supabase_functions-2.28.0.tar.gz", hash = "sha256:db3dddfc37aca5858819eb461130968473bd8c75bd284581013958526dac718b"},
+    {file = "supabase_functions-2.27.2-py3-none-any.whl", hash = "sha256:db480efc669d0bca07605b9b6f167312af43121adcc842a111f79bea416ef754"},
+    {file = "supabase_functions-2.27.2.tar.gz", hash = "sha256:d0c8266207a94371cb3fd35ad3c7f025b78a97cf026861e04ccd35ac1775f80b"},
 ]

 [package.dependencies]
@@ -2912,4 +2911,4 @@ type = ["pytest-mypy"]
 [metadata]
 lock-version = "2.1"
 python-versions = ">=3.10,<4.0"
-content-hash = "9619cae908ad38fa2c48016a58bcf4241f6f5793aa0e6cc140276e91c433cbbb"
+content-hash = "40eae94995dc0a388fa832ed4af9b6137f28d5b5ced3aaea70d5f91d4d9a179d"
--- a/autogpt_platform/autogpt_libs/pyproject.toml
+++ b/autogpt_platform/autogpt_libs/pyproject.toml
@@ -11,14 +11,14 @@ python = ">=3.10,<4.0"
 colorama = "^0.4.6"
 cryptography = "^46.0"
 expiringdict = "^1.2.2"
-fastapi = "^0.128.7"
+fastapi = "^0.128.0"
 google-cloud-logging = "^3.13.0"
-launchdarkly-server-sdk = "^9.15.0"
+launchdarkly-server-sdk = "^9.14.1"
 pydantic = "^2.12.5"
 pydantic-settings = "^2.12.0"
 pyjwt = { version = "^2.11.0", extras = ["crypto"] }
 redis = "^6.2.0"
-supabase = "^2.28.0"
+supabase = "^2.27.2"
 uvicorn = "^0.40.0"

 [tool.poetry.group.dev.dependencies]
--- a/autogpt_platform/backend/.env.default
+++ b/autogpt_platform/backend/.env.default
@@ -104,12 +104,6 @@ TWITTER_CLIENT_SECRET=
 # Make a new workspace for your OAuth APP -- trust me
 # https://linear.app/settings/api/applications/new
 # Callback URL: http://localhost:3000/auth/integrations/oauth_callback
-LINEAR_API_KEY=
-# Linear project and team IDs for the feature request tracker.
-# Find these in your Linear workspace URL: linear.app/<workspace>/project/<project-id>
-# and in team settings. Used by the chat copilot to file and search feature requests.
-LINEAR_FEATURE_REQUEST_PROJECT_ID=
-LINEAR_FEATURE_REQUEST_TEAM_ID=
 LINEAR_CLIENT_ID=
 LINEAR_CLIENT_SECRET=

--- a/autogpt_platform/backend/Dockerfile
+++ b/autogpt_platform/backend/Dockerfile
@@ -1,5 +1,3 @@
-# ============================ DEPENDENCY BUILDER ============================ #
-
 FROM debian:13-slim AS builder

 # Set environment variables
@@ -53,9 +51,7 @@ COPY autogpt_platform/backend/backend/data/partial_types.py ./backend/data/parti
 COPY autogpt_platform/backend/gen_prisma_types_stub.py ./
 RUN poetry run prisma generate && poetry run gen-prisma-stub

-# ============================== BACKEND SERVER ============================== #
-
-FROM debian:13-slim AS server
+FROM debian:13-slim AS server_dependencies

 WORKDIR /app

@@ -67,14 +63,15 @@ ENV POETRY_HOME=/opt/poetry \
 ENV PATH=/opt/poetry/bin:$PATH

 # Install Python, FFmpeg, and ImageMagick (required for video processing blocks)
-# Using --no-install-recommends saves ~650MB by skipping unnecessary deps like llvm, mesa, etc.
-RUN apt-get update && apt-get install -y --no-install-recommends \
+RUN apt-get update && apt-get install -y \
    python3.13 \
    python3-pip \
    ffmpeg \
    imagemagick \
    && rm -rf /var/lib/apt/lists/*

+# Copy only necessary files from builder
+COPY --from=builder /app /app
 COPY --from=builder /usr/local/lib/python3* /usr/local/lib/python3*
 COPY --from=builder /usr/local/bin/poetry /usr/local/bin/poetry
 # Copy Node.js installation for Prisma
@@ -84,54 +81,30 @@ COPY --from=builder /usr/bin/npm /usr/bin/npm
 COPY --from=builder /usr/bin/npx /usr/bin/npx
 COPY --from=builder /root/.cache/prisma-python/binaries /root/.cache/prisma-python/binaries

-WORKDIR /app/autogpt_platform/backend
-
-# Copy only the .venv from builder (not the entire /app directory)
-# The .venv includes the generated Prisma client
-COPY --from=builder /app/autogpt_platform/backend/.venv ./.venv
 ENV PATH="/app/autogpt_platform/backend/.venv/bin:$PATH"

-# Copy dependency files + autogpt_libs (path dependency)
-COPY autogpt_platform/autogpt_libs /app/autogpt_platform/autogpt_libs
-COPY autogpt_platform/backend/poetry.lock autogpt_platform/backend/pyproject.toml ./
+RUN mkdir -p /app/autogpt_platform/autogpt_libs
+RUN mkdir -p /app/autogpt_platform/backend

-# Copy backend code + docs (for Copilot docs search)
-COPY autogpt_platform/backend ./
+COPY autogpt_platform/autogpt_libs /app/autogpt_platform/autogpt_libs
+
+COPY autogpt_platform/backend/poetry.lock autogpt_platform/backend/pyproject.toml /app/autogpt_platform/backend/
+
+WORKDIR /app/autogpt_platform/backend
+
+FROM server_dependencies AS migrate
+
+# Migration stage only needs schema and migrations - much lighter than full backend
+COPY autogpt_platform/backend/schema.prisma /app/autogpt_platform/backend/
+COPY autogpt_platform/backend/backend/data/partial_types.py /app/autogpt_platform/backend/backend/data/partial_types.py
+COPY autogpt_platform/backend/migrations /app/autogpt_platform/backend/migrations
+
+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

 CMD ["poetry", "run", "rest"]
-
-# =============================== DB MIGRATOR =============================== #
-
-# Lightweight migrate stage - only needs Prisma CLI, not full Python environment
-FROM debian:13-slim AS migrate
-
-WORKDIR /app/autogpt_platform/backend
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-# Install only what's needed for prisma migrate: Node.js and minimal Python for prisma-python
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    python3.13 \
-    python3-pip \
-    ca-certificates \
-    && rm -rf /var/lib/apt/lists/*
-
-# Copy Node.js from builder (needed for Prisma CLI)
-COPY --from=builder /usr/bin/node /usr/bin/node
-COPY --from=builder /usr/lib/node_modules /usr/lib/node_modules
-COPY --from=builder /usr/bin/npm /usr/bin/npm
-
-# Copy Prisma binaries
-COPY --from=builder /root/.cache/prisma-python/binaries /root/.cache/prisma-python/binaries
-
-# Install prisma-client-py directly (much smaller than copying full venv)
-RUN pip3 install prisma>=0.15.0 --break-system-packages
-
-COPY autogpt_platform/backend/schema.prisma ./
-COPY autogpt_platform/backend/backend/data/partial_types.py ./backend/data/partial_types.py
-COPY autogpt_platform/backend/gen_prisma_types_stub.py ./
-COPY autogpt_platform/backend/migrations ./migrations
--- a/autogpt_platform/backend/backend/api/features/chat/routes.py
+++ b/autogpt_platform/backend/backend/api/features/chat/routes.py
@@ -24,7 +24,6 @@ from .tools.models import (
    AgentPreviewResponse,
    AgentSavedResponse,
    AgentsFoundResponse,
-    BlockDetailsResponse,
    BlockListResponse,
    BlockOutputResponse,
    ClarificationNeededResponse,
@@ -972,7 +971,6 @@ ToolResponseUnion = (
    | AgentSavedResponse
    | ClarificationNeededResponse
    | BlockListResponse
-    | BlockDetailsResponse
    | BlockOutputResponse
    | DocSearchResultsResponse
    | DocPageResponse
--- a/autogpt_platform/backend/backend/api/features/chat/service.py
+++ b/autogpt_platform/backend/backend/api/features/chat/service.py
@@ -1245,7 +1245,6 @@ async def _stream_chat_chunks(
                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
@@ -1261,27 +1260,12 @@ async def _stream_chat_chunks(
                    continue  # Retry the stream
                else:
                    # Non-retryable error or max retries exceeded
-                    _log_api_error(
-                        error=e,
-                        context="stream (not retrying)",
-                        session_id=session.session_id if session else None,
-                        message_count=len(messages) if messages else None,
-                        model=model,
-                        retry_count=retry_count,
+                    logger.error(
+                        f"Error in stream (not retrying): {e!s}",
+                        exc_info=True,
                    )
                    error_code = None
                    error_text = str(e)
-
-                    error_details = _extract_api_error_details(e)
-                    if error_details.get("response_body"):
-                        body = error_details["response_body"]
-                        if isinstance(body, dict):
-                            err = body.get("error")
-                            if isinstance(err, dict) and err.get("message"):
-                                error_text = err["message"]
-                            elif body.get("message"):
-                                error_text = body["message"]
-
                    if _is_region_blocked_error(e):
                        error_code = "MODEL_NOT_AVAILABLE_REGION"
                        error_text = (
@@ -1298,13 +1282,9 @@ async def _stream_chat_chunks(

        # If we exit the retry loop without returning, it means we exhausted retries
        if last_error:
-            _log_api_error(
-                error=last_error,
-                context=f"stream (max retries {MAX_RETRIES} exceeded)",
-                session_id=session.session_id if session else None,
-                message_count=len(messages) if messages else None,
-                model=model,
-                retry_count=MAX_RETRIES,
+            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()
@@ -1877,7 +1857,6 @@ async def _generate_llm_continuation(
                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(
@@ -1891,25 +1870,17 @@ async def _generate_llm_continuation(
                    await asyncio.sleep(delay)
                    continue
                else:
-                    # Non-retryable error - log details and exit gracefully
-                    _log_api_error(
-                        error=e,
-                        context="LLM continuation (not retrying)",
-                        session_id=session_id,
-                        message_count=len(messages) if messages else None,
-                        model=config.model,
-                        retry_count=retry_count,
+                    # 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:
-            _log_api_error(
-                error=last_error,
-                context=f"LLM continuation (max retries {MAX_RETRIES} exceeded)",
-                session_id=session_id,
-                message_count=len(messages) if messages else None,
-                model=config.model,
-                retry_count=MAX_RETRIES,
+            logger.error(
+                f"Max retries ({MAX_RETRIES}) exceeded for LLM continuation. "
+                f"Last error: {last_error!s}"
            )
            return

@@ -1949,91 +1920,6 @@ async def _generate_llm_continuation(
        logger.error(f"Failed to generate LLM continuation: {e}", exc_info=True)


-def _log_api_error(
-    error: Exception,
-    context: str,
-    session_id: str | None = None,
-    message_count: int | None = None,
-    model: str | None = None,
-    retry_count: int = 0,
-) -> None:
-    """Log detailed API error information for debugging."""
-    details = _extract_api_error_details(error)
-    details["context"] = context
-    details["session_id"] = session_id
-    details["message_count"] = message_count
-    details["model"] = model
-    details["retry_count"] = retry_count
-
-    if isinstance(error, RateLimitError):
-        logger.warning(f"Rate limit error in {context}: {details}", exc_info=error)
-    elif isinstance(error, APIConnectionError):
-        logger.warning(f"API connection error in {context}: {details}", exc_info=error)
-    elif isinstance(error, APIStatusError) and error.status_code >= 500:
-        logger.error(f"API server error (5xx) in {context}: {details}", exc_info=error)
-    else:
-        logger.error(f"API error in {context}: {details}", exc_info=error)
-
-
-def _extract_api_error_details(error: Exception) -> dict[str, Any]:
-    """Extract detailed information from OpenAI/OpenRouter API errors."""
-    error_msg = str(error)
-    details: dict[str, Any] = {
-        "error_type": type(error).__name__,
-        "error_message": error_msg[:500] + "..." if len(error_msg) > 500 else error_msg,
-    }
-
-    if hasattr(error, "code"):
-        details["code"] = getattr(error, "code", None)
-    if hasattr(error, "param"):
-        details["param"] = getattr(error, "param", None)
-
-    if isinstance(error, APIStatusError):
-        details["status_code"] = error.status_code
-        details["request_id"] = getattr(error, "request_id", None)
-
-        if hasattr(error, "body") and error.body:
-            details["response_body"] = _sanitize_error_body(error.body)
-
-        if hasattr(error, "response") and error.response:
-            headers = error.response.headers
-            details["openrouter_provider"] = headers.get("x-openrouter-provider")
-            details["openrouter_model"] = headers.get("x-openrouter-model")
-            details["retry_after"] = headers.get("retry-after")
-            details["rate_limit_remaining"] = headers.get("x-ratelimit-remaining")
-
-    return details
-
-
-def _sanitize_error_body(
-    body: Any, max_length: int = 2000
-) -> dict[str, Any] | str | None:
-    """Extract only safe fields from error response body to avoid logging sensitive data."""
-    if not isinstance(body, dict):
-        # Non-dict bodies (e.g., HTML error pages) - return truncated string
-        if body is not None:
-            body_str = str(body)
-            if len(body_str) > max_length:
-                return body_str[:max_length] + "...[truncated]"
-            return body_str
-        return None
-
-    safe_fields = ("message", "type", "code", "param", "error")
-    sanitized: dict[str, Any] = {}
-
-    for field in safe_fields:
-        if field in body:
-            value = body[field]
-            if field == "error" and isinstance(value, dict):
-                sanitized[field] = _sanitize_error_body(value, max_length)
-            elif isinstance(value, str) and len(value) > max_length:
-                sanitized[field] = value[:max_length] + "...[truncated]"
-            else:
-                sanitized[field] = value
-
-    return sanitized if sanitized else None
-
-
 async def _generate_llm_continuation_with_streaming(
    session_id: str,
    user_id: str | None,
--- a/autogpt_platform/backend/backend/api/features/chat/tools/init.py
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/init.py
@@ -12,7 +12,6 @@ from .base import BaseTool
 from .create_agent import CreateAgentTool
 from .customize_agent import CustomizeAgentTool
 from .edit_agent import EditAgentTool
-from .feature_requests import CreateFeatureRequestTool, SearchFeatureRequestsTool
 from .find_agent import FindAgentTool
 from .find_block import FindBlockTool
 from .find_library_agent import FindLibraryAgentTool
@@ -46,9 +45,6 @@ TOOL_REGISTRY: dict[str, BaseTool] = {
    "view_agent_output": AgentOutputTool(),
    "search_docs": SearchDocsTool(),
    "get_doc_page": GetDocPageTool(),
-    # Feature request tools
-    "search_feature_requests": SearchFeatureRequestsTool(),
-    "create_feature_request": CreateFeatureRequestTool(),
    # Workspace tools for CoPilot file operations
    "list_workspace_files": ListWorkspaceFilesTool(),
    "read_workspace_file": ReadWorkspaceFileTool(),
--- a/autogpt_platform/backend/backend/api/features/chat/tools/feature_requests.py
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/feature_requests.py
@@ -1,448 +0,0 @@
-"""Feature request tools - search and create feature requests via Linear."""
-
-import logging
-from typing import Any
-
-from pydantic import SecretStr
-
-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 (
-    ErrorResponse,
-    FeatureRequestCreatedResponse,
-    FeatureRequestInfo,
-    FeatureRequestSearchResponse,
-    NoResultsResponse,
-    ToolResponseBase,
-)
-from backend.blocks.linear._api import LinearClient
-from backend.data.model import APIKeyCredentials
-from backend.data.user import get_user_email_by_id
-from backend.util.settings import Settings
-
-logger = logging.getLogger(__name__)
-
-MAX_SEARCH_RESULTS = 10
-
-# GraphQL queries/mutations
-SEARCH_ISSUES_QUERY = """
-query SearchFeatureRequests($term: String!, $filter: IssueFilter, $first: Int) {
-  searchIssues(term: $term, filter: $filter, first: $first) {
-    nodes {
-      id
-      identifier
-      title
-      description
-    }
-  }
-}
-"""
-
-CUSTOMER_UPSERT_MUTATION = """
-mutation CustomerUpsert($input: CustomerUpsertInput!) {
-  customerUpsert(input: $input) {
-    success
-    customer {
-      id
-      name
-      externalIds
-    }
-  }
-}
-"""
-
-ISSUE_CREATE_MUTATION = """
-mutation IssueCreate($input: IssueCreateInput!) {
-  issueCreate(input: $input) {
-    success
-    issue {
-      id
-      identifier
-      title
-      url
-    }
-  }
-}
-"""
-
-CUSTOMER_NEED_CREATE_MUTATION = """
-mutation CustomerNeedCreate($input: CustomerNeedCreateInput!) {
-  customerNeedCreate(input: $input) {
-    success
-    need {
-      id
-      body
-      customer {
-        id
-        name
-      }
-      issue {
-        id
-        identifier
-        title
-        url
-      }
-    }
-  }
-}
-"""
-
-
-_settings: Settings | None = None
-
-
-def _get_settings() -> Settings:
-    global _settings
-    if _settings is None:
-        _settings = Settings()
-    return _settings
-
-
-def _get_linear_config() -> tuple[LinearClient, str, str]:
-    """Return a configured Linear client, project ID, and team ID.
-
-    Raises RuntimeError if any required setting is missing.
-    """
-    secrets = _get_settings().secrets
-    if not secrets.linear_api_key:
-        raise RuntimeError("LINEAR_API_KEY is not configured")
-    if not secrets.linear_feature_request_project_id:
-        raise RuntimeError("LINEAR_FEATURE_REQUEST_PROJECT_ID is not configured")
-    if not secrets.linear_feature_request_team_id:
-        raise RuntimeError("LINEAR_FEATURE_REQUEST_TEAM_ID is not configured")
-
-    credentials = APIKeyCredentials(
-        id="system-linear",
-        provider="linear",
-        api_key=SecretStr(secrets.linear_api_key),
-        title="System Linear API Key",
-    )
-    client = LinearClient(credentials=credentials)
-    return (
-        client,
-        secrets.linear_feature_request_project_id,
-        secrets.linear_feature_request_team_id,
-    )
-
-
-class SearchFeatureRequestsTool(BaseTool):
-    """Tool for searching existing feature requests in Linear."""
-
-    @property
-    def name(self) -> str:
-        return "search_feature_requests"
-
-    @property
-    def description(self) -> str:
-        return (
-            "Search existing feature requests to check if a similar request "
-            "already exists before creating a new one. Returns matching feature "
-            "requests with their ID, title, and description."
-        )
-
-    @property
-    def parameters(self) -> dict[str, Any]:
-        return {
-            "type": "object",
-            "properties": {
-                "query": {
-                    "type": "string",
-                    "description": "Search term to find matching feature requests.",
-                },
-            },
-            "required": ["query"],
-        }
-
-    @property
-    def requires_auth(self) -> bool:
-        return True
-
-    async def _execute(
-        self,
-        user_id: str | None,
-        session: ChatSession,
-        **kwargs,
-    ) -> ToolResponseBase:
-        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:
-            client, project_id, _team_id = _get_linear_config()
-            data = await client.query(
-                SEARCH_ISSUES_QUERY,
-                {
-                    "term": query,
-                    "filter": {
-                        "project": {"id": {"eq": project_id}},
-                    },
-                    "first": MAX_SEARCH_RESULTS,
-                },
-            )
-
-            nodes = data.get("searchIssues", {}).get("nodes", [])
-
-            if not nodes:
-                return NoResultsResponse(
-                    message=f"No feature requests found matching '{query}'.",
-                    suggestions=[
-                        "Try different keywords",
-                        "Use broader search terms",
-                        "You can create a new feature request if none exists",
-                    ],
-                    session_id=session_id,
-                )
-
-            results = [
-                FeatureRequestInfo(
-                    id=node["id"],
-                    identifier=node["identifier"],
-                    title=node["title"],
-                    description=node.get("description"),
-                )
-                for node in nodes
-            ]
-
-            return FeatureRequestSearchResponse(
-                message=f"Found {len(results)} feature request(s) matching '{query}'.",
-                results=results,
-                count=len(results),
-                query=query,
-                session_id=session_id,
-            )
-        except Exception as e:
-            logger.exception("Failed to search feature requests")
-            return ErrorResponse(
-                message="Failed to search feature requests.",
-                error=str(e),
-                session_id=session_id,
-            )
-
-
-class CreateFeatureRequestTool(BaseTool):
-    """Tool for creating feature requests (or adding needs to existing ones)."""
-
-    @property
-    def name(self) -> str:
-        return "create_feature_request"
-
-    @property
-    def description(self) -> str:
-        return (
-            "Create a new feature request or add a customer need to an existing one. "
-            "Always search first with search_feature_requests to avoid duplicates. "
-            "If a matching request exists, pass its ID as existing_issue_id to add "
-            "the user's need to it instead of creating a duplicate."
-        )
-
-    @property
-    def parameters(self) -> dict[str, Any]:
-        return {
-            "type": "object",
-            "properties": {
-                "title": {
-                    "type": "string",
-                    "description": "Title for the feature request.",
-                },
-                "description": {
-                    "type": "string",
-                    "description": "Detailed description of what the user wants and why.",
-                },
-                "existing_issue_id": {
-                    "type": "string",
-                    "description": (
-                        "If adding a need to an existing feature request, "
-                        "provide its Linear issue ID (from search results). "
-                        "Omit to create a new feature request."
-                    ),
-                },
-            },
-            "required": ["title", "description"],
-        }
-
-    @property
-    def requires_auth(self) -> bool:
-        return True
-
-    async def _find_or_create_customer(
-        self, client: LinearClient, user_id: str, name: str
-    ) -> dict:
-        """Find existing customer by user_id or create a new one via upsert.
-
-        Args:
-            client: Linear API client.
-            user_id: Stable external ID used to deduplicate customers.
-            name: Human-readable display name (e.g. the user's email).
-        """
-        data = await client.mutate(
-            CUSTOMER_UPSERT_MUTATION,
-            {
-                "input": {
-                    "name": name,
-                    "externalId": user_id,
-                },
-            },
-        )
-        result = data.get("customerUpsert", {})
-        if not result.get("success"):
-            raise RuntimeError(f"Failed to upsert customer: {data}")
-        return result["customer"]
-
-    async def _execute(
-        self,
-        user_id: str | None,
-        session: ChatSession,
-        **kwargs,
-    ) -> ToolResponseBase:
-        title = kwargs.get("title", "").strip()
-        description = kwargs.get("description", "").strip()
-        existing_issue_id = kwargs.get("existing_issue_id")
-        session_id = session.session_id if session else None
-
-        if not title or not description:
-            return ErrorResponse(
-                message="Both title and description are required.",
-                error="Missing required parameters",
-                session_id=session_id,
-            )
-
-        if not user_id:
-            return ErrorResponse(
-                message="Authentication required to create feature requests.",
-                error="Missing user_id",
-                session_id=session_id,
-            )
-
-        try:
-            client, project_id, team_id = _get_linear_config()
-        except Exception as e:
-            logger.exception("Failed to initialize Linear client")
-            return ErrorResponse(
-                message="Failed to create feature request.",
-                error=str(e),
-                session_id=session_id,
-            )
-
-        # Resolve a human-readable name (email) for the Linear customer record.
-        # Fall back to user_id if the lookup fails or returns None.
-        try:
-            customer_display_name = await get_user_email_by_id(user_id) or user_id
-        except Exception:
-            customer_display_name = user_id
-
-        # Step 1: Find or create customer for this user
-        try:
-            customer = await self._find_or_create_customer(
-                client, user_id, customer_display_name
-            )
-            customer_id = customer["id"]
-            customer_name = customer["name"]
-        except Exception as e:
-            logger.exception("Failed to upsert customer in Linear")
-            return ErrorResponse(
-                message="Failed to create feature request.",
-                error=str(e),
-                session_id=session_id,
-            )
-
-        # Step 2: Create or reuse issue
-        issue_id: str | None = None
-        issue_identifier: str | None = None
-        if existing_issue_id:
-            # Add need to existing issue - we still need the issue details for response
-            is_new_issue = False
-            issue_id = existing_issue_id
-        else:
-            # Create new issue in the feature requests project
-            try:
-                data = await client.mutate(
-                    ISSUE_CREATE_MUTATION,
-                    {
-                        "input": {
-                            "title": title,
-                            "description": description,
-                            "teamId": team_id,
-                            "projectId": project_id,
-                        },
-                    },
-                )
-                result = data.get("issueCreate", {})
-                if not result.get("success"):
-                    return ErrorResponse(
-                        message="Failed to create feature request issue.",
-                        error=str(data),
-                        session_id=session_id,
-                    )
-                issue = result["issue"]
-                issue_id = issue["id"]
-                issue_identifier = issue.get("identifier")
-            except Exception as e:
-                logger.exception("Failed to create feature request issue")
-                return ErrorResponse(
-                    message="Failed to create feature request.",
-                    error=str(e),
-                    session_id=session_id,
-                )
-            is_new_issue = True
-
-        # Step 3: Create customer need on the issue
-        try:
-            data = await client.mutate(
-                CUSTOMER_NEED_CREATE_MUTATION,
-                {
-                    "input": {
-                        "customerId": customer_id,
-                        "issueId": issue_id,
-                        "body": description,
-                        "priority": 0,
-                    },
-                },
-            )
-            need_result = data.get("customerNeedCreate", {})
-            if not need_result.get("success"):
-                orphaned = (
-                    {"issue_id": issue_id, "issue_identifier": issue_identifier}
-                    if is_new_issue
-                    else None
-                )
-                return ErrorResponse(
-                    message="Failed to attach customer need to the feature request.",
-                    error=str(data),
-                    details=orphaned,
-                    session_id=session_id,
-                )
-            need = need_result["need"]
-            issue_info = need["issue"]
-        except Exception as e:
-            logger.exception("Failed to create customer need")
-            orphaned = (
-                {"issue_id": issue_id, "issue_identifier": issue_identifier}
-                if is_new_issue
-                else None
-            )
-            return ErrorResponse(
-                message="Failed to attach customer need to the feature request.",
-                error=str(e),
-                details=orphaned,
-                session_id=session_id,
-            )
-
-        return FeatureRequestCreatedResponse(
-            message=(
-                f"{'Created new feature request' if is_new_issue else 'Added your request to existing feature request'}: "
-                f"{issue_info['title']}."
-            ),
-            issue_id=issue_info["id"],
-            issue_identifier=issue_info["identifier"],
-            issue_title=issue_info["title"],
-            issue_url=issue_info.get("url", ""),
-            is_new_issue=is_new_issue,
-            customer_name=customer_name,
-            session_id=session_id,
-        )
--- a/autogpt_platform/backend/backend/api/features/chat/tools/feature_requests_test.py
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/feature_requests_test.py
@@ -1,615 +0,0 @@
-"""Tests for SearchFeatureRequestsTool and CreateFeatureRequestTool."""
-
-from unittest.mock import AsyncMock, patch
-
-import pytest
-
-from backend.api.features.chat.tools.feature_requests import (
-    CreateFeatureRequestTool,
-    SearchFeatureRequestsTool,
-)
-from backend.api.features.chat.tools.models import (
-    ErrorResponse,
-    FeatureRequestCreatedResponse,
-    FeatureRequestSearchResponse,
-    NoResultsResponse,
-)
-
-from ._test_data import make_session
-
-_TEST_USER_ID = "test-user-feature-requests"
-_TEST_USER_EMAIL = "testuser@example.com"
-
-
-# ---------------------------------------------------------------------------
-# Helpers
-# ---------------------------------------------------------------------------
-
-
-_FAKE_PROJECT_ID = "test-project-id"
-_FAKE_TEAM_ID = "test-team-id"
-
-
-def _mock_linear_config(*, query_return=None, mutate_return=None):
-    """Return a patched _get_linear_config that yields a mock LinearClient."""
-    client = AsyncMock()
-    if query_return is not None:
-        client.query.return_value = query_return
-    if mutate_return is not None:
-        client.mutate.return_value = mutate_return
-    return (
-        patch(
-            "backend.api.features.chat.tools.feature_requests._get_linear_config",
-            return_value=(client, _FAKE_PROJECT_ID, _FAKE_TEAM_ID),
-        ),
-        client,
-    )
-
-
-def _search_response(nodes: list[dict]) -> dict:
-    return {"searchIssues": {"nodes": nodes}}
-
-
-def _customer_upsert_response(
-    customer_id: str = "cust-1", name: str = _TEST_USER_EMAIL, success: bool = True
-) -> dict:
-    return {
-        "customerUpsert": {
-            "success": success,
-            "customer": {"id": customer_id, "name": name, "externalIds": [name]},
-        }
-    }
-
-
-def _issue_create_response(
-    issue_id: str = "issue-1",
-    identifier: str = "FR-1",
-    title: str = "New Feature",
-    success: bool = True,
-) -> dict:
-    return {
-        "issueCreate": {
-            "success": success,
-            "issue": {
-                "id": issue_id,
-                "identifier": identifier,
-                "title": title,
-                "url": f"https://linear.app/issue/{identifier}",
-            },
-        }
-    }
-
-
-def _need_create_response(
-    need_id: str = "need-1",
-    issue_id: str = "issue-1",
-    identifier: str = "FR-1",
-    title: str = "New Feature",
-    success: bool = True,
-) -> dict:
-    return {
-        "customerNeedCreate": {
-            "success": success,
-            "need": {
-                "id": need_id,
-                "body": "description",
-                "customer": {"id": "cust-1", "name": _TEST_USER_EMAIL},
-                "issue": {
-                    "id": issue_id,
-                    "identifier": identifier,
-                    "title": title,
-                    "url": f"https://linear.app/issue/{identifier}",
-                },
-            },
-        }
-    }
-
-
-# ===========================================================================
-# SearchFeatureRequestsTool
-# ===========================================================================
-
-
-class TestSearchFeatureRequestsTool:
-    """Tests for SearchFeatureRequestsTool._execute."""
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_successful_search(self):
-        session = make_session(user_id=_TEST_USER_ID)
-        nodes = [
-            {
-                "id": "id-1",
-                "identifier": "FR-1",
-                "title": "Dark mode",
-                "description": "Add dark mode support",
-            },
-            {
-                "id": "id-2",
-                "identifier": "FR-2",
-                "title": "Dark theme",
-                "description": None,
-            },
-        ]
-        patcher, _ = _mock_linear_config(query_return=_search_response(nodes))
-        with patcher:
-            tool = SearchFeatureRequestsTool()
-            resp = await tool._execute(
-                user_id=_TEST_USER_ID, session=session, query="dark mode"
-            )
-
-        assert isinstance(resp, FeatureRequestSearchResponse)
-        assert resp.count == 2
-        assert resp.results[0].id == "id-1"
-        assert resp.results[1].identifier == "FR-2"
-        assert resp.query == "dark mode"
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_no_results(self):
-        session = make_session(user_id=_TEST_USER_ID)
-        patcher, _ = _mock_linear_config(query_return=_search_response([]))
-        with patcher:
-            tool = SearchFeatureRequestsTool()
-            resp = await tool._execute(
-                user_id=_TEST_USER_ID, session=session, query="nonexistent"
-            )
-
-        assert isinstance(resp, NoResultsResponse)
-        assert "nonexistent" in resp.message
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_empty_query_returns_error(self):
-        session = make_session(user_id=_TEST_USER_ID)
-        tool = SearchFeatureRequestsTool()
-        resp = await tool._execute(user_id=_TEST_USER_ID, session=session, query="   ")
-
-        assert isinstance(resp, ErrorResponse)
-        assert resp.error is not None
-        assert "query" in resp.error.lower()
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_missing_query_returns_error(self):
-        session = make_session(user_id=_TEST_USER_ID)
-        tool = SearchFeatureRequestsTool()
-        resp = await tool._execute(user_id=_TEST_USER_ID, session=session)
-
-        assert isinstance(resp, ErrorResponse)
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_api_failure(self):
-        session = make_session(user_id=_TEST_USER_ID)
-        patcher, client = _mock_linear_config()
-        client.query.side_effect = RuntimeError("Linear API down")
-        with patcher:
-            tool = SearchFeatureRequestsTool()
-            resp = await tool._execute(
-                user_id=_TEST_USER_ID, session=session, query="test"
-            )
-
-        assert isinstance(resp, ErrorResponse)
-        assert resp.error is not None
-        assert "Linear API down" in resp.error
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_malformed_node_returns_error(self):
-        """A node missing required keys should be caught by the try/except."""
-        session = make_session(user_id=_TEST_USER_ID)
-        # Node missing 'identifier' key
-        bad_nodes = [{"id": "id-1", "title": "Missing identifier"}]
-        patcher, _ = _mock_linear_config(query_return=_search_response(bad_nodes))
-        with patcher:
-            tool = SearchFeatureRequestsTool()
-            resp = await tool._execute(
-                user_id=_TEST_USER_ID, session=session, query="test"
-            )
-
-        assert isinstance(resp, ErrorResponse)
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_linear_client_init_failure(self):
-        session = make_session(user_id=_TEST_USER_ID)
-        with patch(
-            "backend.api.features.chat.tools.feature_requests._get_linear_config",
-            side_effect=RuntimeError("No API key"),
-        ):
-            tool = SearchFeatureRequestsTool()
-            resp = await tool._execute(
-                user_id=_TEST_USER_ID, session=session, query="test"
-            )
-
-        assert isinstance(resp, ErrorResponse)
-        assert resp.error is not None
-        assert "No API key" in resp.error
-
-
-# ===========================================================================
-# CreateFeatureRequestTool
-# ===========================================================================
-
-
-class TestCreateFeatureRequestTool:
-    """Tests for CreateFeatureRequestTool._execute."""
-
-    @pytest.fixture(autouse=True)
-    def _patch_email_lookup(self):
-        with patch(
-            "backend.api.features.chat.tools.feature_requests.get_user_email_by_id",
-            new_callable=AsyncMock,
-            return_value=_TEST_USER_EMAIL,
-        ):
-            yield
-
-    # ---- Happy paths -------------------------------------------------------
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_create_new_issue(self):
-        """Full happy path: upsert customer -> create issue -> attach need."""
-        session = make_session(user_id=_TEST_USER_ID)
-
-        patcher, client = _mock_linear_config()
-        client.mutate.side_effect = [
-            _customer_upsert_response(),
-            _issue_create_response(),
-            _need_create_response(),
-        ]
-
-        with patcher:
-            tool = CreateFeatureRequestTool()
-            resp = await tool._execute(
-                user_id=_TEST_USER_ID,
-                session=session,
-                title="New Feature",
-                description="Please add this",
-            )
-
-        assert isinstance(resp, FeatureRequestCreatedResponse)
-        assert resp.is_new_issue is True
-        assert resp.issue_identifier == "FR-1"
-        assert resp.customer_name == _TEST_USER_EMAIL
-        assert client.mutate.call_count == 3
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_add_need_to_existing_issue(self):
-        """When existing_issue_id is provided, skip issue creation."""
-        session = make_session(user_id=_TEST_USER_ID)
-
-        patcher, client = _mock_linear_config()
-        client.mutate.side_effect = [
-            _customer_upsert_response(),
-            _need_create_response(issue_id="existing-1", identifier="FR-99"),
-        ]
-
-        with patcher:
-            tool = CreateFeatureRequestTool()
-            resp = await tool._execute(
-                user_id=_TEST_USER_ID,
-                session=session,
-                title="Existing Feature",
-                description="Me too",
-                existing_issue_id="existing-1",
-            )
-
-        assert isinstance(resp, FeatureRequestCreatedResponse)
-        assert resp.is_new_issue is False
-        assert resp.issue_id == "existing-1"
-        # Only 2 mutations: customer upsert + need create (no issue create)
-        assert client.mutate.call_count == 2
-
-    # ---- Validation errors -------------------------------------------------
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_missing_title(self):
-        session = make_session(user_id=_TEST_USER_ID)
-        tool = CreateFeatureRequestTool()
-        resp = await tool._execute(
-            user_id=_TEST_USER_ID,
-            session=session,
-            title="",
-            description="some desc",
-        )
-
-        assert isinstance(resp, ErrorResponse)
-        assert resp.error is not None
-        assert "required" in resp.error.lower()
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_missing_description(self):
-        session = make_session(user_id=_TEST_USER_ID)
-        tool = CreateFeatureRequestTool()
-        resp = await tool._execute(
-            user_id=_TEST_USER_ID,
-            session=session,
-            title="Some title",
-            description="",
-        )
-
-        assert isinstance(resp, ErrorResponse)
-        assert resp.error is not None
-        assert "required" in resp.error.lower()
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_missing_user_id(self):
-        session = make_session(user_id=_TEST_USER_ID)
-        tool = CreateFeatureRequestTool()
-        resp = await tool._execute(
-            user_id=None,
-            session=session,
-            title="Some title",
-            description="Some desc",
-        )
-
-        assert isinstance(resp, ErrorResponse)
-        assert resp.error is not None
-        assert "user_id" in resp.error.lower()
-
-    # ---- Linear client init failure ----------------------------------------
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_linear_client_init_failure(self):
-        session = make_session(user_id=_TEST_USER_ID)
-        with patch(
-            "backend.api.features.chat.tools.feature_requests._get_linear_config",
-            side_effect=RuntimeError("No API key"),
-        ):
-            tool = CreateFeatureRequestTool()
-            resp = await tool._execute(
-                user_id=_TEST_USER_ID,
-                session=session,
-                title="Title",
-                description="Desc",
-            )
-
-        assert isinstance(resp, ErrorResponse)
-        assert resp.error is not None
-        assert "No API key" in resp.error
-
-    # ---- Customer upsert failures ------------------------------------------
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_customer_upsert_api_error(self):
-        session = make_session(user_id=_TEST_USER_ID)
-        patcher, client = _mock_linear_config()
-        client.mutate.side_effect = RuntimeError("Customer API error")
-
-        with patcher:
-            tool = CreateFeatureRequestTool()
-            resp = await tool._execute(
-                user_id=_TEST_USER_ID,
-                session=session,
-                title="Title",
-                description="Desc",
-            )
-
-        assert isinstance(resp, ErrorResponse)
-        assert resp.error is not None
-        assert "Customer API error" in resp.error
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_customer_upsert_not_success(self):
-        session = make_session(user_id=_TEST_USER_ID)
-        patcher, client = _mock_linear_config()
-        client.mutate.return_value = _customer_upsert_response(success=False)
-
-        with patcher:
-            tool = CreateFeatureRequestTool()
-            resp = await tool._execute(
-                user_id=_TEST_USER_ID,
-                session=session,
-                title="Title",
-                description="Desc",
-            )
-
-        assert isinstance(resp, ErrorResponse)
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_customer_malformed_response(self):
-        """Customer dict missing 'id' key should be caught."""
-        session = make_session(user_id=_TEST_USER_ID)
-        patcher, client = _mock_linear_config()
-        # success=True but customer has no 'id'
-        client.mutate.return_value = {
-            "customerUpsert": {
-                "success": True,
-                "customer": {"name": _TEST_USER_ID},
-            }
-        }
-
-        with patcher:
-            tool = CreateFeatureRequestTool()
-            resp = await tool._execute(
-                user_id=_TEST_USER_ID,
-                session=session,
-                title="Title",
-                description="Desc",
-            )
-
-        assert isinstance(resp, ErrorResponse)
-
-    # ---- Issue creation failures -------------------------------------------
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_issue_create_api_error(self):
-        session = make_session(user_id=_TEST_USER_ID)
-        patcher, client = _mock_linear_config()
-        client.mutate.side_effect = [
-            _customer_upsert_response(),
-            RuntimeError("Issue create failed"),
-        ]
-
-        with patcher:
-            tool = CreateFeatureRequestTool()
-            resp = await tool._execute(
-                user_id=_TEST_USER_ID,
-                session=session,
-                title="Title",
-                description="Desc",
-            )
-
-        assert isinstance(resp, ErrorResponse)
-        assert resp.error is not None
-        assert "Issue create failed" in resp.error
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_issue_create_not_success(self):
-        session = make_session(user_id=_TEST_USER_ID)
-        patcher, client = _mock_linear_config()
-        client.mutate.side_effect = [
-            _customer_upsert_response(),
-            _issue_create_response(success=False),
-        ]
-
-        with patcher:
-            tool = CreateFeatureRequestTool()
-            resp = await tool._execute(
-                user_id=_TEST_USER_ID,
-                session=session,
-                title="Title",
-                description="Desc",
-            )
-
-        assert isinstance(resp, ErrorResponse)
-        assert "Failed to create feature request issue" in resp.message
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_issue_create_malformed_response(self):
-        """issueCreate success=True but missing 'issue' key."""
-        session = make_session(user_id=_TEST_USER_ID)
-        patcher, client = _mock_linear_config()
-        client.mutate.side_effect = [
-            _customer_upsert_response(),
-            {"issueCreate": {"success": True}},  # no 'issue' key
-        ]
-
-        with patcher:
-            tool = CreateFeatureRequestTool()
-            resp = await tool._execute(
-                user_id=_TEST_USER_ID,
-                session=session,
-                title="Title",
-                description="Desc",
-            )
-
-        assert isinstance(resp, ErrorResponse)
-
-    # ---- Customer need attachment failures ---------------------------------
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_need_create_api_error_new_issue(self):
-        """Need creation fails after new issue was created -> orphaned issue info."""
-        session = make_session(user_id=_TEST_USER_ID)
-        patcher, client = _mock_linear_config()
-        client.mutate.side_effect = [
-            _customer_upsert_response(),
-            _issue_create_response(issue_id="orphan-1", identifier="FR-10"),
-            RuntimeError("Need attach failed"),
-        ]
-
-        with patcher:
-            tool = CreateFeatureRequestTool()
-            resp = await tool._execute(
-                user_id=_TEST_USER_ID,
-                session=session,
-                title="Title",
-                description="Desc",
-            )
-
-        assert isinstance(resp, ErrorResponse)
-        assert resp.error is not None
-        assert "Need attach failed" in resp.error
-        assert resp.details is not None
-        assert resp.details["issue_id"] == "orphan-1"
-        assert resp.details["issue_identifier"] == "FR-10"
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_need_create_api_error_existing_issue(self):
-        """Need creation fails on existing issue -> no orphaned info."""
-        session = make_session(user_id=_TEST_USER_ID)
-        patcher, client = _mock_linear_config()
-        client.mutate.side_effect = [
-            _customer_upsert_response(),
-            RuntimeError("Need attach failed"),
-        ]
-
-        with patcher:
-            tool = CreateFeatureRequestTool()
-            resp = await tool._execute(
-                user_id=_TEST_USER_ID,
-                session=session,
-                title="Title",
-                description="Desc",
-                existing_issue_id="existing-1",
-            )
-
-        assert isinstance(resp, ErrorResponse)
-        assert resp.details is None
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_need_create_not_success_includes_orphaned_info(self):
-        """customerNeedCreate returns success=False -> includes orphaned issue."""
-        session = make_session(user_id=_TEST_USER_ID)
-        patcher, client = _mock_linear_config()
-        client.mutate.side_effect = [
-            _customer_upsert_response(),
-            _issue_create_response(issue_id="orphan-2", identifier="FR-20"),
-            _need_create_response(success=False),
-        ]
-
-        with patcher:
-            tool = CreateFeatureRequestTool()
-            resp = await tool._execute(
-                user_id=_TEST_USER_ID,
-                session=session,
-                title="Title",
-                description="Desc",
-            )
-
-        assert isinstance(resp, ErrorResponse)
-        assert resp.details is not None
-        assert resp.details["issue_id"] == "orphan-2"
-        assert resp.details["issue_identifier"] == "FR-20"
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_need_create_not_success_existing_issue_no_details(self):
-        """customerNeedCreate fails on existing issue -> no orphaned info."""
-        session = make_session(user_id=_TEST_USER_ID)
-        patcher, client = _mock_linear_config()
-        client.mutate.side_effect = [
-            _customer_upsert_response(),
-            _need_create_response(success=False),
-        ]
-
-        with patcher:
-            tool = CreateFeatureRequestTool()
-            resp = await tool._execute(
-                user_id=_TEST_USER_ID,
-                session=session,
-                title="Title",
-                description="Desc",
-                existing_issue_id="existing-1",
-            )
-
-        assert isinstance(resp, ErrorResponse)
-        assert resp.details is None
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_need_create_malformed_response(self):
-        """need_result missing 'need' key after success=True."""
-        session = make_session(user_id=_TEST_USER_ID)
-        patcher, client = _mock_linear_config()
-        client.mutate.side_effect = [
-            _customer_upsert_response(),
-            _issue_create_response(),
-            {"customerNeedCreate": {"success": True}},  # no 'need' key
-        ]
-
-        with patcher:
-            tool = CreateFeatureRequestTool()
-            resp = await tool._execute(
-                user_id=_TEST_USER_ID,
-                session=session,
-                title="Title",
-                description="Desc",
-            )
-
-        assert isinstance(resp, ErrorResponse)
-        assert resp.details is not None
-        assert resp.details["issue_id"] == "issue-1"
--- a/autogpt_platform/backend/backend/api/features/chat/tools/find_block.py
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/find_block.py
@@ -7,6 +7,7 @@ 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,
@@ -54,8 +55,7 @@ class FindBlockTool(BaseTool):
            "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, name, and description. "
-            "Call run_block with the block's id **with no inputs** to see detailed inputs/outputs and execute it."
+            "The response includes each block's id, required_inputs, and input_schema."
        )

    @property
@@ -124,7 +124,7 @@ class FindBlockTool(BaseTool):
                    session_id=session_id,
                )

-            # Enrich results with block information
+            # Enrich results with full block information
            blocks: list[BlockInfoSummary] = []
            for result in results:
                block_id = result["content_id"]
@@ -141,11 +141,65 @@ class FindBlockTool(BaseTool):
                ):
                    continue

+                # Get input/output schemas
+                input_schema = {}
+                output_schema = {}
+                try:
+                    input_schema = block.input_schema.jsonschema()
+                except Exception as e:
+                    logger.debug(
+                        "Failed to generate input schema for block %s: %s",
+                        block_id,
+                        e,
+                    )
+                try:
+                    output_schema = block.output_schema.jsonschema()
+                except Exception as e:
+                    logger.debug(
+                        "Failed to generate output schema for block %s: %s",
+                        block_id,
+                        e,
+                    )
+
+                # 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,
                    )
                )

@@ -174,7 +228,8 @@ class FindBlockTool(BaseTool):
            return BlockListResponse(
                message=(
                    f"Found {len(blocks)} block(s) matching '{query}'. "
-                    "To see a block's inputs/outputs and execute it, use run_block with the block's 'id' - providing no inputs."
+                    "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),
--- a/autogpt_platform/backend/backend/api/features/chat/tools/find_block_test.py
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/find_block_test.py
@@ -18,13 +18,7 @@ _TEST_USER_ID = "test-user-find-block"


 def make_mock_block(
-    block_id: str,
-    name: str,
-    block_type: BlockType,
-    disabled: bool = False,
-    input_schema: dict | None = None,
-    output_schema: dict | None = None,
-    credentials_fields: dict | None = None,
+    block_id: str, name: str, block_type: BlockType, disabled: bool = False
 ):
    """Create a mock block for testing."""
    mock = MagicMock()
@@ -34,13 +28,10 @@ def make_mock_block(
    mock.block_type = block_type
    mock.disabled = disabled
    mock.input_schema = MagicMock()
-    mock.input_schema.jsonschema.return_value = input_schema or {
-        "properties": {},
-        "required": [],
-    }
-    mock.input_schema.get_credentials_fields.return_value = credentials_fields or {}
+    mock.input_schema.jsonschema.return_value = {"properties": {}, "required": []}
+    mock.input_schema.get_credentials_fields.return_value = {}
    mock.output_schema = MagicMock()
-    mock.output_schema.jsonschema.return_value = output_schema or {}
+    mock.output_schema.jsonschema.return_value = {}
    mock.categories = []
    return mock

@@ -146,241 +137,3 @@ class TestFindBlockFiltering:
        assert isinstance(response, BlockListResponse)
        assert len(response.blocks) == 1
        assert response.blocks[0].id == "normal-block-id"
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_response_size_average_chars_per_block(self):
-        """Measure average chars per block in the serialized response."""
-        session = make_session(user_id=_TEST_USER_ID)
-
-        # Realistic block definitions modeled after real blocks
-        block_defs = [
-            {
-                "id": "http-block-id",
-                "name": "Send Web Request",
-                "input_schema": {
-                    "properties": {
-                        "url": {
-                            "type": "string",
-                            "description": "The URL to send the request to",
-                        },
-                        "method": {
-                            "type": "string",
-                            "description": "The HTTP method to use",
-                        },
-                        "headers": {
-                            "type": "object",
-                            "description": "Headers to include in the request",
-                        },
-                        "json_format": {
-                            "type": "boolean",
-                            "description": "If true, send the body as JSON",
-                        },
-                        "body": {
-                            "type": "object",
-                            "description": "Form/JSON body payload",
-                        },
-                        "credentials": {
-                            "type": "object",
-                            "description": "HTTP credentials",
-                        },
-                    },
-                    "required": ["url", "method"],
-                },
-                "output_schema": {
-                    "properties": {
-                        "response": {
-                            "type": "object",
-                            "description": "The response from the server",
-                        },
-                        "client_error": {
-                            "type": "object",
-                            "description": "Errors on 4xx status codes",
-                        },
-                        "server_error": {
-                            "type": "object",
-                            "description": "Errors on 5xx status codes",
-                        },
-                        "error": {
-                            "type": "string",
-                            "description": "Errors for all other exceptions",
-                        },
-                    },
-                },
-                "credentials_fields": {"credentials": True},
-            },
-            {
-                "id": "email-block-id",
-                "name": "Send Email",
-                "input_schema": {
-                    "properties": {
-                        "to_email": {
-                            "type": "string",
-                            "description": "Recipient email address",
-                        },
-                        "subject": {
-                            "type": "string",
-                            "description": "Subject of the email",
-                        },
-                        "body": {
-                            "type": "string",
-                            "description": "Body of the email",
-                        },
-                        "config": {
-                            "type": "object",
-                            "description": "SMTP Config",
-                        },
-                        "credentials": {
-                            "type": "object",
-                            "description": "SMTP credentials",
-                        },
-                    },
-                    "required": ["to_email", "subject", "body", "credentials"],
-                },
-                "output_schema": {
-                    "properties": {
-                        "status": {
-                            "type": "string",
-                            "description": "Status of the email sending operation",
-                        },
-                        "error": {
-                            "type": "string",
-                            "description": "Error message if sending failed",
-                        },
-                    },
-                },
-                "credentials_fields": {"credentials": True},
-            },
-            {
-                "id": "claude-code-block-id",
-                "name": "Claude Code",
-                "input_schema": {
-                    "properties": {
-                        "e2b_credentials": {
-                            "type": "object",
-                            "description": "API key for E2B platform",
-                        },
-                        "anthropic_credentials": {
-                            "type": "object",
-                            "description": "API key for Anthropic",
-                        },
-                        "prompt": {
-                            "type": "string",
-                            "description": "Task or instruction for Claude Code",
-                        },
-                        "timeout": {
-                            "type": "integer",
-                            "description": "Sandbox timeout in seconds",
-                        },
-                        "setup_commands": {
-                            "type": "array",
-                            "description": "Shell commands to run before execution",
-                        },
-                        "working_directory": {
-                            "type": "string",
-                            "description": "Working directory for Claude Code",
-                        },
-                        "session_id": {
-                            "type": "string",
-                            "description": "Session ID to resume a conversation",
-                        },
-                        "sandbox_id": {
-                            "type": "string",
-                            "description": "Sandbox ID to reconnect to",
-                        },
-                        "conversation_history": {
-                            "type": "string",
-                            "description": "Previous conversation history",
-                        },
-                        "dispose_sandbox": {
-                            "type": "boolean",
-                            "description": "Whether to dispose sandbox after execution",
-                        },
-                    },
-                    "required": [
-                        "e2b_credentials",
-                        "anthropic_credentials",
-                        "prompt",
-                    ],
-                },
-                "output_schema": {
-                    "properties": {
-                        "response": {
-                            "type": "string",
-                            "description": "Output from Claude Code execution",
-                        },
-                        "files": {
-                            "type": "array",
-                            "description": "Files created/modified by Claude Code",
-                        },
-                        "conversation_history": {
-                            "type": "string",
-                            "description": "Full conversation history",
-                        },
-                        "session_id": {
-                            "type": "string",
-                            "description": "Session ID for this conversation",
-                        },
-                        "sandbox_id": {
-                            "type": "string",
-                            "description": "ID of the sandbox instance",
-                        },
-                        "error": {
-                            "type": "string",
-                            "description": "Error message if execution failed",
-                        },
-                    },
-                },
-                "credentials_fields": {
-                    "e2b_credentials": True,
-                    "anthropic_credentials": True,
-                },
-            },
-        ]
-
-        search_results = [
-            {"content_id": d["id"], "score": 0.9 - i * 0.1}
-            for i, d in enumerate(block_defs)
-        ]
-        mock_blocks = {
-            d["id"]: make_mock_block(
-                block_id=d["id"],
-                name=d["name"],
-                block_type=BlockType.STANDARD,
-                input_schema=d["input_schema"],
-                output_schema=d["output_schema"],
-                credentials_fields=d["credentials_fields"],
-            )
-            for d in block_defs
-        }
-
-        with patch(
-            "backend.api.features.chat.tools.find_block.unified_hybrid_search",
-            new_callable=AsyncMock,
-            return_value=(search_results, len(search_results)),
-        ), patch(
-            "backend.api.features.chat.tools.find_block.get_block",
-            side_effect=lambda bid: mock_blocks.get(bid),
-        ):
-            tool = FindBlockTool()
-            response = await tool._execute(
-                user_id=_TEST_USER_ID, session=session, query="test"
-            )
-
-        assert isinstance(response, BlockListResponse)
-        assert response.count == len(block_defs)
-
-        total_chars = len(response.model_dump_json())
-        avg_chars = total_chars // response.count
-
-        # Print for visibility in test output
-        print(f"\nTotal response size: {total_chars} chars")
-        print(f"Number of blocks: {response.count}")
-        print(f"Average chars per block: {avg_chars}")
-
-        # The old response was ~90K for 10 blocks (~9K per block).
-        # Previous optimization reduced it to ~1.5K per block (no raw JSON schemas).
-        # Now with only id/name/description, we expect ~300 chars per block.
-        assert avg_chars < 500, (
-            f"Average chars per block ({avg_chars}) exceeds 500. "
-            f"Total response: {total_chars} chars for {response.count} blocks."
-        )
--- a/autogpt_platform/backend/backend/api/features/chat/tools/models.py
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/models.py
@@ -25,7 +25,6 @@ class ResponseType(str, Enum):
    AGENT_SAVED = "agent_saved"
    CLARIFICATION_NEEDED = "clarification_needed"
    BLOCK_LIST = "block_list"
-    BLOCK_DETAILS = "block_details"
    BLOCK_OUTPUT = "block_output"
    DOC_SEARCH_RESULTS = "doc_search_results"
    DOC_PAGE = "doc_page"
@@ -41,9 +40,6 @@ class ResponseType(str, Enum):
    OPERATION_IN_PROGRESS = "operation_in_progress"
    # Input validation
    INPUT_VALIDATION_ERROR = "input_validation_error"
-    # Feature request types
-    FEATURE_REQUEST_SEARCH = "feature_request_search"
-    FEATURE_REQUEST_CREATED = "feature_request_created"


 # Base response model
@@ -338,6 +334,13 @@ class BlockInfoSummary(BaseModel):
    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):
@@ -347,25 +350,10 @@ class BlockListResponse(ToolResponseBase):
    blocks: list[BlockInfoSummary]
    count: int
    query: str
-
-
-class BlockDetails(BaseModel):
-    """Detailed block information."""
-
-    id: str
-    name: str
-    description: str
-    inputs: dict[str, Any] = {}
-    outputs: dict[str, Any] = {}
-    credentials: list[CredentialsMetaInput] = []
-
-
-class BlockDetailsResponse(ToolResponseBase):
-    """Response for block details (first run_block attempt)."""
-
-    type: ResponseType = ResponseType.BLOCK_DETAILS
-    block: BlockDetails
-    user_authenticated: bool = False
+    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):
@@ -433,34 +421,3 @@ class AsyncProcessingResponse(ToolResponseBase):
    status: str = "accepted"  # Must be "accepted" for detection
    operation_id: str | None = None
    task_id: str | None = None
-
-
-# Feature request models
-class FeatureRequestInfo(BaseModel):
-    """Information about a feature request issue."""
-
-    id: str
-    identifier: str
-    title: str
-    description: str | None = None
-
-
-class FeatureRequestSearchResponse(ToolResponseBase):
-    """Response for search_feature_requests tool."""
-
-    type: ResponseType = ResponseType.FEATURE_REQUEST_SEARCH
-    results: list[FeatureRequestInfo]
-    count: int
-    query: str
-
-
-class FeatureRequestCreatedResponse(ToolResponseBase):
-    """Response for create_feature_request tool."""
-
-    type: ResponseType = ResponseType.FEATURE_REQUEST_CREATED
-    issue_id: str
-    issue_identifier: str
-    issue_title: str
-    issue_url: str
-    is_new_issue: bool  # False if added to existing
-    customer_name: str
--- a/autogpt_platform/backend/backend/api/features/chat/tools/run_block.py
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/run_block.py
@@ -23,11 +23,8 @@ from backend.util.exceptions import BlockError
 from .base import BaseTool
 from .helpers import get_inputs_from_schema
 from .models import (
-    BlockDetails,
-    BlockDetailsResponse,
    BlockOutputResponse,
    ErrorResponse,
-    InputValidationErrorResponse,
    SetupInfo,
    SetupRequirementsResponse,
    ToolResponseBase,
@@ -54,8 +51,8 @@ class RunBlockTool(BaseTool):
            "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. "
-            "On first attempt (without input_data), returns detailed schema showing "
-            "required inputs and outputs. Then call again with proper input_data to execute."
+            "Use the 'id' from find_block results and provide input_data "
+            "matching the block's required_inputs."
        )

    @property
@@ -70,19 +67,11 @@ class RunBlockTool(BaseTool):
                        "NEVER guess this - always get it from find_block first."
                    ),
                },
-                "block_name": {
-                    "type": "string",
-                    "description": (
-                        "The block's human-readable name from find_block results. "
-                        "Used for display purposes in the UI."
-                    ),
-                },
                "input_data": {
                    "type": "object",
                    "description": (
-                        "Input values for the block. "
-                        "First call with empty {} to see the block's schema, "
-                        "then call again with proper values to execute."
+                        "Input values for the block. Use the 'required_inputs' field "
+                        "from find_block to see what fields are needed."
                    ),
                },
            },
@@ -167,34 +156,6 @@ class RunBlockTool(BaseTool):
            await self._resolve_block_credentials(user_id, block, input_data)
        )

-        # Get block schemas for details/validation
-        try:
-            input_schema: dict[str, Any] = block.input_schema.jsonschema()
-        except Exception as e:
-            logger.warning(
-                "Failed to generate input schema for block %s: %s",
-                block_id,
-                e,
-            )
-            return ErrorResponse(
-                message=f"Block '{block.name}' has an invalid input schema",
-                error=str(e),
-                session_id=session_id,
-            )
-        try:
-            output_schema: dict[str, Any] = block.output_schema.jsonschema()
-        except Exception as e:
-            logger.warning(
-                "Failed to generate output schema for block %s: %s",
-                block_id,
-                e,
-            )
-            return ErrorResponse(
-                message=f"Block '{block.name}' has an invalid output schema",
-                error=str(e),
-                session_id=session_id,
-            )
-
        if missing_credentials:
            # Return setup requirements response with missing credentials
            credentials_fields_info = block.input_schema.get_credentials_fields_info()
@@ -227,53 +188,6 @@ class RunBlockTool(BaseTool):
                graph_version=None,
            )

-        # Check if this is a first attempt (required inputs missing)
-        # Return block details so user can see what inputs are needed
-        credentials_fields = set(block.input_schema.get_credentials_fields().keys())
-        required_keys = set(input_schema.get("required", []))
-        required_non_credential_keys = required_keys - credentials_fields
-        provided_input_keys = set(input_data.keys()) - credentials_fields
-
-        # Check for unknown input fields
-        valid_fields = (
-            set(input_schema.get("properties", {}).keys()) - credentials_fields
-        )
-        unrecognized_fields = provided_input_keys - valid_fields
-        if unrecognized_fields:
-            return InputValidationErrorResponse(
-                message=(
-                    f"Unknown input field(s) provided: {', '.join(sorted(unrecognized_fields))}. "
-                    f"Block was not executed. Please use the correct field names from the schema."
-                ),
-                session_id=session_id,
-                unrecognized_fields=sorted(unrecognized_fields),
-                inputs=input_schema,
-            )
-
-        # Show details when not all required non-credential inputs are provided
-        if not (required_non_credential_keys <= provided_input_keys):
-            # Get credentials info for the response
-            credentials_meta = []
-            for field_name, cred_meta in matched_credentials.items():
-                credentials_meta.append(cred_meta)
-
-            return BlockDetailsResponse(
-                message=(
-                    f"Block '{block.name}' details. "
-                    "Provide input_data matching the inputs schema to execute the block."
-                ),
-                session_id=session_id,
-                block=BlockDetails(
-                    id=block_id,
-                    name=block.name,
-                    description=block.description or "",
-                    inputs=input_schema,
-                    outputs=output_schema,
-                    credentials=credentials_meta,
-                ),
-                user_authenticated=True,
-            )
-
        try:
            # Get or create user's workspace for CoPilot file operations
            workspace = await get_or_create_workspace(user_id)
--- a/autogpt_platform/backend/backend/api/features/chat/tools/run_block_test.py
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/run_block_test.py
@@ -1,15 +1,10 @@
-"""Tests for block execution guards and input validation in RunBlockTool."""
+"""Tests for block execution guards in RunBlockTool."""

-from unittest.mock import AsyncMock, MagicMock, patch
+from unittest.mock import MagicMock, patch

 import pytest

-from backend.api.features.chat.tools.models import (
-    BlockDetailsResponse,
-    BlockOutputResponse,
-    ErrorResponse,
-    InputValidationErrorResponse,
-)
+from backend.api.features.chat.tools.models import ErrorResponse
 from backend.api.features.chat.tools.run_block import RunBlockTool
 from backend.blocks._base import BlockType

@@ -33,39 +28,6 @@ def make_mock_block(
    return mock


-def make_mock_block_with_schema(
-    block_id: str,
-    name: str,
-    input_properties: dict,
-    required_fields: list[str],
-    output_properties: dict | None = None,
-):
-    """Create a mock block with a defined input/output schema for validation tests."""
-    mock = MagicMock()
-    mock.id = block_id
-    mock.name = name
-    mock.block_type = BlockType.STANDARD
-    mock.disabled = False
-    mock.description = f"Test block: {name}"
-
-    input_schema = {
-        "properties": input_properties,
-        "required": required_fields,
-    }
-    mock.input_schema = MagicMock()
-    mock.input_schema.jsonschema.return_value = input_schema
-    mock.input_schema.get_credentials_fields_info.return_value = {}
-    mock.input_schema.get_credentials_fields.return_value = {}
-
-    output_schema = {
-        "properties": output_properties or {"result": {"type": "string"}},
-    }
-    mock.output_schema = MagicMock()
-    mock.output_schema.jsonschema.return_value = output_schema
-
-    return mock
-
-
 class TestRunBlockFiltering:
    """Tests for block execution guards in RunBlockTool."""

@@ -142,221 +104,3 @@ class TestRunBlockFiltering:
        # (may be other errors like missing credentials, but not the exclusion guard)
        if isinstance(response, ErrorResponse):
            assert "cannot be run directly in CoPilot" not in response.message
-
-
-class TestRunBlockInputValidation:
-    """Tests for input field validation in RunBlockTool.
-
-    run_block rejects unknown input field names with InputValidationErrorResponse,
-    preventing silent failures where incorrect keys would be ignored and the block
-    would execute with default values instead of the caller's intended values.
-    """
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_unknown_input_fields_are_rejected(self):
-        """run_block rejects unknown input fields instead of silently ignoring them.
-
-        Scenario: The AI Text Generator block has a field called 'model' (for LLM model
-        selection), but the LLM calling the tool guesses wrong and sends 'LLM_Model'
-        instead. The block should reject the request and return the valid schema.
-        """
-        session = make_session(user_id=_TEST_USER_ID)
-
-        mock_block = make_mock_block_with_schema(
-            block_id="ai-text-gen-id",
-            name="AI Text Generator",
-            input_properties={
-                "prompt": {"type": "string", "description": "The prompt to send"},
-                "model": {
-                    "type": "string",
-                    "description": "The LLM model to use",
-                    "default": "gpt-4o-mini",
-                },
-                "sys_prompt": {
-                    "type": "string",
-                    "description": "System prompt",
-                    "default": "",
-                },
-            },
-            required_fields=["prompt"],
-            output_properties={"response": {"type": "string"}},
-        )
-
-        with patch(
-            "backend.api.features.chat.tools.run_block.get_block",
-            return_value=mock_block,
-        ):
-            tool = RunBlockTool()
-
-            # Provide 'prompt' (correct) but 'LLM_Model' instead of 'model' (wrong key)
-            response = await tool._execute(
-                user_id=_TEST_USER_ID,
-                session=session,
-                block_id="ai-text-gen-id",
-                input_data={
-                    "prompt": "Write a haiku about coding",
-                    "LLM_Model": "claude-opus-4-6",  # WRONG KEY - should be 'model'
-                },
-            )
-
-        assert isinstance(response, InputValidationErrorResponse)
-        assert "LLM_Model" in response.unrecognized_fields
-        assert "Block was not executed" in response.message
-        assert "inputs" in response.model_dump()  # valid schema included
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_multiple_wrong_keys_are_all_reported(self):
-        """All unrecognized field names are reported in a single error response."""
-        session = make_session(user_id=_TEST_USER_ID)
-
-        mock_block = make_mock_block_with_schema(
-            block_id="ai-text-gen-id",
-            name="AI Text Generator",
-            input_properties={
-                "prompt": {"type": "string"},
-                "model": {"type": "string", "default": "gpt-4o-mini"},
-                "sys_prompt": {"type": "string", "default": ""},
-                "retry": {"type": "integer", "default": 3},
-            },
-            required_fields=["prompt"],
-        )
-
-        with patch(
-            "backend.api.features.chat.tools.run_block.get_block",
-            return_value=mock_block,
-        ):
-            tool = RunBlockTool()
-
-            response = await tool._execute(
-                user_id=_TEST_USER_ID,
-                session=session,
-                block_id="ai-text-gen-id",
-                input_data={
-                    "prompt": "Hello",  # correct
-                    "llm_model": "claude-opus-4-6",  # WRONG - should be 'model'
-                    "system_prompt": "Be helpful",  # WRONG - should be 'sys_prompt'
-                    "retries": 5,  # WRONG - should be 'retry'
-                },
-            )
-
-        assert isinstance(response, InputValidationErrorResponse)
-        assert set(response.unrecognized_fields) == {
-            "llm_model",
-            "system_prompt",
-            "retries",
-        }
-        assert "Block was not executed" in response.message
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_unknown_fields_rejected_even_with_missing_required(self):
-        """Unknown fields are caught before the missing-required-fields check."""
-        session = make_session(user_id=_TEST_USER_ID)
-
-        mock_block = make_mock_block_with_schema(
-            block_id="ai-text-gen-id",
-            name="AI Text Generator",
-            input_properties={
-                "prompt": {"type": "string"},
-                "model": {"type": "string", "default": "gpt-4o-mini"},
-            },
-            required_fields=["prompt"],
-        )
-
-        with patch(
-            "backend.api.features.chat.tools.run_block.get_block",
-            return_value=mock_block,
-        ):
-            tool = RunBlockTool()
-
-            # 'prompt' is missing AND 'LLM_Model' is an unknown field
-            response = await tool._execute(
-                user_id=_TEST_USER_ID,
-                session=session,
-                block_id="ai-text-gen-id",
-                input_data={
-                    "LLM_Model": "claude-opus-4-6",  # wrong key, and 'prompt' is missing
-                },
-            )
-
-        # Unknown fields are caught first
-        assert isinstance(response, InputValidationErrorResponse)
-        assert "LLM_Model" in response.unrecognized_fields
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_correct_inputs_still_execute(self):
-        """Correct input field names pass validation and the block executes."""
-        session = make_session(user_id=_TEST_USER_ID)
-
-        mock_block = make_mock_block_with_schema(
-            block_id="ai-text-gen-id",
-            name="AI Text Generator",
-            input_properties={
-                "prompt": {"type": "string"},
-                "model": {"type": "string", "default": "gpt-4o-mini"},
-            },
-            required_fields=["prompt"],
-        )
-
-        async def mock_execute(input_data, **kwargs):
-            yield "response", "Generated text"
-
-        mock_block.execute = mock_execute
-
-        with (
-            patch(
-                "backend.api.features.chat.tools.run_block.get_block",
-                return_value=mock_block,
-            ),
-            patch(
-                "backend.api.features.chat.tools.run_block.get_or_create_workspace",
-                new_callable=AsyncMock,
-                return_value=MagicMock(id="test-workspace-id"),
-            ),
-        ):
-            tool = RunBlockTool()
-
-            response = await tool._execute(
-                user_id=_TEST_USER_ID,
-                session=session,
-                block_id="ai-text-gen-id",
-                input_data={
-                    "prompt": "Write a haiku",
-                    "model": "gpt-4o-mini",  # correct field name
-                },
-            )
-
-        assert isinstance(response, BlockOutputResponse)
-        assert response.success is True
-
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_missing_required_fields_returns_details(self):
-        """Missing required fields returns BlockDetailsResponse with schema."""
-        session = make_session(user_id=_TEST_USER_ID)
-
-        mock_block = make_mock_block_with_schema(
-            block_id="ai-text-gen-id",
-            name="AI Text Generator",
-            input_properties={
-                "prompt": {"type": "string"},
-                "model": {"type": "string", "default": "gpt-4o-mini"},
-            },
-            required_fields=["prompt"],
-        )
-
-        with patch(
-            "backend.api.features.chat.tools.run_block.get_block",
-            return_value=mock_block,
-        ):
-            tool = RunBlockTool()
-
-            # Only provide valid optional field, missing required 'prompt'
-            response = await tool._execute(
-                user_id=_TEST_USER_ID,
-                session=session,
-                block_id="ai-text-gen-id",
-                input_data={
-                    "model": "gpt-4o-mini",  # valid but optional
-                },
-            )
-
-        assert isinstance(response, BlockDetailsResponse)
--- a/autogpt_platform/backend/backend/api/features/chat/tools/test_run_block_details.py
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/test_run_block_details.py
@@ -1,153 +0,0 @@
-"""Tests for BlockDetailsResponse in RunBlockTool."""
-
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-
-from backend.api.features.chat.tools.models import BlockDetailsResponse
-from backend.api.features.chat.tools.run_block import RunBlockTool
-from backend.blocks._base import BlockType
-from backend.data.model import CredentialsMetaInput
-from backend.integrations.providers import ProviderName
-
-from ._test_data import make_session
-
-_TEST_USER_ID = "test-user-run-block-details"
-
-
-def make_mock_block_with_inputs(
-    block_id: str, name: str, description: str = "Test description"
-):
-    """Create a mock block with input/output schemas for testing."""
-    mock = MagicMock()
-    mock.id = block_id
-    mock.name = name
-    mock.description = description
-    mock.block_type = BlockType.STANDARD
-    mock.disabled = False
-
-    # Input schema with non-credential fields
-    mock.input_schema = MagicMock()
-    mock.input_schema.jsonschema.return_value = {
-        "properties": {
-            "url": {"type": "string", "description": "URL to fetch"},
-            "method": {"type": "string", "description": "HTTP method"},
-        },
-        "required": ["url"],
-    }
-    mock.input_schema.get_credentials_fields.return_value = {}
-    mock.input_schema.get_credentials_fields_info.return_value = {}
-
-    # Output schema
-    mock.output_schema = MagicMock()
-    mock.output_schema.jsonschema.return_value = {
-        "properties": {
-            "response": {"type": "object", "description": "HTTP response"},
-            "error": {"type": "string", "description": "Error message"},
-        }
-    }
-
-    return mock
-
-
-@pytest.mark.asyncio(loop_scope="session")
-async def test_run_block_returns_details_when_no_input_provided():
-    """When run_block is called without input_data, it should return BlockDetailsResponse."""
-    session = make_session(user_id=_TEST_USER_ID)
-
-    # Create a block with inputs
-    http_block = make_mock_block_with_inputs(
-        "http-block-id", "HTTP Request", "Send HTTP requests"
-    )
-
-    with patch(
-        "backend.api.features.chat.tools.run_block.get_block",
-        return_value=http_block,
-    ):
-        # Mock credentials check to return no missing credentials
-        with patch.object(
-            RunBlockTool,
-            "_resolve_block_credentials",
-            new_callable=AsyncMock,
-            return_value=({}, []),  # (matched_credentials, missing_credentials)
-        ):
-            tool = RunBlockTool()
-            response = await tool._execute(
-                user_id=_TEST_USER_ID,
-                session=session,
-                block_id="http-block-id",
-                input_data={},  # Empty input data
-            )
-
-    # Should return BlockDetailsResponse showing the schema
-    assert isinstance(response, BlockDetailsResponse)
-    assert response.block.id == "http-block-id"
-    assert response.block.name == "HTTP Request"
-    assert response.block.description == "Send HTTP requests"
-    assert "url" in response.block.inputs["properties"]
-    assert "method" in response.block.inputs["properties"]
-    assert "response" in response.block.outputs["properties"]
-    assert response.user_authenticated is True
-
-
-@pytest.mark.asyncio(loop_scope="session")
-async def test_run_block_returns_details_when_only_credentials_provided():
-    """When only credentials are provided (no actual input), should return details."""
-    session = make_session(user_id=_TEST_USER_ID)
-
-    # Create a block with both credential and non-credential inputs
-    mock = MagicMock()
-    mock.id = "api-block-id"
-    mock.name = "API Call"
-    mock.description = "Make API calls"
-    mock.block_type = BlockType.STANDARD
-    mock.disabled = False
-
-    mock.input_schema = MagicMock()
-    mock.input_schema.jsonschema.return_value = {
-        "properties": {
-            "credentials": {"type": "object", "description": "API credentials"},
-            "endpoint": {"type": "string", "description": "API endpoint"},
-        },
-        "required": ["credentials", "endpoint"],
-    }
-    mock.input_schema.get_credentials_fields.return_value = {"credentials": True}
-    mock.input_schema.get_credentials_fields_info.return_value = {}
-
-    mock.output_schema = MagicMock()
-    mock.output_schema.jsonschema.return_value = {
-        "properties": {"result": {"type": "object"}}
-    }
-
-    with patch(
-        "backend.api.features.chat.tools.run_block.get_block",
-        return_value=mock,
-    ):
-        with patch.object(
-            RunBlockTool,
-            "_resolve_block_credentials",
-            new_callable=AsyncMock,
-            return_value=(
-                {
-                    "credentials": CredentialsMetaInput(
-                        id="cred-id",
-                        provider=ProviderName("test_provider"),
-                        type="api_key",
-                        title="Test Credential",
-                    )
-                },
-                [],
-            ),
-        ):
-            tool = RunBlockTool()
-            response = await tool._execute(
-                user_id=_TEST_USER_ID,
-                session=session,
-                block_id="api-block-id",
-                input_data={"credentials": {"some": "cred"}},  # Only credential
-            )
-
-    # Should return details because no non-credential inputs provided
-    assert isinstance(response, BlockDetailsResponse)
-    assert response.block.id == "api-block-id"
-    assert response.block.name == "API Call"
--- a/autogpt_platform/backend/backend/util/settings.py
+++ b/autogpt_platform/backend/backend/util/settings.py
@@ -662,17 +662,6 @@ class Secrets(UpdateTrackingModel["Secrets"], BaseSettings):
    mem0_api_key: str = Field(default="", description="Mem0 API key")
    elevenlabs_api_key: str = Field(default="", description="ElevenLabs API key")

-    linear_api_key: str = Field(
-        default="", description="Linear API key for system-level operations"
-    )
-    linear_feature_request_project_id: str = Field(
-        default="",
-        description="Linear project ID where feature requests are tracked",
-    )
-    linear_feature_request_team_id: str = Field(
-        default="",
-        description="Linear team ID used when creating feature request issues",
-    )
    linear_client_id: str = Field(default="", description="Linear client ID")
    linear_client_secret: str = Field(default="", description="Linear client secret")

--- a/autogpt_platform/backend/poetry.lock
+++ b/autogpt_platform/backend/poetry.lock
@@ -441,14 +441,14 @@ develop = true
 colorama = "^0.4.6"
 cryptography = "^46.0"
 expiringdict = "^1.2.2"
-fastapi = "^0.128.7"
+fastapi = "^0.128.0"
 google-cloud-logging = "^3.13.0"
-launchdarkly-server-sdk = "^9.15.0"
+launchdarkly-server-sdk = "^9.14.1"
 pydantic = "^2.12.5"
 pydantic-settings = "^2.12.0"
 pyjwt = {version = "^2.11.0", extras = ["crypto"]}
 redis = "^6.2.0"
-supabase = "^2.28.0"
+supabase = "^2.27.2"
 uvicorn = "^0.40.0"

 [package.source]
@@ -1382,14 +1382,14 @@ tzdata = "*"

 [[package]]
 name = "fastapi"
-version = "0.128.7"
+version = "0.128.6"
 description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production"
 optional = false
 python-versions = ">=3.9"
 groups = ["main"]
 files = [
-    {file = "fastapi-0.128.7-py3-none-any.whl", hash = "sha256:6bd9bd31cb7047465f2d3fa3ba3f33b0870b17d4eaf7cdb36d1576ab060ad662"},
-    {file = "fastapi-0.128.7.tar.gz", hash = "sha256:783c273416995486c155ad2c0e2b45905dedfaf20b9ef8d9f6a9124670639a24"},
+    {file = "fastapi-0.128.6-py3-none-any.whl", hash = "sha256:bb1c1ef87d6086a7132d0ab60869d6f1ee67283b20fbf84ec0003bd335099509"},
+    {file = "fastapi-0.128.6.tar.gz", hash = "sha256:0cb3946557e792d731b26a42b04912f16367e3c3135ea8290f620e234f2b604f"},
 ]

 [package.dependencies]
@@ -3117,14 +3117,14 @@ urllib3 = ">=1.26.0,<3"

 [[package]]
 name = "launchdarkly-server-sdk"
-version = "9.15.0"
+version = "9.14.1"
 description = "LaunchDarkly SDK for Python"
 optional = false
-python-versions = ">=3.10"
+python-versions = ">=3.9"
 groups = ["main"]
 files = [
-    {file = "launchdarkly_server_sdk-9.15.0-py3-none-any.whl", hash = "sha256:c267e29bfa3fb5e2a06a208448ada6ed5557a2924979b8d79c970b45d227c668"},
-    {file = "launchdarkly_server_sdk-9.15.0.tar.gz", hash = "sha256:f31441b74bc1a69c381db57c33116509e407a2612628ad6dff0a7dbb39d5020b"},
+    {file = "launchdarkly_server_sdk-9.14.1-py3-none-any.whl", hash = "sha256:a9e2bd9ecdef845cd631ae0d4334a1115e5b44257c42eb2349492be4bac7815c"},
+    {file = "launchdarkly_server_sdk-9.14.1.tar.gz", hash = "sha256:1df44baf0a0efa74d8c1dad7a00592b98bce7d19edded7f770da8dbc49922213"},
 ]

 [package.dependencies]
@@ -4728,14 +4728,14 @@ tests = ["coverage-conditional-plugin (>=0.9.0)", "portalocker[redis]", "pytest

 [[package]]
 name = "postgrest"
-version = "2.28.0"
+version = "2.27.3"
 description = "PostgREST client for Python. This library provides an ORM interface to PostgREST."
 optional = false
 python-versions = ">=3.9"
 groups = ["main"]
 files = [
-    {file = "postgrest-2.28.0-py3-none-any.whl", hash = "sha256:7bca2f24dd1a1bf8a3d586c7482aba6cd41662da6733045fad585b63b7f7df75"},
-    {file = "postgrest-2.28.0.tar.gz", hash = "sha256:c36b38646d25ea4255321d3d924ce70f8d20ec7799cb42c1221d6a818d4f6515"},
+    {file = "postgrest-2.27.3-py3-none-any.whl", hash = "sha256:ed79123af7127edd78d538bfe8351d277e45b1a36994a4dbf57ae27dde87a7b7"},
+    {file = "postgrest-2.27.3.tar.gz", hash = "sha256:c2e2679addfc8eaab23197bad7ddaee6cbb4cbe8c483ebd2d2e5219543037cc3"},
 ]

 [package.dependencies]
@@ -6260,14 +6260,14 @@ all = ["numpy"]

 [[package]]
 name = "realtime"
-version = "2.28.0"
+version = "2.27.3"
 description = ""
 optional = false
 python-versions = ">=3.9"
 groups = ["main"]
 files = [
-    {file = "realtime-2.28.0-py3-none-any.whl", hash = "sha256:db1bd59bab9b1fcc9f9d3b1a073bed35bf4994d720e6751f10031a58d57a3836"},
-    {file = "realtime-2.28.0.tar.gz", hash = "sha256:d18cedcebd6a8f22fcd509bc767f639761eb218b7b2b6f14fc4205b6259b50fc"},
+    {file = "realtime-2.27.3-py3-none-any.whl", hash = "sha256:f571115f86988e33c41c895cb3fba2eaa1b693aeaede3617288f44274ca90f43"},
+    {file = "realtime-2.27.3.tar.gz", hash = "sha256:02b082243107656a5ef3fb63e8e2ab4c40bc199abb45adb8a42ed63f089a1041"},
 ]

 [package.dependencies]
@@ -7024,14 +7024,14 @@ full = ["httpx (>=0.27.0,<0.29.0)", "itsdangerous", "jinja2", "python-multipart

 [[package]]
 name = "storage3"
-version = "2.28.0"
+version = "2.27.3"
 description = "Supabase Storage client for Python."
 optional = false
 python-versions = ">=3.9"
 groups = ["main"]
 files = [
-    {file = "storage3-2.28.0-py3-none-any.whl", hash = "sha256:ecb50efd2ac71dabbdf97e99ad346eafa630c4c627a8e5a138ceb5fbbadae716"},
-    {file = "storage3-2.28.0.tar.gz", hash = "sha256:bc1d008aff67de7a0f2bd867baee7aadbcdb6f78f5a310b4f7a38e8c13c19865"},
+    {file = "storage3-2.27.3-py3-none-any.whl", hash = "sha256:11a05b7da84bccabeeea12d940bca3760cf63fe6ca441868677335cfe4fdfbe0"},
+    {file = "storage3-2.27.3.tar.gz", hash = "sha256:dc1a4a010cf36d5482c5cb6c1c28fc5f00e23284342b89e4ae43b5eae8501ddb"},
 ]

 [package.dependencies]
@@ -7091,35 +7091,35 @@ typing-extensions = {version = ">=4.5.0", markers = "python_version >= \"3.7\""}

 [[package]]
 name = "supabase"
-version = "2.28.0"
+version = "2.27.3"
 description = "Supabase client for Python."
 optional = false
 python-versions = ">=3.9"
 groups = ["main"]
 files = [
-    {file = "supabase-2.28.0-py3-none-any.whl", hash = "sha256:42776971c7d0ccca16034df1ab96a31c50228eb1eb19da4249ad2f756fc20272"},
-    {file = "supabase-2.28.0.tar.gz", hash = "sha256:aea299aaab2a2eed3c57e0be7fc035c6807214194cce795a3575add20268ece1"},
+    {file = "supabase-2.27.3-py3-none-any.whl", hash = "sha256:082a74642fcf9954693f1ce8c251baf23e4bda26ffdbc8dcd4c99c82e60d69ff"},
+    {file = "supabase-2.27.3.tar.gz", hash = "sha256:5e5a348232ac4315c1032ddd687278f0b982465471f0cbb52bca7e6a66495ff3"},
 ]

 [package.dependencies]
 httpx = ">=0.26,<0.29"
-postgrest = "2.28.0"
-realtime = "2.28.0"
-storage3 = "2.28.0"
-supabase-auth = "2.28.0"
-supabase-functions = "2.28.0"
+postgrest = "2.27.3"
+realtime = "2.27.3"
+storage3 = "2.27.3"
+supabase-auth = "2.27.3"
+supabase-functions = "2.27.3"
 yarl = ">=1.22.0"

 [[package]]
 name = "supabase-auth"
-version = "2.28.0"
+version = "2.27.3"
 description = "Python Client Library for Supabase Auth"
 optional = false
 python-versions = ">=3.9"
 groups = ["main"]
 files = [
-    {file = "supabase_auth-2.28.0-py3-none-any.whl", hash = "sha256:2ac85026cc285054c7fa6d41924f3a333e9ec298c013e5b5e1754039ba7caec9"},
-    {file = "supabase_auth-2.28.0.tar.gz", hash = "sha256:2bb8f18ff39934e44b28f10918db965659f3735cd6fbfcc022fe0b82dbf8233e"},
+    {file = "supabase_auth-2.27.3-py3-none-any.whl", hash = "sha256:82a4262eaad85383319d394dab0eea11fcf3ebd774062aef8ea3874ae2f02579"},
+    {file = "supabase_auth-2.27.3.tar.gz", hash = "sha256:39894d4bc60b6f23b5cff4d0d7d4c1659e5d69563cadf014d4896f780ca8ca78"},
 ]

 [package.dependencies]
@@ -7129,14 +7129,14 @@ pyjwt = {version = ">=2.10.1", extras = ["crypto"]}

 [[package]]
 name = "supabase-functions"
-version = "2.28.0"
+version = "2.27.3"
 description = "Library for Supabase Functions"
 optional = false
 python-versions = ">=3.9"
 groups = ["main"]
 files = [
-    {file = "supabase_functions-2.28.0-py3-none-any.whl", hash = "sha256:30bf2d586f8df285faf0621bb5d5bb3ec3157234fc820553ca156f009475e4ae"},
-    {file = "supabase_functions-2.28.0.tar.gz", hash = "sha256:db3dddfc37aca5858819eb461130968473bd8c75bd284581013958526dac718b"},
+    {file = "supabase_functions-2.27.3-py3-none-any.whl", hash = "sha256:9d14a931d49ede1c6cf5fbfceb11c44061535ba1c3f310f15384964d86a83d9e"},
+    {file = "supabase_functions-2.27.3.tar.gz", hash = "sha256:e954f1646da8ca6e7e16accef58d0884a5f97b25956ee98e7d4927a210ed92f9"},
 ]

 [package.dependencies]
@@ -8440,4 +8440,4 @@ cffi = ["cffi (>=1.17,<2.0) ; platform_python_implementation != \"PyPy\" and pyt
 [metadata]
 lock-version = "2.1"
 python-versions = ">=3.10,<3.14"
-content-hash = "fa9c5deadf593e815dd2190f58e22152373900603f5f244b9616cd721de84d2f"
+content-hash = "c06e96ad49388ba7a46786e9ea55ea2c1a57408e15613237b4bee40a592a12af"
--- a/autogpt_platform/backend/pyproject.toml
+++ b/autogpt_platform/backend/pyproject.toml
@@ -65,7 +65,7 @@ sentry-sdk = {extras = ["anthropic", "fastapi", "launchdarkly", "openai", "sqlal
 sqlalchemy = "^2.0.40"
 strenum = "^0.4.9"
 stripe = "^11.5.0"
-supabase = "2.28.0"
+supabase = "2.27.3"
 tenacity = "^9.1.4"
 todoist-api-python = "^2.1.7"
 tweepy = "^4.16.0"
--- 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", "prisma generate && python3 gen_prisma_types_stub.py && prisma migrate deploy"]
+    command: ["sh", "-c", "poetry run prisma generate && poetry run gen-prisma-stub && poetry run prisma migrate deploy"]
    develop:
      watch:
        - path: ./
@@ -56,7 +56,7 @@ services:
      test:
        [
          "CMD-SHELL",
-          "prisma migrate status | grep -q 'No pending migrations' || exit 1",
+          "poetry run prisma migrate status | grep -q 'No pending migrations' || exit 1",
        ]
      interval: 30s
      timeout: 10s
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/ChatMessagesContainer.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/ChatMessagesContainer.tsx
@@ -15,10 +15,6 @@ import { ToolUIPart, UIDataTypes, UIMessage, UITools } from "ai";
 import { useEffect, useRef, useState } from "react";
 import { CreateAgentTool } from "../../tools/CreateAgent/CreateAgent";
 import { EditAgentTool } from "../../tools/EditAgent/EditAgent";
-import {
-  CreateFeatureRequestTool,
-  SearchFeatureRequestsTool,
-} from "../../tools/FeatureRequests/FeatureRequests";
 import { FindAgentsTool } from "../../tools/FindAgents/FindAgents";
 import { FindBlocksTool } from "../../tools/FindBlocks/FindBlocks";
 import { RunAgentTool } from "../../tools/RunAgent/RunAgent";
@@ -258,20 +254,6 @@ export const ChatMessagesContainer = ({
                          part={part as ToolUIPart}
                        />
                      );
-                    case "tool-search_feature_requests":
-                      return (
-                        <SearchFeatureRequestsTool
-                          key={`${message.id}-${i}`}
-                          part={part as ToolUIPart}
-                        />
-                      );
-                    case "tool-create_feature_request":
-                      return (
-                        <CreateFeatureRequestTool
-                          key={`${message.id}-${i}`}
-                          part={part as ToolUIPart}
-                        />
-                      );
                    default:
                      return null;
                  }
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/styleguide/page.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/styleguide/page.tsx
@@ -14,10 +14,6 @@ import { Text } from "@/components/atoms/Text/Text";
 import { CopilotChatActionsProvider } from "../components/CopilotChatActionsProvider/CopilotChatActionsProvider";
 import { CreateAgentTool } from "../tools/CreateAgent/CreateAgent";
 import { EditAgentTool } from "../tools/EditAgent/EditAgent";
-import {
-  CreateFeatureRequestTool,
-  SearchFeatureRequestsTool,
-} from "../tools/FeatureRequests/FeatureRequests";
 import { FindAgentsTool } from "../tools/FindAgents/FindAgents";
 import { FindBlocksTool } from "../tools/FindBlocks/FindBlocks";
 import { RunAgentTool } from "../tools/RunAgent/RunAgent";
@@ -49,8 +45,6 @@ const SECTIONS = [
  "Tool: Create Agent",
  "Tool: Edit Agent",
  "Tool: View Agent Output",
-  "Tool: Search Feature Requests",
-  "Tool: Create Feature Request",
  "Full Conversation Example",
 ] as const;

@@ -1427,235 +1421,6 @@ export default function StyleguidePage() {
              </SubSection>
            </Section>

-            {/* ============================================================= */}
-            {/* SEARCH FEATURE REQUESTS                                        */}
-            {/* ============================================================= */}
-
-            <Section title="Tool: Search Feature Requests">
-              <SubSection label="Input streaming">
-                <SearchFeatureRequestsTool
-                  part={{
-                    type: "tool-search_feature_requests",
-                    toolCallId: uid(),
-                    state: "input-streaming",
-                    input: { query: "dark mode" },
-                  }}
-                />
-              </SubSection>
-
-              <SubSection label="Input available">
-                <SearchFeatureRequestsTool
-                  part={{
-                    type: "tool-search_feature_requests",
-                    toolCallId: uid(),
-                    state: "input-available",
-                    input: { query: "dark mode" },
-                  }}
-                />
-              </SubSection>
-
-              <SubSection label="Output available (with results)">
-                <SearchFeatureRequestsTool
-                  part={{
-                    type: "tool-search_feature_requests",
-                    toolCallId: uid(),
-                    state: "output-available",
-                    input: { query: "dark mode" },
-                    output: {
-                      type: "feature_request_search",
-                      message:
-                        'Found 2 feature request(s) matching "dark mode".',
-                      query: "dark mode",
-                      count: 2,
-                      results: [
-                        {
-                          id: "fr-001",
-                          identifier: "INT-42",
-                          title: "Add dark mode to the platform",
-                          description:
-                            "Users have requested a dark mode option for the builder and copilot interfaces to reduce eye strain during long sessions.",
-                        },
-                        {
-                          id: "fr-002",
-                          identifier: "INT-87",
-                          title: "Dark theme for agent output viewer",
-                          description:
-                            "Specifically requesting dark theme support for the agent output/execution viewer panel.",
-                        },
-                      ],
-                    },
-                  }}
-                />
-              </SubSection>
-
-              <SubSection label="Output available (no results)">
-                <SearchFeatureRequestsTool
-                  part={{
-                    type: "tool-search_feature_requests",
-                    toolCallId: uid(),
-                    state: "output-available",
-                    input: { query: "teleportation" },
-                    output: {
-                      type: "no_results",
-                      message:
-                        "No feature requests found matching 'teleportation'.",
-                      suggestions: [
-                        "Try different keywords",
-                        "Use broader search terms",
-                        "You can create a new feature request if none exists",
-                      ],
-                    },
-                  }}
-                />
-              </SubSection>
-
-              <SubSection label="Output available (error)">
-                <SearchFeatureRequestsTool
-                  part={{
-                    type: "tool-search_feature_requests",
-                    toolCallId: uid(),
-                    state: "output-available",
-                    input: { query: "dark mode" },
-                    output: {
-                      type: "error",
-                      message: "Failed to search feature requests.",
-                      error: "LINEAR_API_KEY environment variable is not set",
-                    },
-                  }}
-                />
-              </SubSection>
-
-              <SubSection label="Output error">
-                <SearchFeatureRequestsTool
-                  part={{
-                    type: "tool-search_feature_requests",
-                    toolCallId: uid(),
-                    state: "output-error",
-                    input: { query: "dark mode" },
-                  }}
-                />
-              </SubSection>
-            </Section>
-
-            {/* ============================================================= */}
-            {/* CREATE FEATURE REQUEST                                         */}
-            {/* ============================================================= */}
-
-            <Section title="Tool: Create Feature Request">
-              <SubSection label="Input streaming">
-                <CreateFeatureRequestTool
-                  part={{
-                    type: "tool-create_feature_request",
-                    toolCallId: uid(),
-                    state: "input-streaming",
-                    input: {
-                      title: "Add dark mode",
-                      description: "I would love dark mode for the platform.",
-                    },
-                  }}
-                />
-              </SubSection>
-
-              <SubSection label="Input available">
-                <CreateFeatureRequestTool
-                  part={{
-                    type: "tool-create_feature_request",
-                    toolCallId: uid(),
-                    state: "input-available",
-                    input: {
-                      title: "Add dark mode",
-                      description: "I would love dark mode for the platform.",
-                    },
-                  }}
-                />
-              </SubSection>
-
-              <SubSection label="Output available (new issue created)">
-                <CreateFeatureRequestTool
-                  part={{
-                    type: "tool-create_feature_request",
-                    toolCallId: uid(),
-                    state: "output-available",
-                    input: {
-                      title: "Add dark mode",
-                      description: "I would love dark mode for the platform.",
-                    },
-                    output: {
-                      type: "feature_request_created",
-                      message:
-                        "Created new feature request [INT-105] Add dark mode.",
-                      issue_id: "issue-new-123",
-                      issue_identifier: "INT-105",
-                      issue_title: "Add dark mode",
-                      issue_url:
-                        "https://linear.app/autogpt/issue/INT-105/add-dark-mode",
-                      is_new_issue: true,
-                      customer_name: "user-abc-123",
-                    },
-                  }}
-                />
-              </SubSection>
-
-              <SubSection label="Output available (added to existing issue)">
-                <CreateFeatureRequestTool
-                  part={{
-                    type: "tool-create_feature_request",
-                    toolCallId: uid(),
-                    state: "output-available",
-                    input: {
-                      title: "Dark mode support",
-                      description:
-                        "Please add dark mode, it would help with long sessions.",
-                      existing_issue_id: "fr-001",
-                    },
-                    output: {
-                      type: "feature_request_created",
-                      message:
-                        "Added your request to existing feature request [INT-42] Add dark mode to the platform.",
-                      issue_id: "fr-001",
-                      issue_identifier: "INT-42",
-                      issue_title: "Add dark mode to the platform",
-                      issue_url:
-                        "https://linear.app/autogpt/issue/INT-42/add-dark-mode-to-the-platform",
-                      is_new_issue: false,
-                      customer_name: "user-xyz-789",
-                    },
-                  }}
-                />
-              </SubSection>
-
-              <SubSection label="Output available (error)">
-                <CreateFeatureRequestTool
-                  part={{
-                    type: "tool-create_feature_request",
-                    toolCallId: uid(),
-                    state: "output-available",
-                    input: {
-                      title: "Add dark mode",
-                      description: "I would love dark mode.",
-                    },
-                    output: {
-                      type: "error",
-                      message:
-                        "Failed to attach customer need to the feature request.",
-                      error: "Linear API request failed (500): Internal error",
-                    },
-                  }}
-                />
-              </SubSection>
-
-              <SubSection label="Output error">
-                <CreateFeatureRequestTool
-                  part={{
-                    type: "tool-create_feature_request",
-                    toolCallId: uid(),
-                    state: "output-error",
-                    input: { title: "Add dark mode" },
-                  }}
-                />
-              </SubSection>
-            </Section>
-
            {/* ============================================================= */}
            {/* FULL CONVERSATION EXAMPLE                                      */}
            {/* ============================================================= */}
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/CreateAgent.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/CreateAgent.tsx
@@ -4,6 +4,7 @@ import { Button } from "@/components/atoms/Button/Button";
 import { Text } from "@/components/atoms/Text/Text";
 import {
  BookOpenIcon,
+  CheckFatIcon,
  PencilSimpleIcon,
  WarningDiamondIcon,
 } from "@phosphor-icons/react";
@@ -23,7 +24,6 @@ import {
  ClarificationQuestionsCard,
  ClarifyingQuestion,
 } from "./components/ClarificationQuestionsCard";
-import sparklesImg from "./components/MiniGame/assets/sparkles.png";
 import { MiniGame } from "./components/MiniGame/MiniGame";
 import {
  AccordionIcon,
@@ -83,8 +83,7 @@ function getAccordionMeta(output: CreateAgentToolOutput) {
  ) {
    return {
      icon,
-      title:
-        "Creating agent, this may take a few minutes. Play while you wait.",
+      title: "Creating agent, this may take a few minutes. Sit back and relax.",
      expanded: true,
    };
  }
@@ -168,22 +167,16 @@ export function CreateAgentTool({ part }: Props) {
          {isAgentSavedOutput(output) && (
            <div className="rounded-xl border border-border/60 bg-card p-4 shadow-sm">
              <div className="flex items-baseline gap-2">
-                <img
-                  src={sparklesImg.src}
-                  alt="sparkles"
-                  width={24}
-                  height={24}
-                  className="relative top-1"
+                <CheckFatIcon
+                  size={18}
+                  weight="regular"
+                  className="relative top-1 text-green-500"
                />
                <Text
                  variant="body-medium"
                  className="text-blacks mb-2 text-[16px]"
                >
-                  Agent{" "}
-                  <span className="text-[rgb(124,58,237)]">
-                    {output.agent_name}
-                  </span>{" "}
-                  has been saved to your library!
+                  {output.message}
                </Text>
              </div>
              <div className="mt-3 flex flex-wrap gap-4">
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/components/MiniGame/MiniGame.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/components/MiniGame/MiniGame.tsx
@@ -2,78 +2,20 @@

 import { useMiniGame } from "./useMiniGame";

-function Key({ children }: { children: React.ReactNode }) {
-  return <strong>[{children}]</strong>;
-}
-
 export function MiniGame() {
-  const {
-    canvasRef,
-    activeMode,
-    showOverlay,
-    score,
-    highScore,
-    onContinue,
-  } = useMiniGame();
-
-  const isRunActive =
-    activeMode === "run" || activeMode === "idle" || activeMode === "over";
-  const isBossActive =
-    activeMode === "boss" ||
-    activeMode === "boss-intro" ||
-    activeMode === "boss-defeated";
-
-  let overlayText: string | undefined;
-  let buttonLabel = "Continue";
-  if (activeMode === "idle") {
-    buttonLabel = "Start";
-  } else if (activeMode === "boss-intro") {
-    overlayText = "Face the bandit!";
-  } else if (activeMode === "boss-defeated") {
-    overlayText = "Great job, keep on going";
-  } else if (activeMode === "over") {
-    overlayText = `Score: ${score} / Record: ${highScore}`;
-    buttonLabel = "Retry";
-  }
+  const { canvasRef } = useMiniGame();

  return (
-    <div className="flex flex-col gap-2">
-      <p className="text-sm font-medium text-purple-500">
-        {isBossActive ? (
-          <>
-            Duel mode: <Key>←→</Key> to move · <Key>Z</Key> to attack ·{" "}
-            <Key>X</Key> to block · <Key>Space</Key> to jump
-          </>
-        ) : (
-          <>
-            Run mode: <Key>Space</Key> to jump
-          </>
-        )}
-      </p>
-      <div
-        className="relative w-full overflow-hidden rounded-md bg-background text-foreground"
-        style={{ border: "1px solid #d17fff" }}
-      >
-        <canvas
-          ref={canvasRef}
-          tabIndex={0}
-          className="block w-full outline-none"
-        />
-        {showOverlay && (
-          <div className="absolute inset-0 flex flex-col items-center justify-center gap-3 bg-black/40">
-            {overlayText && (
-              <p className="text-lg font-bold text-white">{overlayText}</p>
-            )}
-            <button
-              type="button"
-              onClick={onContinue}
-              className="rounded-md bg-white px-4 py-2 text-sm font-semibold text-zinc-800 shadow-md transition-colors hover:bg-zinc-100"
-            >
-              {buttonLabel}
-            </button>
-          </div>
-        )}
-      </div>
+    <div
+      className="w-full overflow-hidden rounded-md bg-background text-foreground"
+      style={{ border: "1px solid #d17fff" }}
+    >
+      <canvas
+        ref={canvasRef}
+        tabIndex={0}
+        className="block w-full outline-none"
+        style={{ imageRendering: "pixelated" }}
+      />
    </div>
  );
 }
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/components/MiniGame/assets/archer-attack.png
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/components/MiniGame/assets/archer-attack.png
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/components/MiniGame/assets/archer-idle.png
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/components/MiniGame/assets/archer-idle.png
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/components/MiniGame/assets/archer-shoot.png
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/components/MiniGame/assets/archer-shoot.png
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/components/MiniGame/assets/attack.png
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/components/MiniGame/assets/attack.png
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/components/MiniGame/assets/guard.png
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/components/MiniGame/assets/guard.png
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/components/MiniGame/assets/idle.png
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/components/MiniGame/assets/idle.png
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/components/MiniGame/assets/run.png
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/components/MiniGame/assets/run.png
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/components/MiniGame/assets/sparkles.png
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/components/MiniGame/assets/sparkles.png
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/components/MiniGame/assets/tree-1.png
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/components/MiniGame/assets/tree-1.png
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/components/MiniGame/assets/tree-2.png
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/components/MiniGame/assets/tree-2.png
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/components/MiniGame/assets/tree-3.png
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/components/MiniGame/assets/tree-3.png
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/components/MiniGame/useMiniGame.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/components/MiniGame/useMiniGame.ts
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/helpers.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/helpers.tsx
@@ -136,7 +136,7 @@ export function getAnimationText(part: {
      if (isOperationPendingOutput(output)) return "Agent creation in progress";
      if (isOperationInProgressOutput(output))
        return "Agent creation already in progress";
-      if (isAgentSavedOutput(output)) return `Saved ${output.agent_name}`;
+      if (isAgentSavedOutput(output)) return `Saved "${output.agent_name}"`;
      if (isAgentPreviewOutput(output)) return `Preview "${output.agent_name}"`;
      if (isClarificationNeededOutput(output)) return "Needs clarification";
      return "Error creating agent";
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/EditAgent/EditAgent.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/EditAgent/EditAgent.tsx
@@ -5,6 +5,7 @@ import type { ToolUIPart } from "ai";
 import { useCopilotChatActions } from "../../components/CopilotChatActionsProvider/useCopilotChatActions";
 import { MorphingTextAnimation } from "../../components/MorphingTextAnimation/MorphingTextAnimation";
 import { OrbitLoader } from "../../components/OrbitLoader/OrbitLoader";
+import { ProgressBar } from "../../components/ProgressBar/ProgressBar";
 import {
  ContentCardDescription,
  ContentCodeBlock,
@@ -14,7 +15,7 @@ import {
  ContentMessage,
 } from "../../components/ToolAccordion/AccordionContent";
 import { ToolAccordion } from "../../components/ToolAccordion/ToolAccordion";
-import { MiniGame } from "../CreateAgent/components/MiniGame/MiniGame";
+import { useAsymptoticProgress } from "../../hooks/useAsymptoticProgress";
 import {
  ClarificationQuestionsCard,
  ClarifyingQuestion,
@@ -79,12 +80,7 @@ function getAccordionMeta(output: EditAgentToolOutput): {
    isOperationPendingOutput(output) ||
    isOperationInProgressOutput(output)
  ) {
-    return {
-      icon: <OrbitLoader size={32} />,
-      title:
-        "Editing agent, this may take a few minutes. Play while you wait.",
-      expanded: true,
-    };
+    return { icon: <OrbitLoader size={32} />, title: "Editing agent" };
  }
  return {
    icon: (
@@ -109,6 +105,7 @@ export function EditAgentTool({ part }: Props) {
    (isOperationStartedOutput(output) ||
      isOperationPendingOutput(output) ||
      isOperationInProgressOutput(output));
+  const progress = useAsymptoticProgress(isOperating);
  const hasExpandableContent =
    part.state === "output-available" &&
    !!output &&
@@ -152,9 +149,9 @@ export function EditAgentTool({ part }: Props) {
        <ToolAccordion {...getAccordionMeta(output)}>
          {isOperating && (
            <ContentGrid>
-              <MiniGame />
+              <ProgressBar value={progress} className="max-w-[280px]" />
              <ContentHint>
-                This could take a few minutes — play while you wait!
+                This could take a few minutes, grab a coffee ☕
              </ContentHint>
            </ContentGrid>
          )}
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/FeatureRequests/FeatureRequests.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/FeatureRequests/FeatureRequests.tsx
@@ -1,227 +0,0 @@
-"use client";
-
-import type { ToolUIPart } from "ai";
-import { useMemo } from "react";
-
-import { MorphingTextAnimation } from "../../components/MorphingTextAnimation/MorphingTextAnimation";
-import {
-  ContentBadge,
-  ContentCard,
-  ContentCardDescription,
-  ContentCardHeader,
-  ContentCardTitle,
-  ContentGrid,
-  ContentMessage,
-  ContentSuggestionsList,
-} from "../../components/ToolAccordion/AccordionContent";
-import { ToolAccordion } from "../../components/ToolAccordion/ToolAccordion";
-import {
-  AccordionIcon,
-  getAccordionTitle,
-  getAnimationText,
-  getFeatureRequestOutput,
-  isCreatedOutput,
-  isErrorOutput,
-  isNoResultsOutput,
-  isSearchResultsOutput,
-  ToolIcon,
-  type FeatureRequestToolType,
-} from "./helpers";
-
-export interface FeatureRequestToolPart {
-  type: FeatureRequestToolType;
-  toolCallId: string;
-  state: ToolUIPart["state"];
-  input?: unknown;
-  output?: unknown;
-}
-
-interface Props {
-  part: FeatureRequestToolPart;
-}
-
-function truncate(text: string, maxChars: number): string {
-  const trimmed = text.trim();
-  if (trimmed.length <= maxChars) return trimmed;
-  return `${trimmed.slice(0, maxChars).trimEnd()}…`;
-}
-
-export function SearchFeatureRequestsTool({ part }: Props) {
-  const output = getFeatureRequestOutput(part);
-  const text = getAnimationText(part);
-  const isStreaming =
-    part.state === "input-streaming" || part.state === "input-available";
-  const isError =
-    part.state === "output-error" || (!!output && isErrorOutput(output));
-
-  const normalized = useMemo(() => {
-    if (!output) return null;
-    return { title: getAccordionTitle(part.type, output) };
-  }, [output, part.type]);
-
-  const isOutputAvailable = part.state === "output-available" && !!output;
-
-  const searchOutput =
-    isOutputAvailable && output && isSearchResultsOutput(output)
-      ? output
-      : null;
-  const noResultsOutput =
-    isOutputAvailable && output && isNoResultsOutput(output) ? output : null;
-  const errorOutput =
-    isOutputAvailable && output && isErrorOutput(output) ? output : null;
-
-  const hasExpandableContent =
-    isOutputAvailable &&
-    ((!!searchOutput && searchOutput.count > 0) ||
-      !!noResultsOutput ||
-      !!errorOutput);
-
-  const accordionDescription =
-    hasExpandableContent && searchOutput
-      ? `Found ${searchOutput.count} result${searchOutput.count === 1 ? "" : "s"} for "${searchOutput.query}"`
-      : hasExpandableContent && (noResultsOutput || errorOutput)
-        ? ((noResultsOutput ?? errorOutput)?.message ?? null)
-        : null;
-
-  return (
-    <div className="py-2">
-      <div className="flex items-center gap-2 text-sm text-muted-foreground">
-        <ToolIcon
-          toolType={part.type}
-          isStreaming={isStreaming}
-          isError={isError}
-        />
-        <MorphingTextAnimation
-          text={text}
-          className={isError ? "text-red-500" : undefined}
-        />
-      </div>
-
-      {hasExpandableContent && normalized && (
-        <ToolAccordion
-          icon={<AccordionIcon toolType={part.type} />}
-          title={normalized.title}
-          description={accordionDescription}
-        >
-          {searchOutput && (
-            <ContentGrid>
-              {searchOutput.results.map((r) => (
-                <ContentCard key={r.id}>
-                  <ContentCardHeader>
-                    <ContentCardTitle>{r.title}</ContentCardTitle>
-                  </ContentCardHeader>
-                  {r.description && (
-                    <ContentCardDescription>
-                      {truncate(r.description, 200)}
-                    </ContentCardDescription>
-                  )}
-                </ContentCard>
-              ))}
-            </ContentGrid>
-          )}
-
-          {noResultsOutput && (
-            <div>
-              <ContentMessage>{noResultsOutput.message}</ContentMessage>
-              {noResultsOutput.suggestions &&
-                noResultsOutput.suggestions.length > 0 && (
-                  <ContentSuggestionsList items={noResultsOutput.suggestions} />
-                )}
-            </div>
-          )}
-
-          {errorOutput && (
-            <div>
-              <ContentMessage>{errorOutput.message}</ContentMessage>
-              {errorOutput.error && (
-                <ContentCardDescription>
-                  {errorOutput.error}
-                </ContentCardDescription>
-              )}
-            </div>
-          )}
-        </ToolAccordion>
-      )}
-    </div>
-  );
-}
-
-export function CreateFeatureRequestTool({ part }: Props) {
-  const output = getFeatureRequestOutput(part);
-  const text = getAnimationText(part);
-  const isStreaming =
-    part.state === "input-streaming" || part.state === "input-available";
-  const isError =
-    part.state === "output-error" || (!!output && isErrorOutput(output));
-
-  const normalized = useMemo(() => {
-    if (!output) return null;
-    return { title: getAccordionTitle(part.type, output) };
-  }, [output, part.type]);
-
-  const isOutputAvailable = part.state === "output-available" && !!output;
-
-  const createdOutput =
-    isOutputAvailable && output && isCreatedOutput(output) ? output : null;
-  const errorOutput =
-    isOutputAvailable && output && isErrorOutput(output) ? output : null;
-
-  const hasExpandableContent =
-    isOutputAvailable && (!!createdOutput || !!errorOutput);
-
-  const accordionDescription =
-    hasExpandableContent && createdOutput
-      ? createdOutput.issue_title
-      : hasExpandableContent && errorOutput
-        ? errorOutput.message
-        : null;
-
-  return (
-    <div className="py-2">
-      <div className="flex items-center gap-2 text-sm text-muted-foreground">
-        <ToolIcon
-          toolType={part.type}
-          isStreaming={isStreaming}
-          isError={isError}
-        />
-        <MorphingTextAnimation
-          text={text}
-          className={isError ? "text-red-500" : undefined}
-        />
-      </div>
-
-      {hasExpandableContent && normalized && (
-        <ToolAccordion
-          icon={<AccordionIcon toolType={part.type} />}
-          title={normalized.title}
-          description={accordionDescription}
-        >
-          {createdOutput && (
-            <ContentCard>
-              <ContentCardHeader>
-                <ContentCardTitle>{createdOutput.issue_title}</ContentCardTitle>
-              </ContentCardHeader>
-              <div className="mt-2 flex items-center gap-2">
-                <ContentBadge>
-                  {createdOutput.is_new_issue ? "New" : "Existing"}
-                </ContentBadge>
-              </div>
-              <ContentMessage>{createdOutput.message}</ContentMessage>
-            </ContentCard>
-          )}
-
-          {errorOutput && (
-            <div>
-              <ContentMessage>{errorOutput.message}</ContentMessage>
-              {errorOutput.error && (
-                <ContentCardDescription>
-                  {errorOutput.error}
-                </ContentCardDescription>
-              )}
-            </div>
-          )}
-        </ToolAccordion>
-      )}
-    </div>
-  );
-}
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/FeatureRequests/helpers.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/FeatureRequests/helpers.tsx
@@ -1,271 +0,0 @@
-import {
-  CheckCircleIcon,
-  LightbulbIcon,
-  MagnifyingGlassIcon,
-  PlusCircleIcon,
-} from "@phosphor-icons/react";
-import type { ToolUIPart } from "ai";
-
-/* ------------------------------------------------------------------ */
-/*  Types (local until API client is regenerated)                      */
-/* ------------------------------------------------------------------ */
-
-interface FeatureRequestInfo {
-  id: string;
-  identifier: string;
-  title: string;
-  description?: string | null;
-}
-
-export interface FeatureRequestSearchResponse {
-  type: "feature_request_search";
-  message: string;
-  results: FeatureRequestInfo[];
-  count: number;
-  query: string;
-}
-
-export interface FeatureRequestCreatedResponse {
-  type: "feature_request_created";
-  message: string;
-  issue_id: string;
-  issue_identifier: string;
-  issue_title: string;
-  issue_url: string;
-  is_new_issue: boolean;
-  customer_name: string;
-}
-
-interface NoResultsResponse {
-  type: "no_results";
-  message: string;
-  suggestions?: string[];
-}
-
-interface ErrorResponse {
-  type: "error";
-  message: string;
-  error?: string;
-}
-
-export type FeatureRequestOutput =
-  | FeatureRequestSearchResponse
-  | FeatureRequestCreatedResponse
-  | NoResultsResponse
-  | ErrorResponse;
-
-export type FeatureRequestToolType =
-  | "tool-search_feature_requests"
-  | "tool-create_feature_request"
-  | string;
-
-/* ------------------------------------------------------------------ */
-/*  Output parsing                                                     */
-/* ------------------------------------------------------------------ */
-
-function parseOutput(output: unknown): FeatureRequestOutput | null {
-  if (!output) return null;
-  if (typeof output === "string") {
-    const trimmed = output.trim();
-    if (!trimmed) return null;
-    try {
-      return parseOutput(JSON.parse(trimmed) as unknown);
-    } catch {
-      return null;
-    }
-  }
-  if (typeof output === "object") {
-    const type = (output as { type?: unknown }).type;
-    if (
-      type === "feature_request_search" ||
-      type === "feature_request_created" ||
-      type === "no_results" ||
-      type === "error"
-    ) {
-      return output as FeatureRequestOutput;
-    }
-    // Fallback structural checks
-    if ("results" in output && "query" in output)
-      return output as FeatureRequestSearchResponse;
-    if ("issue_identifier" in output)
-      return output as FeatureRequestCreatedResponse;
-    if ("suggestions" in output && !("error" in output))
-      return output as NoResultsResponse;
-    if ("error" in output || "details" in output)
-      return output as ErrorResponse;
-  }
-  return null;
-}
-
-export function getFeatureRequestOutput(
-  part: unknown,
-): FeatureRequestOutput | null {
-  if (!part || typeof part !== "object") return null;
-  return parseOutput((part as { output?: unknown }).output);
-}
-
-/* ------------------------------------------------------------------ */
-/*  Type guards                                                        */
-/* ------------------------------------------------------------------ */
-
-export function isSearchResultsOutput(
-  output: FeatureRequestOutput,
-): output is FeatureRequestSearchResponse {
-  return (
-    output.type === "feature_request_search" ||
-    ("results" in output && "query" in output)
-  );
-}
-
-export function isCreatedOutput(
-  output: FeatureRequestOutput,
-): output is FeatureRequestCreatedResponse {
-  return (
-    output.type === "feature_request_created" || "issue_identifier" in output
-  );
-}
-
-export function isNoResultsOutput(
-  output: FeatureRequestOutput,
-): output is NoResultsResponse {
-  return (
-    output.type === "no_results" ||
-    ("suggestions" in output && !("error" in output))
-  );
-}
-
-export function isErrorOutput(
-  output: FeatureRequestOutput,
-): output is ErrorResponse {
-  return output.type === "error" || "error" in output;
-}
-
-/* ------------------------------------------------------------------ */
-/*  Accordion metadata                                                 */
-/* ------------------------------------------------------------------ */
-
-export function getAccordionTitle(
-  toolType: FeatureRequestToolType,
-  output: FeatureRequestOutput,
-): string {
-  if (toolType === "tool-search_feature_requests") {
-    if (isSearchResultsOutput(output)) return "Feature requests";
-    if (isNoResultsOutput(output)) return "No feature requests found";
-    return "Feature request search error";
-  }
-  if (isCreatedOutput(output)) {
-    return output.is_new_issue
-      ? "Feature request created"
-      : "Added to feature request";
-  }
-  if (isErrorOutput(output)) return "Feature request error";
-  return "Feature request";
-}
-
-/* ------------------------------------------------------------------ */
-/*  Animation text                                                     */
-/* ------------------------------------------------------------------ */
-
-interface AnimationPart {
-  type: FeatureRequestToolType;
-  state: ToolUIPart["state"];
-  input?: unknown;
-  output?: unknown;
-}
-
-export function getAnimationText(part: AnimationPart): string {
-  if (part.type === "tool-search_feature_requests") {
-    const query = (part.input as { query?: string } | undefined)?.query?.trim();
-    const queryText = query ? ` for "${query}"` : "";
-
-    switch (part.state) {
-      case "input-streaming":
-      case "input-available":
-        return `Searching feature requests${queryText}`;
-      case "output-available": {
-        const output = parseOutput(part.output);
-        if (!output) return `Searching feature requests${queryText}`;
-        if (isSearchResultsOutput(output)) {
-          return `Found ${output.count} feature request${output.count === 1 ? "" : "s"}${queryText}`;
-        }
-        if (isNoResultsOutput(output))
-          return `No feature requests found${queryText}`;
-        return `Error searching feature requests${queryText}`;
-      }
-      case "output-error":
-        return `Error searching feature requests${queryText}`;
-      default:
-        return "Searching feature requests";
-    }
-  }
-
-  // create_feature_request
-  const title = (part.input as { title?: string } | undefined)?.title?.trim();
-  const titleText = title ? ` "${title}"` : "";
-
-  switch (part.state) {
-    case "input-streaming":
-    case "input-available":
-      return `Creating feature request${titleText}`;
-    case "output-available": {
-      const output = parseOutput(part.output);
-      if (!output) return `Creating feature request${titleText}`;
-      if (isCreatedOutput(output)) {
-        return output.is_new_issue
-          ? "Feature request created"
-          : "Added to existing feature request";
-      }
-      if (isErrorOutput(output)) return "Error creating feature request";
-      return `Created feature request${titleText}`;
-    }
-    case "output-error":
-      return "Error creating feature request";
-    default:
-      return "Creating feature request";
-  }
-}
-
-/* ------------------------------------------------------------------ */
-/*  Icons                                                              */
-/* ------------------------------------------------------------------ */
-
-export function ToolIcon({
-  toolType,
-  isStreaming,
-  isError,
-}: {
-  toolType: FeatureRequestToolType;
-  isStreaming?: boolean;
-  isError?: boolean;
-}) {
-  const IconComponent =
-    toolType === "tool-create_feature_request"
-      ? PlusCircleIcon
-      : MagnifyingGlassIcon;
-
-  return (
-    <IconComponent
-      size={14}
-      weight="regular"
-      className={
-        isError
-          ? "text-red-500"
-          : isStreaming
-            ? "text-neutral-500"
-            : "text-neutral-400"
-      }
-    />
-  );
-}
-
-export function AccordionIcon({
-  toolType,
-}: {
-  toolType: FeatureRequestToolType;
-}) {
-  const IconComponent =
-    toolType === "tool-create_feature_request"
-      ? CheckCircleIcon
-      : LightbulbIcon;
-  return <IconComponent size={32} weight="light" />;
-}
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunAgent/RunAgent.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunAgent/RunAgent.tsx
@@ -2,14 +2,8 @@

 import type { ToolUIPart } from "ai";
 import { MorphingTextAnimation } from "../../components/MorphingTextAnimation/MorphingTextAnimation";
-import { OrbitLoader } from "../../components/OrbitLoader/OrbitLoader";
 import { ToolAccordion } from "../../components/ToolAccordion/ToolAccordion";
-import {
-  ContentGrid,
-  ContentHint,
-  ContentMessage,
-} from "../../components/ToolAccordion/AccordionContent";
-import { MiniGame } from "../CreateAgent/components/MiniGame/MiniGame";
+import { ContentMessage } from "../../components/ToolAccordion/AccordionContent";
 import {
  getAccordionMeta,
  getAnimationText,
@@ -66,21 +60,6 @@ export function RunAgentTool({ part }: Props) {
        />
      </div>

-      {isStreaming && !output && (
-        <ToolAccordion
-          icon={<OrbitLoader size={32} />}
-          title="Running agent, this may take a few minutes. Play while you wait."
-          expanded={true}
-        >
-          <ContentGrid>
-            <MiniGame />
-            <ContentHint>
-              This could take a few minutes — play while you wait!
-            </ContentHint>
-          </ContentGrid>
-        </ToolAccordion>
-      )}
-
      {hasExpandableContent && output && (
        <ToolAccordion {...getAccordionMeta(output)}>
          {isRunAgentExecutionStartedOutput(output) && (
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunBlock/RunBlock.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunBlock/RunBlock.tsx
@@ -3,7 +3,6 @@
 import type { ToolUIPart } from "ai";
 import { MorphingTextAnimation } from "../../components/MorphingTextAnimation/MorphingTextAnimation";
 import { ToolAccordion } from "../../components/ToolAccordion/ToolAccordion";
-import { BlockDetailsCard } from "./components/BlockDetailsCard/BlockDetailsCard";
 import { BlockOutputCard } from "./components/BlockOutputCard/BlockOutputCard";
 import { ErrorCard } from "./components/ErrorCard/ErrorCard";
 import { SetupRequirementsCard } from "./components/SetupRequirementsCard/SetupRequirementsCard";
@@ -12,7 +11,6 @@ import {
  getAnimationText,
  getRunBlockToolOutput,
  isRunBlockBlockOutput,
-  isRunBlockDetailsOutput,
  isRunBlockErrorOutput,
  isRunBlockSetupRequirementsOutput,
  ToolIcon,
@@ -43,7 +41,6 @@ export function RunBlockTool({ part }: Props) {
    part.state === "output-available" &&
    !!output &&
    (isRunBlockBlockOutput(output) ||
-      isRunBlockDetailsOutput(output) ||
      isRunBlockSetupRequirementsOutput(output) ||
      isRunBlockErrorOutput(output));

@@ -61,10 +58,6 @@ export function RunBlockTool({ part }: Props) {
        <ToolAccordion {...getAccordionMeta(output)}>
          {isRunBlockBlockOutput(output) && <BlockOutputCard output={output} />}

-          {isRunBlockDetailsOutput(output) && (
-            <BlockDetailsCard output={output} />
-          )}
-
          {isRunBlockSetupRequirementsOutput(output) && (
            <SetupRequirementsCard output={output} />
          )}
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunBlock/components/BlockDetailsCard/BlockDetailsCard.stories.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunBlock/components/BlockDetailsCard/BlockDetailsCard.stories.tsx
@@ -1,188 +0,0 @@
-import type { Meta, StoryObj } from "@storybook/nextjs";
-import { ResponseType } from "@/app/api/__generated__/models/responseType";
-import type { BlockDetailsResponse } from "../../helpers";
-import { BlockDetailsCard } from "./BlockDetailsCard";
-
-const meta: Meta<typeof BlockDetailsCard> = {
-  title: "Copilot/RunBlock/BlockDetailsCard",
-  component: BlockDetailsCard,
-  parameters: {
-    layout: "centered",
-  },
-  tags: ["autodocs"],
-  decorators: [
-    (Story) => (
-      <div style={{ maxWidth: 480 }}>
-        <Story />
-      </div>
-    ),
-  ],
-};
-
-export default meta;
-type Story = StoryObj<typeof meta>;
-
-const baseBlock: BlockDetailsResponse = {
-  type: ResponseType.block_details,
-  message:
-    "Here are the details for the GetWeather block. Provide the required inputs to run it.",
-  session_id: "session-123",
-  user_authenticated: true,
-  block: {
-    id: "block-abc-123",
-    name: "GetWeather",
-    description: "Fetches current weather data for a given location.",
-    inputs: {
-      type: "object",
-      properties: {
-        location: {
-          title: "Location",
-          type: "string",
-          description:
-            "City name or coordinates (e.g. 'London' or '51.5,-0.1')",
-        },
-        units: {
-          title: "Units",
-          type: "string",
-          description: "Temperature units: 'metric' or 'imperial'",
-        },
-      },
-      required: ["location"],
-    },
-    outputs: {
-      type: "object",
-      properties: {
-        temperature: {
-          title: "Temperature",
-          type: "number",
-          description: "Current temperature in the requested units",
-        },
-        condition: {
-          title: "Condition",
-          type: "string",
-          description: "Weather condition description (e.g. 'Sunny', 'Rain')",
-        },
-      },
-    },
-    credentials: [],
-  },
-};
-
-export const Default: Story = {
-  args: {
-    output: baseBlock,
-  },
-};
-
-export const InputsOnly: Story = {
-  args: {
-    output: {
-      ...baseBlock,
-      message: "This block requires inputs. No outputs are defined.",
-      block: {
-        ...baseBlock.block,
-        outputs: {},
-      },
-    },
-  },
-};
-
-export const OutputsOnly: Story = {
-  args: {
-    output: {
-      ...baseBlock,
-      message: "This block has no required inputs.",
-      block: {
-        ...baseBlock.block,
-        inputs: {},
-      },
-    },
-  },
-};
-
-export const ManyFields: Story = {
-  args: {
-    output: {
-      ...baseBlock,
-      message: "Block with many input and output fields.",
-      block: {
-        ...baseBlock.block,
-        name: "SendEmail",
-        description: "Sends an email via SMTP.",
-        inputs: {
-          type: "object",
-          properties: {
-            to: {
-              title: "To",
-              type: "string",
-              description: "Recipient email address",
-            },
-            subject: {
-              title: "Subject",
-              type: "string",
-              description: "Email subject line",
-            },
-            body: {
-              title: "Body",
-              type: "string",
-              description: "Email body content",
-            },
-            cc: {
-              title: "CC",
-              type: "string",
-              description: "CC recipients (comma-separated)",
-            },
-            bcc: {
-              title: "BCC",
-              type: "string",
-              description: "BCC recipients (comma-separated)",
-            },
-          },
-          required: ["to", "subject", "body"],
-        },
-        outputs: {
-          type: "object",
-          properties: {
-            message_id: {
-              title: "Message ID",
-              type: "string",
-              description: "Unique ID of the sent email",
-            },
-            status: {
-              title: "Status",
-              type: "string",
-              description: "Delivery status",
-            },
-          },
-        },
-      },
-    },
-  },
-};
-
-export const NoFieldDescriptions: Story = {
-  args: {
-    output: {
-      ...baseBlock,
-      message: "Fields without descriptions.",
-      block: {
-        ...baseBlock.block,
-        name: "SimpleBlock",
-        inputs: {
-          type: "object",
-          properties: {
-            input_a: { title: "Input A", type: "string" },
-            input_b: { title: "Input B", type: "number" },
-          },
-          required: ["input_a"],
-        },
-        outputs: {
-          type: "object",
-          properties: {
-            result: { title: "Result", type: "string" },
-          },
-        },
-      },
-    },
-  },
-};
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunBlock/components/BlockDetailsCard/BlockDetailsCard.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunBlock/components/BlockDetailsCard/BlockDetailsCard.tsx
@@ -1,103 +0,0 @@
-"use client";
-
-import type { BlockDetailsResponse } from "../../helpers";
-import {
-  ContentBadge,
-  ContentCard,
-  ContentCardDescription,
-  ContentCardTitle,
-  ContentGrid,
-  ContentMessage,
-} from "../../../../components/ToolAccordion/AccordionContent";
-
-interface Props {
-  output: BlockDetailsResponse;
-}
-
-function SchemaFieldList({
-  title,
-  properties,
-  required,
-}: {
-  title: string;
-  properties: Record<string, unknown>;
-  required?: string[];
-}) {
-  const entries = Object.entries(properties);
-  if (entries.length === 0) return null;
-
-  const requiredSet = new Set(required ?? []);
-
-  return (
-    <ContentCard>
-      <ContentCardTitle className="text-xs">{title}</ContentCardTitle>
-      <div className="mt-2 grid gap-2">
-        {entries.map(([name, schema]) => {
-          const field = schema as Record<string, unknown> | undefined;
-          const fieldTitle =
-            typeof field?.title === "string" ? field.title : name;
-          const fieldType =
-            typeof field?.type === "string" ? field.type : "unknown";
-          const description =
-            typeof field?.description === "string"
-              ? field.description
-              : undefined;
-
-          return (
-            <div key={name} className="rounded-xl border p-2">
-              <div className="flex items-center justify-between gap-2">
-                <ContentCardTitle className="text-xs">
-                  {fieldTitle}
-                </ContentCardTitle>
-                <div className="flex gap-1">
-                  <ContentBadge>{fieldType}</ContentBadge>
-                  {requiredSet.has(name) && (
-                    <ContentBadge>Required</ContentBadge>
-                  )}
-                </div>
-              </div>
-              {description && (
-                <ContentCardDescription className="mt-1 text-xs">
-                  {description}
-                </ContentCardDescription>
-              )}
-            </div>
-          );
-        })}
-      </div>
-    </ContentCard>
-  );
-}
-
-export function BlockDetailsCard({ output }: Props) {
-  const inputs = output.block.inputs as {
-    properties?: Record<string, unknown>;
-    required?: string[];
-  } | null;
-  const outputs = output.block.outputs as {
-    properties?: Record<string, unknown>;
-    required?: string[];
-  } | null;
-
-  return (
-    <ContentGrid>
-      <ContentMessage>{output.message}</ContentMessage>
-
-      {inputs?.properties && Object.keys(inputs.properties).length > 0 && (
-        <SchemaFieldList
-          title="Inputs"
-          properties={inputs.properties}
-          required={inputs.required}
-        />
-      )}
-
-      {outputs?.properties && Object.keys(outputs.properties).length > 0 && (
-        <SchemaFieldList
-          title="Outputs"
-          properties={outputs.properties}
-          required={outputs.required}
-        />
-      )}
-    </ContentGrid>
-  );
-}
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunBlock/helpers.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunBlock/helpers.tsx
@@ -10,37 +10,18 @@ import {
 import type { ToolUIPart } from "ai";
 import { OrbitLoader } from "../../components/OrbitLoader/OrbitLoader";

-/** Block details returned on first run_block attempt (before input_data provided). */
-export interface BlockDetailsResponse {
-  type: typeof ResponseType.block_details;
-  message: string;
-  session_id?: string | null;
-  block: {
-    id: string;
-    name: string;
-    description: string;
-    inputs: Record<string, unknown>;
-    outputs: Record<string, unknown>;
-    credentials: unknown[];
-  };
-  user_authenticated: boolean;
-}
-
 export interface RunBlockInput {
  block_id?: string;
-  block_name?: string;
  input_data?: Record<string, unknown>;
 }

 export type RunBlockToolOutput =
  | SetupRequirementsResponse
-  | BlockDetailsResponse
  | BlockOutputResponse
  | ErrorResponse;

 const RUN_BLOCK_OUTPUT_TYPES = new Set<string>([
  ResponseType.setup_requirements,
-  ResponseType.block_details,
  ResponseType.block_output,
  ResponseType.error,
 ]);
@@ -54,15 +35,6 @@ export function isRunBlockSetupRequirementsOutput(
  );
 }

-export function isRunBlockDetailsOutput(
-  output: RunBlockToolOutput,
-): output is BlockDetailsResponse {
-  return (
-    output.type === ResponseType.block_details ||
-    ("block" in output && typeof output.block === "object")
-  );
-}
-
 export function isRunBlockBlockOutput(
  output: RunBlockToolOutput,
 ): output is BlockOutputResponse {
@@ -92,7 +64,6 @@ function parseOutput(output: unknown): RunBlockToolOutput | null {
      return output as RunBlockToolOutput;
    }
    if ("block_id" in output) return output as BlockOutputResponse;
-    if ("block" in output) return output as BlockDetailsResponse;
    if ("setup_info" in output) return output as SetupRequirementsResponse;
    if ("error" in output || "details" in output)
      return output as ErrorResponse;
@@ -113,25 +84,17 @@ export function getAnimationText(part: {
  output?: unknown;
 }): string {
  const input = part.input as RunBlockInput | undefined;
-  const blockName = input?.block_name?.trim();
  const blockId = input?.block_id?.trim();
-  // Prefer block_name if available, otherwise fall back to block_id
-  const blockText = blockName
-    ? ` "${blockName}"`
-    : blockId
-      ? ` "${blockId}"`
-      : "";
+  const blockText = blockId ? ` "${blockId}"` : "";

  switch (part.state) {
    case "input-streaming":
    case "input-available":
-      return `Running${blockText}`;
+      return `Running the block${blockText}`;
    case "output-available": {
      const output = parseOutput(part.output);
-      if (!output) return `Running${blockText}`;
+      if (!output) return `Running the block${blockText}`;
      if (isRunBlockBlockOutput(output)) return `Ran "${output.block_name}"`;
-      if (isRunBlockDetailsOutput(output))
-        return `Details for "${output.block.name}"`;
      if (isRunBlockSetupRequirementsOutput(output)) {
        return `Setup needed for "${output.setup_info.agent_name}"`;
      }
@@ -195,21 +158,6 @@ export function getAccordionMeta(output: RunBlockToolOutput): {
    };
  }

-  if (isRunBlockDetailsOutput(output)) {
-    const inputKeys = Object.keys(
-      (output.block.inputs as { properties?: Record<string, unknown> })
-        ?.properties ?? {},
-    );
-    return {
-      icon,
-      title: output.block.name,
-      description:
-        inputKeys.length > 0
-          ? `${inputKeys.length} input field${inputKeys.length === 1 ? "" : "s"} available`
-          : output.message,
-    };
-  }
-
  if (isRunBlockSetupRequirementsOutput(output)) {
    const missingCredsCount = Object.keys(
      (output.setup_info.user_readiness?.missing_credentials ?? {}) as Record<
--- a/autogpt_platform/frontend/src/app/api/openapi.json
+++ b/autogpt_platform/frontend/src/app/api/openapi.json
@@ -1053,7 +1053,6 @@
                      "$ref": "#/components/schemas/ClarificationNeededResponse"
                    },
                    { "$ref": "#/components/schemas/BlockListResponse" },
-                    { "$ref": "#/components/schemas/BlockDetailsResponse" },
                    { "$ref": "#/components/schemas/BlockOutputResponse" },
                    { "$ref": "#/components/schemas/DocSearchResultsResponse" },
                    { "$ref": "#/components/schemas/DocPageResponse" },
@@ -6959,58 +6958,6 @@
        "enum": ["run", "byte", "second"],
        "title": "BlockCostType"
      },
-      "BlockDetails": {
-        "properties": {
-          "id": { "type": "string", "title": "Id" },
-          "name": { "type": "string", "title": "Name" },
-          "description": { "type": "string", "title": "Description" },
-          "inputs": {
-            "additionalProperties": true,
-            "type": "object",
-            "title": "Inputs",
-            "default": {}
-          },
-          "outputs": {
-            "additionalProperties": true,
-            "type": "object",
-            "title": "Outputs",
-            "default": {}
-          },
-          "credentials": {
-            "items": { "$ref": "#/components/schemas/CredentialsMetaInput" },
-            "type": "array",
-            "title": "Credentials",
-            "default": []
-          }
-        },
-        "type": "object",
-        "required": ["id", "name", "description"],
-        "title": "BlockDetails",
-        "description": "Detailed block information."
-      },
-      "BlockDetailsResponse": {
-        "properties": {
-          "type": {
-            "$ref": "#/components/schemas/ResponseType",
-            "default": "block_details"
-          },
-          "message": { "type": "string", "title": "Message" },
-          "session_id": {
-            "anyOf": [{ "type": "string" }, { "type": "null" }],
-            "title": "Session Id"
-          },
-          "block": { "$ref": "#/components/schemas/BlockDetails" },
-          "user_authenticated": {
-            "type": "boolean",
-            "title": "User Authenticated",
-            "default": false
-          }
-        },
-        "type": "object",
-        "required": ["message", "block"],
-        "title": "BlockDetailsResponse",
-        "description": "Response for block details (first run_block attempt)."
-      },
      "BlockInfo": {
        "properties": {
          "id": { "type": "string", "title": "Id" },
@@ -7066,13 +7013,62 @@
        "properties": {
          "id": { "type": "string", "title": "Id" },
          "name": { "type": "string", "title": "Name" },
-          "description": { "type": "string", "title": "Description" }
+          "description": { "type": "string", "title": "Description" },
+          "categories": {
+            "items": { "type": "string" },
+            "type": "array",
+            "title": "Categories"
+          },
+          "input_schema": {
+            "additionalProperties": true,
+            "type": "object",
+            "title": "Input Schema"
+          },
+          "output_schema": {
+            "additionalProperties": true,
+            "type": "object",
+            "title": "Output Schema"
+          },
+          "required_inputs": {
+            "items": { "$ref": "#/components/schemas/BlockInputFieldInfo" },
+            "type": "array",
+            "title": "Required Inputs",
+            "description": "List of required input fields for this block"
+          }
        },
        "type": "object",
-        "required": ["id", "name", "description"],
+        "required": [
+          "id",
+          "name",
+          "description",
+          "categories",
+          "input_schema",
+          "output_schema"
+        ],
        "title": "BlockInfoSummary",
        "description": "Summary of a block for search results."
      },
+      "BlockInputFieldInfo": {
+        "properties": {
+          "name": { "type": "string", "title": "Name" },
+          "type": { "type": "string", "title": "Type" },
+          "description": {
+            "type": "string",
+            "title": "Description",
+            "default": ""
+          },
+          "required": {
+            "type": "boolean",
+            "title": "Required",
+            "default": false
+          },
+          "default": { "anyOf": [{}, { "type": "null" }], "title": "Default" }
+        },
+        "type": "object",
+        "required": ["name", "type"],
+        "title": "BlockInputFieldInfo",
+        "description": "Information about a block input field."
+      },
      "BlockListResponse": {
        "properties": {
          "type": {
@@ -7090,7 +7086,12 @@
            "title": "Blocks"
          },
          "count": { "type": "integer", "title": "Count" },
-          "query": { "type": "string", "title": "Query" }
+          "query": { "type": "string", "title": "Query" },
+          "usage_hint": {
+            "type": "string",
+            "title": "Usage Hint",
+            "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."
+          }
        },
        "type": "object",
        "required": ["message", "blocks", "count", "query"],
@@ -10483,7 +10484,6 @@
          "agent_saved",
          "clarification_needed",
          "block_list",
-          "block_details",
          "block_output",
          "doc_search_results",
          "doc_page",
@@ -10495,9 +10495,7 @@
          "operation_started",
          "operation_pending",
          "operation_in_progress",
-          "input_validation_error",
-          "feature_request_search",
-          "feature_request_created"
+          "input_validation_error"
        ],
        "title": "ResponseType",
        "description": "Types of tool responses."
--- a/autogpt_platform/frontend/src/components/ai-elements/message.tsx
+++ b/autogpt_platform/frontend/src/components/ai-elements/message.tsx
@@ -10,7 +10,7 @@ import {
 } from "@/components/ui/tooltip";
 import { cn } from "@/lib/utils";
 import { cjk } from "@streamdown/cjk";
-import { code } from "@streamdown/code";
+import { code } from "@/lib/streamdown-code-singleton";
 import { math } from "@streamdown/math";
 import { mermaid } from "@streamdown/mermaid";
 import type { UIMessage } from "ai";
--- a/autogpt_platform/frontend/src/lib/streamdown-code-singleton.ts
+++ b/autogpt_platform/frontend/src/lib/streamdown-code-singleton.ts
@@ -0,0 +1,237 @@
+/**
+ * Custom Streamdown code plugin with proper shiki singleton.
+ *
+ * Fixes SENTRY-1051: "@streamdown/code creates a new shiki highlighter per language,
+ * causing "10 instances created" warnings and memory bloat.
+ *
+ * This plugin creates ONE highlighter and loads languages dynamically.
+ */
+
+import {
+  createHighlighter,
+  bundledLanguages,
+  type Highlighter,
+  type BundledLanguage,
+  type BundledTheme,
+} from "shiki";
+
+// Types matching streamdown's expected interface
+interface HighlightToken {
+  content: string;
+  color?: string;
+  bgColor?: string;
+  htmlStyle?: Record<string, string>;
+  htmlAttrs?: Record<string, string>;
+  offset?: number;
+}
+
+interface HighlightResult {
+  tokens: HighlightToken[][];
+  fg?: string;
+  bg?: string;
+}
+
+interface HighlightOptions {
+  code: string;
+  language: BundledLanguage;
+  themes: [string, string];
+}
+
+interface CodeHighlighterPlugin {
+  name: "shiki";
+  type: "code-highlighter";
+  highlight: (
+    options: HighlightOptions,
+    callback?: (result: HighlightResult) => void
+  ) => HighlightResult | null;
+  supportsLanguage: (language: BundledLanguage) => boolean;
+  getSupportedLanguages: () => BundledLanguage[];
+  getThemes: () => [BundledTheme, BundledTheme];
+}
+
+// Singleton state
+let highlighterPromise: Promise<Highlighter> | null = null;
+let highlighterInstance: Highlighter | null = null;
+const loadedLanguages = new Set<string>();
+const pendingLanguages = new Map<string, Promise<void>>();
+
+// Result cache (same as @streamdown/code)
+const resultCache = new Map<string, HighlightResult>();
+const pendingCallbacks = new Map<string, Set<(result: HighlightResult) => void>>();
+
+// All supported languages
+const supportedLanguages = new Set(Object.keys(bundledLanguages));
+
+// Cache key for results
+function getCacheKey(code: string, language: string, themes: [string, string]): string {
+  const prefix = code.slice(0, 100);
+  const suffix = code.length > 100 ? code.slice(-100) : "";
+  return `${language}:${themes[0]}:${themes[1]}:${code.length}:${prefix}:${suffix}`;
+}
+
+// Get or create the singleton highlighter
+async function getHighlighter(themes: [string, string]): Promise<Highlighter> {
+  if (highlighterInstance) {
+    return highlighterInstance;
+  }
+
+  if (!highlighterPromise) {
+    highlighterPromise = createHighlighter({
+      themes: themes as [BundledTheme, BundledTheme],
+      // Start with common languages pre-loaded for faster first render
+      langs: ["javascript", "typescript", "python", "json", "html", "css", "bash", "markdown"],
+    }).then((h: Highlighter) => {
+      highlighterInstance = h;
+      ["javascript", "typescript", "python", "json", "html", "css", "bash", "markdown"].forEach(
+        (l) => loadedLanguages.add(l)
+      );
+      return h;
+    });
+  }
+
+  return highlighterPromise;
+}
+
+// Load a language dynamically
+async function ensureLanguageLoaded(
+  highlighter: Highlighter,
+  language: string
+): Promise<void> {
+  if (loadedLanguages.has(language)) {
+    return;
+  }
+
+  if (pendingLanguages.has(language)) {
+    return pendingLanguages.get(language);
+  }
+
+  const loadPromise = highlighter
+    .loadLanguage(language as BundledLanguage)
+    .then(() => {
+      loadedLanguages.add(language);
+      pendingLanguages.delete(language);
+    })
+    .catch((err: Error) => {
+      console.warn(`[streamdown-code-singleton] Failed to load language: ${language}`, err);
+      pendingLanguages.delete(language);
+    });
+
+  pendingLanguages.set(language, loadPromise);
+  return loadPromise;
+}
+
+// Shiki token types
+interface ShikiToken {
+  content: string;
+  color?: string;
+  htmlStyle?: Record<string, string>;
+}
+
+// Convert shiki tokens to streamdown format
+function convertTokens(
+  shikiResult: ReturnType<Highlighter["codeToTokens"]>
+): HighlightResult {
+  return {
+    tokens: shikiResult.tokens.map((line: ShikiToken[]) =>
+      line.map((token: ShikiToken) => ({
+        content: token.content,
+        color: token.color,
+        htmlStyle: token.htmlStyle,
+      }))
+    ),
+    fg: shikiResult.fg,
+    bg: shikiResult.bg,
+  };
+}
+
+export interface CodePluginOptions {
+  themes?: [BundledTheme, BundledTheme];
+}
+
+export function createCodePlugin(
+  options: CodePluginOptions = {}
+): CodeHighlighterPlugin {
+  const themes = options.themes ?? ["github-light", "github-dark"];
+
+  return {
+    name: "shiki",
+    type: "code-highlighter",
+
+    supportsLanguage(language: BundledLanguage): boolean {
+      return supportedLanguages.has(language);
+    },
+
+    getSupportedLanguages(): BundledLanguage[] {
+      return Array.from(supportedLanguages) as BundledLanguage[];
+    },
+
+    getThemes(): [BundledTheme, BundledTheme] {
+      return themes as [BundledTheme, BundledTheme];
+    },
+
+    highlight(
+      { code, language, themes: highlightThemes }: HighlightOptions,
+      callback?: (result: HighlightResult) => void
+    ): HighlightResult | null {
+      const cacheKey = getCacheKey(code, language, highlightThemes);
+
+      // Return cached result if available
+      if (resultCache.has(cacheKey)) {
+        return resultCache.get(cacheKey)!;
+      }
+
+      // Register callback for async result
+      if (callback) {
+        if (!pendingCallbacks.has(cacheKey)) {
+          pendingCallbacks.set(cacheKey, new Set());
+        }
+        pendingCallbacks.get(cacheKey)!.add(callback);
+      }
+
+      // Start async highlighting
+      getHighlighter(highlightThemes)
+        .then(async (highlighter) => {
+          // Ensure language is loaded
+          const lang = supportedLanguages.has(language) ? language : "text";
+          if (lang !== "text") {
+            await ensureLanguageLoaded(highlighter, lang);
+          }
+
+          // Highlight the code
+          const effectiveLang = highlighter.getLoadedLanguages().includes(lang)
+            ? lang
+            : "text";
+
+          const shikiResult = highlighter.codeToTokens(code, {
+            lang: effectiveLang,
+            themes: {
+              light: highlightThemes[0] as BundledTheme,
+              dark: highlightThemes[1] as BundledTheme,
+            },
+          });
+
+          const result = convertTokens(shikiResult);
+          resultCache.set(cacheKey, result);
+
+          // Notify all pending callbacks
+          const callbacks = pendingCallbacks.get(cacheKey);
+          if (callbacks) {
+            for (const cb of callbacks) {
+              cb(result);
+            }
+            pendingCallbacks.delete(cacheKey);
+          }
+        })
+        .catch((err) => {
+          console.error("[streamdown-code-singleton] Failed to highlight code:", err);
+          pendingCallbacks.delete(cacheKey);
+        });
+
+      // Return null while async loading
+      return null;
+    },
+  };
+}
+
+// Pre-configured plugin with default settings (drop-in replacement for @streamdown/code)
+export const code = createCodePlugin();
--- a/plans/SECRT-1950-claude-ci-optimizations.md
+++ b/plans/SECRT-1950-claude-ci-optimizations.md
@@ -1,165 +0,0 @@
-# Implementation Plan: SECRT-1950 - Apply E2E CI Optimizations to Claude Code Workflows
-
-## Ticket
-[SECRT-1950](https://linear.app/autogpt/issue/SECRT-1950)
-
-## Summary
-Apply Pwuts's CI performance optimizations from PR #12090 to Claude Code workflows.
-
-## Reference PR
-https://github.com/Significant-Gravitas/AutoGPT/pull/12090
-
---
-
-## Analysis
-
-### Current State (claude.yml)
-
-**pnpm caching (lines 104-118):**
-```yaml
- name: Set up Node.js
-  uses: actions/setup-node@v6
-  with:
-    node-version: "22"
-
- name: Enable corepack
-  run: corepack enable
-
- name: Set pnpm store directory
-  run: |
-    pnpm config set store-dir ~/.pnpm-store
-    echo "PNPM_HOME=$HOME/.pnpm-store" >> $GITHUB_ENV
-
- name: Cache frontend dependencies
-  uses: actions/cache@v5
-  with:
-    path: ~/.pnpm-store
-    key: ${{ runner.os }}-pnpm-${{ hashFiles('autogpt_platform/frontend/pnpm-lock.yaml', 'autogpt_platform/frontend/package.json') }}
-    restore-keys: |
-      ${{ runner.os }}-pnpm-${{ hashFiles('autogpt_platform/frontend/pnpm-lock.yaml') }}
-      ${{ runner.os }}-pnpm-
-```
-
-**Docker setup (lines 134-165):**
- Uses `docker-buildx-action@v3` 
- Has manual Docker image caching via `actions/cache`
- Runs `docker compose up` without buildx bake optimization
-
-### Pwuts's Optimizations (PR #12090)
-
-1. **Simplified pnpm caching** - Use `setup-node` built-in cache:
-```yaml
- name: Enable corepack
-  run: corepack enable
-
- name: Set up Node
-  uses: actions/setup-node@v6
-  with:
-    node-version: "22.18.0"
-    cache: "pnpm"
-    cache-dependency-path: autogpt_platform/frontend/pnpm-lock.yaml
-```
-
-2. **Docker build caching via buildx bake**:
-```yaml
- name: Set up Docker Buildx
-  uses: docker/setup-buildx-action@v3
-  with:
-    driver: docker-container
-    driver-opts: network=host
-
- name: Expose GHA cache to docker buildx CLI
-  uses: crazy-max/ghaction-github-runtime@v3
-
- name: Build Docker images (with cache)
-  run: |
-    pip install pyyaml
-    docker compose -f docker-compose.yml config > docker-compose.resolved.yml
-    python ../.github/workflows/scripts/docker-ci-fix-compose-build-cache.py \
-      --source docker-compose.resolved.yml \
-      --cache-from "type=gha" \
-      --cache-to "type=gha,mode=max" \
-      ...
-    docker buildx bake --allow=fs.read=.. -f docker-compose.resolved.yml --load
-```
-
---
-
-## Proposed Changes
-
-### 1. Update pnpm caching in `claude.yml`
-
-**Before:**
- Manual cache key generation
- Separate `actions/cache` step
- Manual pnpm store directory config
-
-**After:**
- Use `setup-node` built-in `cache: "pnpm"` option
- Remove manual cache step
- Keep `corepack enable` before `setup-node`
-
-### 2. Update Docker build in `claude.yml`
-
-**Before:**
- Manual Docker layer caching via `actions/cache` with `/tmp/.buildx-cache`
- Simple `docker compose build`
-
-**After:**
- Use `crazy-max/ghaction-github-runtime@v3` to expose GHA cache
- Use `docker-ci-fix-compose-build-cache.py` script
- Build with `docker buildx bake`
-
-### 3. Apply same changes to other Claude workflows
-
- `claude-dependabot.yml` - Check if it has similar patterns
- `claude-ci-failure-auto-fix.yml` - Check if it has similar patterns
- `copilot-setup-steps.yml` - Reusable workflow, may be the source of truth
-
---
-
-## Files to Modify
-
-1. `.github/workflows/claude.yml`
-2. `.github/workflows/claude-dependabot.yml` (if applicable)
-3. `.github/workflows/claude-ci-failure-auto-fix.yml` (if applicable)
-
-## Dependencies
-
- PR #12090 must be merged first (provides the `docker-ci-fix-compose-build-cache.py` script)
- Backend Dockerfile optimizations (already in PR #12090)
-
---
-
-## Test Plan
-
-1. Create PR with changes
-2. Trigger Claude workflow manually or via `@claude` mention on a test issue
-3. Compare CI runtime before/after
-4. Verify Claude agent still works correctly (can checkout, build, run tests)
-
---
-
-## Risk Assessment
-
-**Low risk:**
- These are CI infrastructure changes, not code changes
- If caching fails, builds fall back to uncached (slower but works)
- Changes mirror proven patterns from PR #12090
-
---
-
-## Questions for Reviewer
-
-1. Should we wait for PR #12090 to merge before creating this PR?
-2. Does `copilot-setup-steps.yml` need updating, or is it a separate concern?
-3. Any concerns about cache key collisions between frontend E2E and Claude workflows?
-
---
-
-## Verified
-
- ✅ **`claude-dependabot.yml`**: Has same pnpm caching pattern as `claude.yml` (manual `actions/cache`) — NEEDS UPDATE
- ✅ **`claude-ci-failure-auto-fix.yml`**: Simple workflow with no pnpm or Docker caching — NO CHANGES NEEDED
- ✅ **Script path**: `docker-ci-fix-compose-build-cache.py` will be at `.github/workflows/scripts/` after PR #12090 merges
- ✅ **Test seed caching**: NOT APPLICABLE — Claude workflows spin up a dev environment but don't run E2E tests with pre-seeded data. The seed caching in PR #12090 is specific to the frontend E2E test suite which needs consistent test data. Claude just needs the services running.