@yourgpt/copilot-sdk 2.1.5-alpha.0 → 2.1.5-alpha.2

package/dist/ui/index.js

@@ -1,10 +1,10 @@
-import { useCopilot, useThreadManager } from '../chunk-6BMQZIS3.js';
-import { createServerAdapter } from '../chunk-UXJ6LIZB.js';
+import { useCopilot, useThreadManager } from '../chunk-PT2TOHG5.js';
+import { createServerAdapter } from '../chunk-WZ2TOZ7M.js';
 import { DEFAULT_MCP_UI_SANDBOX, parseMCPUIMessage } from '../chunk-G4SF2PNQ.js';
 import '../chunk-EWVQWTNV.js';
 import '../chunk-VNLLW3ZI.js';
-import '../chunk-ENFWM3EY.js';
-import '../chunk-4QXY2PBG.js';
+import '../chunk-RKGRQRZU.js';
+import '../chunk-3AONOZLY.js';
 import '../chunk-LLM7AHMO.js';
 import '../chunk-RQ74USYU.js';
 import '../chunk-7W7QLZNC.js';
@@ -18,8 +18,8 @@ import '../chunk-DGUM43GV.js';
 import { clsx } from 'clsx';
 import { twMerge } from 'tailwind-merge';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import * as React18 from 'react';
-import React18__default, { memo, createContext, useState, useRef, useId, useCallback, useLayoutEffect, useContext, useEffect } from 'react';
+import * as React17 from 'react';
+import React17__default, { memo, createContext, useState, useRef, useId, useCallback, useLayoutEffect, useContext, useEffect } from 'react';
 import { Streamdown } from 'streamdown';
 import { code } from '@streamdown/code';
 import { Slot } from '@radix-ui/react-slot';
@@ -384,7 +384,7 @@ var buttonVariants = cva(
     }
   }
 );
