diff --git a/src/app/api/ai/pipeline/route.ts b/src/app/api/ai/pipeline/route.ts
index 574d45a..30c18cd 100644
--- a/src/app/api/ai/pipeline/route.ts
+++ b/src/app/api/ai/pipeline/route.ts
@@ -5,7 +5,7 @@ import { prisma } from "@/lib/prisma";
 import { streamCompletion } from "@/server/services/ai";
 import { buildPipelineSystemPrompt } from "@/lib/ai/prompts";
 import { writeAuditLog } from "@/server/services/audit";
-import type { AiReviewResponse } from "@/lib/ai/types";
+
 import { Prisma } from "@/generated/prisma";
 
 export async function POST(request: Request) {
@@ -184,8 +184,9 @@ export async function POST(request: Request) {
         if (body.mode === "review" && conversationId) {
           let parsedSuggestions = null;
           try {
-            const parsed: AiReviewResponse = JSON.parse(fullResponse);
-            if (parsed.summary && Array.isArray(parsed.suggestions)) {
+            const { parseAiReviewResponse } = await import("@/lib/ai/suggestion-validator");
+            const parsed = parseAiReviewResponse(fullResponse);
+            if (parsed) {
               parsedSuggestions = parsed.suggestions;
             }
           } catch {
diff --git a/src/app/api/ai/vrl-chat/route.ts b/src/app/api/ai/vrl-chat/route.ts
index 19ce91a..c4d757c 100644
--- a/src/app/api/ai/vrl-chat/route.ts
+++ b/src/app/api/ai/vrl-chat/route.ts
@@ -5,7 +5,7 @@ import { prisma } from "@/lib/prisma";
 import { streamCompletion } from "@/server/services/ai";
 import { buildVrlChatSystemPrompt } from "@/lib/ai/prompts";
 import { writeAuditLog } from "@/server/services/audit";
-import type { VrlChatResponse } from "@/lib/ai/vrl-suggestion-types";
+
 import { Prisma } from "@/generated/prisma";
 
 export async function POST(request: Request) {
@@ -174,8 +174,9 @@ export async function POST(request: Request) {
         // Persist assistant response
         let parsedSuggestions = null;
         try {
-          const parsed: VrlChatResponse = JSON.parse(fullResponse);
-          if (parsed.summary && Array.isArray(parsed.suggestions)) {
+          const { parseVrlChatResponse } = await import("@/lib/ai/vrl-suggestion-types");
+          const parsed = parseVrlChatResponse(fullResponse);
+          if (parsed) {
             parsedSuggestions = parsed.suggestions;
           }
         } catch {
diff --git a/src/components/flow/ai-pipeline-dialog.tsx b/src/components/flow/ai-pipeline-dialog.tsx
index 31a827f..0d6ed06 100644
--- a/src/components/flow/ai-pipeline-dialog.tsx
+++ b/src/components/flow/ai-pipeline-dialog.tsx
@@ -13,7 +13,7 @@ import {
   DialogTitle,
 } from "@/components/ui/dialog";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
-import { ScrollArea } from "@/components/ui/scroll-area";
+
 import { useTeamStore } from "@/stores/team-store";
 import { useFlowStore } from "@/stores/flow-store";
 import { generateVectorYaml, importVectorConfig } from "@/lib/config-generator";
@@ -400,7 +400,7 @@ export function AiPipelineDialog({
             ) : (
               <>
                 {/* Message thread */}
-                <ScrollArea className="flex-1 h-0 pr-4">
+                <div className="flex-1 min-h-0 overflow-y-auto pr-4">
                   <div className="space-y-4 pb-4">
                     {conversation.messages.length === 0 && !conversation.isStreaming && (
                       <p className="text-sm text-muted-foreground text-center py-8">
@@ -439,7 +439,7 @@ export function AiPipelineDialog({
 
                     <div ref={messagesEndRef} />
                   </div>
-                </ScrollArea>
+                </div>
 
                 {conversation.error && (
                   <div className="flex items-start gap-2 rounded border border-destructive/50 bg-destructive/10 px-3 py-2 text-sm text-destructive mb-3">
diff --git a/src/components/vrl-editor/vrl-editor.tsx b/src/components/vrl-editor/vrl-editor.tsx
index 4c5ebd0..15074f0 100644
--- a/src/components/vrl-editor/vrl-editor.tsx
+++ b/src/components/vrl-editor/vrl-editor.tsx
@@ -577,7 +577,7 @@ export function VrlEditor({ value, onChange, sourceTypes, pipelineId, componentK
         <DialogContent
           className="h-[85vh] flex flex-col sm:max-w-[calc(100vw-4rem)] xl:max-w-6xl"
           onKeyDown={(e) => e.stopPropagation()}
-          onFocusOutside={(e) => e.preventDefault()}
+          onInteractOutside={(e) => e.preventDefault()}
         >
           <DialogHeader>
             <DialogTitle>VRL Editor</DialogTitle>
@@ -616,7 +616,7 @@ export function VrlEditor({ value, onChange, sourceTypes, pipelineId, componentK
             {pipelineId && upstreamSourceKeys && upstreamSourceKeys.length > 0 && (
               <>
                 <Select value={String(sampleLimit)} onValueChange={(val) => setSampleLimit(Number(val))}>
-                  <SelectTrigger className="h-8 w-[120px] text-sm">
+                  <SelectTrigger size="sm" className="w-[120px]">
                     <SelectValue />
                   </SelectTrigger>
                   <SelectContent>
diff --git a/src/lib/ai/suggestion-validator.ts b/src/lib/ai/suggestion-validator.ts
index a2e0923..5f48f3e 100644
--- a/src/lib/ai/suggestion-validator.ts
+++ b/src/lib/ai/suggestion-validator.ts
@@ -2,12 +2,19 @@
 import type { Node } from "@xyflow/react";
 import type { AiSuggestion, AiReviewResponse, SuggestionStatus } from "./types";
 
+/** Strip markdown code fences and extract the JSON body. */
+function stripCodeFences(raw: string): string {
+  const trimmed = raw.trim();
+  const match = trimmed.match(/^```(?:json)?\s*\n?([\s\S]*?)\n?\s*```$/);
+  return match ? match[1].trim() : trimmed;
+}
+
 /**
  * Validate a parsed AI response. Returns the response if valid, null if not.
  */
 export function parseAiReviewResponse(raw: string): AiReviewResponse | null {
   try {
-    const parsed = JSON.parse(raw);
+    const parsed = JSON.parse(stripCodeFences(raw));
     if (
       typeof parsed === "object" &&
       parsed !== null &&
diff --git a/src/lib/ai/vrl-suggestion-types.ts b/src/lib/ai/vrl-suggestion-types.ts
index 1893807..dc4e333 100644
--- a/src/lib/ai/vrl-suggestion-types.ts
+++ b/src/lib/ai/vrl-suggestion-types.ts
@@ -18,13 +18,21 @@ export interface VrlChatResponse {
 /** Status of a VRL suggestion in the UI */
 export type VrlSuggestionStatus = "actionable" | "applied" | "outdated";
 
+/** Strip markdown code fences and extract the JSON body. */
+function stripCodeFences(raw: string): string {
+  const trimmed = raw.trim();
+  // Match ```json ... ``` or ``` ... ```
+  const match = trimmed.match(/^```(?:json)?\s*\n?([\s\S]*?)\n?\s*```$/);
+  return match ? match[1].trim() : trimmed;
+}
+
 /**
  * Parse the streamed AI response as a VrlChatResponse.
  * Returns null if the response is not valid JSON or missing required fields.
  */
 export function parseVrlChatResponse(raw: string): VrlChatResponse | null {
   try {
-    const parsed = JSON.parse(raw);
+    const parsed = JSON.parse(stripCodeFences(raw));
     if (
       typeof parsed === "object" &&
       parsed !== null &&