-var Button = React18.forwardRef(
+var Button = React17.forwardRef(
   ({ className, variant, size, asChild = false, ...props }, ref) => {
     const Comp = asChild ? Slot : "button";
     return /* @__PURE__ */ jsx(
@@ -625,7 +625,7 @@ function TooltipTrigger({
   disabled,
   ...props
 }) {
-  if (asChild && React18__default.isValidElement(children)) {
+  if (asChild && React17__default.isValidElement(children)) {
     return /* @__PURE__ */ jsx(Tooltip$1.Trigger, { disabled, render: children, ...props });
   }
   return /* @__PURE__ */ jsx(Tooltip$1.Trigger, { disabled, ...props, children });
@@ -654,7 +654,7 @@ function TooltipContent({
     }
   ) }) });
 }
-var Avatar = React18.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx(
+var Avatar = React17.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx(
   AvatarPrimitive.Root,
   {
     ref,
@@ -666,7 +666,7 @@ var Avatar = React18.forwardRef(({ className, ...props }, ref) => /* @__PURE__ *
   }
 ));
 Avatar.displayName = AvatarPrimitive.Root.displayName;
-var AvatarImage = React18.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx(
+var AvatarImage = React17.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx(
   AvatarPrimitive.Image,
   {
     ref,
@@ -675,7 +675,7 @@ var AvatarImage = React18.forwardRef(({ className, ...props }, ref) => /* @__PUR
   }
 ));
 AvatarImage.displayName = AvatarPrimitive.Image.displayName;
-var AvatarFallback = React18.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx(
+var AvatarFallback = React17.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx(
   AvatarPrimitive.Fallback,
   {
     ref,
@@ -735,7 +735,7 @@ var MessageContent = ({
   );
   return markdown ? /* @__PURE__ */ jsx(Markdown, { className: classNames, ...props, children }) : /* @__PURE__ */ jsx("div", { className: classNames, ...props, children });
 };
-var Textarea = React18.forwardRef(({ className, ...props }, ref) => {
+var Textarea = React17.forwardRef(({ className, ...props }, ref) => {
   return /* @__PURE__ */ jsx(
     "textarea",
     {
@@ -899,7 +899,7 @@ function PromptInputAction({
 }
 var HoverCard = HoverCardPrimitive.Root;
 var HoverCardTrigger = HoverCardPrimitive.Trigger;
-var HoverCardContent = React18.forwardRef(({ className, align = "center", sideOffset = 4, ...props }, ref) => /* @__PURE__ */ jsx(
+var HoverCardContent = React17.forwardRef(({ className, align = "center", sideOffset = 4, ...props }, ref) => /* @__PURE__ */ jsx(
   HoverCardPrimitive.Content,
   {
     ref,
@@ -1442,7 +1442,7 @@ function SourcesCollapsible({
   defaultExpanded = false,
   className
 }) {
-  const [expanded, setExpanded] = React18.useState(defaultExpanded);
+  const [expanded, setExpanded] = React17.useState(defaultExpanded);
   if (citations.length === 0) return null;
   return /* @__PURE__ */ jsxs("div", { className: cn("border rounded-lg", className), children: [
     /* @__PURE__ */ jsxs(
@@ -1508,7 +1508,7 @@ function SourcesList({
   if (compact) {
     return /* @__PURE__ */ jsxs("div", { className: cn("text-xs text-muted-foreground", className), children: [
       /* @__PURE__ */ jsx("span", { className: "font-medium", children: "Sources: " }),
-      citations.map((c, i) => /* @__PURE__ */ jsxs(React18.Fragment, { children: [
+      citations.map((c, i) => /* @__PURE__ */ jsxs(React17.Fragment, { children: [
         /* @__PURE__ */ jsxs(
           "a",
           {
@@ -1586,11 +1586,11 @@ function resultsToCitations(results) {
     domain: result.domain || getDomain3(result.url)
   }));
 }
-var ReasoningContext = React18.createContext(
+var ReasoningContext = React17.createContext(
   null
 );
 function useReasoningContext() {
-  const context = React18.useContext(ReasoningContext);
+  const context = React17.useContext(ReasoningContext);
   if (!context) {
     throw new Error(
       "Reasoning components must be used within a Reasoning provider"
@@ -1606,11 +1606,11 @@ function Reasoning({
   defaultOpen = false,
   className
 }) {
-  const [uncontrolledOpen, setUncontrolledOpen] = React18.useState(defaultOpen);
-  const prevStreamingRef = React18.useRef(isStreaming);
+  const [uncontrolledOpen, setUncontrolledOpen] = React17.useState(defaultOpen);
+  const prevStreamingRef = React17.useRef(isStreaming);
   const isControlled = controlledOpen !== void 0;
   const isOpen = isControlled ? controlledOpen : uncontrolledOpen;
-  const setIsOpen = React18.useCallback(
+  const setIsOpen = React17.useCallback(
     (open) => {
       if (onOpenChange) {
         onOpenChange(open);
@@ -1621,7 +1621,7 @@ function Reasoning({
     },
     [isControlled, onOpenChange]
   );
-  React18.useEffect(() => {
+  React17.useEffect(() => {
     if (isStreaming && !prevStreamingRef.current) {
       setIsOpen(true);
     } else if (!isStreaming && prevStreamingRef.current) {
@@ -1677,9 +1677,9 @@ function ReasoningContent({
   className
 }) {
   const { isOpen } = useReasoningContext();
-  const contentRef = React18.useRef(null);
-  const [height, setHeight] = React18.useState(0);
-  React18.useEffect(() => {
+  const contentRef = React17.useRef(null);
+  const [height, setHeight] = React17.useState(0);
+  React17.useEffect(() => {
     if (contentRef.current) {
       const resizeObserver = new ResizeObserver((entries) => {
         for (const entry of entries) {
@@ -1728,11 +1728,11 @@ function SimpleReasoning({
     /* @__PURE__ */ jsx(ReasoningContent, { markdown, children: content })
   ] });
 }
-var CopilotUIContext = React18.createContext(
+var CopilotUIContext = React17.createContext(
   null
 );
 function useCopilotUI() {
-  const context = React18.useContext(CopilotUIContext);
+  const context = React17.useContext(CopilotUIContext);
   if (!context) {
     return {
       debug: false,
@@ -1747,7 +1747,7 @@ function CopilotUIProvider({
   debug = false,
   defaultDebugExpanded = false
 }) {
-  const value = React18.useMemo(
+  const value = React17.useMemo(
     () => ({
       debug,
       defaultDebugExpanded,
@@ -1890,7 +1890,7 @@ function ToolStep({
 }) {
   const { isDebug, defaultDebugExpanded } = useCopilotUI();
   const debug = debugProp ?? isDebug;
-  const [expanded, setExpanded] = React18.useState(
+  const [expanded, setExpanded] = React17.useState(
     defaultExpanded ?? defaultDebugExpanded ?? false
   );
   const displayTitle = getDisplayTitle(step);
@@ -2371,9 +2371,9 @@ function ArrowUpRightIcon({ className }) {
     }
   );
 }
-var ConfirmationContext = React18.createContext(null);
+var ConfirmationContext = React17.createContext(null);
 function useConfirmationContext() {
-  const context = React18.useContext(ConfirmationContext);
+  const context = React17.useContext(ConfirmationContext);
   if (!context) {
     throw new Error(
       "Confirmation components must be used within a Confirmation provider"
@@ -2541,30 +2541,27 @@ function PermissionConfirmation({
   message,
   onApprove,
   onReject,
-  showPermissionOptions = true,
-  permissionOptions = DEFAULT_PERMISSION_OPTIONS,
   className
 }) {
-  const [selectedPermission, setSelectedPermission] = React18.useState("ask");
-  const [showOptions, setShowOptions] = React18.useState(false);
   const handleApprove = () => {
-    onApprove?.(selectedPermission);
+    onApprove?.("ask");
   };
   const handleReject = () => {
-    onReject?.(
-      selectedPermission === "deny_always" ? "deny_always" : void 0
-    );
+    onReject?.(void 0);
   };
   if (state === "approved") {
     return /* @__PURE__ */ jsxs(
       "div",
       {
         className: cn(
-          "flex items-center gap-2 px-4 py-2 text-sm text-green-600 dark:text-green-400 rounded-lg border bg-green-50 dark:bg-green-950/20",
+          "csdk-confirm-result",
+          "inline-flex items-center gap-2 px-3 py-1.5 text-sm",
+          "rounded-2xl border border-green-200/70 dark:border-green-900/40",
+          "bg-green-50 dark:bg-green-950/20 text-green-700 dark:text-green-400",
           className
         ),
         children: [
-          /* @__PURE__ */ jsx(CheckIcon, { className: "h-4 w-4" }),
+          /* @__PURE__ */ jsx(CheckIcon, { className: "h-3.5 w-3.5 shrink-0" }),
           /* @__PURE__ */ jsx("span", { children: "Approved" })
         ]
       }
@@ -2575,11 +2572,14 @@ function PermissionConfirmation({
       "div",
       {
         className: cn(
-          "flex items-center gap-2 px-4 py-2 text-sm text-red-600 dark:text-red-400 rounded-lg border bg-red-50 dark:bg-red-950/20",
+          "csdk-confirm-result",
+          "inline-flex items-center gap-2 px-3 py-1.5 text-sm",
+          "rounded-2xl border border-red-200/70 dark:border-red-900/40",
+          "bg-red-50 dark:bg-red-950/20 text-red-700 dark:text-red-400",
           className
         ),
         children: [
-          /* @__PURE__ */ jsx(XIcon2, { className: "h-4 w-4" }),
+          /* @__PURE__ */ jsx(XIcon2, { className: "h-3.5 w-3.5 shrink-0" }),
           /* @__PURE__ */ jsx("span", { children: "Rejected" })
         ]
       }
@@ -2589,81 +2589,47 @@ function PermissionConfirmation({
     "div",
     {
       className: cn(
-        "rounded-lg border bg-card text-card-foreground p-4",
+        "csdk-confirm-card",
+        "w-full rounded-2xl border border-border/60 bg-card text-card-foreground shadow-sm overflow-hidden",
         className
       ),
       children: [
-        /* @__PURE__ */ jsxs("div", { className: "flex items-start gap-3 mb-3", children: [
-          /* @__PURE__ */ jsx(AlertTriangleIcon, { className: "mt-0.5 h-5 w-5 flex-shrink-0 text-amber-500" }),
-          /* @__PURE__ */ jsxs("div", { className: "flex-1 min-w-0", children: [
-            toolName && /* @__PURE__ */ jsx("p", { className: "text-sm font-medium text-foreground", children: toolName }),
-            /* @__PURE__ */ jsx("p", { className: "text-sm text-muted-foreground", children: message || "This tool requires your approval to execute." })
+        /* @__PURE__ */ jsxs("div", { className: "flex items-start gap-3 p-4", children: [
+          /* @__PURE__ */ jsx("div", { className: "mt-0.5 flex h-7 w-7 shrink-0 items-center justify-center rounded-xl bg-amber-100 dark:bg-amber-950/50", children: /* @__PURE__ */ jsx(AlertTriangleIcon, { className: "h-3.5 w-3.5 text-amber-600 dark:text-amber-400" }) }),
+          /* @__PURE__ */ jsxs("div", { className: "flex-1 min-w-0 pt-0.5", children: [
+            toolName && /* @__PURE__ */ jsx("p", { className: "text-[10px] font-semibold uppercase tracking-widest text-muted-foreground mb-1", children: toolName }),
+            /* @__PURE__ */ jsx("p", { className: "text-sm text-foreground leading-snug", children: message || "This tool requires your approval to execute." })
           ] })
         ] }),
-        showPermissionOptions && /* @__PURE__ */ jsxs("div", { className: "mb-4", children: [
-          /* @__PURE__ */ jsxs(
+        /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-end gap-2 px-4 pb-4", children: [
+          /* @__PURE__ */ jsx(
             "button",
             {
               type: "button",
-              onClick: () => setShowOptions(!showOptions),
-              className: "flex items-center gap-2 text-sm text-muted-foreground hover:text-foreground transition-colors",
-              children: [
-                /* @__PURE__ */ jsx("span", { children: permissionOptions.find((o) => o.value === selectedPermission)?.label }),
-                /* @__PURE__ */ jsx(
-                  "svg",
-                  {
-                    className: cn(
-                      "h-4 w-4 transition-transform",
-                      showOptions && "rotate-180"
-                    ),
-                    fill: "none",
-                    viewBox: "0 0 24 24",
-                    stroke: "currentColor",
-                    strokeWidth: 2,
-                    children: /* @__PURE__ */ jsx(
-                      "path",
-                      {
-                        strokeLinecap: "round",
-                        strokeLinejoin: "round",
-                        d: "M19 9l-7 7-7-7"
-                      }
-                    )
-                  }
-                )
-              ]
+              onClick: handleReject,
+              className: cn(
+                "csdk-confirm-btn",
+                "px-4 py-1.5 text-sm font-medium rounded-xl",
+                "border border-border bg-transparent text-muted-foreground",
+                "hover:bg-muted/60 hover:text-foreground"
+              ),
+              children: "Deny"
             }
           ),
-          showOptions && /* @__PURE__ */ jsx("div", { className: "mt-2 space-y-1 pl-1", children: permissionOptions.map((option) => /* @__PURE__ */ jsxs(
-            "label",
+          /* @__PURE__ */ jsx(
+            "button",
             {
+              type: "button",
+              onClick: handleApprove,
               className: cn(
-                "flex items-start gap-2 p-2 rounded-md cursor-pointer transition-colors",
-                selectedPermission === option.value ? "bg-primary/10" : "hover:bg-muted/50"
+                "csdk-confirm-btn",
+                "px-4 py-1.5 text-sm font-medium rounded-xl",
+                "bg-primary text-primary-foreground",
+                "hover:opacity-90"
               ),
-              children: [
-                /* @__PURE__ */ jsx(
-                  "input",
-                  {
-                    type: "radio",
-                    name: "permission",
-                    value: option.value,
-                    checked: selectedPermission === option.value,
-                    onChange: () => setSelectedPermission(option.value),
-                    className: "mt-0.5"
-                  }
-                ),
-                /* @__PURE__ */ jsxs("div", { children: [
-                  /* @__PURE__ */ jsx("div", { className: "text-sm font-medium", children: option.label }),
-                  option.description && /* @__PURE__ */ jsx("div", { className: "text-xs text-muted-foreground", children: option.description })
-                ] })
-              ]
-            },
-            option.value
-          )) })
-        ] }),
-        /* @__PURE__ */ jsxs("div", { className: "flex justify-end gap-2", children: [
-          /* @__PURE__ */ jsx(Button, { variant: "outline", size: "sm", onClick: handleReject, children: "Deny" }),
-          /* @__PURE__ */ jsx(Button, { variant: "default", size: "sm", onClick: handleApprove, children: "Allow" })
+              children: "Allow"
+            }
+          )
         ] })
       ]
     }
@@ -2676,23 +2642,25 @@ function CompactPermissionConfirmation({
   onReject,
   className
 }) {
-  const [rememberChoice, setRememberChoice] = React18.useState(false);
   const handleApprove = () => {
-    onApprove?.(rememberChoice ? "allow_always" : "ask");
+    onApprove?.("ask");
   };
   const handleReject = () => {
-    onReject?.(rememberChoice ? "deny_always" : void 0);
+    onReject?.(void 0);
   };
   if (state === "approved") {
     return /* @__PURE__ */ jsxs(
       "div",
       {
         className: cn(
-          "flex items-center gap-2 px-4 py-2 text-sm text-green-600 dark:text-green-400",
+          "csdk-confirm-result",
+          "inline-flex items-center gap-2 px-3 py-1.5 text-sm",
+          "rounded-2xl border border-green-200/70 dark:border-green-900/40",
+          "bg-green-50 dark:bg-green-950/20 text-green-700 dark:text-green-400",
           className
         ),
         children: [
-          /* @__PURE__ */ jsx(CheckIcon, { className: "h-4 w-4" }),
+          /* @__PURE__ */ jsx(CheckIcon, { className: "h-3.5 w-3.5 shrink-0" }),
           /* @__PURE__ */ jsx("span", { children: "Approved" })
         ]
       }
@@ -2703,11 +2671,14 @@ function CompactPermissionConfirmation({
       "div",
       {
         className: cn(
-          "flex items-center gap-2 px-4 py-2 text-sm text-red-600 dark:text-red-400",
+          "csdk-confirm-result",
+          "inline-flex items-center gap-2 px-3 py-1.5 text-sm",
+          "rounded-2xl border border-red-200/70 dark:border-red-900/40",
+          "bg-red-50 dark:bg-red-950/20 text-red-700 dark:text-red-400",
           className
         ),
         children: [
-          /* @__PURE__ */ jsx(XIcon2, { className: "h-4 w-4" }),
+          /* @__PURE__ */ jsx(XIcon2, { className: "h-3.5 w-3.5 shrink-0" }),
           /* @__PURE__ */ jsx("span", { children: "Rejected" })
         ]
       }
@@ -2717,31 +2688,44 @@ function CompactPermissionConfirmation({
     "div",
     {
       className: cn(
-        "rounded-lg border bg-card text-card-foreground p-4",
+        "csdk-confirm-card",
+        "w-full rounded-2xl border border-border/60 bg-card text-card-foreground shadow-sm overflow-hidden",
         className
       ),
       children: [
-        /* @__PURE__ */ jsxs("div", { className: "flex items-start gap-3 mb-3", children: [
-          /* @__PURE__ */ jsx(AlertTriangleIcon, { className: "mt-0.5 h-5 w-5 flex-shrink-0 text-amber-500" }),
-          /* @__PURE__ */ jsx("p", { className: "text-sm text-foreground", children: message || "This action requires your approval." })
+        /* @__PURE__ */ jsxs("div", { className: "flex items-start gap-3 p-4", children: [
+          /* @__PURE__ */ jsx("div", { className: "mt-0.5 flex h-7 w-7 shrink-0 items-center justify-center rounded-xl bg-amber-100 dark:bg-amber-950/50", children: /* @__PURE__ */ jsx(AlertTriangleIcon, { className: "h-3.5 w-3.5 text-amber-600 dark:text-amber-400" }) }),
+          /* @__PURE__ */ jsx("p", { className: "flex-1 min-w-0 pt-0.5 text-sm text-foreground leading-snug", children: message || "This action requires your approval." })
         ] }),
-        /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between", children: [
-          /* @__PURE__ */ jsxs("label", { className: "flex items-center gap-2 text-sm text-muted-foreground cursor-pointer", children: [
-            /* @__PURE__ */ jsx(
-              "input",
-              {
-                type: "checkbox",
-                checked: rememberChoice,
-                onChange: (e) => setRememberChoice(e.target.checked),
-                className: "rounded border-gray-300"
-              }
-            ),
-            "Don't ask again"
-          ] }),
-          /* @__PURE__ */ jsxs("div", { className: "flex gap-2", children: [
-            /* @__PURE__ */ jsx(Button, { variant: "outline", size: "sm", onClick: handleReject, children: "Deny" }),
-            /* @__PURE__ */ jsx(Button, { variant: "default", size: "sm", onClick: handleApprove, children: "Allow" })
-          ] })
+        /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-end gap-2 px-4 pb-4", children: [
+          /* @__PURE__ */ jsx(
+            "button",
+            {
+              type: "button",
+              onClick: handleReject,
+              className: cn(
+                "csdk-confirm-btn",
+                "px-4 py-1.5 text-sm font-medium rounded-xl",
+                "border border-border bg-transparent text-muted-foreground",
+                "hover:bg-muted/60 hover:text-foreground"
+              ),
+              children: "Deny"
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            "button",
+            {
+              type: "button",
+              onClick: handleApprove,
+              className: cn(
+                "csdk-confirm-btn",
+                "px-4 py-1.5 text-sm font-medium rounded-xl",
+                "bg-primary text-primary-foreground",
+                "hover:opacity-90"
+              ),
+              children: "Allow"
+            }
+          )
         ] })
       ]
     }
@@ -3299,9 +3283,9 @@ function ModelSelector({
   showCapabilities = true,
   className
 }) {
-  const [isOpen, setIsOpen] = React18.useState(false);
-  const containerRef = React18.useRef(null);
-  React18.useEffect(() => {
+  const [isOpen, setIsOpen] = React17.useState(false);
+  const containerRef = React17.useRef(null);
+  React17.useEffect(() => {
     function handleClickOutside(event) {
       if (containerRef.current && !containerRef.current.contains(event.target)) {
         setIsOpen(false);
@@ -3310,7 +3294,7 @@ function ModelSelector({
     document.addEventListener("mousedown", handleClickOutside);
     return () => document.removeEventListener("mousedown", handleClickOutside);
   }, []);
-  const selectedModel = React18.useMemo(() => {
+  const selectedModel = React17.useMemo(() => {
     if (!value) return null;
     if (providers) {
       for (const provider of providers) {
@@ -3536,7 +3520,7 @@ function PopoverTrigger({
   className,
   ...props
 }) {
-  if (asChild && React18.isValidElement(children)) {
+  if (asChild && React17.isValidElement(children)) {
     return /* @__PURE__ */ jsx(Popover$1.Trigger, { render: children, className, ...props });
   }
   return /* @__PURE__ */ jsx(Popover$1.Trigger, { className, ...props, children });
@@ -3671,8 +3655,8 @@ function ThreadPicker({
   itemClassName,
   newButtonClassName
 }) {
-  const [isOpen, setIsOpen] = React18.useState(false);
-  const selectedThread = React18.useMemo(() => {
+  const [isOpen, setIsOpen] = React17.useState(false);
+  const selectedThread = React17.useMemo(() => {
     if (!value) return null;
     return threads.find((t) => t.id === value) ?? null;
   }, [value, threads]);
@@ -3878,7 +3862,7 @@ function ThreadCard({
   showDelete = true,
   className
 }) {
-  const [isHovered, setIsHovered] = React18.useState(false);
+  const [isHovered, setIsHovered] = React17.useState(false);
   const handleDelete = (e) => {
     e.stopPropagation();
     onDelete?.();
@@ -4119,10 +4103,10 @@ function MCPUIFrame({
   showLoading = true,
   testId
 }) {
-  const iframeRef = React18.useRef(null);
-  const [isLoading, setIsLoading] = React18.useState(true);
-  const [error, setError] = React18.useState(null);
-  React18.useEffect(() => {
+  const iframeRef = React17.useRef(null);
+  const [isLoading, setIsLoading] = React17.useState(true);
+  const [error, setError] = React17.useState(null);
+  React17.useEffect(() => {
     const handleMessage = (event) => {
       if (event.source !== iframeRef.current?.contentWindow) {
         return;
@@ -4135,17 +4119,17 @@ function MCPUIFrame({
     window.addEventListener("message", handleMessage);
     return () => window.removeEventListener("message", handleMessage);
   }, [onIntent]);
-  const handleLoad = React18.useCallback(() => {
+  const handleLoad = React17.useCallback(() => {
     setIsLoading(false);
     onLoad?.();
   }, [onLoad]);
-  const handleError = React18.useCallback(() => {
+  const handleError = React17.useCallback(() => {
     const err = new Error("Failed to load MCP UI content");
     setError(err);
     setIsLoading(false);
     onError?.(err);
   }, [onError]);
-  const { srcDoc, src } = React18.useMemo(() => {
+  const { srcDoc, src } = React17.useMemo(() => {
     if (resource.mimeType === "text/html") {
       let content = resource.content || "";
       if (resource.blob && !resource.content) {
@@ -4325,24 +4309,24 @@ function DefaultMessage({
   const isUser = message.role === "user";
   const isCompactionMarker = message.role === "system" && message.metadata?.type === "compaction-marker";
   const isStreaming = isLastMessage && isLoading;
-  const [isEditing, setIsEditing] = React18.useState(false);
-  const [editValue, setEditValue] = React18.useState(message.content ?? "");
-  const editRef = React18.useRef(null);
-  const startEdit = React18.useCallback(() => {
+  const [isEditing, setIsEditing] = React17.useState(false);
+  const [editValue, setEditValue] = React17.useState(message.content ?? "");
+  const editRef = React17.useRef(null);
+  const startEdit = React17.useCallback(() => {
     setEditValue(message.content ?? "");
     setIsEditing(true);
     requestAnimationFrame(() => editRef.current?.focus());
   }, [message.content]);
-  const cancelEdit = React18.useCallback(() => {
+  const cancelEdit = React17.useCallback(() => {
     setIsEditing(false);
   }, []);
-  const submitEdit = React18.useCallback(() => {
+  const submitEdit = React17.useCallback(() => {
     const trimmed = editValue.trim();
     if (!trimmed || !onEditMessage) return;
     onEditMessage(message.id, trimmed);
     setIsEditing(false);
   }, [editValue, message.id, onEditMessage]);
-  const handleEditKeyDown = React18.useCallback(
+  const handleEditKeyDown = React17.useCallback(
     (e) => {
       if (e.key === "Enter" && !e.shiftKey) {
         e.preventDefault();
@@ -4384,18 +4368,18 @@ function DefaultMessage({
       /* @__PURE__ */ jsx("div", { className: "flex-1 h-px bg-border" })
     ] });
   }
-  const { cleanContent: contentWithoutFollowUps, followUps } = React18.useMemo(() => {
+  const { cleanContent: contentWithoutFollowUps, followUps } = React17.useMemo(() => {
     if (isUser || !message.content) {
       return { cleanContent: message.content, followUps: [] };
     }
     return parseFollowUps(message.content);
   }, [message.content, isUser]);
-  const cleanContent = React18.useMemo(() => {
+  const cleanContent = React17.useMemo(() => {
     if (!contentWithoutFollowUps) return contentWithoutFollowUps;
     return contentWithoutFollowUps.replace(/\n*\*{0,2}Sources:?\*{0,2}\s*(\[.+?\]\(.+?\)[,\s]*)+$/gi, "").trim();
   }, [contentWithoutFollowUps]);
   const shouldShowFollowUps = showFollowUps && !isUser && isLastMessage && !isLoading && followUps.length > 0 && onFollowUpClick;
-  const sources = React18.useMemo(() => {
+  const sources = React17.useMemo(() => {
     if (isUser || !citations.enabled) return [];
     const extractedSources = [];
     const addSource = (url, title, description) => {
@@ -4449,127 +4433,121 @@ function DefaultMessage({
   const shouldShowSources = citations.enabled && sources.length > 0;
   if (isUser) {
     const hasAttachments = message.attachments && message.attachments.length > 0;
-    return /* @__PURE__ */ jsxs(
-      Message,
-      {
-        className: cn("flex gap-2 group/user-msg justify-end"),
-        children: [
-          /* @__PURE__ */ jsx("div", { className: "flex flex-col items-end max-w-[80%] min-w-0", children: isEditing ? /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-1.5 w-full min-w-[200px]", children: [
-            /* @__PURE__ */ jsx(
-              "textarea",
-              {
-                ref: editRef,
-                value: editValue,
-                onChange: (e) => setEditValue(e.target.value),
-                onKeyDown: handleEditKeyDown,
-                rows: Math.max(2, (editValue.match(/\n/g) || []).length + 1),
-                className: cn(
-                  "csdk-edit-textarea w-full rounded-lg px-3 py-2 text-sm resize-none",
-                  "bg-primary text-primary-foreground placeholder:text-primary-foreground/50",
-                  "focus:outline-none focus:ring-2 focus:ring-primary-foreground/30",
-                  userMessageClassName
-                )
-              }
-            ),
-            /* @__PURE__ */ jsxs("div", { className: "flex gap-1.5 justify-end", children: [
-              /* @__PURE__ */ jsx(
-                "button",
-                {
-                  type: "button",
-                  onClick: cancelEdit,
-                  className: "csdk-edit-cancel px-3 py-1 text-xs rounded-md bg-muted text-muted-foreground hover:bg-muted/80 transition-colors",
-                  children: "Cancel"
-                }
+    return /* @__PURE__ */ jsxs(Message, { className: cn("flex gap-2 group/user-msg justify-end"), children: [
+      /* @__PURE__ */ jsx("div", { className: "flex flex-col items-end max-w-[80%] min-w-0", children: isEditing ? /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-1.5 w-full min-w-[200px]", children: [
+        /* @__PURE__ */ jsx(
+          "textarea",
+          {
+            ref: editRef,
+            value: editValue,
+            onChange: (e) => setEditValue(e.target.value),
+            onKeyDown: handleEditKeyDown,
+            rows: Math.max(2, (editValue.match(/\n/g) || []).length + 1),
+            className: cn(
+              "csdk-edit-textarea w-full rounded-lg px-3 py-2 text-sm resize-none",
+              "bg-primary text-primary-foreground placeholder:text-primary-foreground/50",
+              "focus:outline-none focus:ring-2 focus:ring-primary-foreground/30",
+              userMessageClassName
+            )
+          }
+        ),
+        /* @__PURE__ */ jsxs("div", { className: "flex gap-1.5 justify-end", children: [
+          /* @__PURE__ */ jsx(
+            "button",
+            {
+              type: "button",
+              onClick: cancelEdit,
+              className: "csdk-edit-cancel px-3 py-1 text-xs rounded-md bg-muted text-muted-foreground hover:bg-muted/80 transition-colors",
+              children: "Cancel"
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            "button",
+            {
+              type: "button",
+              onClick: submitEdit,
+              disabled: !editValue.trim(),
+              className: "csdk-edit-submit px-3 py-1 text-xs rounded-md bg-primary text-primary-foreground hover:bg-primary/90 disabled:opacity-50 transition-colors",
+              children: "Send"
+            }
+          )
+        ] })
+      ] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
+        message.content && /* @__PURE__ */ jsxs("div", { className: "relative", children: [
+          /* @__PURE__ */ jsx(
+            MessageContent,
+            {
+              className: cn(
+                "csdk-message-user rounded-lg px-4 py-2 bg-primary text-primary-foreground",
+                userMessageClassName
               ),
-              /* @__PURE__ */ jsx(
-                "button",
-                {
-                  type: "button",
-                  onClick: submitEdit,
-                  disabled: !editValue.trim(),
-                  className: "csdk-edit-submit px-3 py-1 text-xs rounded-md bg-primary text-primary-foreground hover:bg-primary/90 disabled:opacity-50 transition-colors",
-                  children: "Send"
-                }
-              )
-            ] })
-          ] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
-            message.content && /* @__PURE__ */ jsxs("div", { className: "relative", children: [
-              /* @__PURE__ */ jsx(
-                MessageContent,
-                {
-                  className: cn(
-                    "csdk-message-user rounded-lg px-4 py-2 bg-primary text-primary-foreground",
-                    userMessageClassName
-                  ),
-                  markdown: true,
-                  size,
-                  children: message.content
-                }
+              markdown: true,
+              size,
+              children: message.content
+            }
+          ),
+          showEditBtn && /* @__PURE__ */ jsx(
+            "button",
+            {
+              type: "button",
+              onClick: startEdit,
+              "aria-label": "Edit message",
+              className: cn(
+                "csdk-edit-btn absolute -left-7 top-1/2 -translate-y-1/2",
+                "size-6 flex items-center justify-center rounded-full",
+                "text-muted-foreground bg-background border border-border shadow-sm",
+                "opacity-0 group-hover/user-msg:opacity-100 transition-opacity",
+                "hover:text-foreground hover:bg-muted"
               ),
-              showEditBtn && /* @__PURE__ */ jsx(
-                "button",
+              children: /* @__PURE__ */ jsxs(
+                "svg",
                 {
-                  type: "button",
-                  onClick: startEdit,
-                  "aria-label": "Edit message",
-                  className: cn(
-                    "csdk-edit-btn absolute -left-7 top-1/2 -translate-y-1/2",
-                    "size-6 flex items-center justify-center rounded-full",
-                    "text-muted-foreground bg-background border border-border shadow-sm",
-                    "opacity-0 group-hover/user-msg:opacity-100 transition-opacity",
-                    "hover:text-foreground hover:bg-muted"
-                  ),
-                  children: /* @__PURE__ */ jsxs(
-                    "svg",
-                    {
-                      width: "12",
-                      height: "12",
-                      viewBox: "0 0 24 24",
-                      fill: "none",
-                      stroke: "currentColor",
-                      strokeWidth: 2,
-                      strokeLinecap: "round",
-                      strokeLinejoin: "round",
-                      children: [
-                        /* @__PURE__ */ jsx("path", { d: "M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7" }),
-                        /* @__PURE__ */ jsx("path", { d: "M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z" })
-                      ]
-                    }
-                  )
+                  width: "12",
+                  height: "12",
+                  viewBox: "0 0 24 24",
+                  fill: "none",
+                  stroke: "currentColor",
+                  strokeWidth: 2,
+                  strokeLinecap: "round",
+                  strokeLinejoin: "round",
+                  children: [
+                    /* @__PURE__ */ jsx("path", { d: "M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7" }),
+                    /* @__PURE__ */ jsx("path", { d: "M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z" })
+                  ]
                 }
               )
-            ] }),
-            hasAttachments && /* @__PURE__ */ jsx("div", { className: "mt-2 flex flex-wrap gap-2 justify-end", children: message.attachments.map((attachment, index) => /* @__PURE__ */ jsx(AttachmentPreview, { attachment }, index)) }),
-            showBranchNav && /* @__PURE__ */ jsx(
-              BranchNavigator,
-              {
-                siblingIndex: branchInfo.siblingIndex,
-                totalSiblings: branchInfo.totalSiblings,
-                hasPrevious: branchInfo.hasPrevious,
-                hasNext: branchInfo.hasNext,
-                onPrevious: () => onSwitchBranch(
-                  branchInfo.siblingIds[branchInfo.siblingIndex - 1]
-                ),
-                onNext: () => onSwitchBranch(
-                  branchInfo.siblingIds[branchInfo.siblingIndex + 1]
-                ),
-                className: "mt-1"
-              }
-            )
-          ] }) }),
-          showUserAvatar && /* @__PURE__ */ jsx(
-            MessageAvatar,
-            {
-              src: userAvatar.src,
-              alt: "User",
-              fallback: userAvatar.fallback,
-              className: userAvatar.className,
-              children: userAvatar.component
             }
           )
-        ]
-      }
-    );
+        ] }),
+        hasAttachments && /* @__PURE__ */ jsx("div", { className: "mt-2 flex flex-wrap gap-2 justify-end", children: message.attachments.map((attachment, index) => /* @__PURE__ */ jsx(AttachmentPreview, { attachment }, index)) }),
+        showBranchNav && /* @__PURE__ */ jsx(
+          BranchNavigator,
+          {
+            siblingIndex: branchInfo.siblingIndex,
+            totalSiblings: branchInfo.totalSiblings,
+            hasPrevious: branchInfo.hasPrevious,
+            hasNext: branchInfo.hasNext,
+            onPrevious: () => onSwitchBranch(
+              branchInfo.siblingIds[branchInfo.siblingIndex - 1]
+            ),
+            onNext: () => onSwitchBranch(
+              branchInfo.siblingIds[branchInfo.siblingIndex + 1]
+            ),
+            className: "mt-1"
+          }
+        )
+      ] }) }),
+      showUserAvatar && /* @__PURE__ */ jsx(
+        MessageAvatar,
+        {
+          src: userAvatar.src,
+          alt: "User",
+          fallback: userAvatar.fallback,
+          className: userAvatar.className,
+          children: userAvatar.component
+        }
+      )
+    ] });
   }
   const isToolHidden = (exec) => {
     if (exec.hidden === true) return true;
@@ -4643,10 +4621,34 @@ function DefaultMessage({
             }
           ),
           toolsWithCustomRender && toolsWithCustomRender.length > 0 && /* @__PURE__ */ jsx("div", { className: cn("space-y-2", cleanContent?.trim() && "mt-2"), children: toolsWithCustomRender.map((exec) => {
-            const Renderer = toolRenderers?.[exec.name];
-            if (Renderer) {
+            const toolDef = registeredTools?.find(
+              (t) => t.name === exec.name
+            );
+            if (toolDef?.render) {
+              let status = "pending";
+              if (exec.status === "executing") status = "executing";
+              else if (exec.status === "completed") status = "completed";
+              else if (exec.status === "error" || exec.status === "failed" || exec.status === "rejected")
+                status = "error";
+              const renderProps = {
+                status,
+                args: exec.args,
+                result: exec.result,
+                error: exec.error,
+                toolCallId: exec.id,
+                toolName: exec.name
+              };
+              const output = toolDef.render(
+                renderProps
+              );
+              if (output != null) {
+                return /* @__PURE__ */ jsx(React17.Fragment, { children: output }, exec.id);
+              }
+            }
+            if (mcpToolRenderer && (exec.source === "mcp" || toolDef?.source === "mcp")) {
+              const MCPRenderer = mcpToolRenderer;
               return /* @__PURE__ */ jsx(
-                Renderer,
+                MCPRenderer,
                 {
                   execution: {
                     id: exec.id,
@@ -4655,20 +4657,16 @@ function DefaultMessage({
                     status: exec.status,
                     result: exec.result,
                     error: exec.error,
-                    approvalStatus: exec.approvalStatus,
-                    source: exec.source
+                    source: exec.source || toolDef?.source
                   }
                 },
                 exec.id
               );
             }
-            const toolDef = registeredTools?.find(
-              (t) => t.name === exec.name
-            );
-            if (mcpToolRenderer && (exec.source === "mcp" || toolDef?.source === "mcp")) {
-              const MCPRenderer = mcpToolRenderer;
+            if (fallbackToolRenderer) {
+              const FallbackRenderer = fallbackToolRenderer;
               return /* @__PURE__ */ jsx(
-                MCPRenderer,
+                FallbackRenderer,
                 {
                   execution: {
                     id: exec.id,
@@ -4677,16 +4675,16 @@ function DefaultMessage({
                     status: exec.status,
                     result: exec.result,
                     error: exec.error,
-                    source: exec.source || toolDef?.source
+                    source: exec.source
                   }
                 },
                 exec.id
               );
             }
-            if (fallbackToolRenderer) {
-              const FallbackRenderer = fallbackToolRenderer;
+            const Renderer = toolRenderers?.[exec.name];
+            if (Renderer) {
               return /* @__PURE__ */ jsx(
-                FallbackRenderer,
+                Renderer,
                 {
                   execution: {
                     id: exec.id,
@@ -4695,32 +4693,13 @@ function DefaultMessage({
                     status: exec.status,
                     result: exec.result,
                     error: exec.error,
+                    approvalStatus: exec.approvalStatus,
                     source: exec.source
                   }
                 },
                 exec.id
               );
             }
-            const toolDefForRender = toolDef ?? registeredTools?.find((t) => t.name === exec.name);
-            if (toolDefForRender?.render) {
-              let status = "pending";
-              if (exec.status === "executing") status = "executing";
-              else if (exec.status === "completed") status = "completed";
-              else if (exec.status === "error" || exec.status === "failed" || exec.status === "rejected")
-                status = "error";
-              const renderProps = {
-                status,
-                args: exec.args,
-                result: exec.result,
-                error: exec.error,
-                toolCallId: exec.id,
-                toolName: exec.name
-              };
-              const output = toolDefForRender.render(
-                renderProps
-              );
-              return /* @__PURE__ */ jsx(React18.Fragment, { children: output }, exec.id);
-            }
             return null;
           }) }),
           toolSteps && toolSteps.length > 0 && /* @__PURE__ */ jsx(
@@ -4779,13 +4758,13 @@ function DefaultMessage({
               const output = toolDef.render(
                 renderProps
               );
-              return /* @__PURE__ */ jsx(React18.Fragment, { children: output }, tool.id);
+              return /* @__PURE__ */ jsx(React17.Fragment, { children: output }, tool.id);
             }
             return /* @__PURE__ */ jsx(
               PermissionConfirmation,
               {
                 state: "pending",
-                toolName: tool.name,
+                toolName: tool.approvalTitle ?? tool.name,
                 message: tool.approvalMessage || `This tool wants to execute. Do you approve?`,
                 onApprove: (permissionLevel) => onApproveToolExecution?.(
                   tool.id,
@@ -4828,7 +4807,7 @@ function DefaultMessage({
   ] });
 }
 function AttachmentPreview({ attachment }) {
-  const [expanded, setExpanded] = React18.useState(false);
+  const [expanded, setExpanded] = React17.useState(false);
   if (attachment.type !== "image") {
     return /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2 rounded-lg border bg-muted/50 px-3 py-2 text-sm", children: [
       /* @__PURE__ */ jsx("span", { className: "text-muted-foreground", children: attachment.type }),
@@ -5286,10 +5265,10 @@ function ChatView({ children, className }) {
 ChatView.displayName = "ChatView";
 function chatViewHasOnlyLayoutChildren(chatViewElement) {
   if (!chatViewElement?.props?.children) return false;
-  const childArray = React18__default.Children.toArray(chatViewElement.props.children);
+  const childArray = React17__default.Children.toArray(chatViewElement.props.children);
   if (childArray.length === 0) return false;
   return childArray.every(
-    (child) => React18__default.isValidElement(child) && (child.type === Header || child.type === Footer)
+    (child) => React17__default.isValidElement(child) && (child.type === Header || child.type === Footer)
   );
 }
 function Header({ children, className }) {
@@ -5427,18 +5406,18 @@ function ThreadPickerCompound(props) {
   );
 }
 function hasCompoundChild(children, ...components) {
-  return React18__default.Children.toArray(children).some(
-    (child) => React18__default.isValidElement(child) && components.includes(child.type)
+  return React17__default.Children.toArray(children).some(
+    (child) => React17__default.isValidElement(child) && components.includes(child.type)
   );
 }
 function findCompoundChild(children, component) {
-  return React18__default.Children.toArray(children).find(
-    (child) => React18__default.isValidElement(child) && child.type === component
+  return React17__default.Children.toArray(children).find(
+    (child) => React17__default.isValidElement(child) && child.type === component
   );
 }
 function filterCompoundChildren(children, ...components) {
-  return React18__default.Children.toArray(children).filter(
-    (child) => React18__default.isValidElement(child) && components.includes(child.type)
+  return React17__default.Children.toArray(children).filter(
+    (child) => React17__default.isValidElement(child) && components.includes(child.type)
   );
 }
 var DEFAULT_MAX_FILE_SIZE2 = 5 * 1024 * 1024;
@@ -5523,6 +5502,7 @@ function ChatComponent({
   // Citations/Sources
   citations,
   // Custom rendering
+  messageView,
   renderMessage,
   renderInput,
   renderHeader,
@@ -5715,7 +5695,7 @@ function ChatComponent({
     },
     [onSendMessage]
   );
-  const contextValue = React18__default.useMemo(
+  const contextValue = React17__default.useMemo(
     () => ({
       view,
       send,
@@ -5807,84 +5787,87 @@ function ChatComponent({
                     className: cn("gap-4 p-4", classNames.messageList),
                     children: [
                       messages.length === 0 && /* @__PURE__ */ jsx("div", { className: "py-8 text-center text-muted-foreground", children: welcomeMessage || "Send a message to start the conversation" }),
-                      messages.map((message, index) => {
-                        const isLastMessage = index === messages.length - 1;
-                        const GROUP_THRESHOLD_MS = 5 * 60 * 1e3;
-                        const shouldHideAvatar = (() => {
-                          if (!groupConsecutiveMessages || index === 0)
-                            return false;
-                          let prevIdx = index - 1;
-                          while (prevIdx >= 0) {
-                            const prev = messages[prevIdx];
-                            const isToolMsg = prev.role === "tool";
-                            const isInvisibleSystem = prev.role === "system" && // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                            prev.metadata?.type !== "compaction-marker";
-                            if (!isToolMsg && !isInvisibleSystem) break;
-                            prevIdx--;
+                      (() => {
+                        const messageElements = messages.map((message, index) => {
+                          const isLastMessage = index === messages.length - 1;
+                          const GROUP_THRESHOLD_MS = 5 * 60 * 1e3;
+                          const shouldHideAvatar = (() => {
+                            if (!groupConsecutiveMessages || index === 0)
+                              return false;
+                            let prevIdx = index - 1;
+                            while (prevIdx >= 0) {
+                              const prev = messages[prevIdx];
+                              const isToolMsg = prev.role === "tool";
+                              const isInvisibleSystem = prev.role === "system" && // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                              prev.metadata?.type !== "compaction-marker";
+                              if (!isToolMsg && !isInvisibleSystem) break;
+                              prevIdx--;
+                            }
+                            if (prevIdx < 0) return false;
+                            const prevVisible = messages[prevIdx];
+                            if (prevVisible.role !== message.role) return false;
+                            const curTs = message.timestamp;
+                            const prevTs = prevVisible.timestamp;
+                            if (curTs && prevTs && curTs - prevTs > GROUP_THRESHOLD_MS)
+                              return false;
+                            return true;
+                          })();
+                          const isEmptyAssistant = message.role === "assistant" && !message.content?.trim();
+                          const hasToolCalls = message.tool_calls && message.tool_calls.length > 0;
+                          const hasToolExecutions = message.toolExecutions && message.toolExecutions.length > 0;
+                          const hasPendingApprovals = message.toolExecutions?.some(
+                            (exec) => exec.approvalStatus === "required"
+                          );
+                          if (isEmptyAssistant) {
+                            const shouldShowMessage = hasToolCalls || hasToolExecutions || hasPendingApprovals || isLastMessage && (isLoading || isProcessing);
+                            if (!shouldShowMessage) {
+                              return null;
+                            }
                           }
-                          if (prevIdx < 0) return false;
-                          const prevVisible = messages[prevIdx];
-                          if (prevVisible.role !== message.role) return false;
-                          const curTs = message.timestamp;
-                          const prevTs = prevVisible.timestamp;
-                          if (curTs && prevTs && curTs - prevTs > GROUP_THRESHOLD_MS)
-                            return false;
-                          return true;
-                        })();
-                        const isEmptyAssistant = message.role === "assistant" && !message.content?.trim();
-                        const hasToolCalls = message.tool_calls && message.tool_calls.length > 0;
-                        const hasToolExecutions = message.toolExecutions && message.toolExecutions.length > 0;
-                        const hasPendingApprovals = message.toolExecutions?.some(
-                          (exec) => exec.approvalStatus === "required"
-                        );
-                        if (isEmptyAssistant) {
-                          const shouldShowMessage = hasToolCalls || hasToolExecutions || hasPendingApprovals || isLastMessage && (isLoading || isProcessing);
-                          if (!shouldShowMessage) {
-                            return null;
-                          }
-                        }
-                        const savedExecutions = message.metadata?.toolExecutions;
-                        const messageToolExecutions = message.toolExecutions || savedExecutions;
-                        const messageWithExecutions = messageToolExecutions ? { ...message, toolExecutions: messageToolExecutions } : message;
-                        const handleFollowUpClick = (question) => {
-                          if (onSuggestionClick) {
-                            onSuggestionClick(question);
-                          } else {
-                            onSendMessage?.(question);
-                          }
-                        };
-                        return renderMessage ? /* @__PURE__ */ jsx(React18__default.Fragment, { children: renderMessage(messageWithExecutions, index) }, message.id) : /* @__PURE__ */ jsx(
-                          DefaultMessage,
-                          {
-                            message: messageWithExecutions,
-                            userAvatar: shouldHideAvatar && message.role === "user" ? { ...userAvatar, className: "invisible" } : userAvatar,
-                            assistantAvatar: shouldHideAvatar && message.role === "assistant" ? { ...assistantAvatar, className: "invisible" } : assistantAvatar,
-                            showUserAvatar,
-                            userMessageClassName: classNames.userMessage,
-                            assistantMessageClassName: classNames.assistantMessage,
-                            size: fontSize,
-                            isLastMessage,
-                            isLoading,
-                            isProcessing,
-                            loaderVariant,
-                            registeredTools,
-                            toolRenderers,
-                            mcpToolRenderer,
-                            fallbackToolRenderer,
-                            onApproveToolExecution,
-                            onRejectToolExecution,
-                            showFollowUps,
-                            onFollowUpClick: handleFollowUpClick,
-                            followUpClassName,
-                            followUpButtonClassName,
-                            citations: citations === false ? { enabled: false } : citations,
-                            branchInfo: message.role === "user" ? getBranchInfo?.(message.id) ?? null : null,
-                            onSwitchBranch,
-                            onEditMessage
-                          },
-                          message.id
-                        );
-                      }),
+                          const savedExecutions = message.metadata?.toolExecutions;
+                          const messageToolExecutions = message.toolExecutions || savedExecutions;
+                          const messageWithExecutions = messageToolExecutions ? { ...message, toolExecutions: messageToolExecutions } : message;
+                          const handleFollowUpClick = (question) => {
+                            if (onSuggestionClick) {
+                              onSuggestionClick(question);
+                            } else {
+                              onSendMessage?.(question);
+                            }
+                          };
+                          return renderMessage ? /* @__PURE__ */ jsx(React17__default.Fragment, { children: renderMessage(messageWithExecutions, index) }, message.id) : /* @__PURE__ */ jsx(
+                            DefaultMessage,
+                            {
+                              message: messageWithExecutions,
+                              userAvatar: shouldHideAvatar && message.role === "user" ? { ...userAvatar, className: "invisible" } : userAvatar,
+                              assistantAvatar: shouldHideAvatar && message.role === "assistant" ? { ...assistantAvatar, className: "invisible" } : assistantAvatar,
+                              showUserAvatar,
+                              userMessageClassName: classNames.userMessage,
+                              assistantMessageClassName: classNames.assistantMessage,
+                              size: fontSize,
+                              isLastMessage,
+                              isLoading,
+                              isProcessing,
+                              loaderVariant,
+                              registeredTools,
+                              toolRenderers,
+                              mcpToolRenderer,
+                              fallbackToolRenderer,
+                              onApproveToolExecution,
+                              onRejectToolExecution,
+                              showFollowUps,
+                              onFollowUpClick: handleFollowUpClick,
+                              followUpClassName,
+                              followUpButtonClassName,
+                              citations: citations === false ? { enabled: false } : citations,
+                              branchInfo: message.role === "user" ? getBranchInfo?.(message.id) ?? null : null,
+                              onSwitchBranch,
+                              onEditMessage
+                            },
+                            message.id
+                          );
+                        });
+                        return messageView?.children ? messageView.children({ messages, messageElements }) : messageElements;
+                      })(),
                       isLoading && !isProcessing && messages.length > 0 && messages[messages.length - 1]?.role === "user" && /* @__PURE__ */ jsx(
                         DefaultMessage,
                         {
@@ -6454,6 +6437,8 @@ function CopilotChatBase(props) {
       error: exec.error,
       timestamp: exec.startedAt ? exec.startedAt.getTime() : Date.now(),
       approvalStatus: exec.approvalStatus,
+      approvalTitle: exec.approvalTitle,
+      approvalMessage: exec.approvalMessage,
       hidden: exec.hidden
     })
   );
@@ -6595,7 +6580,7 @@ function CopilotChatBase(props) {
     footer: classNames.footer
   } : void 0;
   const { threadManager, handleSwitchThread, handleNewThread, isBusy } = threadManagerResult;
-  const handleDeleteThread = React18__default.useCallback(
+  const handleDeleteThread = React17__default.useCallback(
     (threadId) => {
       const isCurrentThread = threadManager.currentThreadId === threadId;
       threadManager.deleteThread(threadId);