From 96a3bb9aa28c774a125b86f7acdbc7e82104aaa0 Mon Sep 17 00:00:00 2001
From: Lluis Agusti <hi@llu.lu>
Date: Mon, 2 Mar 2026 19:10:32 +0800
Subject: [PATCH 1/7] feat(frontend/copilot): add output action buttons (copy,
 upvote, downvote) with Langfuse feedback

Add copy, upvote, and downvote action buttons to assistant messages in the
CoPilot chat. Feedback is submitted to the backend Langfuse integration for
observability. Downvote opens a modal for optional detailed feedback.

- AssistantMessageActions: renders copy/upvote/downvote with hover reveal
- FeedbackModal: dialog for optional downvote comment (max 2000 chars)
- useMessageFeedback: manages feedback state and backend submission
- Actions hidden during streaming, visible on hover or after selection

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../ChatContainer/ChatContainer.tsx           |   1 +
 .../ChatMessagesContainer.tsx                 |  61 +++------
 .../components/AssistantMessageActions.tsx    | 100 +++++++++++++++
 .../components/FeedbackModal.tsx              |  70 ++++++++++
 .../useMessageFeedback.ts                     | 120 ++++++++++++++++++
 .../src/components/ai-elements/message.tsx    |  15 +--
 6 files changed, 317 insertions(+), 50 deletions(-)
 create mode 100644 autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/AssistantMessageActions.tsx
 create mode 100644 autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/FeedbackModal.tsx
 create mode 100644 autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/useMessageFeedback.ts

diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatContainer/ChatContainer.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatContainer/ChatContainer.tsx
index 3ec761183a51..8178cc7421ea 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatContainer/ChatContainer.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatContainer/ChatContainer.tsx
@@ -64,6 +64,7 @@ export const ChatContainer = ({
                 error={error}
                 isLoading={isLoadingSession}
                 headerSlot={headerSlot}
+                sessionID={sessionId}
               />
               <motion.div
                 initial={{ opacity: 0 }}
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/ChatMessagesContainer.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/ChatMessagesContainer.tsx
index 8abee1a2f5ae..01d2ef5d81da 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/ChatMessagesContainer.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/ChatMessagesContainer.tsx
@@ -3,19 +3,13 @@ import {
   ConversationContent,
   ConversationScrollButton,
 } from "@/components/ai-elements/conversation";
-import {
-  Message,
-  MessageActions,
-  MessageContent,
-} from "@/components/ai-elements/message";
+import { Message, MessageContent } from "@/components/ai-elements/message";
 import { LoadingSpinner } from "@/components/atoms/LoadingSpinner/LoadingSpinner";
 import { FileUIPart, UIDataTypes, UIMessage, UITools } from "ai";
+import { AssistantMessageActions } from "./components/AssistantMessageActions";
 import { MessageAttachments } from "./components/MessageAttachments";
 import { MessagePartRenderer } from "./components/MessagePartRenderer";
 import { ThinkingIndicator } from "./components/ThinkingIndicator";
-import { CopyButton } from "./components/CopyButton";
-import { TTSButton } from "./components/TTSButton";
-import { parseSpecialMarkers } from "./helpers";
 
 interface Props {
   messages: UIMessage<unknown, UIDataTypes, UITools>[];
@@ -23,6 +17,7 @@ interface Props {
   error: Error | undefined;
   isLoading: boolean;
   headerSlot?: React.ReactNode;
+  sessionID?: string | null;
 }
 
 export function ChatMessagesContainer({
@@ -31,6 +26,7 @@ export function ChatMessagesContainer({
   error,
   isLoading,
   headerSlot,
+  sessionID,
 }: Props) {
   const lastMessage = messages[messages.length - 1];
 
@@ -80,14 +76,17 @@ export function ChatMessagesContainer({
             messageIndex === messages.length - 1 &&
             message.role === "assistant";
 
-          const isAssistant = message.role === "assistant";
-
-          // Past assistant messages are always done; the last one
-          // is done only when the stream has finished.
-          const isAssistantDone =
-            isAssistant &&
-            (!isLastAssistant ||
-              (status !== "streaming" && status !== "submitted"));
+          const isCurrentlyStreaming =
+            isLastAssistant &&
+            (status === "streaming" || status === "submitted");
+          const nextMessage = messages[messageIndex + 1];
+          const isLastInTurn =
+            message.role === "assistant" &&
+            (!nextMessage || nextMessage.role === "user");
+          const showActions =
+            isLastInTurn &&
+            !isCurrentlyStreaming &&
+            message.parts.some((p) => p.type === "text");
 
           const fileParts = message.parts.filter(
             (p): p is FileUIPart => p.type === "file",
@@ -120,30 +119,12 @@ export function ChatMessagesContainer({
                   isUser={message.role === "user"}
                 />
               )}
-              {isAssistantDone &&
-                (() => {
-                  const textParts = message.parts.filter(
-                    (p): p is Extract<typeof p, { type: "text" }> =>
-                      p.type === "text",
-                  );
-
-                  // Hide actions when the message ended with an error or cancellation
-                  const lastTextPart = textParts[textParts.length - 1];
-                  if (lastTextPart) {
-                    const { markerType } = parseSpecialMarkers(
-                      lastTextPart.text,
-                    );
-                    if (markerType === "error") return null;
-                  }
-
-                  const textContent = textParts.map((p) => p.text).join("\n");
-                  return (
-                    <MessageActions>
-                      <CopyButton text={textContent} />
-                      <TTSButton text={textContent} />
-                    </MessageActions>
-                  );
-                })()}
+              {showActions && (
+                <AssistantMessageActions
+                  message={message}
+                  sessionID={sessionID ?? null}
+                />
+              )}
             </Message>
           );
         })}
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/AssistantMessageActions.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/AssistantMessageActions.tsx
new file mode 100644
index 000000000000..2409a51bfb6a
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/AssistantMessageActions.tsx
@@ -0,0 +1,100 @@
+"use client";
+
+import {
+  MessageAction,
+  MessageActions,
+} from "@/components/ai-elements/message";
+import { cn } from "@/lib/utils";
+import { CopySimple, ThumbsDown, ThumbsUp } from "@phosphor-icons/react";
+import { UIDataTypes, UIMessage, UITools } from "ai";
+import { useMessageFeedback } from "../useMessageFeedback";
+import { FeedbackModal } from "./FeedbackModal";
+import { TTSButton } from "./TTSButton";
+
+interface Props {
+  message: UIMessage<unknown, UIDataTypes, UITools>;
+  sessionID: string | null;
+}
+
+function extractTextFromParts(
+  parts: UIMessage<unknown, UIDataTypes, UITools>["parts"],
+): string {
+  return parts
+    .filter((p) => p.type === "text")
+    .map((p) => (p as { type: "text"; text: string }).text)
+    .join("\n")
+    .trim();
+}
+
+export function AssistantMessageActions({ message, sessionID }: Props) {
+  const {
+    feedback,
+    showFeedbackModal,
+    handleCopy,
+    handleUpvote,
+    handleDownvoteClick,
+    handleDownvoteSubmit,
+    handleDownvoteCancel,
+  } = useMessageFeedback({ sessionID, messageID: message.id });
+
+  const text = extractTextFromParts(message.parts);
+
+  return (
+    <>
+      <MessageActions className="mt-1">
+        <MessageAction
+          tooltip="Copy"
+          onClick={() => handleCopy(text)}
+          variant="ghost"
+          size="icon-sm"
+        >
+          <CopySimple size={16} weight="regular" />
+        </MessageAction>
+
+        <MessageAction
+          tooltip="Good response"
+          onClick={handleUpvote}
+          variant="ghost"
+          size="icon-sm"
+          disabled={feedback === "downvote"}
+          className={cn(
+            feedback === "upvote" && "text-green-300 hover:text-green-300",
+            feedback === "downvote" && "!opacity-20",
+          )}
+        >
+          <ThumbsUp
+            size={16}
+            weight={feedback === "upvote" ? "fill" : "regular"}
+          />
+        </MessageAction>
+
+        <MessageAction
+          tooltip="Bad response"
+          onClick={handleDownvoteClick}
+          variant="ghost"
+          size="icon-sm"
+          disabled={feedback === "upvote"}
+          className={cn(
+            feedback === "downvote" && "text-red-300 hover:text-red-300",
+            feedback === "upvote" && "!opacity-20",
+          )}
+        >
+          <ThumbsDown
+            size={16}
+            weight={feedback === "downvote" ? "fill" : "regular"}
+          />
+        </MessageAction>
+
+        <TTSButton text={text} />
+      </MessageActions>
+
+      {showFeedbackModal && (
+        <FeedbackModal
+          isOpen={showFeedbackModal}
+          onSubmit={handleDownvoteSubmit}
+          onCancel={handleDownvoteCancel}
+        />
+      )}
+    </>
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/FeedbackModal.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/FeedbackModal.tsx
new file mode 100644
index 000000000000..8c773b1aaf12
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/FeedbackModal.tsx
@@ -0,0 +1,70 @@
+"use client";
+
+import { Dialog } from "@/components/molecules/Dialog/Dialog";
+import { Button } from "@/components/ui/button";
+import { Textarea } from "@/components/ui/textarea";
+import { useState } from "react";
+
+interface Props {
+  isOpen: boolean;
+  onSubmit: (comment: string) => void;
+  onCancel: () => void;
+}
+
+export function FeedbackModal({ isOpen, onSubmit, onCancel }: Props) {
+  const [comment, setComment] = useState("");
+
+  function handleSubmit() {
+    if (!comment.trim()) return;
+    onSubmit(comment);
+    setComment("");
+  }
+
+  function handleClose() {
+    onCancel();
+    setComment("");
+  }
+
+  return (
+    <Dialog
+      title="What could have been better?"
+      controlled={{
+        isOpen,
+        set: (open) => {
+          if (!open) handleClose();
+        },
+      }}
+    >
+      <Dialog.Content>
+        <div className="mx-auto w-[95%] space-y-4">
+          <p className="text-sm text-slate-600">
+            Your feedback helps us improve. Share details below.
+          </p>
+          <Textarea
+            placeholder="Tell us what went wrong or could be improved..."
+            value={comment}
+            onChange={(e) => setComment(e.target.value)}
+            rows={4}
+            maxLength={2000}
+            className="resize-none"
+          />
+          <div className="flex items-center justify-between">
+            <p className="text-xs text-slate-400">{comment.length}/2000</p>
+            <div className="flex gap-2">
+              <Button variant="outline" size="sm" onClick={handleClose}>
+                Cancel
+              </Button>
+              <Button
+                size="sm"
+                onClick={handleSubmit}
+                disabled={!comment.trim()}
+              >
+                Submit feedback
+              </Button>
+            </div>
+          </div>
+        </div>
+      </Dialog.Content>
+    </Dialog>
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/useMessageFeedback.ts b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/useMessageFeedback.ts
new file mode 100644
index 000000000000..720258bd20b4
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/useMessageFeedback.ts
@@ -0,0 +1,120 @@
+import { toast } from "@/components/molecules/Toast/use-toast";
+import { getWebSocketToken } from "@/lib/supabase/actions";
+import { environment } from "@/services/environment";
+import { useState } from "react";
+
+interface Args {
+  sessionID: string | null;
+  messageID: string;
+}
+
+async function submitFeedbackToBackend(args: {
+  sessionID: string;
+  messageID: string;
+  scoreName: string;
+  scoreValue: number;
+  comment?: string;
+}) {
+  try {
+    const { token } = await getWebSocketToken();
+    if (!token) return;
+
+    await fetch(
+      `${environment.getAGPTServerBaseUrl()}/api/chat/sessions/${args.sessionID}/feedback`,
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${token}`,
+        },
+        body: JSON.stringify({
+          message_id: args.messageID,
+          score_name: args.scoreName,
+          score_value: args.scoreValue,
+          comment: args.comment,
+        }),
+      },
+    );
+  } catch {
+    // Feedback submission is best-effort; silently ignore failures
+  }
+}
+
+export function useMessageFeedback({ sessionID, messageID }: Args) {
+  const [feedback, setFeedback] = useState<"upvote" | "downvote" | null>(null);
+  const [showFeedbackModal, setShowFeedbackModal] = useState(false);
+
+  async function handleCopy(text: string) {
+    try {
+      await navigator.clipboard.writeText(text);
+      toast({ title: "Copied!", variant: "success", duration: 2000 });
+    } catch {
+      toast({
+        title: "Failed to copy",
+        variant: "destructive",
+        duration: 2000,
+      });
+      return;
+    }
+    if (sessionID) {
+      submitFeedbackToBackend({
+        sessionID,
+        messageID,
+        scoreName: "copy",
+        scoreValue: 1,
+      });
+    }
+  }
+
+  function handleUpvote() {
+    if (feedback) return;
+    setFeedback("upvote");
+    toast({
+      title: "Thank you for your feedback!",
+      variant: "success",
+      duration: 3000,
+    });
+    if (sessionID) {
+      submitFeedbackToBackend({
+        sessionID,
+        messageID,
+        scoreName: "user-feedback",
+        scoreValue: 1,
+      });
+    }
+  }
+
+  function handleDownvoteClick() {
+    if (feedback) return;
+    setFeedback("downvote");
+    setShowFeedbackModal(true);
+  }
+
+  function handleDownvoteSubmit(comment: string) {
+    setShowFeedbackModal(false);
+    if (sessionID) {
+      submitFeedbackToBackend({
+        sessionID,
+        messageID,
+        scoreName: "user-feedback",
+        scoreValue: 0,
+        comment: comment || undefined,
+      });
+    }
+  }
+
+  function handleDownvoteCancel() {
+    setShowFeedbackModal(false);
+    setFeedback(null);
+  }
+
+  return {
+    feedback,
+    showFeedbackModal,
+    handleCopy,
+    handleUpvote,
+    handleDownvoteClick,
+    handleDownvoteSubmit,
+    handleDownvoteCancel,
+  };
+}
diff --git a/autogpt_platform/frontend/src/components/ai-elements/message.tsx b/autogpt_platform/frontend/src/components/ai-elements/message.tsx
index d2875a6adbfb..6590bf7bef17 100644
--- a/autogpt_platform/frontend/src/components/ai-elements/message.tsx
+++ b/autogpt_platform/frontend/src/components/ai-elements/message.tsx
@@ -5,9 +5,8 @@ import { ButtonGroup, ButtonGroupText } from "@/components/ui/button-group";
 import {
   Tooltip,
   TooltipContent,
-  TooltipProvider,
   TooltipTrigger,
-} from "@/components/ui/tooltip";
+} from "@/components/atoms/Tooltip/BaseTooltip";
 import { cn } from "@/lib/utils";
 import { cjk } from "@streamdown/cjk";
 import { code } from "@/lib/streamdown-code-plugin";
@@ -89,14 +88,10 @@ export const MessageAction = ({
 
   if (tooltip) {
     return (
-      <TooltipProvider>
-        <Tooltip>
-          <TooltipTrigger asChild>{button}</TooltipTrigger>
-          <TooltipContent>
-            <p>{tooltip}</p>
-          </TooltipContent>
-        </Tooltip>
-      </TooltipProvider>
+      <Tooltip>
+        <TooltipTrigger asChild>{button}</TooltipTrigger>
+        <TooltipContent>{tooltip}</TooltipContent>
+      </Tooltip>
     );
   }
 

From a1ad8e18bdb12bcc3e74616c09ea4a267d62366f Mon Sep 17 00:00:00 2001
From: Lluis Agusti <hi@llu.lu>
Date: Wed, 4 Mar 2026 23:08:26 +0800
Subject: [PATCH 2/7] feat(copilot): collapse repeated tool calls and fix
 stream stuck on completion

Frontend:
- Group consecutive completed generic tool parts into collapsible summaries
- Split finalized assistant messages into reasoning (tools) and response sections
- Merge consecutive assistant messages on hydration to avoid split bubbles
- Extract GenericTool helpers to dedicated file
- Add reconnectExhausted state to unblock UI when all reconnect attempts fail
- Add 500ms delay before refetching session to reduce stale active_stream races

Backend:
- Make transcript upload fire-and-forget instead of blocking the generator exit
  The 30s upload timeout was delaying mark_session_completed(), keeping the SSE
  stream alive with only heartbeats after the LLM had finished

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../backend/backend/copilot/sdk/service.py    |  28 +-
 .../ChatMessagesContainer.tsx                 | 171 ++++++++++-
 .../components/CollapsedToolGroup.tsx         | 146 +++++++++
 .../components/ReasoningCollapse.tsx          |  27 ++
 .../helpers/convertChatSessionToUiMessages.ts |   8 +
 .../copilot/tools/CreateAgent/helpers.tsx     |   4 +-
 .../copilot/tools/EditAgent/helpers.tsx       |   4 +-
 .../copilot/tools/GenericTool/GenericTool.tsx | 276 +----------------
 .../copilot/tools/GenericTool/helpers.ts      | 283 ++++++++++++++++++
 .../copilot/tools/RunAgent/RunAgent.tsx       |   4 +-
 .../copilot/tools/RunAgent/helpers.tsx        |   4 +-
 .../copilot/tools/RunBlock/helpers.tsx        |   4 +-
 .../copilot/tools/RunMCPTool/helpers.tsx      |   4 +-
 .../(platform)/copilot/useCopilotStream.ts    |  20 +-
 14 files changed, 679 insertions(+), 304 deletions(-)
 create mode 100644 autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/CollapsedToolGroup.tsx
 create mode 100644 autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/ReasoningCollapse.tsx
 create mode 100644 autogpt_platform/frontend/src/app/(platform)/copilot/tools/GenericTool/helpers.ts

diff --git a/autogpt_platform/backend/backend/copilot/sdk/service.py b/autogpt_platform/backend/backend/copilot/sdk/service.py
index 6891482098a6..6d254beb8ad6 100644
--- a/autogpt_platform/backend/backend/copilot/sdk/service.py
+++ b/autogpt_platform/backend/backend/copilot/sdk/service.py
@@ -1198,11 +1198,11 @@ async def _next_msg() -> Any:
                     )
 
                 if raw_transcript:
-                    # Shield the upload from generator cancellation so a
-                    # client disconnect / page refresh doesn't lose the
-                    # transcript.  The upload must finish even if the SSE
-                    # connection is torn down.
-                    await asyncio.shield(
+                    # Fire-and-forget: upload in background so the generator
+                    # can exit promptly and mark_session_completed() runs
+                    # without delay.  Blocking here kept the SSE stream alive
+                    # with only heartbeats for up to 30s (the upload timeout).
+                    task = asyncio.create_task(
                         _try_upload_transcript(
                             user_id,
                             session_id,
@@ -1210,6 +1210,8 @@ async def _next_msg() -> Any:
                             message_count=len(session.messages),
                         )
                     )
+                    _background_tasks.add(task)
+                    task.add_done_callback(_background_tasks.discard)
 
         except ImportError:
             raise RuntimeError(
@@ -1296,22 +1298,18 @@ async def _next_msg() -> Any:
                 )
 
         # --- Upload transcript for next-turn --resume ---
-        # This MUST run in finally so the transcript is uploaded even when
-        # the streaming loop raises an exception.  The CLI uses
-        # appendFileSync, so whatever was written before the error/SIGTERM
-        # is safely on disk and still useful for the next turn.
+        # Fire-and-forget so the generator exits promptly and
+        # mark_session_completed() in the processor runs without delay.
+        # Previously this awaited the upload (up to 30s timeout), keeping
+        # the SSE stream alive with only heartbeats.
         if config.claude_agent_use_resume and user_id:
             try:
-                # Prefer content captured in the Stop hook (read before
-                # cleanup removes the file).  Fall back to the resume
-                # file when the stop hook didn't fire (e.g. error before
-                # completion) so we don't lose the prior transcript.
                 raw_transcript = captured_transcript.raw_content or None
                 if not raw_transcript and use_resume and resume_file:
                     raw_transcript = read_transcript_file(resume_file)
 
                 if raw_transcript and session is not None:
-                    await asyncio.shield(
+                    task = asyncio.create_task(
                         _try_upload_transcript(
                             user_id,
                             session_id,
@@ -1319,6 +1317,8 @@ async def _next_msg() -> Any:
                             message_count=len(session.messages),
                         )
                     )
+                    _background_tasks.add(task)
+                    task.add_done_callback(_background_tasks.discard)
                 else:
                     logger.warning(f"[SDK] No transcript to upload for {session_id}")
             except Exception as upload_err:
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/ChatMessagesContainer.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/ChatMessagesContainer.tsx
index 01d2ef5d81da..e4070a44813c 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/ChatMessagesContainer.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/ChatMessagesContainer.tsx
@@ -5,12 +5,16 @@ import {
 } from "@/components/ai-elements/conversation";
 import { Message, MessageContent } from "@/components/ai-elements/message";
 import { LoadingSpinner } from "@/components/atoms/LoadingSpinner/LoadingSpinner";
-import { FileUIPart, UIDataTypes, UIMessage, UITools } from "ai";
+import { FileUIPart, ToolUIPart, UIDataTypes, UIMessage, UITools } from "ai";
 import { AssistantMessageActions } from "./components/AssistantMessageActions";
+import { CollapsedToolGroup } from "./components/CollapsedToolGroup";
 import { MessageAttachments } from "./components/MessageAttachments";
 import { MessagePartRenderer } from "./components/MessagePartRenderer";
+import { ReasoningCollapse } from "./components/ReasoningCollapse";
 import { ThinkingIndicator } from "./components/ThinkingIndicator";
 
+type MessagePart = UIMessage<unknown, UIDataTypes, UITools>["parts"][number];
+
 interface Props {
   messages: UIMessage<unknown, UIDataTypes, UITools>[];
   status: string;
@@ -20,6 +24,133 @@ interface Props {
   sessionID?: string | null;
 }
 
+function isCompletedToolPart(part: MessagePart): part is ToolUIPart {
+  return (
+    part.type.startsWith("tool-") &&
+    "state" in part &&
+    (part.state === "output-available" || part.state === "output-error")
+  );
+}
+
+type RenderSegment =
+  | { kind: "part"; part: MessagePart; index: number }
+  | { kind: "collapsed-group"; parts: ToolUIPart[] };
+
+// Tool types that have custom renderers and should NOT be collapsed
+const CUSTOM_TOOL_TYPES = new Set([
+  "tool-find_block",
+  "tool-find_agent",
+  "tool-find_library_agent",
+  "tool-search_docs",
+  "tool-get_doc_page",
+  "tool-run_block",
+  "tool-run_mcp_tool",
+  "tool-run_agent",
+  "tool-schedule_agent",
+  "tool-create_agent",
+  "tool-edit_agent",
+  "tool-view_agent_output",
+  "tool-search_feature_requests",
+  "tool-create_feature_request",
+]);
+
+/**
+ * Groups consecutive completed generic tool parts into collapsed segments.
+ * Non-generic tools (those with custom renderers) and active/streaming tools
+ * are left as individual parts.
+ */
+function buildRenderSegments(parts: MessagePart[]): RenderSegment[] {
+  const segments: RenderSegment[] = [];
+  let pendingGroup: ToolUIPart[] | null = null;
+
+  function flushGroup() {
+    if (!pendingGroup) return;
+    if (pendingGroup.length >= 2) {
+      segments.push({ kind: "collapsed-group", parts: pendingGroup });
+    } else {
+      for (const p of pendingGroup) {
+        const idx = parts.indexOf(p);
+        segments.push({ kind: "part", part: p, index: idx });
+      }
+    }
+    pendingGroup = null;
+  }
+
+  parts.forEach((part, i) => {
+    const isGenericCompletedTool =
+      isCompletedToolPart(part) && !CUSTOM_TOOL_TYPES.has(part.type);
+
+    if (isGenericCompletedTool) {
+      if (!pendingGroup) pendingGroup = [];
+      pendingGroup.push(part as ToolUIPart);
+    } else {
+      flushGroup();
+      segments.push({ kind: "part", part, index: i });
+    }
+  });
+
+  flushGroup();
+  return segments;
+}
+
+/**
+ * For finalized assistant messages, split parts into "reasoning" (intermediate
+ * text + tools before the final response) and "response" (final text after the
+ * last tool). If there are no tools, everything is response.
+ */
+function splitReasoningAndResponse(parts: MessagePart[]): {
+  reasoning: MessagePart[];
+  response: MessagePart[];
+} {
+  // Find the index of the last tool part
+  let lastToolIndex = -1;
+  for (let i = parts.length - 1; i >= 0; i--) {
+    if (parts[i].type.startsWith("tool-")) {
+      lastToolIndex = i;
+      break;
+    }
+  }
+
+  // No tools → everything is response
+  if (lastToolIndex === -1) {
+    return { reasoning: [], response: parts };
+  }
+
+  // Check if there's any text after the last tool
+  const hasResponseAfterTools = parts
+    .slice(lastToolIndex + 1)
+    .some((p) => p.type === "text");
+
+  if (!hasResponseAfterTools) {
+    // No final text response → don't collapse anything
+    return { reasoning: [], response: parts };
+  }
+
+  return {
+    reasoning: parts.slice(0, lastToolIndex + 1),
+    response: parts.slice(lastToolIndex + 1),
+  };
+}
+
+function renderSegments(
+  segments: RenderSegment[],
+  messageID: string,
+): React.ReactNode[] {
+  return segments.map((seg, segIdx) => {
+    if (seg.kind === "collapsed-group") {
+      return <CollapsedToolGroup key={`group-${segIdx}`} parts={seg.parts} />;
+    }
+    return (
+      <MessagePartRenderer
+        key={`${messageID}-${seg.index}`}
+        part={seg.part}
+        messageID={messageID}
+        partIndex={seg.index}
+      />
+    );
+  });
+}
+
 export function ChatMessagesContainer({
   messages,
   status,
@@ -92,6 +223,21 @@ export function ChatMessagesContainer({
             (p): p is FileUIPart => p.type === "file",
           );
 
+          // For finalized assistant messages, split into reasoning + response.
+          // During streaming, show everything normally with tool collapsing.
+          const isFinalized =
+            message.role === "assistant" && !isCurrentlyStreaming;
+          const { reasoning, response } = isFinalized
+            ? splitReasoningAndResponse(message.parts)
+            : { reasoning: [] as MessagePart[], response: message.parts };
+          const hasReasoning = reasoning.length > 0;
+
+          const responseSegments =
+            message.role === "assistant" ? buildRenderSegments(response) : null;
+          const reasoningSegments = hasReasoning
+            ? buildRenderSegments(reasoning)
+            : null;
+
           return (
             <Message from={message.role} key={message.id}>
               <MessageContent
@@ -101,14 +247,21 @@ export function ChatMessagesContainer({
                   "group-[.is-assistant]:bg-transparent group-[.is-assistant]:text-slate-900"
                 }
               >
-                {message.parts.map((part, i) => (
-                  <MessagePartRenderer
-                    key={`${message.id}-${i}`}
-                    part={part}
-                    messageID={message.id}
-                    partIndex={i}
-                  />
-                ))}
+                {hasReasoning && reasoningSegments && (
+                  <ReasoningCollapse>
+                    {renderSegments(reasoningSegments, message.id)}
+                  </ReasoningCollapse>
+                )}
+                {responseSegments
+                  ? renderSegments(responseSegments, message.id)
+                  : message.parts.map((part, i) => (
+                      <MessagePartRenderer
+                        key={`${message.id}-${i}`}
+                        part={part}
+                        messageID={message.id}
+                        partIndex={i}
+                      />
+                    ))}
                 {isLastAssistant && showThinking && (
                   <ThinkingIndicator active={showThinking} />
                 )}
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/CollapsedToolGroup.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/CollapsedToolGroup.tsx
new file mode 100644
index 000000000000..8c9811b83735
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/CollapsedToolGroup.tsx
@@ -0,0 +1,146 @@
+"use client";
+
+import { useState } from "react";
+import {
+  ArrowsClockwiseIcon,
+  CaretRightIcon,
+  CheckCircleIcon,
+  FileIcon,
+  FilesIcon,
+  GearIcon,
+  GlobeIcon,
+  ListChecksIcon,
+  MagnifyingGlassIcon,
+  MonitorIcon,
+  PencilSimpleIcon,
+  TerminalIcon,
+  TrashIcon,
+  WarningDiamondIcon,
+} from "@phosphor-icons/react";
+import type { ToolUIPart } from "ai";
+import {
+  type ToolCategory,
+  extractToolName,
+  getAnimationText,
+  getToolCategory,
+} from "../../../tools/GenericTool/helpers";
+
+interface Props {
+  parts: ToolUIPart[];
+}
+
+/** Category icon matching GenericTool's ToolIcon for completed states. */
+function EntryIcon({
+  category,
+  isError,
+}: {
+  category: ToolCategory;
+  isError: boolean;
+}) {
+  if (isError) {
+    return (
+      <WarningDiamondIcon size={14} weight="regular" className="text-red-500" />
+    );
+  }
+
+  const iconClass = "text-green-500";
+  switch (category) {
+    case "bash":
+      return <TerminalIcon size={14} weight="regular" className={iconClass} />;
+    case "web":
+      return <GlobeIcon size={14} weight="regular" className={iconClass} />;
+    case "browser":
+      return <MonitorIcon size={14} weight="regular" className={iconClass} />;
+    case "file-read":
+    case "file-write":
+      return <FileIcon size={14} weight="regular" className={iconClass} />;
+    case "file-delete":
+      return <TrashIcon size={14} weight="regular" className={iconClass} />;
+    case "file-list":
+      return <FilesIcon size={14} weight="regular" className={iconClass} />;
+    case "search":
+      return (
+        <MagnifyingGlassIcon size={14} weight="regular" className={iconClass} />
+      );
+    case "edit":
+      return (
+        <PencilSimpleIcon size={14} weight="regular" className={iconClass} />
+      );
+    case "todo":
+      return (
+        <ListChecksIcon size={14} weight="regular" className={iconClass} />
+      );
+    case "compaction":
+      return (
+        <ArrowsClockwiseIcon size={14} weight="regular" className={iconClass} />
+      );
+    default:
+      return <GearIcon size={14} weight="regular" className={iconClass} />;
+  }
+}
+
+export function CollapsedToolGroup({ parts }: Props) {
+  const [expanded, setExpanded] = useState(false);
+
+  const errorCount = parts.filter((p) => p.state === "output-error").length;
+  const label =
+    errorCount > 0
+      ? `${parts.length} tool calls (${errorCount} failed)`
+      : `${parts.length} tool calls completed`;
+
+  return (
+    <div className="py-1">
+      <button
+        type="button"
+        onClick={() => setExpanded(!expanded)}
+        className="flex items-center gap-1.5 text-sm text-muted-foreground transition-colors hover:text-foreground"
+      >
+        <CaretRightIcon
+          size={12}
+          weight="bold"
+          className={
+            "transition-transform duration-150 " + (expanded ? "rotate-90" : "")
+          }
+        />
+        {errorCount > 0 ? (
+          <WarningDiamondIcon
+            size={14}
+            weight="regular"
+            className="text-red-500"
+          />
+        ) : (
+          <CheckCircleIcon
+            size={14}
+            weight="regular"
+            className="text-green-500"
+          />
+        )}
+        <span>{label}</span>
+      </button>
+
+      {expanded && (
+        <div className="ml-5 mt-1 space-y-0.5 border-l border-neutral-200 pl-3">
+          {parts.map((part) => {
+            const toolName = extractToolName(part);
+            const category = getToolCategory(toolName);
+            const text = getAnimationText(part, category);
+            const isError = part.state === "output-error";
+
+            return (
+              <div
+                key={part.toolCallId}
+                className={
+                  "flex items-center gap-1.5 text-xs " +
+                  (isError ? "text-red-500" : "text-muted-foreground")
+                }
+              >
+                <EntryIcon category={category} isError={isError} />
+                <span>{text}</span>
+              </div>
+            );
+          })}
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/ReasoningCollapse.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/ReasoningCollapse.tsx
new file mode 100644
index 000000000000..5590b04b4f03
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/ReasoningCollapse.tsx
@@ -0,0 +1,27 @@
+"use client";
+
+import { LightbulbIcon } from "@phosphor-icons/react";
+import { Dialog } from "@/components/molecules/Dialog/Dialog";
+
+interface Props {
+  children: React.ReactNode;
+}
+
+export function ReasoningCollapse({ children }: Props) {
+  return (
+    <Dialog title="Reasoning">
+      <Dialog.Trigger>
+        <button
+          type="button"
+          className="flex items-center gap-1 text-xs text-zinc-500 transition-colors hover:text-zinc-700"
+        >
+          <LightbulbIcon size={12} weight="bold" />
+          <span>Show reasoning</span>
+        </button>
+      </Dialog.Trigger>
+      <Dialog.Content>
+        <div className="space-y-1">{children}</div>
+      </Dialog.Content>
+    </Dialog>
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/helpers/convertChatSessionToUiMessages.ts b/autogpt_platform/frontend/src/app/(platform)/copilot/helpers/convertChatSessionToUiMessages.ts
index ed21bc0c187c..f6e008467665 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/helpers/convertChatSessionToUiMessages.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/helpers/convertChatSessionToUiMessages.ts
@@ -181,6 +181,14 @@ export function convertChatSessionMessagesToUiMessages(
 
     if (parts.length === 0) return;
 
+    // Merge consecutive assistant messages into a single UIMessage
+    // to avoid split bubbles on page reload.
+    const prevUI = uiMessages[uiMessages.length - 1];
+    if (msg.role === "assistant" && prevUI && prevUI.role === "assistant") {
+      prevUI.parts.push(...parts);
+      return;
+    }
+
     uiMessages.push({
       id: `${sessionId}-${index}`,
       role: msg.role,
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/helpers.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/helpers.tsx
index a4bae886fc6f..2f0992793afa 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/helpers.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/CreateAgent/helpers.tsx
@@ -10,7 +10,7 @@ import {
   WarningDiamondIcon,
 } from "@phosphor-icons/react";
 import type { ToolUIPart } from "ai";
-import { OrbitLoader } from "../../components/OrbitLoader/OrbitLoader";
+import { ScaleLoader } from "../../components/ScaleLoader/ScaleLoader";
 
 export type CreateAgentToolOutput =
   | AgentPreviewResponse
@@ -134,7 +134,7 @@ export function ToolIcon({
     );
   }
   if (isStreaming) {
-    return <OrbitLoader size={24} />;
+    return <ScaleLoader size={14} />;
   }
   return <PlusIcon size={14} weight="regular" className="text-neutral-400" />;
 }
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/EditAgent/helpers.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/EditAgent/helpers.tsx
index 0fa12f1e19c9..54465ccbe604 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/EditAgent/helpers.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/EditAgent/helpers.tsx
@@ -9,7 +9,7 @@ import {
   WarningDiamondIcon,
 } from "@phosphor-icons/react";
 import type { ToolUIPart } from "ai";
-import { OrbitLoader } from "../../components/OrbitLoader/OrbitLoader";
+import { ScaleLoader } from "../../components/ScaleLoader/ScaleLoader";
 
 export type EditAgentToolOutput =
   | AgentPreviewResponse
@@ -121,7 +121,7 @@ export function ToolIcon({
     );
   }
   if (isStreaming) {
-    return <OrbitLoader size={24} />;
+    return <ScaleLoader size={14} />;
   }
   return (
     <PencilLineIcon size={14} weight="regular" className="text-neutral-400" />
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/GenericTool/GenericTool.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/GenericTool/GenericTool.tsx
index c5f28ebd662a..f7c3a2f1ee53 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/GenericTool/GenericTool.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/GenericTool/GenericTool.tsx
@@ -25,83 +25,19 @@ import {
   ContentCodeBlock,
   ContentMessage,
 } from "../../components/ToolAccordion/AccordionContent";
-import { OrbitLoader } from "../../components/OrbitLoader/OrbitLoader";
+import { ScaleLoader } from "../../components/ScaleLoader/ScaleLoader";
+import {
+  type ToolCategory,
+  extractToolName,
+  getAnimationText,
+  getToolCategory,
+  truncate,
+} from "./helpers";
 
 interface Props {
   part: ToolUIPart;
 }
 
-/* ------------------------------------------------------------------ */
-/*  Tool name helpers                                                  */
-/* ------------------------------------------------------------------ */
-
-function extractToolName(part: ToolUIPart): string {
-  return part.type.replace(/^tool-/, "");
-}
-
-function formatToolName(name: string): string {
-  return name.replace(/_/g, " ").replace(/^\w/, (c) => c.toUpperCase());
-}
-
-/* ------------------------------------------------------------------ */
-/*  Tool categorization                                                */
-/* ------------------------------------------------------------------ */
-
-type ToolCategory =
-  | "bash"
-  | "web"
-  | "browser"
-  | "file-read"
-  | "file-write"
-  | "file-delete"
-  | "file-list"
-  | "search"
-  | "edit"
-  | "todo"
-  | "compaction"
-  | "other";
-
-function getToolCategory(toolName: string): ToolCategory {
-  switch (toolName) {
-    case "bash_exec":
-      return "bash";
-    case "web_fetch":
-    case "WebSearch":
-    case "WebFetch":
-      return "web";
-    case "browser_navigate":
-    case "browser_act":
-    case "browser_screenshot":
-      return "browser";
-    case "read_workspace_file":
-    case "read_file":
-    case "Read":
-      return "file-read";
-    case "write_workspace_file":
-    case "write_file":
-    case "Write":
-      return "file-write";
-    case "delete_workspace_file":
-      return "file-delete";
-    case "list_workspace_files":
-    case "glob":
-    case "Glob":
-      return "file-list";
-    case "grep":
-    case "Grep":
-      return "search";
-    case "edit_file":
-    case "Edit":
-      return "edit";
-    case "TodoWrite":
-      return "todo";
-    case "context_compaction":
-      return "compaction";
-    default:
-      return "other";
-  }
-}
-
 /* ------------------------------------------------------------------ */
 /*  Tool icon                                                          */
 /* ------------------------------------------------------------------ */
@@ -121,10 +57,10 @@ function ToolIcon({
     );
   }
   if (isStreaming) {
-    return <OrbitLoader size={14} />;
+    return <ScaleLoader size={14} />;
   }
 
-  const iconClass = "text-neutral-400";
+  const iconClass = "text-green-500";
   switch (category) {
     case "bash":
       return <TerminalIcon size={14} weight="regular" className={iconClass} />;
@@ -193,191 +129,6 @@ function AccordionIcon({ category }: { category: ToolCategory }) {
   }
 }
 
-/* ------------------------------------------------------------------ */
-/*  Input extraction                                                   */
-/* ------------------------------------------------------------------ */
-
-function getInputSummary(toolName: string, input: unknown): string | null {
-  if (!input || typeof input !== "object") return null;
-  const inp = input as Record<string, unknown>;
-
-  switch (toolName) {
-    case "bash_exec":
-      return typeof inp.command === "string" ? inp.command : null;
-    case "web_fetch":
-    case "WebFetch":
-      return typeof inp.url === "string" ? inp.url : null;
-    case "WebSearch":
-      return typeof inp.query === "string" ? inp.query : null;
-    case "browser_navigate":
-      return typeof inp.url === "string" ? inp.url : null;
-    case "browser_act":
-      return typeof inp.action === "string"
-        ? inp.target
-          ? `${inp.action} ${inp.target}`
-          : (inp.action as string)
-        : null;
-    case "browser_screenshot":
-      return null;
-    case "read_workspace_file":
-    case "read_file":
-    case "Read":
-      return (
-        (typeof inp.file_path === "string" ? inp.file_path : null) ??
-        (typeof inp.path === "string" ? inp.path : null)
-      );
-    case "write_workspace_file":
-    case "write_file":
-    case "Write":
-      return (
-        (typeof inp.file_path === "string" ? inp.file_path : null) ??
-        (typeof inp.path === "string" ? inp.path : null)
-      );
-    case "delete_workspace_file":
-      return typeof inp.file_path === "string" ? inp.file_path : null;
-    case "glob":
-    case "Glob":
-      return typeof inp.pattern === "string" ? inp.pattern : null;
-    case "grep":
-    case "Grep":
-      return typeof inp.pattern === "string" ? inp.pattern : null;
-    case "edit_file":
-    case "Edit":
-      return typeof inp.file_path === "string" ? inp.file_path : null;
-    case "TodoWrite": {
-      // Extract the in-progress task name for the status line
-      const todos = Array.isArray(inp.todos) ? inp.todos : [];
-      const active = todos.find(
-        (t: Record<string, unknown>) => t.status === "in_progress",
-      );
-      if (active && typeof active.activeForm === "string")
-        return active.activeForm;
-      if (active && typeof active.content === "string") return active.content;
-      return null;
-    }
-    default:
-      return null;
-  }
-}
-
-function truncate(text: string, maxLen: number): string {
-  if (text.length <= maxLen) return text;
-  return text.slice(0, maxLen).trimEnd() + "…";
-}
-
-/* ------------------------------------------------------------------ */
-/*  Animation text                                                     */
-/* ------------------------------------------------------------------ */
-
-function getAnimationText(part: ToolUIPart, category: ToolCategory): string {
-  const toolName = extractToolName(part);
-  const summary = getInputSummary(toolName, part.input);
-  const shortSummary = summary ? truncate(summary, 60) : null;
-
-  switch (part.state) {
-    case "input-streaming":
-    case "input-available": {
-      switch (category) {
-        case "bash":
-          return shortSummary ? `Running: ${shortSummary}` : "Running command…";
-        case "web":
-          if (toolName === "WebSearch") {
-            return shortSummary
-              ? `Searching "${shortSummary}"`
-              : "Searching the web…";
-          }
-          return shortSummary
-            ? `Fetching ${shortSummary}`
-            : "Fetching web content…";
-        case "browser":
-          if (toolName === "browser_screenshot") return "Taking screenshot…";
-          return shortSummary
-            ? `Browsing ${shortSummary}`
-            : "Interacting with browser…";
-        case "file-read":
-          return shortSummary ? `Reading ${shortSummary}` : "Reading file…";
-        case "file-write":
-          return shortSummary ? `Writing ${shortSummary}` : "Writing file…";
-        case "file-delete":
-          return shortSummary ? `Deleting ${shortSummary}` : "Deleting file…";
-        case "file-list":
-          return shortSummary ? `Listing ${shortSummary}` : "Listing files…";
-        case "search":
-          return shortSummary
-            ? `Searching for "${shortSummary}"`
-            : "Searching…";
-        case "edit":
-          return shortSummary ? `Editing ${shortSummary}` : "Editing file…";
-        case "todo":
-          return shortSummary ? `${shortSummary}` : "Updating task list…";
-        case "compaction":
-          return "Summarizing earlier messages…";
-        default:
-          return `Running ${formatToolName(toolName)}…`;
-      }
-    }
-    case "output-available": {
-      switch (category) {
-        case "bash": {
-          const exitCode = getExitCode(part.output);
-          if (exitCode !== null && exitCode !== 0) {
-            return `Command exited with code ${exitCode}`;
-          }
-          return shortSummary ? `Ran: ${shortSummary}` : "Command completed";
-        }
-        case "web":
-          if (toolName === "WebSearch") {
-            return shortSummary
-              ? `Searched "${shortSummary}"`
-              : "Web search completed";
-          }
-          return shortSummary
-            ? `Fetched ${shortSummary}`
-            : "Fetched web content";
-        case "browser":
-          if (toolName === "browser_screenshot") return "Screenshot captured";
-          return shortSummary
-            ? `Browsed ${shortSummary}`
-            : "Browser action completed";
-        case "file-read":
-          return shortSummary ? `Read ${shortSummary}` : "File read completed";
-        case "file-write":
-          return shortSummary ? `Wrote ${shortSummary}` : "File written";
-        case "file-delete":
-          return shortSummary ? `Deleted ${shortSummary}` : "File deleted";
-        case "file-list":
-          return "Listed files";
-        case "search":
-          return shortSummary
-            ? `Searched for "${shortSummary}"`
-            : "Search completed";
-        case "edit":
-          return shortSummary ? `Edited ${shortSummary}` : "Edit completed";
-        case "todo":
-          return "Updated task list";
-        case "compaction":
-          return "Earlier messages were summarized";
-        default:
-          return `${formatToolName(toolName)} completed`;
-      }
-    }
-    case "output-error": {
-      switch (category) {
-        case "bash":
-          return "Command failed";
-        case "web":
-          return toolName === "WebSearch" ? "Search failed" : "Fetch failed";
-        case "browser":
-          return "Browser action failed";
-        default:
-          return `${formatToolName(toolName)} failed`;
-      }
-    }
-    default:
-      return `Running ${formatToolName(toolName)}…`;
-  }
-}
-
 /* ------------------------------------------------------------------ */
 /*  Output parsing helpers                                             */
 /* ------------------------------------------------------------------ */
@@ -418,13 +169,6 @@ function extractMcpText(output: Record<string, unknown>): string | null {
   return null;
 }
 
-function getExitCode(output: unknown): number | null {
-  const parsed = parseOutput(output);
-  if (!parsed) return null;
-  if (typeof parsed.exit_code === "number") return parsed.exit_code;
-  return null;
-}
-
 function getStringField(
   obj: Record<string, unknown>,
   ...keys: string[]
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/GenericTool/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/GenericTool/helpers.ts
new file mode 100644
index 000000000000..c0c5bef1b9a1
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/GenericTool/helpers.ts
@@ -0,0 +1,283 @@
+import type { ToolUIPart } from "ai";
+
+/* ------------------------------------------------------------------ */
+/*  Tool name helpers                                                  */
+/* ------------------------------------------------------------------ */
+
+export function extractToolName(part: ToolUIPart): string {
+  return part.type.replace(/^tool-/, "");
+}
+
+export function formatToolName(name: string): string {
+  return name.replace(/_/g, " ").replace(/^\w/, (c) => c.toUpperCase());
+}
+
+/* ------------------------------------------------------------------ */
+/*  Tool categorization                                                */
+/* ------------------------------------------------------------------ */
+
+export type ToolCategory =
+  | "bash"
+  | "web"
+  | "browser"
+  | "file-read"
+  | "file-write"
+  | "file-delete"
+  | "file-list"
+  | "search"
+  | "edit"
+  | "todo"
+  | "compaction"
+  | "other";
+
+export function getToolCategory(toolName: string): ToolCategory {
+  switch (toolName) {
+    case "bash_exec":
+      return "bash";
+    case "web_fetch":
+    case "WebSearch":
+    case "WebFetch":
+      return "web";
+    case "browser_navigate":
+    case "browser_act":
+    case "browser_screenshot":
+      return "browser";
+    case "read_workspace_file":
+    case "read_file":
+    case "Read":
+      return "file-read";
+    case "write_workspace_file":
+    case "write_file":
+    case "Write":
+      return "file-write";
+    case "delete_workspace_file":
+      return "file-delete";
+    case "list_workspace_files":
+    case "glob":
+    case "Glob":
+      return "file-list";
+    case "grep":
+    case "Grep":
+      return "search";
+    case "edit_file":
+    case "Edit":
+      return "edit";
+    case "TodoWrite":
+      return "todo";
+    case "context_compaction":
+      return "compaction";
+    default:
+      return "other";
+  }
+}
+
+/* ------------------------------------------------------------------ */
+/*  Input summary                                                      */
+/* ------------------------------------------------------------------ */
+
+function getInputSummary(toolName: string, input: unknown): string | null {
+  if (!input || typeof input !== "object") return null;
+  const inp = input as Record<string, unknown>;
+
+  switch (toolName) {
+    case "bash_exec":
+      return typeof inp.command === "string" ? inp.command : null;
+    case "web_fetch":
+    case "WebFetch":
+      return typeof inp.url === "string" ? inp.url : null;
+    case "WebSearch":
+      return typeof inp.query === "string" ? inp.query : null;
+    case "browser_navigate":
+      return typeof inp.url === "string" ? inp.url : null;
+    case "browser_act":
+      return typeof inp.action === "string"
+        ? inp.target
+          ? `${inp.action} ${inp.target}`
+          : (inp.action as string)
+        : null;
+    case "browser_screenshot":
+      return null;
+    case "read_workspace_file":
+    case "read_file":
+    case "Read":
+      return (
+        (typeof inp.file_path === "string" ? inp.file_path : null) ??
+        (typeof inp.path === "string" ? inp.path : null)
+      );
+    case "write_workspace_file":
+    case "write_file":
+    case "Write":
+      return (
+        (typeof inp.file_path === "string" ? inp.file_path : null) ??
+        (typeof inp.path === "string" ? inp.path : null)
+      );
+    case "delete_workspace_file":
+      return typeof inp.file_path === "string" ? inp.file_path : null;
+    case "glob":
+    case "Glob":
+      return typeof inp.pattern === "string" ? inp.pattern : null;
+    case "grep":
+    case "Grep":
+      return typeof inp.pattern === "string" ? inp.pattern : null;
+    case "edit_file":
+    case "Edit":
+      return typeof inp.file_path === "string" ? inp.file_path : null;
+    case "TodoWrite": {
+      const todos = Array.isArray(inp.todos) ? inp.todos : [];
+      const active = todos.find(
+        (t: Record<string, unknown>) => t.status === "in_progress",
+      );
+      if (active && typeof active.activeForm === "string")
+        return active.activeForm;
+      if (active && typeof active.content === "string") return active.content;
+      return null;
+    }
+    default:
+      return null;
+  }
+}
+
+export function truncate(text: string, maxLen: number): string {
+  if (text.length <= maxLen) return text;
+  return text.slice(0, maxLen).trimEnd() + "\u2026";
+}
+
+/* ------------------------------------------------------------------ */
+/*  Exit code helper                                                   */
+/* ------------------------------------------------------------------ */
+
+function getExitCode(output: unknown): number | null {
+  if (!output || typeof output !== "object") return null;
+  const parsed = output as Record<string, unknown>;
+  if (typeof parsed.exit_code === "number") return parsed.exit_code;
+  return null;
+}
+
+/* ------------------------------------------------------------------ */
+/*  Animation text                                                     */
+/* ------------------------------------------------------------------ */
+
+export function getAnimationText(
+  part: ToolUIPart,
+  category: ToolCategory,
+): string {
+  const toolName = extractToolName(part);
+  const summary = getInputSummary(toolName, part.input);
+  const shortSummary = summary ? truncate(summary, 60) : null;
+
+  switch (part.state) {
+    case "input-streaming":
+    case "input-available": {
+      switch (category) {
+        case "bash":
+          return shortSummary
+            ? `Running: ${shortSummary}`
+            : "Running command\u2026";
+        case "web":
+          if (toolName === "WebSearch") {
+            return shortSummary
+              ? `Searching "${shortSummary}"`
+              : "Searching the web\u2026";
+          }
+          return shortSummary
+            ? `Fetching ${shortSummary}`
+            : "Fetching web content\u2026";
+        case "browser":
+          if (toolName === "browser_screenshot")
+            return "Taking screenshot\u2026";
+          return shortSummary
+            ? `Browsing ${shortSummary}`
+            : "Interacting with browser\u2026";
+        case "file-read":
+          return shortSummary
+            ? `Reading ${shortSummary}`
+            : "Reading file\u2026";
+        case "file-write":
+          return shortSummary
+            ? `Writing ${shortSummary}`
+            : "Writing file\u2026";
+        case "file-delete":
+          return shortSummary
+            ? `Deleting ${shortSummary}`
+            : "Deleting file\u2026";
+        case "file-list":
+          return shortSummary
+            ? `Listing ${shortSummary}`
+            : "Listing files\u2026";
+        case "search":
+          return shortSummary
+            ? `Searching for "${shortSummary}"`
+            : "Searching\u2026";
+        case "edit":
+          return shortSummary
+            ? `Editing ${shortSummary}`
+            : "Editing file\u2026";
+        case "todo":
+          return shortSummary ? `${shortSummary}` : "Updating task list\u2026";
+        case "compaction":
+          return "Summarizing earlier messages\u2026";
+        default:
+          return `Running ${formatToolName(toolName)}\u2026`;
+      }
+    }
+    case "output-available": {
+      switch (category) {
+        case "bash": {
+          const exitCode = getExitCode(part.output);
+          if (exitCode !== null && exitCode !== 0) {
+            return `Command exited with code ${exitCode}`;
+          }
+          return shortSummary ? `Ran: ${shortSummary}` : "Command completed";
+        }
+        case "web":
+          if (toolName === "WebSearch") {
+            return shortSummary
+              ? `Searched "${shortSummary}"`
+              : "Web search completed";
+          }
+          return shortSummary
+            ? `Fetched ${shortSummary}`
+            : "Fetched web content";
+        case "browser":
+          if (toolName === "browser_screenshot") return "Screenshot captured";
+          return shortSummary
+            ? `Browsed ${shortSummary}`
+            : "Browser action completed";
+        case "file-read":
+          return shortSummary ? `Read ${shortSummary}` : "File read completed";
+        case "file-write":
+          return shortSummary ? `Wrote ${shortSummary}` : "File written";
+        case "file-delete":
+          return shortSummary ? `Deleted ${shortSummary}` : "File deleted";
+        case "file-list":
+          return "Listed files";
+        case "search":
+          return shortSummary
+            ? `Searched for "${shortSummary}"`
+            : "Search completed";
+        case "edit":
+          return shortSummary ? `Edited ${shortSummary}` : "Edit completed";
+        case "todo":
+          return "Updated task list";
+        case "compaction":
+          return "Earlier messages were summarized";
+        default:
+          return `${formatToolName(toolName)} completed`;
+      }
+    }
+    case "output-error": {
+      switch (category) {
+        case "bash":
+          return "Command failed";
+        case "web":
+          return toolName === "WebSearch" ? "Search failed" : "Fetch failed";
+        case "browser":
+          return "Browser action failed";
+        default:
+          return `${formatToolName(toolName)} failed`;
+      }
+    }
+    default:
+      return `Running ${formatToolName(toolName)}\u2026`;
+  }
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunAgent/RunAgent.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunAgent/RunAgent.tsx
index f00d6e6b7f37..d14417d6efb1 100644
--- 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,7 +2,7 @@
 
 import type { ToolUIPart } from "ai";
 import { MorphingTextAnimation } from "../../components/MorphingTextAnimation/MorphingTextAnimation";
-import { OrbitLoader } from "../../components/OrbitLoader/OrbitLoader";
+import { ScaleLoader } from "../../components/ScaleLoader/ScaleLoader";
 import { ToolAccordion } from "../../components/ToolAccordion/ToolAccordion";
 import {
   ContentGrid,
@@ -86,7 +86,7 @@ export function RunAgentTool({ part }: Props) {
 
       {isStreaming && !output && (
         <ToolAccordion
-          icon={<OrbitLoader size={32} />}
+          icon={<ScaleLoader size={14} />}
           title="Running agent, this may take a few minutes. Play while you wait."
           expanded={true}
         >
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunAgent/helpers.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunAgent/helpers.tsx
index 2b75ed9c9742..7a08a2d6a54b 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunAgent/helpers.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunAgent/helpers.tsx
@@ -10,7 +10,7 @@ import {
   WarningDiamondIcon,
 } from "@phosphor-icons/react";
 import type { ToolUIPart } from "ai";
-import { OrbitLoader } from "../../components/OrbitLoader/OrbitLoader";
+import { ScaleLoader } from "../../components/ScaleLoader/ScaleLoader";
 
 export interface RunAgentInput {
   username_agent_slug?: string;
@@ -171,7 +171,7 @@ export function ToolIcon({
     );
   }
   if (isStreaming) {
-    return <OrbitLoader size={24} />;
+    return <ScaleLoader size={14} />;
   }
   return <PlayIcon size={14} weight="regular" className="text-neutral-400" />;
 }
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunBlock/helpers.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunBlock/helpers.tsx
index 6e56154a5e92..d5a498456f9f 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunBlock/helpers.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunBlock/helpers.tsx
@@ -8,7 +8,7 @@ import {
   WarningDiamondIcon,
 } from "@phosphor-icons/react";
 import type { ToolUIPart } from "ai";
-import { OrbitLoader } from "../../components/OrbitLoader/OrbitLoader";
+import { ScaleLoader } from "../../components/ScaleLoader/ScaleLoader";
 
 /** Block details returned on first run_block attempt (before input_data provided). */
 export interface BlockDetailsResponse {
@@ -157,7 +157,7 @@ export function ToolIcon({
     );
   }
   if (isStreaming) {
-    return <OrbitLoader size={24} />;
+    return <ScaleLoader size={14} />;
   }
   return <PlayIcon size={14} weight="regular" className="text-neutral-400" />;
 }
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunMCPTool/helpers.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunMCPTool/helpers.tsx
index 416c18bd3f1b..ff294022bcbe 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunMCPTool/helpers.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunMCPTool/helpers.tsx
@@ -6,7 +6,7 @@ import { ResponseType } from "@/app/api/__generated__/models/responseType";
 import type { SetupRequirementsResponse } from "@/app/api/__generated__/models/setupRequirementsResponse";
 import { WarningDiamondIcon, PlugsConnectedIcon } from "@phosphor-icons/react";
 import type { ToolUIPart } from "ai";
-import { OrbitLoader } from "../../components/OrbitLoader/OrbitLoader";
+import { ScaleLoader } from "../../components/ScaleLoader/ScaleLoader";
 
 // ------------------------------------------------------------------ //
 //  Re-export generated types for use by RunMCPTool components
@@ -212,7 +212,7 @@ export function ToolIcon({
     );
   }
   if (isStreaming) {
-    return <OrbitLoader size={24} />;
+    return <ScaleLoader size={14} />;
   }
   return (
     <PlugsConnectedIcon
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/useCopilotStream.ts b/autogpt_platform/frontend/src/app/(platform)/copilot/useCopilotStream.ts
index e47a2b943444..d8a620732d16 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/useCopilotStream.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/useCopilotStream.ts
@@ -92,12 +92,18 @@ export function useCopilotStream({
   // Set when the user explicitly clicks stop — prevents onError from
   // triggering a reconnect cycle for the resulting AbortError.
   const isUserStoppingRef = useRef(false);
+  // Set when all reconnect attempts are exhausted — prevents hasActiveStream
+  // from keeping the UI blocked forever when the backend is slow to clear it.
+  // Must be state (not ref) so that setting it triggers a re-render and
+  // recomputes `isReconnecting`.
+  const [reconnectExhausted, setReconnectExhausted] = useState(false);
 
   function handleReconnect(sid: string) {
     if (isReconnectScheduledRef.current || !sid) return;
 
     const nextAttempt = reconnectAttemptsRef.current + 1;
     if (nextAttempt > RECONNECT_MAX_ATTEMPTS) {
+      setReconnectExhausted(true);
       toast({
         title: "Connection lost",
         description: "Unable to reconnect. Please refresh the page.",
@@ -146,7 +152,11 @@ export function useCopilotStream({
         return;
       }
 
-      // Check if backend executor is still running after clean close
+      // Check if backend executor is still running after clean close.
+      // Brief delay to let the backend clear active_stream — without this,
+      // the refetch often races and sees stale active_stream=true, triggering
+      // unnecessary reconnect cycles.
+      await new Promise((r) => setTimeout(r, 500));
       const result = await refetchSession();
       const d = result.data;
       const backendActive =
@@ -276,6 +286,7 @@ export function useCopilotStream({
     setIsReconnectScheduled(false);
     hasShownDisconnectToast.current = false;
     isUserStoppingRef.current = false;
+    setReconnectExhausted(false);
     hasResumedRef.current.clear();
     return () => {
       clearTimeout(reconnectTimerRef.current);
@@ -299,6 +310,7 @@ export function useCopilotStream({
       if (status === "ready") {
         reconnectAttemptsRef.current = 0;
         hasShownDisconnectToast.current = false;
+        setReconnectExhausted(false);
       }
     }
   }, [status, sessionId, queryClient, isReconnectScheduled]);
@@ -358,10 +370,12 @@ export function useCopilotStream({
   }, [hasActiveStream]);
 
   // True while reconnecting or backend has active stream but we haven't connected yet.
-  // Suppressed when the user explicitly stopped — the backend may take a moment
-  // to clear active_stream but the UI should be responsive immediately.
+  // Suppressed when the user explicitly stopped or when all reconnect attempts
+  // are exhausted — the backend may be slow to clear active_stream but the UI
+  // should remain responsive.
   const isReconnecting =
     !isUserStoppingRef.current &&
+    !reconnectExhausted &&
     (isReconnectScheduled ||
       (hasActiveStream && status !== "streaming" && status !== "submitted"));
 

From 224663b56c362469983fb139a9eaa6f40babd5df Mon Sep 17 00:00:00 2001
From: Lluis Agusti <hi@llu.lu>
Date: Thu, 5 Mar 2026 19:50:33 +0800
Subject: [PATCH 3/7] chore: update

---
 .../components/FeedbackModal.tsx              | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/FeedbackModal.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/FeedbackModal.tsx
index 8c773b1aaf12..8f3f8ede2071 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/FeedbackModal.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/FeedbackModal.tsx
@@ -1,8 +1,9 @@
 "use client";
 
+import { Button } from "@/components/atoms/Button/Button";
+import { Input } from "@/components/atoms/Input/Input";
 import { Dialog } from "@/components/molecules/Dialog/Dialog";
-import { Button } from "@/components/ui/button";
-import { Textarea } from "@/components/ui/textarea";
+
 import { useState } from "react";
 
 interface Props {
@@ -28,6 +29,7 @@ export function FeedbackModal({ isOpen, onSubmit, onCancel }: Props) {
   return (
     <Dialog
       title="What could have been better?"
+      styling={{ maxWidth: "30rem" }}
       controlled={{
         isOpen,
         set: (open) => {
@@ -36,29 +38,25 @@ export function FeedbackModal({ isOpen, onSubmit, onCancel }: Props) {
       }}
     >
       <Dialog.Content>
-        <div className="mx-auto w-[95%] space-y-4">
-          <p className="text-sm text-slate-600">
-            Your feedback helps us improve. Share details below.
-          </p>
-          <Textarea
+        <div className="mx-auto w-[99%] space-y-4">
+          <Input
+            label="Your feedback helps us improve. Share details below."
+            id="feedback-textarea"
+            type="textarea"
             placeholder="Tell us what went wrong or could be improved..."
             value={comment}
             onChange={(e) => setComment(e.target.value)}
             rows={4}
             maxLength={2000}
-            className="resize-none"
+            className="w-full resize-none"
           />
           <div className="flex items-center justify-between">
             <p className="text-xs text-slate-400">{comment.length}/2000</p>
             <div className="flex gap-2">
-              <Button variant="outline" size="sm" onClick={handleClose}>
+              <Button variant="ghost" onClick={handleClose}>
                 Cancel
               </Button>
-              <Button
-                size="sm"
-                onClick={handleSubmit}
-                disabled={!comment.trim()}
-              >
+              <Button onClick={handleSubmit} disabled={!comment.trim()}>
                 Submit feedback
               </Button>
             </div>

From fc7744db71760cc4a5b2a254ae7e73cb9daf933d Mon Sep 17 00:00:00 2001
From: Lluis Agusti <hi@llu.lu>
Date: Thu, 5 Mar 2026 20:13:15 +0800
Subject: [PATCH 4/7] Merge branch 'dev' and address review feedback

- Resolve merge conflicts in ChatMessagesContainer, FeedbackModal, GenericTool
- Fix double transcript upload (add guard flag to prevent duplicate scheduling)
- Add ARIA attributes to CollapsedToolGroup (aria-expanded, aria-controls)
- Guard browser_act target type before string interpolation
- Preserve original partIndex values in buildRenderSegments with baseIndex
- Regenerate API client to include workspace delete hook

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../api/features/executions/review/routes.py  |   4 +
 .../backend/api/features/workspace/routes.py  |  34 +-
 .../api/features/workspace/routes_test.py     |  52 +++
 .../backend/copilot/baseline/service.py       |  26 +-
 .../backend/backend/copilot/config.py         |  26 +-
 .../backend/copilot/executor/processor.py     |  42 +-
 .../backend/backend/copilot/sdk/dummy.py      |   2 +
 .../backend/copilot/sdk/e2b_file_tools.py     |   4 +-
 .../backend/backend/copilot/sdk/service.py    | 412 ++++++++++++++----
 .../backend/copilot/sdk/service_test.py       | 147 +++++++
 .../backend/copilot/sdk/tool_adapter.py       |  81 +---
 .../backend/copilot/sdk/tool_adapter_test.py  |  27 +-
 .../backend/backend/copilot/service.py        |   9 +-
 .../backend/copilot/stream_registry.py        |   5 +-
 .../backend/backend/copilot/tools/base.py     | 103 ++++-
 .../backend/copilot/tools/base_test.py        | 194 +++++++++
 .../backend/copilot/tools/workspace_files.py  |  59 ++-
 .../copilot/tools/workspace_files_test.py     |  59 +++
 .../backend/backend/executor/utils.py         |   4 +
 .../backend/backend/executor/utils_test.py    |  16 +
 autogpt_platform/backend/poetry.lock          |  14 +-
 autogpt_platform/backend/pyproject.toml       |   2 +-
 .../NodeOutput/components/ContentRenderer.tsx |   1 +
 .../ChatMessagesContainer.tsx                 |  75 +++-
 .../components/CollapsedToolGroup.tsx         |  10 +-
 .../components/FeedbackModal.tsx              |  26 +-
 .../components/MessageAttachments.tsx         |  60 ++-
 .../components/JobStatsBar/TurnStatsBar.tsx   |  29 ++
 .../components/JobStatsBar/constants.ts       |   1 +
 .../JobStatsBar/useWorkDoneCounters.ts        |  75 ++++
 .../copilot/tools/GenericTool/GenericTool.tsx |  53 ++-
 .../copilot/tools/GenericTool/helpers.ts      |   9 +-
 .../BlockOutputCard/BlockOutputCard.tsx       |  28 +-
 .../tools/ViewAgentOutput/ViewAgentOutput.tsx |  28 +-
 .../src/app/(platform)/login/useLoginPage.ts  |  17 +-
 .../frontend/src/app/api/openapi.json         |  44 ++
 .../src/app/api/proxy/[...path]/route.ts      |  11 +-
 .../components/atoms/FileInput/FileInput.tsx  | 116 +++--
 .../contextual/OutputRenderers/index.ts       |   2 +
 .../renderers/WorkspaceFileRenderer.test.ts   | 115 +++++
 .../renderers/WorkspaceFileRenderer.tsx       | 226 ++++++++++
 .../standard/widgets/FileInput/FileWidget.tsx |  19 +-
 .../widgets/FileInput/useWorkspaceUpload.ts   |  47 ++
 .../GoogleDrivePickerField.tsx                |  48 +-
 .../InputRenderer/utils/generate-ui-schema.ts |  10 +
 .../frontend/src/lib/workspace-uri.ts         |  54 +++
 46 files changed, 2083 insertions(+), 343 deletions(-)
 create mode 100644 autogpt_platform/backend/backend/copilot/sdk/service_test.py
 create mode 100644 autogpt_platform/backend/backend/copilot/tools/base_test.py
 create mode 100644 autogpt_platform/frontend/src/app/(platform)/copilot/components/JobStatsBar/TurnStatsBar.tsx
 create mode 100644 autogpt_platform/frontend/src/app/(platform)/copilot/components/JobStatsBar/constants.ts
 create mode 100644 autogpt_platform/frontend/src/app/(platform)/copilot/components/JobStatsBar/useWorkDoneCounters.ts
 create mode 100644 autogpt_platform/frontend/src/components/contextual/OutputRenderers/renderers/WorkspaceFileRenderer.test.ts
 create mode 100644 autogpt_platform/frontend/src/components/contextual/OutputRenderers/renderers/WorkspaceFileRenderer.tsx
 create mode 100644 autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/FileInput/useWorkspaceUpload.ts
 create mode 100644 autogpt_platform/frontend/src/lib/workspace-uri.ts

diff --git a/autogpt_platform/backend/backend/api/features/executions/review/routes.py b/autogpt_platform/backend/backend/api/features/executions/review/routes.py
index 539c7fd87b30..0da7838e0240 100644
--- a/autogpt_platform/backend/backend/api/features/executions/review/routes.py
+++ b/autogpt_platform/backend/backend/api/features/executions/review/routes.py
@@ -22,6 +22,7 @@
 )
 from backend.data.model import USER_TIMEZONE_NOT_SET
 from backend.data.user import get_user_by_id
+from backend.data.workspace import get_or_create_workspace
 from backend.executor.utils import add_graph_execution
 
 from .model import PendingHumanReviewModel, ReviewRequest, ReviewResponse
@@ -321,10 +322,13 @@ async def create_auto_approval_for_node(
                     user.timezone if user.timezone != USER_TIMEZONE_NOT_SET else "UTC"
                 )
 
+                workspace = await get_or_create_workspace(user_id)
+
                 execution_context = ExecutionContext(
                     human_in_the_loop_safe_mode=settings.human_in_the_loop_safe_mode,
                     sensitive_action_safe_mode=settings.sensitive_action_safe_mode,
                     user_timezone=user_timezone,
+                    workspace_id=workspace.id,
                 )
 
                 await add_graph_execution(
diff --git a/autogpt_platform/backend/backend/api/features/workspace/routes.py b/autogpt_platform/backend/backend/api/features/workspace/routes.py
index 588b88b64b37..54b3e1802e2d 100644
--- a/autogpt_platform/backend/backend/api/features/workspace/routes.py
+++ b/autogpt_platform/backend/backend/api/features/workspace/routes.py
@@ -120,6 +120,10 @@ class UploadFileResponse(BaseModel):
     size_bytes: int
 
 
+class DeleteFileResponse(BaseModel):
+    deleted: bool
+
+
 class StorageUsageResponse(BaseModel):
     used_bytes: int
     limit_bytes: int
@@ -151,6 +155,31 @@ async def download_file(
     return await _create_file_download_response(file)
 
 
+@router.delete(
+    "/files/{file_id}",
+    summary="Delete a workspace file",
+)
+async def delete_workspace_file(
+    user_id: Annotated[str, fastapi.Security(get_user_id)],
+    file_id: str,
+) -> DeleteFileResponse:
+    """
+    Soft-delete a workspace file and attempt to remove it from storage.
+
+    Used when a user clears a file input in the builder.
+    """
+    workspace = await get_workspace(user_id)
+    if workspace is None:
+        raise fastapi.HTTPException(status_code=404, detail="Workspace not found")
+
+    manager = WorkspaceManager(user_id, workspace.id)
+    deleted = await manager.delete_file(file_id)
+    if not deleted:
+        raise fastapi.HTTPException(status_code=404, detail="File not found")
+
+    return DeleteFileResponse(deleted=True)
+
+
 @router.post(
     "/files/upload",
     summary="Upload file to workspace",
@@ -218,7 +247,10 @@ async def upload_file(
 
     # Write file via WorkspaceManager
     manager = WorkspaceManager(user_id, workspace.id, session_id)
-    workspace_file = await manager.write_file(content, filename)
+    try:
+        workspace_file = await manager.write_file(content, filename)
+    except ValueError as e:
+        raise fastapi.HTTPException(status_code=409, detail=str(e)) from e
 
     # Post-write storage check — eliminates TOCTOU race on the quota.
     # If a concurrent upload pushed us over the limit, undo this write.
diff --git a/autogpt_platform/backend/backend/api/features/workspace/routes_test.py b/autogpt_platform/backend/backend/api/features/workspace/routes_test.py
index e87ea98db23e..76da67aaa1e9 100644
--- a/autogpt_platform/backend/backend/api/features/workspace/routes_test.py
+++ b/autogpt_platform/backend/backend/api/features/workspace/routes_test.py
@@ -305,3 +305,55 @@ def test_download_file_not_found(mocker: pytest_mock.MockFixture):
 
     response = client.get("/files/some-file-id/download")
     assert response.status_code == 404
+
+
+# ---- Delete ----
+
+
+def test_delete_file_success(mocker: pytest_mock.MockFixture):
+    """Deleting an existing file should return {"deleted": true}."""
+    mocker.patch(
+        "backend.api.features.workspace.routes.get_workspace",
+        return_value=MOCK_WORKSPACE,
+    )
+    mock_manager = mocker.MagicMock()
+    mock_manager.delete_file = mocker.AsyncMock(return_value=True)
+    mocker.patch(
+        "backend.api.features.workspace.routes.WorkspaceManager",
+        return_value=mock_manager,
+    )
+
+    response = client.delete("/files/file-aaa-bbb")
+    assert response.status_code == 200
+    assert response.json() == {"deleted": True}
+    mock_manager.delete_file.assert_called_once_with("file-aaa-bbb")
+
+
+def test_delete_file_not_found(mocker: pytest_mock.MockFixture):
+    """Deleting a non-existent file should return 404."""
+    mocker.patch(
+        "backend.api.features.workspace.routes.get_workspace",
+        return_value=MOCK_WORKSPACE,
+    )
+    mock_manager = mocker.MagicMock()
+    mock_manager.delete_file = mocker.AsyncMock(return_value=False)
+    mocker.patch(
+        "backend.api.features.workspace.routes.WorkspaceManager",
+        return_value=mock_manager,
+    )
+
+    response = client.delete("/files/nonexistent-id")
+    assert response.status_code == 404
+    assert "File not found" in response.text
+
+
+def test_delete_file_no_workspace(mocker: pytest_mock.MockFixture):
+    """Deleting when user has no workspace should return 404."""
+    mocker.patch(
+        "backend.api.features.workspace.routes.get_workspace",
+        return_value=None,
+    )
+
+    response = client.delete("/files/file-aaa-bbb")
+    assert response.status_code == 404
+    assert "Workspace not found" in response.text
diff --git a/autogpt_platform/backend/backend/copilot/baseline/service.py b/autogpt_platform/backend/backend/copilot/baseline/service.py
index 6855fa702fab..d151a5edbe92 100644
--- a/autogpt_platform/backend/backend/copilot/baseline/service.py
+++ b/autogpt_platform/backend/backend/copilot/baseline/service.py
@@ -13,6 +13,7 @@
 from typing import Any
 
 import orjson
+from langfuse import propagate_attributes
 
 from backend.copilot.model import (
     ChatMessage,
@@ -198,6 +199,20 @@ async def stream_chat_completion_baseline(
 
     yield StreamStart(messageId=message_id, sessionId=session_id)
 
+    # Propagate user/session context to Langfuse so all LLM calls within
+    # this request are grouped under a single trace with proper attribution.
+    _trace_ctx: Any = None
+    try:
+        _trace_ctx = propagate_attributes(
+            user_id=user_id,
+            session_id=session_id,
+            trace_name="copilot-baseline",
+            tags=["baseline"],
+        )
+        _trace_ctx.__enter__()
+    except Exception:
+        logger.warning("[Baseline] Langfuse trace context setup failed")
+
     assistant_text = ""
     text_block_id = str(uuid.uuid4())
     text_started = False
@@ -272,7 +287,7 @@ async def stream_chat_completion_baseline(
             yield StreamFinishStep()
             step_open = False
 
-            # Append the assistant message with tool_calls to context
+            # Append the assistant message with tool_calls to context.
             assistant_msg: dict[str, Any] = {"role": "assistant"}
             if round_text:
                 assistant_msg["content"] = round_text
@@ -282,7 +297,7 @@ async def stream_chat_completion_baseline(
                     "type": "function",
                     "function": {
                         "name": tc["name"],
-                        "arguments": tc["arguments"],
+                        "arguments": tc["arguments"] or "{}",
                     },
                 }
                 for tc in tool_calls_by_index.values()
@@ -385,6 +400,13 @@ async def stream_chat_completion_baseline(
         yield StreamError(errorText=error_msg, code="baseline_error")
         # Still persist whatever we got
     finally:
+        # Close Langfuse trace context
+        if _trace_ctx is not None:
+            try:
+                _trace_ctx.__exit__(None, None, None)
+            except Exception:
+                logger.warning("[Baseline] Langfuse trace context teardown failed")
+
         # Persist assistant response
         if assistant_text:
             session.messages.append(
diff --git a/autogpt_platform/backend/backend/copilot/config.py b/autogpt_platform/backend/backend/copilot/config.py
index b7174b001635..401875be2dfe 100644
--- a/autogpt_platform/backend/backend/copilot/config.py
+++ b/autogpt_platform/backend/backend/copilot/config.py
@@ -62,6 +62,10 @@ class ChatConfig(BaseSettings):
         default="CoPilot Prompt",
         description="Name of the prompt in Langfuse to fetch",
     )
+    langfuse_prompt_cache_ttl: int = Field(
+        default=300,
+        description="Cache TTL in seconds for Langfuse prompt (0 to disable caching)",
+    )
 
     # Claude Agent SDK Configuration
     use_claude_agent_sdk: bool = Field(
@@ -87,6 +91,10 @@ class ChatConfig(BaseSettings):
         description="Use --resume for multi-turn conversations instead of "
         "history compression. Falls back to compression when unavailable.",
     )
+    use_claude_code_subscription: bool = Field(
+        default=False,
+        description="For personal/dev use: use Claude Code CLI subscription auth instead of API keys. Requires `claude login` on the host. Only works with SDK mode.",
+    )
 
     # E2B Sandbox Configuration
     use_e2b_sandbox: bool = Field(
@@ -121,7 +129,7 @@ def get_use_e2b_sandbox(cls, v):
     @classmethod
     def get_e2b_api_key(cls, v):
         """Get E2B API key from environment if not provided."""
-        if v is None:
+        if not v:
             v = os.getenv("CHAT_E2B_API_KEY") or os.getenv("E2B_API_KEY")
         return v
 
@@ -129,7 +137,7 @@ def get_e2b_api_key(cls, v):
     @classmethod
     def get_api_key(cls, v):
         """Get API key from environment if not provided."""
-        if v is None:
+        if not v:
             # Try to get from environment variables
             # First check for CHAT_API_KEY (Pydantic prefix)
             v = os.getenv("CHAT_API_KEY")
@@ -139,13 +147,16 @@ def get_api_key(cls, v):
             if not v:
                 # Fall back to OPENAI_API_KEY
                 v = os.getenv("OPENAI_API_KEY")
+            # Note: ANTHROPIC_API_KEY is intentionally NOT included here.
+            # The SDK CLI picks it up from the env directly. Including it
+            # would pair it with the OpenRouter base_url, causing auth failures.
         return v
 
     @field_validator("base_url", mode="before")
     @classmethod
     def get_base_url(cls, v):
         """Get base URL from environment if not provided."""
-        if v is None:
+        if not v:
             # Check for OpenRouter or custom base URL
             v = os.getenv("CHAT_BASE_URL")
             if not v:
@@ -167,6 +178,15 @@ def get_use_claude_agent_sdk(cls, v):
         # Default to True (SDK enabled by default)
         return True if v is None else v
 
+    @field_validator("use_claude_code_subscription", mode="before")
+    @classmethod
+    def get_use_claude_code_subscription(cls, v):
+        """Get use_claude_code_subscription from environment if not provided."""
+        env_val = os.getenv("CHAT_USE_CLAUDE_CODE_SUBSCRIPTION", "").lower()
+        if env_val:
+            return env_val in ("true", "1", "yes", "on")
+        return False if v is None else v
+
     # Prompt paths for different contexts
     PROMPT_PATHS: dict[str, str] = {
         "default": "prompts/chat_system.md",
diff --git a/autogpt_platform/backend/backend/copilot/executor/processor.py b/autogpt_platform/backend/backend/copilot/executor/processor.py
index 97c441b7f553..ed243e0980a9 100644
--- a/autogpt_platform/backend/backend/copilot/executor/processor.py
+++ b/autogpt_platform/backend/backend/copilot/executor/processor.py
@@ -6,6 +6,8 @@
 
 import asyncio
 import logging
+import os
+import subprocess
 import threading
 import time
 
@@ -108,8 +110,41 @@ def on_executor_start(self):
         )
         self.execution_thread.start()
 
+        # Skip the SDK's per-request CLI version check — the bundled CLI is
+        # already version-matched to the SDK package.
+        os.environ.setdefault("CLAUDE_AGENT_SDK_SKIP_VERSION_CHECK", "1")
+
+        # Pre-warm the bundled CLI binary so the OS page-caches the ~185 MB
+        # executable.  First spawn pays ~1.2 s; subsequent spawns ~0.65 s.
+        self._prewarm_cli()
+
         logger.info(f"[CoPilotExecutor] Worker {self.tid} started")
 
+    def _prewarm_cli(self) -> None:
+        """Run the bundled CLI binary once to warm OS page caches."""
+        try:
+            from claude_agent_sdk._internal.transport.subprocess_cli import (
+                SubprocessCLITransport,
+            )
+
+            cli_path = SubprocessCLITransport._find_bundled_cli(None)  # type: ignore[arg-type]
+            if cli_path:
+                result = subprocess.run(
+                    [cli_path, "-v"],
+                    capture_output=True,
+                    timeout=10,
+                )
+                if result.returncode == 0:
+                    logger.info(f"[CoPilotExecutor] CLI pre-warm done: {cli_path}")
+                else:
+                    logger.warning(
+                        "[CoPilotExecutor] CLI pre-warm failed (rc=%d): %s",
+                        result.returncode,  # type: ignore[reportCallIssue]
+                        cli_path,
+                    )
+        except Exception as e:
+            logger.debug(f"[CoPilotExecutor] CLI pre-warm skipped: {e}")
+
     def cleanup(self):
         """Clean up event-loop-bound resources before the loop is destroyed.
 
@@ -208,9 +243,10 @@ async def _execute_async(
         error_msg = None
 
         try:
-            # Choose service based on LaunchDarkly flag
+            # Choose service based on LaunchDarkly flag.
+            # Claude Code subscription forces SDK mode (CLI subprocess auth).
             config = ChatConfig()
-            use_sdk = await is_feature_enabled(
+            use_sdk = config.use_claude_code_subscription or await is_feature_enabled(
                 Flag.COPILOT_SDK,
                 entry.user_id or "anonymous",
                 default=config.use_claude_agent_sdk,
@@ -228,6 +264,8 @@ async def _execute_async(
                 message=entry.message if entry.message else None,
                 is_user_message=entry.is_user_message,
                 user_id=entry.user_id,
+                context=entry.context,
+                file_ids=entry.file_ids,
             ):
                 if cancel.is_set():
                     log.info("Cancel requested, breaking stream")
diff --git a/autogpt_platform/backend/backend/copilot/sdk/dummy.py b/autogpt_platform/backend/backend/copilot/sdk/dummy.py
index cf54bccae79d..e3d0254f78e3 100644
--- a/autogpt_platform/backend/backend/copilot/sdk/dummy.py
+++ b/autogpt_platform/backend/backend/copilot/sdk/dummy.py
@@ -10,6 +10,7 @@
 import logging
 import uuid
 from collections.abc import AsyncGenerator
+from typing import Any
 
 from ..model import ChatSession
 from ..response_model import StreamBaseResponse, StreamStart, StreamTextDelta
@@ -26,6 +27,7 @@ async def stream_chat_completion_dummy(
     retry_count: int = 0,
     session: ChatSession | None = None,
     context: dict[str, str] | None = None,
+    **_kwargs: Any,
 ) -> AsyncGenerator[StreamBaseResponse, None]:
     """Stream dummy chat completion for testing.
 
diff --git a/autogpt_platform/backend/backend/copilot/sdk/e2b_file_tools.py b/autogpt_platform/backend/backend/copilot/sdk/e2b_file_tools.py
index 98216ff58e10..5041bd066887 100644
--- a/autogpt_platform/backend/backend/copilot/sdk/e2b_file_tools.py
+++ b/autogpt_platform/backend/backend/copilot/sdk/e2b_file_tools.py
@@ -280,7 +280,9 @@ def _read_local(file_path: str, offset: int, limit: int) -> dict[str, Any]:
     (
         "write_file",
         "Write or create a file in the cloud sandbox (/home/user). "
-        "Parent directories are created automatically.",
+        "Parent directories are created automatically. "
+        "To copy a workspace file into the sandbox, use "
+        "read_workspace_file with save_to_path instead.",
         {
             "type": "object",
             "properties": {
diff --git a/autogpt_platform/backend/backend/copilot/sdk/service.py b/autogpt_platform/backend/backend/copilot/sdk/service.py
index 8d54bfb05a8c..d883b1e2298c 100644
--- a/autogpt_platform/backend/backend/copilot/sdk/service.py
+++ b/autogpt_platform/backend/backend/copilot/sdk/service.py
@@ -2,10 +2,13 @@
 
 import asyncio
 import base64
+import functools
 import json
 import logging
 import os
+import re
 import shutil
+import subprocess
 import sys
 import uuid
 from collections.abc import AsyncGenerator
@@ -22,6 +25,7 @@
 )
 from langfuse import propagate_attributes
 from langsmith.integrations.claude_agent_sdk import configure_claude_agent_sdk
+from pydantic import BaseModel
 
 from backend.data.redis_client import get_redis_async
 from backend.executor.cluster_lock import AsyncClusterLock
@@ -55,6 +59,7 @@
 )
 from ..tools.e2b_sandbox import get_or_create_sandbox
 from ..tools.sandbox import WORKSPACE_PREFIX, make_session_path
+from ..tools.workspace_files import get_manager
 from ..tracking import track_user_message
 from .compaction import CompactionTracker, filter_compaction_messages
 from .response_adapter import SDKResponseAdapter
@@ -177,6 +182,13 @@ def available(self) -> bool:
 asynchronously.  You will receive an immediate response; the actual result
 is delivered to the user via a background stream.
 
+### Large tool outputs
+When a tool output exceeds the display limit, it is automatically saved to
+the persistent workspace.  The truncated output includes a
+`<tool-output-truncated>` tag with the workspace path.  Use
+`read_workspace_file(path="...", offset=N, length=50000)` to retrieve
+additional sections.
+
 ### Sub-agent tasks
 - When using the Task tool, NEVER set `run_in_background` to true.
   All tasks must run in the foreground.
@@ -288,15 +300,52 @@ def _resolve_sdk_model() -> str | None:
     Uses ``config.claude_agent_model`` if set, otherwise derives from
     ``config.model`` by stripping the OpenRouter provider prefix (e.g.,
     ``"anthropic/claude-opus-4.6"`` → ``"claude-opus-4.6"``).
+
+    When ``use_claude_code_subscription`` is enabled and no explicit
+    ``claude_agent_model`` is set, returns ``None`` so the CLI uses the
+    default model for the user's subscription plan.
     """
     if config.claude_agent_model:
         return config.claude_agent_model
+    if config.use_claude_code_subscription:
+        return None
     model = config.model
     if "/" in model:
         return model.split("/", 1)[1]
     return model
 
 
+@functools.cache
+def _validate_claude_code_subscription() -> None:
+    """Validate Claude CLI is installed and responds to ``--version``.
+
+    Cached so the blocking subprocess check runs at most once per process
+    lifetime.  A failure (CLI not installed) is a config error that requires
+    a process restart anyway.
+    """
+    claude_path = shutil.which("claude")
+    if not claude_path:
+        raise RuntimeError(
+            "Claude Code CLI not found. Install it with: "
+            "npm install -g @anthropic-ai/claude-code"
+        )
+    result = subprocess.run(
+        [claude_path, "--version"],
+        capture_output=True,
+        text=True,
+        timeout=10,
+    )
+    if result.returncode != 0:
+        raise RuntimeError(
+            f"Claude CLI check failed (exit {result.returncode}): "
+            f"{result.stderr.strip()}"
+        )
+    logger.info(
+        "Claude Code subscription mode: CLI version %s",
+        result.stdout.strip(),
+    )
+
+
 def _build_sdk_env(
     session_id: str | None = None,
     user_id: str | None = None,
@@ -317,7 +366,16 @@ def _build_sdk_env(
     falls back to its default credentials.
     """
     env: dict[str, str] = {}
-    if config.api_key and config.base_url:
+
+    if config.use_claude_code_subscription:
+        # Claude Code subscription: let the CLI use its own logged-in auth.
+        # Explicitly clear API key env vars so the subprocess doesn't pick
+        # them up from the parent process and bypass subscription auth.
+        _validate_claude_code_subscription()
+        env["ANTHROPIC_API_KEY"] = ""
+        env["ANTHROPIC_AUTH_TOKEN"] = ""
+        env["ANTHROPIC_BASE_URL"] = ""
+    elif config.api_key and config.base_url:
         # Strip /v1 suffix — SDK expects the base URL without a version path
         base = config.base_url.rstrip("/")
         if base.endswith("/v1"):
@@ -330,21 +388,24 @@ def _build_sdk_env(
         # Must be explicitly empty so the CLI uses AUTH_TOKEN instead
         env["ANTHROPIC_API_KEY"] = ""
 
-        # Inject broadcast headers so OpenRouter forwards traces to Langfuse.
-        # The ``x-session-id`` header is *required* for the Anthropic-native
-        # ``/messages`` endpoint — without it broadcast silently drops the
-        # trace even when org-level Langfuse integration is configured.
-        def _safe(value: str) -> str:
-            """Strip CR/LF to prevent header injection, then truncate."""
-            return value.replace("\r", "").replace("\n", "").strip()[:128]
-
-        headers: list[str] = []
-        if session_id:
-            headers.append(f"x-session-id: {_safe(session_id)}")
-        if user_id:
-            headers.append(f"x-user-id: {_safe(user_id)}")
-        if headers:
-            env["ANTHROPIC_CUSTOM_HEADERS"] = "\n".join(headers)
+    # Inject broadcast headers so OpenRouter forwards traces to Langfuse.
+    # The ``x-session-id`` header is *required* for the Anthropic-native
+    # ``/messages`` endpoint — without it broadcast silently drops the
+    # trace even when org-level Langfuse integration is configured.
+    def _safe(value: str) -> str:
+        """Strip CR/LF to prevent header injection, then truncate."""
+        return value.replace("\r", "").replace("\n", "").strip()[:128]
+
+    headers: list[str] = []
+    if session_id:
+        headers.append(f"x-session-id: {_safe(session_id)}")
+    if user_id:
+        headers.append(f"x-user-id: {_safe(user_id)}")
+    # Only inject headers when routing through OpenRouter/proxy — they're
+    # meaningless (and leak internal IDs) when using subscription mode.
+    if headers and env.get("ANTHROPIC_BASE_URL"):
+        env["ANTHROPIC_CUSTOM_HEADERS"] = "\n".join(headers)
+
     return env
 
 
@@ -568,15 +629,142 @@ async def _build_query_message(
     return current_message, False
 
 
+# Claude API vision-supported image types.
+_VISION_MIME_TYPES = frozenset({"image/png", "image/jpeg", "image/gif", "image/webp"})
+
+# Max size for embedding images directly in the user message (20 MiB raw).
+_MAX_INLINE_IMAGE_BYTES = 20 * 1024 * 1024
+
+# Matches characters unsafe for filenames.
+_UNSAFE_FILENAME = re.compile(r"[^\w.\-]")
+
+
+def _save_to_sdk_cwd(sdk_cwd: str, filename: str, content: bytes) -> str:
+    """Write file content to the SDK ephemeral directory.
+
+    Returns the absolute path.  Adds a numeric suffix on name collisions.
+    """
+    safe = _UNSAFE_FILENAME.sub("_", filename) or "file"
+    candidate = os.path.join(sdk_cwd, safe)
+    if os.path.exists(candidate):
+        stem, ext = os.path.splitext(safe)
+        idx = 1
+        while os.path.exists(candidate):
+            candidate = os.path.join(sdk_cwd, f"{stem}_{idx}{ext}")
+            idx += 1
+    with open(candidate, "wb") as f:
+        f.write(content)
+    return candidate
+
+
+class PreparedAttachments(BaseModel):
+    """Result of preparing file attachments for a query."""
+
+    hint: str = ""
+    """Text hint describing the files (appended to the user message)."""
+
+    image_blocks: list[dict[str, Any]] = []
+    """Claude API image content blocks to embed in the user message."""
+
+
+async def _prepare_file_attachments(
+    file_ids: list[str],
+    user_id: str,
+    session_id: str,
+    sdk_cwd: str,
+) -> PreparedAttachments:
+    """Download workspace files and prepare them for Claude.
+
+    Images (PNG/JPEG/GIF/WebP) are embedded directly as vision content blocks
+    in the user message so Claude can see them without tool calls.
+
+    Non-image files (PDFs, text, etc.) are saved to *sdk_cwd* so the CLI's
+    built-in Read tool can access them.
+
+    Returns a :class:`PreparedAttachments` with a text hint and any image
+    content blocks.
+    """
+    empty = PreparedAttachments(hint="", image_blocks=[])
+    if not file_ids or not user_id:
+        return empty
+
+    try:
+        manager = await get_manager(user_id, session_id)
+    except Exception:
+        logger.warning(
+            "Failed to create workspace manager for file attachments",
+            exc_info=True,
+        )
+        return empty
+
+    image_blocks: list[dict[str, Any]] = []
+    file_descriptions: list[str] = []
+
+    for fid in file_ids:
+        try:
+            file_info = await manager.get_file_info(fid)
+            if file_info is None:
+                continue
+            content = await manager.read_file_by_id(fid)
+            mime = (file_info.mime_type or "").split(";")[0].strip().lower()
+
+            # Images: embed directly in the user message as vision blocks
+            if mime in _VISION_MIME_TYPES and len(content) <= _MAX_INLINE_IMAGE_BYTES:
+                b64 = base64.b64encode(content).decode("ascii")
+                image_blocks.append(
+                    {
+                        "type": "image",
+                        "source": {
+                            "type": "base64",
+                            "media_type": mime,
+                            "data": b64,
+                        },
+                    }
+                )
+                file_descriptions.append(
+                    f"- {file_info.name} ({mime}, "
+                    f"{file_info.size_bytes:,} bytes) [embedded as image]"
+                )
+            else:
+                # Non-image files: save to sdk_cwd for Read tool access
+                local_path = _save_to_sdk_cwd(sdk_cwd, file_info.name, content)
+                file_descriptions.append(
+                    f"- {file_info.name} ({mime}, "
+                    f"{file_info.size_bytes:,} bytes) saved to {local_path}"
+                )
+        except Exception:
+            logger.warning("Failed to prepare file %s", fid[:12], exc_info=True)
+
+    if not file_descriptions:
+        return empty
+
+    noun = "file" if len(file_descriptions) == 1 else "files"
+    has_non_images = len(file_descriptions) > len(image_blocks)
+    read_hint = " Use the Read tool to view non-image files." if has_non_images else ""
+    hint = (
+        f"[The user attached {len(file_descriptions)} {noun}.{read_hint}\n"
+        + "\n".join(file_descriptions)
+        + "]"
+    )
+    return PreparedAttachments(hint=hint, image_blocks=image_blocks)
+
+
 async def stream_chat_completion_sdk(
     session_id: str,
     message: str | None = None,
     is_user_message: bool = True,
     user_id: str | None = None,
     session: ChatSession | None = None,
+    file_ids: list[str] | None = None,
     **_kwargs: Any,
 ) -> AsyncGenerator[StreamBaseResponse, None]:
-    """Stream chat completion using Claude Agent SDK."""
+    """Stream chat completion using Claude Agent SDK.
+
+    Args:
+        file_ids: Optional workspace file IDs attached to the user's message.
+            Images are embedded as vision content blocks; other files are
+            saved to the SDK working directory for the Read tool.
+    """
 
     if session is None:
         session = await get_chat_session(session_id, user_id)
@@ -639,6 +827,7 @@ async def stream_chat_completion_sdk(
     use_resume = False
     resume_file: str | None = None
     captured_transcript = CapturedTranscript()
+    transcript_upload_scheduled = False
     sdk_cwd = ""
 
     # Acquire stream lock to prevent concurrent streams to the same session
@@ -683,54 +872,108 @@ async def stream_chat_completion_sdk(
                 code="sdk_cwd_error",
             )
             return
-        # Set up E2B sandbox for persistent cloud execution when configured.
-        # When active, MCP file tools route directly to the sandbox filesystem
-        # so bash_exec and file tools share the same /home/user directory.
-        if config.use_e2b_sandbox and not config.e2b_api_key:
-            logger.warning(
-                "[E2B] [%s] E2B sandbox enabled but no API key configured "
-                "(CHAT_E2B_API_KEY / E2B_API_KEY) — falling back to bubblewrap",
-                session_id[:12],
-            )
-        if config.use_e2b_sandbox and config.e2b_api_key:
-            try:
-                e2b_sandbox = await get_or_create_sandbox(
-                    session_id,
-                    api_key=config.e2b_api_key,
-                    template=config.e2b_sandbox_template,
-                    timeout=config.e2b_sandbox_timeout,
+        # --- Run independent async I/O operations in parallel ---
+        # E2B sandbox setup, system prompt build (Langfuse + DB), and transcript
+        # download are independent network calls.  Running them concurrently
+        # saves ~200-500ms compared to sequential execution.
+
+        async def _setup_e2b():
+            """Set up E2B sandbox if configured, return sandbox or None."""
+            if config.use_e2b_sandbox and not config.e2b_api_key:
+                logger.warning(
+                    "[E2B] [%s] E2B sandbox enabled but no API key configured "
+                    "(CHAT_E2B_API_KEY / E2B_API_KEY) — falling back to bubblewrap",
+                    session_id[:12],
                 )
-            except Exception as e2b_err:
-                logger.error(
-                    "[E2B] [%s] Setup failed: %s",
+                return None
+            if config.use_e2b_sandbox and config.e2b_api_key:
+                try:
+                    return await get_or_create_sandbox(
+                        session_id,
+                        api_key=config.e2b_api_key,
+                        template=config.e2b_sandbox_template,
+                        timeout=config.e2b_sandbox_timeout,
+                    )
+                except Exception as e2b_err:
+                    logger.error(
+                        "[E2B] [%s] Setup failed: %s",
+                        session_id[:12],
+                        e2b_err,
+                        exc_info=True,
+                    )
+            return None
+
+        async def _fetch_transcript():
+            """Download transcript for --resume if applicable."""
+            if not (
+                config.claude_agent_use_resume and user_id and len(session.messages) > 1
+            ):
+                return None
+            try:
+                return await download_transcript(user_id, session_id)
+            except Exception as transcript_err:
+                logger.warning(
+                    "[SDK] [%s] Transcript download failed, continuing without "
+                    "--resume: %s",
                     session_id[:12],
-                    e2b_err,
-                    exc_info=True,
+                    transcript_err,
                 )
-                e2b_sandbox = None
-
-        use_e2b = e2b_sandbox is not None
+                return None
 
-        system_prompt, _ = await _build_system_prompt(
-            user_id, has_conversation_history=has_history
+        e2b_sandbox, (base_system_prompt, _), dl = await asyncio.gather(
+            _setup_e2b(),
+            _build_system_prompt(user_id, has_conversation_history=has_history),
+            _fetch_transcript(),
         )
-        system_prompt += (
+
+        use_e2b = e2b_sandbox is not None
+        system_prompt = base_system_prompt + (
             _E2B_TOOL_SUPPLEMENT
             if use_e2b
             else _LOCAL_TOOL_SUPPLEMENT.format(cwd=sdk_cwd)
         )
 
+        # Process transcript download result
+        transcript_msg_count = 0
+        if dl:
+            is_valid = validate_transcript(dl.content)
+            if is_valid:
+                logger.info(
+                    f"[SDK] Transcript available for session {session_id}: "
+                    f"{len(dl.content)}B, msg_count={dl.message_count}"
+                )
+                resume_file = write_transcript_to_tempfile(
+                    dl.content, session_id, sdk_cwd
+                )
+                if resume_file:
+                    use_resume = True
+                    transcript_msg_count = dl.message_count
+                    logger.debug(
+                        f"[SDK] Using --resume ({len(dl.content)}B, "
+                        f"msg_count={transcript_msg_count})"
+                    )
+            else:
+                logger.warning(
+                    f"[SDK] Transcript downloaded but invalid for {session_id}"
+                )
+        elif config.claude_agent_use_resume and user_id and len(session.messages) > 1:
+            logger.warning(
+                f"[SDK] No transcript available for {session_id} "
+                f"({len(session.messages)} messages in session)"
+            )
+
         yield StreamStart(messageId=message_id, sessionId=session_id)
 
         set_execution_context(user_id, session, sandbox=e2b_sandbox, sdk_cwd=sdk_cwd)
 
-        # Fail fast when no API credentials are available at all
+        # Fail fast when no API credentials are available at all.
         sdk_env = _build_sdk_env(session_id=session_id, user_id=user_id)
-        if not sdk_env and not os.environ.get("ANTHROPIC_API_KEY"):
+        if not config.api_key and not config.use_claude_code_subscription:
             raise RuntimeError(
-                "No API key configured. Set OPEN_ROUTER_API_KEY "
-                "(or CHAT_API_KEY) for OpenRouter routing, "
-                "or ANTHROPIC_API_KEY for direct Anthropic access."
+                "No API key configured. Set OPEN_ROUTER_API_KEY, "
+                "CHAT_API_KEY, or ANTHROPIC_API_KEY for API access, "
+                "or CHAT_USE_CLAUDE_CODE_SUBSCRIPTION=true to use "
+                "Claude Code CLI subscription (requires `claude login`)."
             )
 
         mcp_server = create_copilot_mcp_server(use_e2b=use_e2b)
@@ -767,37 +1010,6 @@ def _on_stop(transcript_path: str, sdk_session_id: str) -> None:
             on_compact=compaction.on_compact,
         )
 
-        # --- Resume strategy: download transcript from bucket ---
-        transcript_msg_count = 0  # watermark: session.messages length at upload
-
-        if config.claude_agent_use_resume and user_id and len(session.messages) > 1:
-            dl = await download_transcript(user_id, session_id)
-            is_valid = bool(dl and validate_transcript(dl.content))
-            if dl and is_valid:
-                logger.info(
-                    f"[SDK] Transcript available for session {session_id}: "
-                    f"{len(dl.content)}B, msg_count={dl.message_count}"
-                )
-                resume_file = write_transcript_to_tempfile(
-                    dl.content, session_id, sdk_cwd
-                )
-                if resume_file:
-                    use_resume = True
-                    transcript_msg_count = dl.message_count
-                    logger.debug(
-                        f"[SDK] Using --resume ({len(dl.content)}B, "
-                        f"msg_count={transcript_msg_count})"
-                    )
-            elif dl:
-                logger.warning(
-                    f"[SDK] Transcript downloaded but invalid for {session_id}"
-                )
-            else:
-                logger.warning(
-                    f"[SDK] No transcript available for {session_id} "
-                    f"({len(session.messages)} messages in session)"
-                )
-
         allowed = get_copilot_tool_names(use_e2b=use_e2b)
         disallowed = get_sdk_disallowed_tools(use_e2b=use_e2b)
         sdk_options_kwargs: dict[str, Any] = {
@@ -854,19 +1066,48 @@ def _on_stop(transcript_path: str, sdk_session_id: str) -> None:
                 transcript_msg_count,
                 session_id,
             )
+            # If files are attached, prepare them: images become vision
+            # content blocks in the user message, other files go to sdk_cwd.
+            attachments = await _prepare_file_attachments(
+                file_ids or [], user_id or "", session_id, sdk_cwd
+            )
+            if attachments.hint:
+                query_message = f"{query_message}\n\n{attachments.hint}"
+
             logger.info(
-                "[SDK] [%s] Sending query — resume=%s, total_msgs=%d, query_len=%d",
+                "[SDK] [%s] Sending query — resume=%s, total_msgs=%d, "
+                "query_len=%d, attached_files=%d, image_blocks=%d",
                 session_id[:12],
                 use_resume,
                 len(session.messages),
                 len(query_message),
+                len(file_ids) if file_ids else 0,
+                len(attachments.image_blocks),
             )
 
             compaction.reset_for_query()
             if was_compacted:
                 for ev in compaction.emit_pre_query(session):
                     yield ev
-            await client.query(query_message, session_id=session_id)
+
+            if attachments.image_blocks:
+                # Build multimodal content: image blocks + text
+                content_blocks: list[dict[str, Any]] = [
+                    *attachments.image_blocks,
+                    {"type": "text", "text": query_message},
+                ]
+                user_msg = {
+                    "type": "user",
+                    "message": {"role": "user", "content": content_blocks},
+                    "parent_tool_use_id": None,
+                    "session_id": session_id,
+                }
+                assert client._transport is not None  # noqa: SLF001
+                await client._transport.write(  # noqa: SLF001
+                    json.dumps(user_msg) + "\n"
+                )
+            else:
+                await client.query(query_message, session_id=session_id)
 
             assistant_response = ChatMessage(role="assistant", content="")
             accumulated_tool_calls: list[dict[str, Any]] = []
@@ -1210,6 +1451,7 @@ async def _next_msg() -> Any:
                 )
                 _background_tasks.add(task)
                 task.add_done_callback(_background_tasks.discard)
+                transcript_upload_scheduled = True
 
         logger.info(
             "[SDK] [%s] Stream completed successfully with %d messages",
@@ -1293,7 +1535,11 @@ async def _next_msg() -> Any:
         # mark_session_completed() in the processor runs without delay.
         # Previously this awaited the upload (up to 30s timeout), keeping
         # the SSE stream alive with only heartbeats.
-        if config.claude_agent_use_resume and user_id:
+        if (
+            config.claude_agent_use_resume
+            and user_id
+            and not transcript_upload_scheduled
+        ):
             try:
                 raw_transcript = captured_transcript.raw_content or None
                 if not raw_transcript and use_resume and resume_file:
diff --git a/autogpt_platform/backend/backend/copilot/sdk/service_test.py b/autogpt_platform/backend/backend/copilot/sdk/service_test.py
new file mode 100644
index 000000000000..25279ed57edc
--- /dev/null
+++ b/autogpt_platform/backend/backend/copilot/sdk/service_test.py
@@ -0,0 +1,147 @@
+"""Tests for SDK service helpers."""
+
+import base64
+import os
+from dataclasses import dataclass
+from unittest.mock import AsyncMock, patch
+
+import pytest
+
+from .service import _prepare_file_attachments
+
+
+@dataclass
+class _FakeFileInfo:
+    id: str
+    name: str
+    path: str
+    mime_type: str
+    size_bytes: int
+
+
+_PATCH_TARGET = "backend.copilot.sdk.service.get_manager"
+
+
+class TestPrepareFileAttachments:
+    @pytest.mark.asyncio
+    async def test_empty_list_returns_empty(self, tmp_path):
+        result = await _prepare_file_attachments([], "u", "s", str(tmp_path))
+        assert result.hint == ""
+        assert result.image_blocks == []
+
+    @pytest.mark.asyncio
+    async def test_image_embedded_as_vision_block(self, tmp_path):
+        """JPEG images should become vision content blocks, not files on disk."""
+        raw = b"\xff\xd8\xff\xe0fake-jpeg"
+        info = _FakeFileInfo(
+            id="abc",
+            name="photo.jpg",
+            path="/photo.jpg",
+            mime_type="image/jpeg",
+            size_bytes=len(raw),
+        )
+        mgr = AsyncMock()
+        mgr.get_file_info.return_value = info
+        mgr.read_file_by_id.return_value = raw
+
+        with patch(_PATCH_TARGET, new_callable=AsyncMock, return_value=mgr):
+            result = await _prepare_file_attachments(
+                ["abc"], "user1", "sess1", str(tmp_path)
+            )
+
+        assert "1 file" in result.hint
+        assert "photo.jpg" in result.hint
+        assert "embedded as image" in result.hint
+        assert len(result.image_blocks) == 1
+        block = result.image_blocks[0]
+        assert block["type"] == "image"
+        assert block["source"]["media_type"] == "image/jpeg"
+        assert block["source"]["data"] == base64.b64encode(raw).decode("ascii")
+        # Image should NOT be written to disk (embedded instead)
+        assert not os.path.exists(os.path.join(tmp_path, "photo.jpg"))
+
+    @pytest.mark.asyncio
+    async def test_pdf_saved_to_disk(self, tmp_path):
+        """PDFs should be saved to disk for Read tool access, not embedded."""
+        info = _FakeFileInfo("f1", "doc.pdf", "/doc.pdf", "application/pdf", 50)
+        mgr = AsyncMock()
+        mgr.get_file_info.return_value = info
+        mgr.read_file_by_id.return_value = b"%PDF-1.4 fake"
+
+        with patch(_PATCH_TARGET, new_callable=AsyncMock, return_value=mgr):
+            result = await _prepare_file_attachments(["f1"], "u", "s", str(tmp_path))
+
+        assert result.image_blocks == []
+        saved = tmp_path / "doc.pdf"
+        assert saved.exists()
+        assert saved.read_bytes() == b"%PDF-1.4 fake"
+        assert str(saved) in result.hint
+
+    @pytest.mark.asyncio
+    async def test_mixed_images_and_files(self, tmp_path):
+        """Images become blocks, non-images go to disk."""
+        infos = {
+            "id1": _FakeFileInfo("id1", "a.png", "/a.png", "image/png", 4),
+            "id2": _FakeFileInfo("id2", "b.pdf", "/b.pdf", "application/pdf", 4),
+            "id3": _FakeFileInfo("id3", "c.txt", "/c.txt", "text/plain", 4),
+        }
+        mgr = AsyncMock()
+        mgr.get_file_info.side_effect = lambda fid: infos[fid]
+        mgr.read_file_by_id.return_value = b"data"
+
+        with patch(_PATCH_TARGET, new_callable=AsyncMock, return_value=mgr):
+            result = await _prepare_file_attachments(
+                ["id1", "id2", "id3"], "u", "s", str(tmp_path)
+            )
+
+        assert "3 files" in result.hint
+        assert "a.png" in result.hint
+        assert "b.pdf" in result.hint
+        assert "c.txt" in result.hint
+        # Only the image should be a vision block
+        assert len(result.image_blocks) == 1
+        assert result.image_blocks[0]["source"]["media_type"] == "image/png"
+        # Non-image files should be on disk
+        assert (tmp_path / "b.pdf").exists()
+        assert (tmp_path / "c.txt").exists()
+        # Read tool hint should appear (has non-image files)
+        assert "Read tool" in result.hint
+
+    @pytest.mark.asyncio
+    async def test_singular_noun(self, tmp_path):
+        info = _FakeFileInfo("x", "only.txt", "/only.txt", "text/plain", 2)
+        mgr = AsyncMock()
+        mgr.get_file_info.return_value = info
+        mgr.read_file_by_id.return_value = b"hi"
+
+        with patch(_PATCH_TARGET, new_callable=AsyncMock, return_value=mgr):
+            result = await _prepare_file_attachments(["x"], "u", "s", str(tmp_path))
+
+        assert "1 file." in result.hint
+
+    @pytest.mark.asyncio
+    async def test_missing_file_skipped(self, tmp_path):
+        mgr = AsyncMock()
+        mgr.get_file_info.return_value = None
+
+        with patch(_PATCH_TARGET, new_callable=AsyncMock, return_value=mgr):
+            result = await _prepare_file_attachments(
+                ["missing-id"], "u", "s", str(tmp_path)
+            )
+
+        assert result.hint == ""
+        assert result.image_blocks == []
+
+    @pytest.mark.asyncio
+    async def test_image_only_no_read_hint(self, tmp_path):
+        """When all files are images, no Read tool hint should appear."""
+        info = _FakeFileInfo("i1", "cat.png", "/cat.png", "image/png", 4)
+        mgr = AsyncMock()
+        mgr.get_file_info.return_value = info
+        mgr.read_file_by_id.return_value = b"data"
+
+        with patch(_PATCH_TARGET, new_callable=AsyncMock, return_value=mgr):
+            result = await _prepare_file_attachments(["i1"], "u", "s", str(tmp_path))
+
+        assert "Read tool" not in result.hint
+        assert len(result.image_blocks) == 1
diff --git a/autogpt_platform/backend/backend/copilot/sdk/tool_adapter.py b/autogpt_platform/backend/backend/copilot/sdk/tool_adapter.py
index ae81a74e4fd1..6815b775358f 100644
--- a/autogpt_platform/backend/backend/copilot/sdk/tool_adapter.py
+++ b/autogpt_platform/backend/backend/copilot/sdk/tool_adapter.py
@@ -102,6 +102,9 @@ def is_allowed_local_path(path: str, sdk_cwd: str | None = None) -> bool:
 _current_sandbox: ContextVar["AsyncSandbox | None"] = ContextVar(
     "_current_sandbox", default=None
 )
+# Raw SDK working directory path (e.g. /tmp/copilot-<session_id>).
+# Used by workspace tools to save binary files for the CLI's built-in Read.
+_current_sdk_cwd: ContextVar[str] = ContextVar("_current_sdk_cwd", default="")
 
 # Stash for MCP tool outputs before the SDK potentially truncates them.
 # Keyed by tool_name → full output string. Consumed (popped) by the
@@ -140,6 +143,7 @@ def set_execution_context(
     _current_user_id.set(user_id)
     _current_session.set(session)
     _current_sandbox.set(sandbox)
+    _current_sdk_cwd.set(sdk_cwd or "")
     _current_project_dir.set(_encode_cwd_for_cli(sdk_cwd) if sdk_cwd else "")
     _pending_tool_outputs.set({})
     _stash_event.set(asyncio.Event())
@@ -150,6 +154,11 @@ def get_current_sandbox() -> "AsyncSandbox | None":
     return _current_sandbox.get()
 
 
+def get_sdk_cwd() -> str:
+    """Return the SDK ephemeral working directory for the current turn."""
+    return _current_sdk_cwd.get()
+
+
 def get_execution_context() -> tuple[str | None, ChatSession | None]:
     """Get the current execution context."""
     return (
@@ -263,61 +272,12 @@ async def _execute_tool_sync(
         result.output if isinstance(result.output, str) else json.dumps(result.output)
     )
 
-    content_blocks: list[dict[str, str]] = [{"type": "text", "text": text}]
-
-    # If the tool result contains inline image data, add an MCP image block
-    # so Claude can "see" the image (e.g. read_workspace_file on a small PNG).
-    image_block = _extract_image_block(text)
-    if image_block:
-        content_blocks.append(image_block)
-
     return {
-        "content": content_blocks,
+        "content": [{"type": "text", "text": text}],
         "isError": not result.success,
     }
 
 
-# MIME types that Claude can process as image content blocks.
-_SUPPORTED_IMAGE_TYPES = frozenset(
-    {"image/png", "image/jpeg", "image/gif", "image/webp"}
-)
-
-
-def _extract_image_block(text: str) -> dict[str, str] | None:
-    """Extract an MCP image content block from a tool result JSON string.
-
-    Detects workspace file responses with ``content_base64`` and an image
-    MIME type, returning an MCP-format image block that allows Claude to
-    "see" the image.  Returns ``None`` if the result is not an inline image.
-    """
-    try:
-        data = json.loads(text)
-    except (json.JSONDecodeError, TypeError):
-        return None
-
-    if not isinstance(data, dict):
-        return None
-
-    mime_type = data.get("mime_type", "")
-    base64_content = data.get("content_base64", "")
-
-    # Only inline small images — large ones would exceed Claude's limits.
-    # 32 KB raw ≈ ~43 KB base64.
-    _MAX_IMAGE_BASE64_BYTES = 43_000
-    if (
-        mime_type in _SUPPORTED_IMAGE_TYPES
-        and base64_content
-        and len(base64_content) <= _MAX_IMAGE_BASE64_BYTES
-    ):
-        return {
-            "type": "image",
-            "data": base64_content,
-            "mimeType": mime_type,
-        }
-
-    return None
-
-
 def _mcp_error(message: str) -> dict[str, Any]:
     return {
         "content": [
@@ -423,18 +383,21 @@ async def _read_file_handler(args: dict[str, Any]) -> dict[str, Any]:
 }
 
 
-# Create the MCP server configuration
+# ---------------------------------------------------------------------------
+# MCP result helpers
+# ---------------------------------------------------------------------------
+
+
 def _text_from_mcp_result(result: dict[str, Any]) -> str:
     """Extract concatenated text from an MCP response's content blocks."""
     content = result.get("content", [])
-    if isinstance(content, list):
-        parts = [
-            b.get("text", "")
-            for b in content
-            if isinstance(b, dict) and b.get("type") == "text"
-        ]
-        return "".join(parts)
-    return ""
+    if not isinstance(content, list):
+        return ""
+    return "".join(
+        b.get("text", "")
+        for b in content
+        if isinstance(b, dict) and b.get("type") == "text"
+    )
 
 
 def create_copilot_mcp_server(*, use_e2b: bool = False):
diff --git a/autogpt_platform/backend/backend/copilot/sdk/tool_adapter_test.py b/autogpt_platform/backend/backend/copilot/sdk/tool_adapter_test.py
index f6e9590d4471..ace6c1f552b7 100644
--- a/autogpt_platform/backend/backend/copilot/sdk/tool_adapter_test.py
+++ b/autogpt_platform/backend/backend/copilot/sdk/tool_adapter_test.py
@@ -1,4 +1,4 @@
-"""Tests for tool_adapter helpers: _text_from_mcp_result, truncation stash."""
+"""Tests for tool_adapter helpers: truncation, stash, context vars."""
 
 import pytest
 
@@ -7,6 +7,7 @@
 from .tool_adapter import (
     _MCP_MAX_CHARS,
     _text_from_mcp_result,
+    get_sdk_cwd,
     pop_pending_tool_output,
     set_execution_context,
     stash_pending_tool_output,
@@ -54,6 +55,30 @@ def test_missing_text_field(self):
         assert _text_from_mcp_result(result) == ""
 
 
+# ---------------------------------------------------------------------------
+# get_sdk_cwd
+# ---------------------------------------------------------------------------
+
+
+class TestGetSdkCwd:
+    def test_returns_empty_string_by_default(self):
+        set_execution_context(
+            user_id="test",
+            session=None,  # type: ignore[arg-type]
+            sandbox=None,
+        )
+        assert get_sdk_cwd() == ""
+
+    def test_returns_set_value(self):
+        set_execution_context(
+            user_id="test",
+            session=None,  # type: ignore[arg-type]
+            sandbox=None,
+            sdk_cwd="/tmp/copilot-test-123",
+        )
+        assert get_sdk_cwd() == "/tmp/copilot-test-123"
+
+
 # ---------------------------------------------------------------------------
 # stash / pop round-trip (the mechanism _truncating relies on)
 # ---------------------------------------------------------------------------
diff --git a/autogpt_platform/backend/backend/copilot/service.py b/autogpt_platform/backend/backend/copilot/service.py
index c97a803385a1..2bcba33abdd6 100644
--- a/autogpt_platform/backend/backend/copilot/service.py
+++ b/autogpt_platform/backend/backend/copilot/service.py
@@ -11,8 +11,10 @@
 import logging
 from typing import Any
 
-import openai
 from langfuse import get_client
+from langfuse.openai import (
+    AsyncOpenAI as LangfuseAsyncOpenAI,  # pyright: ignore[reportPrivateImportUsage]
+)
 
 from backend.data.db_accessors import understanding_db
 from backend.data.understanding import format_understanding_for_prompt
@@ -26,7 +28,7 @@
 
 config = ChatConfig()
 settings = Settings()
-client = openai.AsyncOpenAI(api_key=config.api_key, base_url=config.base_url)
+client = LangfuseAsyncOpenAI(api_key=config.api_key, base_url=config.base_url)
 
 
 langfuse = get_client()
@@ -173,7 +175,6 @@ async def _get_system_prompt_template(context: str) -> str:
     """
     if _is_langfuse_configured():
         try:
-            # cache_ttl_seconds=0 disables SDK caching to always get the latest prompt
             # Use asyncio.to_thread to avoid blocking the event loop
             # In non-production environments, fetch the latest prompt version
             # instead of the production-labeled version for easier testing
@@ -186,7 +187,7 @@ async def _get_system_prompt_template(context: str) -> str:
                 langfuse.get_prompt,
                 config.langfuse_prompt_name,
                 label=label,
-                cache_ttl_seconds=0,
+                cache_ttl_seconds=config.langfuse_prompt_cache_ttl,
             )
             return prompt.compile(users_information=context)
         except Exception as e:
diff --git a/autogpt_platform/backend/backend/copilot/stream_registry.py b/autogpt_platform/backend/backend/copilot/stream_registry.py
index 80ddaa832143..4af11dcb5b76 100644
--- a/autogpt_platform/backend/backend/copilot/stream_registry.py
+++ b/autogpt_platform/backend/backend/copilot/stream_registry.py
@@ -733,7 +733,10 @@ async def mark_session_completed(
     # This is the SINGLE place that publishes StreamFinish — services and
     # the processor must NOT publish it themselves.
     try:
-        await publish_chunk(turn_id, StreamFinish())
+        await publish_chunk(
+            turn_id,
+            StreamFinish(),
+        )
     except Exception as e:
         logger.error(
             f"Failed to publish StreamFinish for session {session_id}: {e}. "
diff --git a/autogpt_platform/backend/backend/copilot/tools/base.py b/autogpt_platform/backend/backend/copilot/tools/base.py
index da2a644edfc4..1225d22e18d4 100644
--- a/autogpt_platform/backend/backend/copilot/tools/base.py
+++ b/autogpt_platform/backend/backend/copilot/tools/base.py
@@ -1,5 +1,6 @@
 """Base classes and shared utilities for chat tools."""
 
+import json
 import logging
 from typing import Any
 
@@ -7,11 +8,98 @@
 
 from backend.copilot.model import ChatSession
 from backend.copilot.response_model import StreamToolOutputAvailable
+from backend.data.db_accessors import workspace_db
+from backend.util.truncate import truncate
+from backend.util.workspace import WorkspaceManager
 
 from .models import ErrorResponse, NeedLoginResponse, ToolResponseBase
 
 logger = logging.getLogger(__name__)
 
+# Persist full tool output to workspace when it exceeds this threshold.
+# Must be below _MAX_TOOL_OUTPUT_SIZE (100K) in response_model.py so we
+# capture the data before model_post_init middle-out truncation discards it.
+_LARGE_OUTPUT_THRESHOLD = 80_000
+
+# Character budget for the middle-out preview.  The total preview + wrapper
+# must stay below BOTH:
+#   - _MAX_TOOL_OUTPUT_SIZE (100K) in response_model.py (our own truncation)
+#   - Claude SDK's ~100 KB tool-result spill-to-disk threshold
+# to avoid double truncation/spilling.  95K + ~300 wrapper = ~95.3K, under both.
+_PREVIEW_CHARS = 95_000
+
+
+# Fields whose values are binary/base64 data — truncating them produces
+# garbage, so we replace them with a human-readable size summary instead.
+_BINARY_FIELD_NAMES = {"content_base64"}
+
+
+def _summarize_binary_fields(raw_json: str) -> str:
+    """Replace known binary fields with a size summary so truncate() doesn't
+    produce garbled base64 in the middle-out preview."""
+    try:
+        data = json.loads(raw_json)
+    except (json.JSONDecodeError, TypeError):
+        return raw_json
+
+    if not isinstance(data, dict):
+        return raw_json
+
+    changed = False
+    for key in _BINARY_FIELD_NAMES:
+        if key in data and isinstance(data[key], str) and len(data[key]) > 1_000:
+            byte_size = len(data[key]) * 3 // 4  # approximate decoded size
+            data[key] = f"<binary, ~{byte_size:,} bytes>"
+            changed = True
+
+    return json.dumps(data, ensure_ascii=False) if changed else raw_json
+
+
+async def _persist_and_summarize(
+    raw_output: str,
+    user_id: str,
+    session_id: str,
+    tool_call_id: str,
+) -> str:
+    """Persist full output to workspace and return a middle-out preview with retrieval instructions.
+
+    On failure, returns the original ``raw_output`` unchanged so that the
+    existing ``model_post_init`` middle-out truncation handles it as before.
+    """
+    file_path = f"tool-outputs/{tool_call_id}.json"
+    try:
+        workspace = await workspace_db().get_or_create_workspace(user_id)
+        manager = WorkspaceManager(user_id, workspace.id, session_id)
+        await manager.write_file(
+            content=raw_output.encode("utf-8"),
+            filename=f"{tool_call_id}.json",
+            path=file_path,
+            mime_type="application/json",
+            overwrite=True,
+        )
+    except Exception:
+        logger.warning(
+            "Failed to persist large tool output for %s",
+            tool_call_id,
+            exc_info=True,
+        )
+        return raw_output  # fall back to normal truncation
+
+    total = len(raw_output)
+    preview = truncate(_summarize_binary_fields(raw_output), _PREVIEW_CHARS)
+    retrieval = (
+        f"\nFull output ({total:,} chars) saved to workspace. "
+        f"Use read_workspace_file("
+        f'path="{file_path}", offset=<char_offset>, length=50000) '
+        f"to read any section."
+    )
+    return (
+        f'<tool-output-truncated total_chars={total} path="{file_path}">\n'
+        f"{preview}\n"
+        f"{retrieval}\n"
+        f"</tool-output-truncated>"
+    )
+
 
 class BaseTool:
     """Base class for all chat tools."""
@@ -67,7 +155,7 @@ async def execute(
         """Execute the tool with authentication check.
 
         Args:
-            user_id: User ID (may be anonymous like "anon_123")
+            user_id: User ID (None for anonymous users)
             session_id: Chat session ID
             **kwargs: Tool-specific parameters
 
@@ -91,10 +179,21 @@ async def execute(
 
         try:
             result = await self._execute(user_id, session, **kwargs)
+            raw_output = result.model_dump_json()
+
+            if (
+                len(raw_output) > _LARGE_OUTPUT_THRESHOLD
+                and user_id
+                and session.session_id
+            ):
+                raw_output = await _persist_and_summarize(
+                    raw_output, user_id, session.session_id, tool_call_id
+                )
+
             return StreamToolOutputAvailable(
                 toolCallId=tool_call_id,
                 toolName=self.name,
-                output=result.model_dump_json(),
+                output=raw_output,
             )
         except Exception as e:
             logger.error(f"Error in {self.name}: {e}", exc_info=True)
diff --git a/autogpt_platform/backend/backend/copilot/tools/base_test.py b/autogpt_platform/backend/backend/copilot/tools/base_test.py
new file mode 100644
index 000000000000..803b76babaca
--- /dev/null
+++ b/autogpt_platform/backend/backend/copilot/tools/base_test.py
@@ -0,0 +1,194 @@
+"""Tests for BaseTool large-output persistence in execute()."""
+
+from unittest.mock import AsyncMock, MagicMock, patch
+
+import pytest
+
+from backend.copilot.tools.base import (
+    _LARGE_OUTPUT_THRESHOLD,
+    BaseTool,
+    _persist_and_summarize,
+    _summarize_binary_fields,
+)
+from backend.copilot.tools.models import ResponseType, ToolResponseBase
+
+
+class _HugeOutputTool(BaseTool):
+    """Fake tool that returns an arbitrarily large output."""
+
+    def __init__(self, output_size: int) -> None:
+        self._output_size = output_size
+
+    @property
+    def name(self) -> str:
+        return "huge_output_tool"
+
+    @property
+    def description(self) -> str:
+        return "Returns a huge output"
+
+    @property
+    def parameters(self) -> dict:
+        return {"type": "object", "properties": {}}
+
+    async def _execute(self, user_id, session, **kwargs) -> ToolResponseBase:
+        return ToolResponseBase(
+            type=ResponseType.ERROR,
+            message="x" * self._output_size,
+        )
+
+
+# ---------------------------------------------------------------------------
+# _persist_and_summarize
+# ---------------------------------------------------------------------------
+
+
+class TestPersistAndSummarize:
+    @pytest.mark.asyncio
+    async def test_returns_middle_out_preview_with_retrieval_instructions(self):
+        raw = "A" * 200_000
+
+        mock_workspace = MagicMock()
+        mock_workspace.id = "ws-1"
+        mock_db = AsyncMock()
+        mock_db.get_or_create_workspace = AsyncMock(return_value=mock_workspace)
+
+        mock_manager = AsyncMock()
+
+        with (
+            patch("backend.copilot.tools.base.workspace_db", return_value=mock_db),
+            patch(
+                "backend.copilot.tools.base.WorkspaceManager",
+                return_value=mock_manager,
+            ),
+        ):
+            result = await _persist_and_summarize(raw, "user-1", "session-1", "tc-123")
+
+        assert "<tool-output-truncated" in result
+        assert "</tool-output-truncated>" in result
+        assert "total_chars=200000" in result
+        assert 'path="tool-outputs/tc-123.json"' in result
+        assert "read_workspace_file" in result
+        # Middle-out sentinel from truncate()
+        assert "omitted" in result
+        # Total result is much shorter than the raw output
+        assert len(result) < len(raw)
+
+        # Verify write_file was called with full content
+        mock_manager.write_file.assert_awaited_once()
+        call_kwargs = mock_manager.write_file.call_args
+        assert call_kwargs.kwargs["content"] == raw.encode("utf-8")
+        assert call_kwargs.kwargs["path"] == "tool-outputs/tc-123.json"
+
+    @pytest.mark.asyncio
+    async def test_fallback_on_workspace_error(self):
+        """If workspace write fails, return raw output for normal truncation."""
+        raw = "B" * 200_000
+        mock_db = AsyncMock()
+        mock_db.get_or_create_workspace = AsyncMock(side_effect=RuntimeError("boom"))
+
+        with patch("backend.copilot.tools.base.workspace_db", return_value=mock_db):
+            result = await _persist_and_summarize(raw, "user-1", "session-1", "tc-fail")
+
+        assert result == raw  # unchanged — fallback to normal truncation
+
+
+# ---------------------------------------------------------------------------
+# BaseTool.execute — integration with persistence
+# ---------------------------------------------------------------------------
+
+
+class TestBaseToolExecuteLargeOutput:
+    @pytest.mark.asyncio
+    async def test_small_output_not_persisted(self):
+        """Outputs under the threshold go through without persistence."""
+        tool = _HugeOutputTool(output_size=100)
+        session = MagicMock()
+        session.session_id = "s-1"
+
+        with patch(
+            "backend.copilot.tools.base._persist_and_summarize",
+            new_callable=AsyncMock,
+        ) as persist_mock:
+            result = await tool.execute("user-1", session, "tc-small")
+        persist_mock.assert_not_awaited()
+        assert "<tool-output-truncated" not in str(result.output)
+
+    @pytest.mark.asyncio
+    async def test_large_output_persisted(self):
+        """Outputs over the threshold trigger persistence + preview."""
+        tool = _HugeOutputTool(output_size=_LARGE_OUTPUT_THRESHOLD + 10_000)
+        session = MagicMock()
+        session.session_id = "s-1"
+
+        mock_workspace = MagicMock()
+        mock_workspace.id = "ws-1"
+        mock_db = AsyncMock()
+        mock_db.get_or_create_workspace = AsyncMock(return_value=mock_workspace)
+        mock_manager = AsyncMock()
+
+        with (
+            patch("backend.copilot.tools.base.workspace_db", return_value=mock_db),
+            patch(
+                "backend.copilot.tools.base.WorkspaceManager",
+                return_value=mock_manager,
+            ),
+        ):
+            result = await tool.execute("user-1", session, "tc-big")
+
+        assert "<tool-output-truncated" in str(result.output)
+        assert "read_workspace_file" in str(result.output)
+        mock_manager.write_file.assert_awaited_once()
+
+    @pytest.mark.asyncio
+    async def test_no_persistence_without_user_id(self):
+        """Anonymous users skip persistence (no workspace)."""
+        tool = _HugeOutputTool(output_size=_LARGE_OUTPUT_THRESHOLD + 10_000)
+        session = MagicMock()
+        session.session_id = "s-1"
+
+        # user_id=None → should not attempt persistence
+        with patch(
+            "backend.copilot.tools.base._persist_and_summarize",
+            new_callable=AsyncMock,
+        ) as persist_mock:
+            result = await tool.execute(None, session, "tc-anon")
+        persist_mock.assert_not_awaited()
+        # Output is set but not wrapped in <tool-output-truncated> tags
+        # (it will be middle-out truncated by model_post_init instead)
+        assert "<tool-output-truncated" not in str(result.output)
+
+
+# ---------------------------------------------------------------------------
+# _summarize_binary_fields
+# ---------------------------------------------------------------------------
+
+
+class TestSummarizeBinaryFields:
+    def test_replaces_large_content_base64(self):
+        import json
+
+        data = {"content_base64": "A" * 10_000, "name": "file.png"}
+        result = json.loads(_summarize_binary_fields(json.dumps(data)))
+        assert result["name"] == "file.png"
+        assert "<binary" in result["content_base64"]
+        assert "bytes>" in result["content_base64"]
+
+    def test_preserves_small_content_base64(self):
+        import json
+
+        data = {"content_base64": "AQID", "name": "tiny.bin"}
+        result_str = _summarize_binary_fields(json.dumps(data))
+        result = json.loads(result_str)
+        assert result["content_base64"] == "AQID"  # unchanged
+
+    def test_non_json_passthrough(self):
+        raw = "not json at all"
+        assert _summarize_binary_fields(raw) == raw
+
+    def test_no_binary_fields_unchanged(self):
+        import json
+
+        data = {"message": "hello", "type": "info"}
+        raw = json.dumps(data)
+        assert _summarize_binary_fields(raw) == raw
diff --git a/autogpt_platform/backend/backend/copilot/tools/workspace_files.py b/autogpt_platform/backend/backend/copilot/tools/workspace_files.py
index 1bbc36227fe2..f6a1b3356f0e 100644
--- a/autogpt_platform/backend/backend/copilot/tools/workspace_files.py
+++ b/autogpt_platform/backend/backend/copilot/tools/workspace_files.py
@@ -432,7 +432,7 @@ async def _execute(
 class ReadWorkspaceFileTool(BaseTool):
     """Tool for reading file content from workspace."""
 
-    MAX_INLINE_SIZE_BYTES = 32 * 1024  # 32KB
+    MAX_INLINE_SIZE_BYTES = 32 * 1024  # 32KB for text/image files
     PREVIEW_SIZE = 500
 
     @property
@@ -448,8 +448,10 @@ def description(self) -> str:
             "Specify either file_id or path to identify the file. "
             "For small text files, returns content directly. "
             "For large or binary files, returns metadata and a download URL. "
-            "Optionally use 'save_to_path' to copy the file to the ephemeral "
-            "working directory for processing with bash_exec or SDK tools. "
+            "Use 'save_to_path' to copy the file to the working directory "
+            "(sandbox or ephemeral) for processing with bash_exec or file tools. "
+            "Use 'offset' and 'length' for paginated reads of large files "
+            "(e.g., persisted tool outputs). "
             "Paths are scoped to the current session by default. "
             "Use /sessions/<session_id>/... for cross-session access."
         )
@@ -473,9 +475,10 @@ def parameters(self) -> dict[str, Any]:
                 "save_to_path": {
                     "type": "string",
                     "description": (
-                        "If provided, save the file to this path in the ephemeral "
-                        "working directory (e.g., '/tmp/copilot-.../data.csv') "
-                        "so it can be processed with bash_exec or SDK tools. "
+                        "If provided, save the file to this path in the working "
+                        "directory (cloud sandbox when E2B is active, or "
+                        "ephemeral dir otherwise) so it can be processed with "
+                        "bash_exec or file tools. "
                         "The file content is still returned in the response."
                     ),
                 },
@@ -486,6 +489,20 @@ def parameters(self) -> dict[str, Any]:
                         "Default is false (auto-selects based on file size/type)."
                     ),
                 },
+                "offset": {
+                    "type": "integer",
+                    "description": (
+                        "Character offset to start reading from (0-based). "
+                        "Use with 'length' for paginated reads of large files."
+                    ),
+                },
+                "length": {
+                    "type": "integer",
+                    "description": (
+                        "Maximum number of characters to return. "
+                        "Defaults to full file. Use with 'offset' for paginated reads."
+                    ),
+                },
             },
             "required": [],  # At least one must be provided
         }
@@ -510,6 +527,8 @@ async def _execute(
         path: Optional[str] = kwargs.get("path")
         save_to_path: Optional[str] = kwargs.get("save_to_path")
         force_download_url: bool = kwargs.get("force_download_url", False)
+        char_offset: int = max(0, kwargs.get("offset", 0))
+        char_length: Optional[int] = kwargs.get("length")
 
         if not file_id and not path:
             return ErrorResponse(
@@ -532,6 +551,34 @@ async def _execute(
                     return result
                 save_to_path = result
 
+            # Ranged read: return a character slice directly.
+            if char_offset > 0 or char_length is not None:
+                raw = cached_content or await manager.read_file_by_id(target_file_id)
+                text = raw.decode("utf-8", errors="replace")
+                total_chars = len(text)
+                end = (
+                    char_offset + char_length
+                    if char_length is not None
+                    else total_chars
+                )
+                slice_text = text[char_offset:end]
+                return WorkspaceFileContentResponse(
+                    file_id=file_info.id,
+                    name=file_info.name,
+                    path=file_info.path,
+                    mime_type="text/plain",
+                    content_base64=base64.b64encode(slice_text.encode("utf-8")).decode(
+                        "utf-8"
+                    ),
+                    message=(
+                        f"Read chars {char_offset}–"
+                        f"{char_offset + len(slice_text)} "
+                        f"of {total_chars:,} total "
+                        f"from {file_info.name}"
+                    ),
+                    session_id=session_id,
+                )
+
             is_small = file_info.size_bytes <= self.MAX_INLINE_SIZE_BYTES
             is_text = _is_text_mime(file_info.mime_type)
             is_image = file_info.mime_type in _IMAGE_MIME_TYPES
diff --git a/autogpt_platform/backend/backend/copilot/tools/workspace_files_test.py b/autogpt_platform/backend/backend/copilot/tools/workspace_files_test.py
index 0370ad8d983e..9718a3ac1813 100644
--- a/autogpt_platform/backend/backend/copilot/tools/workspace_files_test.py
+++ b/autogpt_platform/backend/backend/copilot/tools/workspace_files_test.py
@@ -236,6 +236,65 @@ async def test_workspace_file_round_trip(setup_test_data):
     assert not any(f.file_id == file_id for f in list_resp2.files)
 
 
+# ---------------------------------------------------------------------------
+# Ranged reads (offset / length)
+# ---------------------------------------------------------------------------
+
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_read_workspace_file_with_offset_and_length(setup_test_data):
+    """Read a slice of a text file using offset and length."""
+    user = setup_test_data["user"]
+    session = make_session(user.id)
+
+    # Write a known-content file
+    content = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" * 100  # 2600 chars
+    write_tool = WriteWorkspaceFileTool()
+    write_resp = await write_tool._execute(
+        user_id=user.id,
+        session=session,
+        filename="ranged_test.txt",
+        content=content,
+    )
+    assert isinstance(write_resp, WorkspaceWriteResponse), write_resp.message
+    file_id = write_resp.file_id
+
+    from backend.copilot.tools.workspace_files import WorkspaceFileContentResponse
+
+    read_tool = ReadWorkspaceFileTool()
+
+    # Read with offset=100, length=50
+    resp = await read_tool._execute(
+        user_id=user.id, session=session, file_id=file_id, offset=100, length=50
+    )
+    assert isinstance(resp, WorkspaceFileContentResponse), resp.message
+    decoded = base64.b64decode(resp.content_base64).decode()
+    assert decoded == content[100:150]
+    assert "100" in resp.message
+    assert "2,600" in resp.message  # total chars (comma-formatted)
+
+    # Read with offset only (no length) — returns from offset to end
+    resp2 = await read_tool._execute(
+        user_id=user.id, session=session, file_id=file_id, offset=2500
+    )
+    assert isinstance(resp2, WorkspaceFileContentResponse)
+    decoded2 = base64.b64decode(resp2.content_base64).decode()
+    assert decoded2 == content[2500:]
+    assert len(decoded2) == 100
+
+    # Read with offset beyond file length — returns empty string
+    resp3 = await read_tool._execute(
+        user_id=user.id, session=session, file_id=file_id, offset=9999, length=10
+    )
+    assert isinstance(resp3, WorkspaceFileContentResponse)
+    decoded3 = base64.b64decode(resp3.content_base64).decode()
+    assert decoded3 == ""
+
+    # Cleanup
+    delete_tool = DeleteWorkspaceFileTool()
+    await delete_tool._execute(user_id=user.id, session=session, file_id=file_id)
+
+
 @pytest.mark.asyncio(loop_scope="session")
 async def test_write_workspace_file_source_path(setup_test_data):
     """E2E: write a file from ephemeral source_path to workspace."""
diff --git a/autogpt_platform/backend/backend/executor/utils.py b/autogpt_platform/backend/backend/executor/utils.py
index 2b9a454061a2..933ea4447388 100644
--- a/autogpt_platform/backend/backend/executor/utils.py
+++ b/autogpt_platform/backend/backend/executor/utils.py
@@ -32,6 +32,7 @@
 from backend.data.graph import GraphModel, Node
 from backend.data.model import USER_TIMEZONE_NOT_SET, CredentialsMetaInput, GraphInput
 from backend.data.rabbitmq import Exchange, ExchangeType, Queue, RabbitMQConfig
+from backend.data.workspace import get_or_create_workspace
 from backend.util.clients import (
     get_async_execution_event_bus,
     get_async_execution_queue,
@@ -891,6 +892,7 @@ async def add_graph_execution(
     if execution_context is None:
         user = await udb.get_user_by_id(user_id)
         settings = await gdb.get_graph_settings(user_id=user_id, graph_id=graph_id)
+        workspace = await get_or_create_workspace(user_id)
 
         execution_context = ExecutionContext(
             # Execution identity
@@ -907,6 +909,8 @@ async def add_graph_execution(
             ),
             # Execution hierarchy
             root_execution_id=graph_exec.id,
+            # Workspace (enables workspace:// file resolution in blocks)
+            workspace_id=workspace.id,
         )
 
     try:
diff --git a/autogpt_platform/backend/backend/executor/utils_test.py b/autogpt_platform/backend/backend/executor/utils_test.py
index 069086a6fd44..5a54926147b4 100644
--- a/autogpt_platform/backend/backend/executor/utils_test.py
+++ b/autogpt_platform/backend/backend/executor/utils_test.py
@@ -368,6 +368,12 @@ async def test_add_graph_execution_is_repeatable(mocker: MockerFixture):
     mock_get_event_bus = mocker.patch(
         "backend.executor.utils.get_async_execution_event_bus"
     )
+    mock_workspace = mocker.MagicMock()
+    mock_workspace.id = "test-workspace-id"
+    mocker.patch(
+        "backend.executor.utils.get_or_create_workspace",
+        new=mocker.AsyncMock(return_value=mock_workspace),
+    )
 
     # Setup mock returns
     # The function returns (graph, starting_nodes_input, compiled_nodes_input_masks, nodes_to_skip)
@@ -643,6 +649,12 @@ def capture_to_entry(**kwargs):
     mock_get_event_bus = mocker.patch(
         "backend.executor.utils.get_async_execution_event_bus"
     )
+    mock_workspace = mocker.MagicMock()
+    mock_workspace.id = "test-workspace-id"
+    mocker.patch(
+        "backend.executor.utils.get_or_create_workspace",
+        new=mocker.AsyncMock(return_value=mock_workspace),
+    )
 
     # Setup returns - include nodes_to_skip in the tuple
     mock_validate.return_value = (
@@ -681,6 +693,10 @@ def capture_to_entry(**kwargs):
     assert "nodes_to_skip" in captured_kwargs
     assert captured_kwargs["nodes_to_skip"] == nodes_to_skip
 
+    # Verify workspace_id is set in the execution context
+    assert "execution_context" in captured_kwargs
+    assert captured_kwargs["execution_context"].workspace_id == "test-workspace-id"
+
 
 @pytest.mark.asyncio
 async def test_stop_graph_execution_in_review_status_cancels_pending_reviews(
diff --git a/autogpt_platform/backend/poetry.lock b/autogpt_platform/backend/poetry.lock
index 04091e2face0..9089236909af 100644
--- a/autogpt_platform/backend/poetry.lock
+++ b/autogpt_platform/backend/poetry.lock
@@ -899,17 +899,17 @@ files = [
 
 [[package]]
 name = "claude-agent-sdk"
-version = "0.1.39"
+version = "0.1.46"
 description = "Python SDK for Claude Code"
 optional = false
 python-versions = ">=3.10"
 groups = ["main"]
 files = [
-    {file = "claude_agent_sdk-0.1.39-py3-none-macosx_11_0_arm64.whl", hash = "sha256:6ed6a79781f545b761b9fe467bc5ae213a103c9d3f0fe7a9dad3c01790ed58fa"},
-    {file = "claude_agent_sdk-0.1.39-py3-none-manylinux_2_17_aarch64.whl", hash = "sha256:0c03b5a3772eaec42e29ea39240c7d24b760358082f2e36336db9e71dde3dda4"},
-    {file = "claude_agent_sdk-0.1.39-py3-none-manylinux_2_17_x86_64.whl", hash = "sha256:d2665c9e87b6ffece590bcdd6eb9def47cde4809b0d2f66e0a61a719189be7c9"},
-    {file = "claude_agent_sdk-0.1.39-py3-none-win_amd64.whl", hash = "sha256:d03324daf7076be79d2dd05944559aabf4cc11c98d3a574b992a442a7c7a26d6"},
-    {file = "claude_agent_sdk-0.1.39.tar.gz", hash = "sha256:dcf0ebd5a638c9a7d9f3af7640932a9212b2705b7056e4f08bd3968a865b4268"},
+    {file = "claude_agent_sdk-0.1.46-py3-none-macosx_11_0_arm64.whl", hash = "sha256:66aed2199234d751a0f8c605ba34d1b3d93e94b4e939526ee04ca243ba74cf62"},
+    {file = "claude_agent_sdk-0.1.46-py3-none-manylinux_2_17_aarch64.whl", hash = "sha256:440f0923811f9e1c6c992655beadb527eb2ed4024059880018fd6ec92846d429"},
+    {file = "claude_agent_sdk-0.1.46-py3-none-manylinux_2_17_x86_64.whl", hash = "sha256:460ab0ad549331dc35ef1bc212a7cd8e8b4d2876b10df7bfa9f4000c95b94c15"},
+    {file = "claude_agent_sdk-0.1.46-py3-none-win_amd64.whl", hash = "sha256:4d0d5b14ad04d6e8fbe5b1ffe3e48d0da38d2602e9efc4f21f0e4593987cf67a"},
+    {file = "claude_agent_sdk-0.1.46.tar.gz", hash = "sha256:7c2b6f3062ca6f016dacb8660660b4afe80935f4eabe0db677649edaddeef2ec"},
 ]
 
 [package.dependencies]
@@ -8840,4 +8840,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 = "e7863413fda5e0a8b236e39a4c37390b52ae8c2f572c77df732abbd4280312b6"
+content-hash = "362a52f55e70ec71ec34bade8dbda160d78ddc28d127cd51d9ac1034115cc862"
diff --git a/autogpt_platform/backend/pyproject.toml b/autogpt_platform/backend/pyproject.toml
index 1b332883f129..c71747d6183d 100644
--- a/autogpt_platform/backend/pyproject.toml
+++ b/autogpt_platform/backend/pyproject.toml
@@ -16,7 +16,7 @@ anthropic = "^0.79.0"
 apscheduler = "^3.11.1"
 autogpt-libs = { path = "../autogpt_libs", develop = true }
 bleach = { extras = ["css"], version = "^6.2.0" }
-claude-agent-sdk = "^0.1.39"  # see copilot/sdk/sdk_compat_test.py for capability checks
+claude-agent-sdk = "^0.1.46"  # see copilot/sdk/sdk_compat_test.py for capability checks
 click = "^8.2.0"
 cryptography = "^46.0"
 discord-py = "^2.5.2"
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/components/ContentRenderer.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/components/ContentRenderer.tsx
index 65826189e68b..bd6417b47225 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/components/ContentRenderer.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/components/ContentRenderer.tsx
@@ -34,6 +34,7 @@ export const ContentRenderer: React.FC<{
   if (
     renderer?.name === "ImageRenderer" ||
     renderer?.name === "VideoRenderer" ||
+    renderer?.name === "WorkspaceFileRenderer" ||
     !shortContent
   ) {
     return (
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/ChatMessagesContainer.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/ChatMessagesContainer.tsx
index e4070a44813c..f1698a9aceba 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/ChatMessagesContainer.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/ChatMessagesContainer.tsx
@@ -6,6 +6,9 @@ import {
 import { Message, MessageContent } from "@/components/ai-elements/message";
 import { LoadingSpinner } from "@/components/atoms/LoadingSpinner/LoadingSpinner";
 import { FileUIPart, ToolUIPart, UIDataTypes, UIMessage, UITools } from "ai";
+import { TOOL_PART_PREFIX } from "../JobStatsBar/constants";
+import { TurnStatsBar } from "../JobStatsBar/TurnStatsBar";
+import { parseSpecialMarkers } from "./helpers";
 import { AssistantMessageActions } from "./components/AssistantMessageActions";
 import { CollapsedToolGroup } from "./components/CollapsedToolGroup";
 import { MessageAttachments } from "./components/MessageAttachments";
@@ -59,33 +62,39 @@ const CUSTOM_TOOL_TYPES = new Set([
  * Non-generic tools (those with custom renderers) and active/streaming tools
  * are left as individual parts.
  */
-function buildRenderSegments(parts: MessagePart[]): RenderSegment[] {
+function buildRenderSegments(
+  parts: MessagePart[],
+  baseIndex = 0,
+): RenderSegment[] {
   const segments: RenderSegment[] = [];
-  let pendingGroup: ToolUIPart[] | null = null;
+  let pendingGroup: Array<{ part: ToolUIPart; index: number }> | null = null;
 
   function flushGroup() {
     if (!pendingGroup) return;
     if (pendingGroup.length >= 2) {
-      segments.push({ kind: "collapsed-group", parts: pendingGroup });
+      segments.push({
+        kind: "collapsed-group",
+        parts: pendingGroup.map((p) => p.part),
+      });
     } else {
       for (const p of pendingGroup) {
-        const idx = parts.indexOf(p);
-        segments.push({ kind: "part", part: p, index: idx });
+        segments.push({ kind: "part", part: p.part, index: p.index });
       }
     }
     pendingGroup = null;
   }
 
   parts.forEach((part, i) => {
+    const absoluteIndex = baseIndex + i;
     const isGenericCompletedTool =
       isCompletedToolPart(part) && !CUSTOM_TOOL_TYPES.has(part.type);
 
     if (isGenericCompletedTool) {
       if (!pendingGroup) pendingGroup = [];
-      pendingGroup.push(part as ToolUIPart);
+      pendingGroup.push({ part: part as ToolUIPart, index: absoluteIndex });
     } else {
       flushGroup();
-      segments.push({ kind: "part", part, index: i });
+      segments.push({ kind: "part", part, index: absoluteIndex });
     }
   });
 
@@ -151,6 +160,23 @@ function renderSegments(
   });
 }
 
+/** Collect all messages belonging to a turn: the user message + every
+ *  assistant message up to (but not including) the next user message. */
+function getTurnMessages(
+  messages: UIMessage<unknown, UIDataTypes, UITools>[],
+  lastAssistantIndex: number,
+): UIMessage<unknown, UIDataTypes, UITools>[] {
+  const userIndex = messages.findLastIndex(
+    (m, i) => i < lastAssistantIndex && m.role === "user",
+  );
+  const nextUserIndex = messages.findIndex(
+    (m, i) => i > lastAssistantIndex && m.role === "user",
+  );
+  const start = userIndex >= 0 ? userIndex : lastAssistantIndex;
+  const end = nextUserIndex >= 0 ? nextUserIndex : messages.length;
+  return messages.slice(start, end);
+}
+
 export function ChatMessagesContainer({
   messages,
   status,
@@ -161,9 +187,6 @@ export function ChatMessagesContainer({
 }: Props) {
   const lastMessage = messages[messages.length - 1];
 
-  // Determine if something is visibly "in-flight" in the last assistant message:
-  // - Text is actively streaming (last part is non-empty text)
-  // - A tool call is pending (state is input-streaming or input-available)
   const hasInflight = (() => {
     if (lastMessage?.role !== "assistant") return false;
     const parts = lastMessage.parts;
@@ -171,13 +194,11 @@ export function ChatMessagesContainer({
 
     const lastPart = parts[parts.length - 1];
 
-    // Text is actively being written
     if (lastPart.type === "text" && lastPart.text.trim().length > 0)
       return true;
 
-    // A tool call is still pending (no output yet)
     if (
-      lastPart.type.startsWith("tool-") &&
+      lastPart.type.startsWith(TOOL_PART_PREFIX) &&
       "state" in lastPart &&
       (lastPart.state === "input-streaming" ||
         lastPart.state === "input-available")
@@ -210,14 +231,26 @@ export function ChatMessagesContainer({
           const isCurrentlyStreaming =
             isLastAssistant &&
             (status === "streaming" || status === "submitted");
+
+          const isAssistant = message.role === "assistant";
+
           const nextMessage = messages[messageIndex + 1];
           const isLastInTurn =
-            message.role === "assistant" &&
+            isAssistant &&
+            messageIndex <= messages.length - 1 &&
             (!nextMessage || nextMessage.role === "user");
+          const textParts = message.parts.filter(
+            (p): p is Extract<typeof p, { type: "text" }> => p.type === "text",
+          );
+          const lastTextPart = textParts[textParts.length - 1];
+          const hasErrorMarker =
+            lastTextPart !== undefined &&
+            parseSpecialMarkers(lastTextPart.text).markerType === "error";
           const showActions =
             isLastInTurn &&
             !isCurrentlyStreaming &&
-            message.parts.some((p) => p.type === "text");
+            textParts.length > 0 &&
+            !hasErrorMarker;
 
           const fileParts = message.parts.filter(
             (p): p is FileUIPart => p.type === "file",
@@ -232,10 +265,13 @@ export function ChatMessagesContainer({
             : { reasoning: [] as MessagePart[], response: message.parts };
           const hasReasoning = reasoning.length > 0;
 
+          const responseStartIndex = message.parts.length - response.length;
           const responseSegments =
-            message.role === "assistant" ? buildRenderSegments(response) : null;
+            message.role === "assistant"
+              ? buildRenderSegments(response, responseStartIndex)
+              : null;
           const reasoningSegments = hasReasoning
-            ? buildRenderSegments(reasoning)
+            ? buildRenderSegments(reasoning, 0)
             : null;
 
           return (
@@ -262,6 +298,11 @@ export function ChatMessagesContainer({
                         partIndex={i}
                       />
                     ))}
+                {isLastInTurn && !isCurrentlyStreaming && (
+                  <TurnStatsBar
+                    turnMessages={getTurnMessages(messages, messageIndex)}
+                  />
+                )}
                 {isLastAssistant && showThinking && (
                   <ThinkingIndicator active={showThinking} />
                 )}
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/CollapsedToolGroup.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/CollapsedToolGroup.tsx
index 8c9811b83735..31d54dea7fd9 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/CollapsedToolGroup.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/CollapsedToolGroup.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useState } from "react";
+import { useId, useState } from "react";
 import {
   ArrowsClockwiseIcon,
   CaretRightIcon,
@@ -81,6 +81,7 @@ function EntryIcon({
 
 export function CollapsedToolGroup({ parts }: Props) {
   const [expanded, setExpanded] = useState(false);
+  const panelId = useId();
 
   const errorCount = parts.filter((p) => p.state === "output-error").length;
   const label =
@@ -93,6 +94,8 @@ export function CollapsedToolGroup({ parts }: Props) {
       <button
         type="button"
         onClick={() => setExpanded(!expanded)}
+        aria-expanded={expanded}
+        aria-controls={panelId}
         className="flex items-center gap-1.5 text-sm text-muted-foreground transition-colors hover:text-foreground"
       >
         <CaretRightIcon
@@ -119,7 +122,10 @@ export function CollapsedToolGroup({ parts }: Props) {
       </button>
 
       {expanded && (
-        <div className="ml-5 mt-1 space-y-0.5 border-l border-neutral-200 pl-3">
+        <div
+          id={panelId}
+          className="ml-5 mt-1 space-y-0.5 border-l border-neutral-200 pl-3"
+        >
           {parts.map((part) => {
             const toolName = extractToolName(part);
             const category = getToolCategory(toolName);
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/FeedbackModal.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/FeedbackModal.tsx
index 8f3f8ede2071..8c773b1aaf12 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/FeedbackModal.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/FeedbackModal.tsx
@@ -1,9 +1,8 @@
 "use client";
 
-import { Button } from "@/components/atoms/Button/Button";
-import { Input } from "@/components/atoms/Input/Input";
 import { Dialog } from "@/components/molecules/Dialog/Dialog";
-
+import { Button } from "@/components/ui/button";
+import { Textarea } from "@/components/ui/textarea";
 import { useState } from "react";
 
 interface Props {
@@ -29,7 +28,6 @@ export function FeedbackModal({ isOpen, onSubmit, onCancel }: Props) {
   return (
     <Dialog
       title="What could have been better?"
-      styling={{ maxWidth: "30rem" }}
       controlled={{
         isOpen,
         set: (open) => {
@@ -38,25 +36,29 @@ export function FeedbackModal({ isOpen, onSubmit, onCancel }: Props) {
       }}
     >
       <Dialog.Content>
-        <div className="mx-auto w-[99%] space-y-4">
-          <Input
-            label="Your feedback helps us improve. Share details below."
-            id="feedback-textarea"
-            type="textarea"
+        <div className="mx-auto w-[95%] space-y-4">
+          <p className="text-sm text-slate-600">
+            Your feedback helps us improve. Share details below.
+          </p>
+          <Textarea
             placeholder="Tell us what went wrong or could be improved..."
             value={comment}
             onChange={(e) => setComment(e.target.value)}
             rows={4}
             maxLength={2000}
-            className="w-full resize-none"
+            className="resize-none"
           />
           <div className="flex items-center justify-between">
             <p className="text-xs text-slate-400">{comment.length}/2000</p>
             <div className="flex gap-2">
-              <Button variant="ghost" onClick={handleClose}>
+              <Button variant="outline" size="sm" onClick={handleClose}>
                 Cancel
               </Button>
-              <Button onClick={handleSubmit} disabled={!comment.trim()}>
+              <Button
+                size="sm"
+                onClick={handleSubmit}
+                disabled={!comment.trim()}
+              >
                 Submit feedback
               </Button>
             </div>
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/MessageAttachments.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/MessageAttachments.tsx
index 1568da54cd5f..6f3085affb1e 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/MessageAttachments.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/MessageAttachments.tsx
@@ -3,6 +3,11 @@ import {
   DownloadSimple as DownloadIcon,
 } from "@phosphor-icons/react";
 import type { FileUIPart } from "ai";
+import {
+  globalRegistry,
+  OutputItem,
+} from "@/components/contextual/OutputRenderers";
+import type { OutputMetadata } from "@/components/contextual/OutputRenderers";
 import {
   ContentCard,
   ContentCardHeader,
@@ -15,13 +20,60 @@ interface Props {
   isUser?: boolean;
 }
 
+function renderFileContent(file: FileUIPart): React.ReactNode | null {
+  if (!file.url) return null;
+  const metadata: OutputMetadata = {
+    mimeType: file.mediaType,
+    filename: file.filename,
+    type: file.mediaType?.startsWith("image/")
+      ? "image"
+      : file.mediaType?.startsWith("video/")
+        ? "video"
+        : undefined,
+  };
+  const renderer = globalRegistry.getRenderer(file.url, metadata);
+  if (!renderer) return null;
+  return (
+    <OutputItem value={file.url} metadata={metadata} renderer={renderer} />
+  );
+}
+
 export function MessageAttachments({ files, isUser }: Props) {
   if (files.length === 0) return null;
 
   return (
     <div className="mt-2 flex flex-col gap-2">
-      {files.map((file, i) =>
-        isUser ? (
+      {files.map((file, i) => {
+        const rendered = renderFileContent(file);
+        return rendered ? (
+          <div
+            key={`${file.filename}-${i}`}
+            className={`inline-block rounded-lg border p-1.5 ${
+              isUser
+                ? "border-purple-300 bg-purple-50"
+                : "border-neutral-200 bg-neutral-50"
+            }`}
+          >
+            {rendered}
+            <div
+              className={`mt-1 flex items-center gap-1 px-0.5 text-xs ${
+                isUser ? "text-zinc-600" : "text-neutral-500"
+              }`}
+            >
+              <span className="truncate">{file.filename || "file"}</span>
+              {file.url && (
+                <a
+                  href={file.url}
+                  download
+                  aria-label="Download file"
+                  className="ml-auto shrink-0 opacity-50 hover:opacity-100"
+                >
+                  <DownloadIcon className="h-3.5 w-3.5" />
+                </a>
+              )}
+            </div>
+          </div>
+        ) : isUser ? (
           <div
             key={`${file.filename}-${i}`}
             className="min-w-0 rounded-lg border border-purple-300 bg-purple-100 p-3"
@@ -77,8 +129,8 @@ export function MessageAttachments({ files, isUser }: Props) {
               </div>
             </ContentCardHeader>
           </ContentCard>
-        ),
-      )}
+        );
+      })}
     </div>
   );
 }
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/JobStatsBar/TurnStatsBar.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/components/JobStatsBar/TurnStatsBar.tsx
new file mode 100644
index 000000000000..9735addea2d3
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/JobStatsBar/TurnStatsBar.tsx
@@ -0,0 +1,29 @@
+import type { UIDataTypes, UIMessage, UITools } from "ai";
+import { getWorkDoneCounters } from "./useWorkDoneCounters";
+
+interface Props {
+  turnMessages: UIMessage<unknown, UIDataTypes, UITools>[];
+}
+
+export function TurnStatsBar({ turnMessages }: Props) {
+  const { counters } = getWorkDoneCounters(turnMessages);
+
+  if (counters.length === 0) return null;
+
+  return (
+    <div className="mt-2 flex items-center gap-1.5">
+      {counters.map(function renderCounter(counter, index) {
+        return (
+          <span key={counter.category} className="flex items-center gap-1">
+            {index > 0 && (
+              <span className="text-xs text-neutral-300">&middot;</span>
+            )}
+            <span className="text-[11px] tabular-nums text-neutral-500">
+              {counter.count} {counter.label}
+            </span>
+          </span>
+        );
+      })}
+    </div>
+  );
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/JobStatsBar/constants.ts b/autogpt_platform/frontend/src/app/(platform)/copilot/components/JobStatsBar/constants.ts
new file mode 100644
index 000000000000..7b373db6a4db
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/JobStatsBar/constants.ts
@@ -0,0 +1 @@
+export const TOOL_PART_PREFIX = "tool-";
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/JobStatsBar/useWorkDoneCounters.ts b/autogpt_platform/frontend/src/app/(platform)/copilot/components/JobStatsBar/useWorkDoneCounters.ts
new file mode 100644
index 000000000000..69b65feac78f
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/JobStatsBar/useWorkDoneCounters.ts
@@ -0,0 +1,75 @@
+import type { UIDataTypes, UIMessage, UITools } from "ai";
+import { TOOL_PART_PREFIX } from "./constants";
+
+const TOOL_TO_CATEGORY: Record<string, string> = {
+  find_agent: "search",
+  find_library_agent: "search",
+  run_agent: "agent run",
+  run_block: "block run",
+  create_agent: "agent created",
+  edit_agent: "agent edited",
+  schedule_agent: "agent scheduled",
+};
+
+const MAX_COUNTERS = 3;
+
+function pluralize(label: string, count: number): string {
+  if (count === 1) return label;
+
+  // "agent created" -> "agents created", "agent edited" -> "agents edited"
+  const nounVerbMatch = label.match(
+    /^(\w+)\s+(created|edited|scheduled|run)$/i,
+  );
+  if (nounVerbMatch) {
+    return pluralizeWord(nounVerbMatch[1]) + " " + nounVerbMatch[2];
+  }
+
+  return pluralizeWord(label);
+}
+
+function pluralizeWord(word: string): string {
+  if (word.endsWith("ch") || word.endsWith("sh") || word.endsWith("x"))
+    return word + "es";
+  return word + "s";
+}
+
+export interface WorkDoneCounter {
+  label: string;
+  count: number;
+  category: string;
+}
+
+export function getWorkDoneCounters(
+  messages: UIMessage<unknown, UIDataTypes, UITools>[],
+) {
+  const categoryCounts = new Map<string, number>();
+
+  for (const message of messages) {
+    if (message.role !== "assistant") continue;
+
+    for (const part of message.parts) {
+      if (!part.type.startsWith(TOOL_PART_PREFIX)) continue;
+
+      const toolName = part.type.replace(TOOL_PART_PREFIX, "");
+      const category = TOOL_TO_CATEGORY[toolName];
+      if (!category) continue;
+
+      categoryCounts.set(category, (categoryCounts.get(category) ?? 0) + 1);
+    }
+  }
+
+  const counters: WorkDoneCounter[] = Array.from(categoryCounts.entries())
+    .map(function toCounter([category, count]) {
+      return {
+        label: pluralize(category, count),
+        count,
+        category,
+      };
+    })
+    .sort(function byCountDesc(a, b) {
+      return b.count - a.count;
+    })
+    .slice(0, MAX_COUNTERS);
+
+  return { counters };
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/GenericTool/GenericTool.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/GenericTool/GenericTool.tsx
index f7c3a2f1ee53..4cbc410ef047 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/GenericTool/GenericTool.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/GenericTool/GenericTool.tsx
@@ -25,7 +25,12 @@ import {
   ContentCodeBlock,
   ContentMessage,
 } from "../../components/ToolAccordion/AccordionContent";
-import { ScaleLoader } from "../../components/ScaleLoader/ScaleLoader";
+import { OrbitLoader } from "../../components/OrbitLoader/OrbitLoader";
+import {
+  globalRegistry,
+  OutputItem,
+} from "@/components/contextual/OutputRenderers";
+import type { OutputMetadata } from "@/components/contextual/OutputRenderers";
 import {
   type ToolCategory,
   extractToolName,
@@ -38,6 +43,18 @@ interface Props {
   part: ToolUIPart;
 }
 
+function RenderMedia({
+  value,
+  metadata,
+}: {
+  value: string;
+  metadata: OutputMetadata;
+}) {
+  const renderer = globalRegistry.getRenderer(value, metadata);
+  if (!renderer) return null;
+  return <OutputItem value={value} metadata={metadata} renderer={renderer} />;
+}
+
 /* ------------------------------------------------------------------ */
 /*  Tool icon                                                          */
 /* ------------------------------------------------------------------ */
@@ -57,7 +74,7 @@ function ToolIcon({
     );
   }
   if (isStreaming) {
-    return <ScaleLoader size={14} />;
+    return <OrbitLoader size={14} />;
   }
 
   const iconClass = "text-green-500";
@@ -356,14 +373,21 @@ function getFileAccordionData(
 
   // Handle base64 content from workspace files
   let displayContent = content;
+  const mimeType = getStringField(output, "mime_type");
+  const isImage = mimeType?.startsWith("image/");
   if (output.content_base64 && typeof output.content_base64 === "string") {
-    try {
-      const bytes = Uint8Array.from(atob(output.content_base64), (c) =>
-        c.charCodeAt(0),
-      );
-      displayContent = new TextDecoder().decode(bytes);
-    } catch {
-      displayContent = "[Binary content]";
+    if (isImage) {
+      // Render image inline — handled below in the JSX
+      displayContent = null;
+    } else {
+      try {
+        const bytes = Uint8Array.from(atob(output.content_base64), (c) =>
+          c.charCodeAt(0),
+        );
+        displayContent = new TextDecoder().decode(bytes);
+      } catch {
+        displayContent = "[Binary content]";
+      }
     }
   }
 
@@ -441,6 +465,17 @@ function getFileAccordionData(
           </>
         ) : writtenContent ? (
           <ContentCodeBlock>{writtenContent}</ContentCodeBlock>
+        ) : isImage &&
+          output.content_base64 &&
+          typeof output.content_base64 === "string" ? (
+          <RenderMedia
+            value={`data:${mimeType};base64,${output.content_base64}`}
+            metadata={{
+              type: "image",
+              mimeType: mimeType ?? undefined,
+              filename: filePath ?? undefined,
+            }}
+          />
         ) : displayContent ? (
           <ContentCodeBlock>{displayContent}</ContentCodeBlock>
         ) : null}
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/GenericTool/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/GenericTool/helpers.ts
index c0c5bef1b9a1..3d5f54cf26dc 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/GenericTool/helpers.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/GenericTool/helpers.ts
@@ -90,11 +90,10 @@ function getInputSummary(toolName: string, input: unknown): string | null {
     case "browser_navigate":
       return typeof inp.url === "string" ? inp.url : null;
     case "browser_act":
-      return typeof inp.action === "string"
-        ? inp.target
-          ? `${inp.action} ${inp.target}`
-          : (inp.action as string)
-        : null;
+      if (typeof inp.action !== "string") return null;
+      return typeof inp.target === "string"
+        ? `${inp.action} ${inp.target}`
+        : inp.action;
     case "browser_screenshot":
       return null;
     case "read_workspace_file":
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunBlock/components/BlockOutputCard/BlockOutputCard.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunBlock/components/BlockOutputCard/BlockOutputCard.tsx
index 4051927653e1..cd434185a1da 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunBlock/components/BlockOutputCard/BlockOutputCard.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunBlock/components/BlockOutputCard/BlockOutputCard.tsx
@@ -9,6 +9,7 @@ import {
   OutputItem,
 } from "@/components/contextual/OutputRenderers";
 import type { OutputMetadata } from "@/components/contextual/OutputRenderers";
+import { isWorkspaceURI, parseWorkspaceURI } from "@/lib/workspace-uri";
 import {
   ContentBadge,
   ContentCard,
@@ -23,30 +24,23 @@ interface Props {
 
 const COLLAPSED_LIMIT = 3;
 
-function isWorkspaceRef(value: unknown): value is string {
-  return typeof value === "string" && value.startsWith("workspace://");
-}
-
 function resolveForRenderer(value: unknown): {
   value: unknown;
   metadata?: OutputMetadata;
 } {
-  if (!isWorkspaceRef(value)) return { value };
+  if (!isWorkspaceURI(value)) return { value };
 
-  const withoutPrefix = value.replace("workspace://", "");
-  const fileId = withoutPrefix.split("#")[0];
-  const apiPath = getGetWorkspaceDownloadFileByIdUrl(fileId);
-  const url = `/api/proxy${apiPath}`;
+  const parsed = parseWorkspaceURI(value);
+  if (!parsed) return { value };
 
-  const hashIndex = value.indexOf("#");
-  const mimeHint =
-    hashIndex !== -1 ? value.slice(hashIndex + 1) || undefined : undefined;
+  const apiPath = getGetWorkspaceDownloadFileByIdUrl(parsed.fileID);
+  const url = `/api/proxy${apiPath}`;
 
   const metadata: OutputMetadata = {};
-  if (mimeHint) {
-    metadata.mimeType = mimeHint;
-    if (mimeHint.startsWith("image/")) metadata.type = "image";
-    else if (mimeHint.startsWith("video/")) metadata.type = "video";
+  if (parsed.mimeType) {
+    metadata.mimeType = parsed.mimeType;
+    if (parsed.mimeType.startsWith("image/")) metadata.type = "image";
+    else if (parsed.mimeType.startsWith("video/")) metadata.type = "video";
   }
 
   return { value: url, metadata };
@@ -71,7 +65,7 @@ function RenderOutputValue({ value }: { value: unknown }) {
 
   // Fallback for audio workspace refs
   if (
-    isWorkspaceRef(value) &&
+    isWorkspaceURI(value) &&
     resolved.metadata?.mimeType?.startsWith("audio/")
   ) {
     return (
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/ViewAgentOutput/ViewAgentOutput.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/ViewAgentOutput/ViewAgentOutput.tsx
index e7265ac7cb78..b5adb0ef07c3 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/ViewAgentOutput/ViewAgentOutput.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/ViewAgentOutput/ViewAgentOutput.tsx
@@ -8,6 +8,7 @@ import {
   OutputItem,
 } from "@/components/contextual/OutputRenderers";
 import type { OutputMetadata } from "@/components/contextual/OutputRenderers";
+import { isWorkspaceURI, parseWorkspaceURI } from "@/lib/workspace-uri";
 import { MorphingTextAnimation } from "../../components/MorphingTextAnimation/MorphingTextAnimation";
 import { ToolAccordion } from "../../components/ToolAccordion/ToolAccordion";
 import {
@@ -46,30 +47,23 @@ interface Props {
   part: ViewAgentOutputToolPart;
 }
 
-function isWorkspaceRef(value: unknown): value is string {
-  return typeof value === "string" && value.startsWith("workspace://");
-}
-
 function resolveForRenderer(value: unknown): {
   value: unknown;
   metadata?: OutputMetadata;
 } {
-  if (!isWorkspaceRef(value)) return { value };
+  if (!isWorkspaceURI(value)) return { value };
 
-  const withoutPrefix = value.replace("workspace://", "");
-  const fileId = withoutPrefix.split("#")[0];
-  const apiPath = getGetWorkspaceDownloadFileByIdUrl(fileId);
-  const url = `/api/proxy${apiPath}`;
+  const parsed = parseWorkspaceURI(value);
+  if (!parsed) return { value };
 
-  const hashIndex = value.indexOf("#");
-  const mimeHint =
-    hashIndex !== -1 ? value.slice(hashIndex + 1) || undefined : undefined;
+  const apiPath = getGetWorkspaceDownloadFileByIdUrl(parsed.fileID);
+  const url = `/api/proxy${apiPath}`;
 
   const metadata: OutputMetadata = {};
-  if (mimeHint) {
-    metadata.mimeType = mimeHint;
-    if (mimeHint.startsWith("image/")) metadata.type = "image";
-    else if (mimeHint.startsWith("video/")) metadata.type = "video";
+  if (parsed.mimeType) {
+    metadata.mimeType = parsed.mimeType;
+    if (parsed.mimeType.startsWith("image/")) metadata.type = "image";
+    else if (parsed.mimeType.startsWith("video/")) metadata.type = "video";
   }
 
   return { value: url, metadata };
@@ -94,7 +88,7 @@ function RenderOutputValue({ value }: { value: unknown }) {
 
   // Fallback for audio workspace refs
   if (
-    isWorkspaceRef(value) &&
+    isWorkspaceURI(value) &&
     resolved.metadata?.mimeType?.startsWith("audio/")
   ) {
     return (
diff --git a/autogpt_platform/frontend/src/app/(platform)/login/useLoginPage.ts b/autogpt_platform/frontend/src/app/(platform)/login/useLoginPage.ts
index 9b81965c31a3..38fc9896d144 100644
--- a/autogpt_platform/frontend/src/app/(platform)/login/useLoginPage.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/login/useLoginPage.ts
@@ -21,8 +21,14 @@ export function useLoginPage() {
   const [showNotAllowedModal, setShowNotAllowedModal] = useState(false);
   const isCloudEnv = environment.isCloud();
 
-  // Get redirect destination from 'next' query parameter
-  const nextUrl = searchParams.get("next");
+  // Get redirect destination from 'next' query parameter.
+  // Only allow relative paths to prevent open redirect attacks
+  // (e.g., /login?next=https://phishing.site).
+  const rawNext = searchParams.get("next");
+  const nextUrl =
+    rawNext && rawNext.startsWith("/") && !rawNext.startsWith("//")
+      ? rawNext
+      : null;
 
   useEffect(() => {
     if (isLoggedIn && !isLoggingIn) {
@@ -93,8 +99,11 @@ export function useLoginPage() {
         throw new Error(result.error || "Login failed");
       }
 
-      // Prefer URL's next parameter, then use backend-determined route
-      router.replace(nextUrl || result.next || "/");
+      // Use full page navigation to ensure middleware processes the new auth cookies.
+      // router.replace() does a soft navigation where the cookie store may not
+      // immediately reflect cookies set by the server action, causing a blank page.
+      // This matches the OAuth flow which also uses window.location.href.
+      window.location.href = nextUrl || result.next || "/";
     } catch (error) {
       toast({
         title:
diff --git a/autogpt_platform/frontend/src/app/api/openapi.json b/autogpt_platform/frontend/src/app/api/openapi.json
index b14e62784574..6a22e0465468 100644
--- a/autogpt_platform/frontend/src/app/api/openapi.json
+++ b/autogpt_platform/frontend/src/app/api/openapi.json
@@ -6596,6 +6596,44 @@
         }
       }
     },
+    "/api/workspace/files/{file_id}": {
+      "delete": {
+        "tags": ["workspace"],
+        "summary": "Delete a workspace file",
+        "description": "Soft-delete a workspace file and attempt to remove it from storage.\n\nUsed when a user clears a file input in the builder.",
+        "operationId": "deleteWorkspaceDelete a workspace file",
+        "security": [{ "HTTPBearerJWT": [] }],
+        "parameters": [
+          {
+            "name": "file_id",
+            "in": "path",
+            "required": true,
+            "schema": { "type": "string", "title": "File Id" }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successful Response",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/DeleteFileResponse" }
+              }
+            }
+          },
+          "401": {
+            "$ref": "#/components/responses/HTTP401NotAuthenticatedError"
+          },
+          "422": {
+            "description": "Validation Error",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/workspace/files/{file_id}/download": {
       "get": {
         "tags": ["workspace"],
@@ -8248,6 +8286,12 @@
         "enum": ["TOP_UP", "USAGE", "GRANT", "REFUND", "CARD_CHECK"],
         "title": "CreditTransactionType"
       },
+      "DeleteFileResponse": {
+        "properties": { "deleted": { "type": "boolean", "title": "Deleted" } },
+        "type": "object",
+        "required": ["deleted"],
+        "title": "DeleteFileResponse"
+      },
       "DeleteGraphResponse": {
         "properties": {
           "version_counts": { "type": "integer", "title": "Version Counts" }
diff --git a/autogpt_platform/frontend/src/app/api/proxy/[...path]/route.ts b/autogpt_platform/frontend/src/app/api/proxy/[...path]/route.ts
index 442bd77e0f96..d1052e2d2496 100644
--- a/autogpt_platform/frontend/src/app/api/proxy/[...path]/route.ts
+++ b/autogpt_platform/frontend/src/app/api/proxy/[...path]/route.ts
@@ -71,9 +71,13 @@ async function handleWorkspaceDownload(
     responseHeaders["Content-Disposition"] = contentDisposition;
   }
 
-  // Return the binary content
-  const arrayBuffer = await response.arrayBuffer();
-  return new NextResponse(arrayBuffer, {
+  const contentLength = response.headers.get("Content-Length");
+  if (contentLength) {
+    responseHeaders["Content-Length"] = contentLength;
+  }
+
+  // Stream the response body directly instead of buffering in memory
+  return new NextResponse(response.body, {
     status: 200,
     headers: responseHeaders,
   });
@@ -255,7 +259,6 @@ async function handler(
       responseBody = await handleJsonRequest(req, method, backendUrl);
     } else if (contentType?.includes("multipart/form-data")) {
       responseBody = await handleFormDataRequest(req, backendUrl);
-      responseHeaders["Content-Type"] = "text/plain";
     } else if (contentType?.includes("application/x-www-form-urlencoded")) {
       responseBody = await handleUrlEncodedRequest(req, method, backendUrl);
     } else {
diff --git a/autogpt_platform/frontend/src/components/atoms/FileInput/FileInput.tsx b/autogpt_platform/frontend/src/components/atoms/FileInput/FileInput.tsx
index 2677a7483b40..55b5c3b80a13 100644
--- a/autogpt_platform/frontend/src/components/atoms/FileInput/FileInput.tsx
+++ b/autogpt_platform/frontend/src/components/atoms/FileInput/FileInput.tsx
@@ -1,10 +1,9 @@
-import { FileTextIcon, TrashIcon, UploadIcon } from "@phosphor-icons/react";
-import { Cross2Icon } from "@radix-ui/react-icons";
+import { FileTextIcon, TrashIcon, UploadIcon, X } from "@phosphor-icons/react";
 import { useRef, useState } from "react";
 import { Button } from "../Button/Button";
 import { formatFileSize, getFileLabel } from "./helpers";
 import { cn } from "@/lib/utils";
-import { Progress } from "../Progress/Progress";
+import { parseWorkspaceURI } from "@/lib/workspace-uri";
 import { Text } from "../Text/Text";
 
 type UploadFileResult = {
@@ -20,6 +19,7 @@ interface BaseProps {
   value?: string;
   placeholder?: string;
   onChange: (value: string) => void;
+  onDeleteFile?: (fileURI: string) => void;
   className?: string;
   maxFileSize?: number;
   accept?: string | string[];
@@ -30,7 +30,7 @@ interface BaseProps {
 interface UploadModeProps extends BaseProps {
   mode?: "upload";
   onUploadFile: (file: File) => Promise<UploadFileResult>;
-  uploadProgress: number;
+  uploadProgress?: number;
 }
 
 interface Base64ModeProps extends BaseProps {
@@ -45,6 +45,7 @@ export function FileInput(props: Props) {
   const {
     value,
     onChange,
+    onDeleteFile,
     className,
     maxFileSize,
     accept,
@@ -56,8 +57,6 @@ export function FileInput(props: Props) {
 
   const onUploadFile =
     mode === "upload" ? (props as UploadModeProps).onUploadFile : undefined;
-  const uploadProgress =
-    mode === "upload" ? (props as UploadModeProps).uploadProgress : 0;
 
   const [isUploading, setIsUploading] = useState(false);
   const [uploadError, setUploadError] = useState<string | null>(null);
@@ -69,8 +68,7 @@ export function FileInput(props: Props) {
 
   const inputRef = useRef<HTMLInputElement>(null);
 
-  const storageNote =
-    "Files are stored securely and will be automatically deleted at most 24 hours after upload.";
+  const storageNote = "Files are stored securely in your workspace.";
 
   function acceptToString(a?: string | string[]) {
     if (!a) return "*/*";
@@ -104,7 +102,7 @@ export function FileInput(props: Props) {
     return false;
   }
 
-  const getFileLabelFromValue = (val: unknown): string => {
+  function getFileLabelFromValue(val: unknown): string {
     // Handle object format from external API: { name, type, size, data }
     if (val && typeof val === "object") {
       const obj = val as Record<string, unknown>;
@@ -124,11 +122,23 @@ export function FileInput(props: Props) {
       return "File";
     }
 
-    // Handle string values (data URIs or file paths)
+    // Handle string values (workspace URIs, data URIs, or file paths)
     if (typeof val !== "string") {
       return "File";
     }
 
+    const wsURI = parseWorkspaceURI(val);
+    if (wsURI) {
+      if (wsURI.mimeType) {
+        const parts = wsURI.mimeType.split("/");
+        if (parts.length > 1) {
+          return `${parts[1].toUpperCase()} file`;
+        }
+        return "File";
+      }
+      return "Uploaded file";
+    }
+
     if (val.startsWith("data:")) {
       const matches = val.match(/^data:([^;]+);/);
       if (matches?.[1]) {
@@ -146,9 +156,9 @@ export function FileInput(props: Props) {
       }
     }
     return "File";
-  };
+  }
 
-  const processFileBase64 = (file: File) => {
+  function processFileBase64(file: File) {
     setIsUploading(true);
     setUploadError(null);
 
@@ -168,9 +178,9 @@ export function FileInput(props: Props) {
       setIsUploading(false);
     };
     reader.readAsDataURL(file);
-  };
+  }
 
-  const uploadFile = async (file: File) => {
+  async function uploadFile(file: File) {
     if (mode === "base64") {
       processFileBase64(file);
       return;
@@ -184,6 +194,8 @@ export function FileInput(props: Props) {
     setIsUploading(true);
     setUploadError(null);
 
+    const oldURI = value;
+
     try {
       const result = await onUploadFile(file);
 
@@ -194,15 +206,20 @@ export function FileInput(props: Props) {
       });
 
       onChange(result.file_uri);
+
+      // Delete the old file only after the new upload succeeds
+      if (oldURI && onDeleteFile) {
+        onDeleteFile(oldURI);
+      }
     } catch (error) {
       console.error("Upload failed:", error);
       setUploadError(error instanceof Error ? error.message : "Upload failed");
     } finally {
       setIsUploading(false);
     }
-  };
+  }
 
-  const handleFileChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+  function handleFileChange(event: React.ChangeEvent<HTMLInputElement>) {
     const file = event.target.files?.[0];
     if (!file) return;
     // Validate max size
@@ -218,21 +235,24 @@ export function FileInput(props: Props) {
       return;
     }
     uploadFile(file);
-  };
+  }
 
-  const handleFileDrop = (event: React.DragEvent<HTMLDivElement>) => {
+  function handleFileDrop(event: React.DragEvent<HTMLDivElement>) {
     event.preventDefault();
     const file = event.dataTransfer.files[0];
     if (file) uploadFile(file);
-  };
+  }
 
-  const handleClear = () => {
+  function handleClear() {
+    if (value && onDeleteFile) {
+      onDeleteFile(value);
+    }
     if (inputRef.current) {
       inputRef.current.value = "";
     }
     onChange("");
     setFileInfo(null);
-  };
+  }
 
   const displayName = placeholder || "File";
 
@@ -241,27 +261,14 @@ export function FileInput(props: Props) {
       <div className={cn("flex flex-col gap-1.5", className)}>
         <div className="nodrag flex flex-col gap-1.5">
           {isUploading ? (
-            <div className="flex flex-col gap-1.5 rounded-md border border-blue-200 bg-blue-50 p-2 dark:border-blue-800 dark:bg-blue-950">
-              <div className="flex items-center gap-2">
-                <UploadIcon className="h-4 w-4 animate-pulse text-blue-600 dark:text-blue-400" />
-                <Text
-                  variant="small"
-                  className="text-blue-700 dark:text-blue-300"
-                >
-                  {mode === "base64" ? "Processing..." : "Uploading..."}
-                </Text>
-                {mode === "upload" && (
-                  <Text
-                    variant="small-medium"
-                    className="ml-auto text-blue-600 dark:text-blue-400"
-                  >
-                    {Math.round(uploadProgress)}%
-                  </Text>
-                )}
-              </div>
-              {mode === "upload" && (
-                <Progress value={uploadProgress} className="h-1 w-full" />
-              )}
+            <div className="flex items-center gap-2 rounded-md border border-blue-200 bg-blue-50 p-2 dark:border-blue-800 dark:bg-blue-950">
+              <div className="h-4 w-4 animate-spin rounded-full border-2 border-blue-300 border-t-blue-600 dark:border-blue-700 dark:border-t-blue-400" />
+              <Text
+                variant="small"
+                className="text-blue-700 dark:text-blue-300"
+              >
+                {mode === "base64" ? "Processing..." : "Uploading..."}
+              </Text>
             </div>
           ) : value ? (
             <div className="flex items-center gap-2">
@@ -292,7 +299,7 @@ export function FileInput(props: Props) {
                 onClick={handleClear}
                 type="button"
               >
-                <Cross2Icon className="h-3.5 w-3.5" />
+                <X size={14} />
               </Button>
             </div>
           ) : (
@@ -333,26 +340,13 @@ export function FileInput(props: Props) {
       {isUploading ? (
         <div className="space-y-2">
           <div className="flex min-h-14 items-center gap-4">
-            <div className="agpt-border-input flex min-h-14 w-full flex-col justify-center rounded-xl bg-zinc-50 p-4 text-sm">
-              <div className="mb-2 flex items-center gap-2">
-                <UploadIcon className="h-5 w-5 text-blue-600" />
-                <span className="text-gray-700">
-                  {mode === "base64" ? "Processing..." : "Uploading..."}
-                </span>
-                {mode === "upload" && (
-                  <span className="text-gray-500">
-                    {Math.round(uploadProgress)}%
-                  </span>
-                )}
-              </div>
-              {mode === "upload" && (
-                <Progress value={uploadProgress} className="w-full" />
-              )}
+            <div className="agpt-border-input flex min-h-14 w-full items-center gap-3 rounded-xl bg-zinc-50 p-4 text-sm">
+              <div className="h-5 w-5 animate-spin rounded-full border-2 border-blue-300 border-t-blue-600" />
+              <span className="text-gray-700">
+                {mode === "base64" ? "Processing..." : "Uploading..."}
+              </span>
             </div>
           </div>
-          {showStorageNote && mode === "upload" && (
-            <p className="text-xs text-gray-500">{storageNote}</p>
-          )}
         </div>
       ) : value ? (
         <div className="space-y-2">
diff --git a/autogpt_platform/frontend/src/components/contextual/OutputRenderers/index.ts b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/index.ts
index ba26054eb2f5..fd33cdad7ef3 100644
--- a/autogpt_platform/frontend/src/components/contextual/OutputRenderers/index.ts
+++ b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/index.ts
@@ -5,8 +5,10 @@ import { imageRenderer } from "./renderers/ImageRenderer";
 import { videoRenderer } from "./renderers/VideoRenderer";
 import { jsonRenderer } from "./renderers/JSONRenderer";
 import { markdownRenderer } from "./renderers/MarkdownRenderer";
+import { workspaceFileRenderer } from "./renderers/WorkspaceFileRenderer";
 
 // Register all renderers in priority order
+globalRegistry.register(workspaceFileRenderer);
 globalRegistry.register(videoRenderer);
 globalRegistry.register(imageRenderer);
 globalRegistry.register(codeRenderer);
diff --git a/autogpt_platform/frontend/src/components/contextual/OutputRenderers/renderers/WorkspaceFileRenderer.test.ts b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/renderers/WorkspaceFileRenderer.test.ts
new file mode 100644
index 000000000000..13f58a6cb99c
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/renderers/WorkspaceFileRenderer.test.ts
@@ -0,0 +1,115 @@
+import { describe, expect, it } from "vitest";
+import {
+  parseWorkspaceURI,
+  parseWorkspaceFileID,
+  isWorkspaceURI,
+  buildWorkspaceURI,
+} from "@/lib/workspace-uri";
+
+describe("parseWorkspaceURI", () => {
+  it("parses a full workspace URI with mime type", () => {
+    const result = parseWorkspaceURI("workspace://file-abc-123#image/png");
+    expect(result).toEqual({ fileID: "file-abc-123", mimeType: "image/png" });
+  });
+
+  it("parses a workspace URI without mime type", () => {
+    const result = parseWorkspaceURI("workspace://file-abc-123");
+    expect(result).toEqual({ fileID: "file-abc-123", mimeType: null });
+  });
+
+  it("returns null for non-workspace URIs", () => {
+    expect(parseWorkspaceURI("https://example.com")).toBeNull();
+    expect(parseWorkspaceURI("data:image/png;base64,abc")).toBeNull();
+    expect(parseWorkspaceURI("")).toBeNull();
+    expect(parseWorkspaceURI("file:///tmp/test.txt")).toBeNull();
+  });
+
+  it("handles empty fragment after hash as null mime type", () => {
+    const result = parseWorkspaceURI("workspace://file-abc-123#");
+    expect(result).toEqual({ fileID: "file-abc-123", mimeType: null });
+  });
+
+  it("handles mime types with subtype", () => {
+    const result = parseWorkspaceURI(
+      "workspace://file-id#application/octet-stream",
+    );
+    expect(result).toEqual({
+      fileID: "file-id",
+      mimeType: "application/octet-stream",
+    });
+  });
+
+  it("handles UUID-style file IDs", () => {
+    const uuid = "550e8400-e29b-41d4-a716-446655440000";
+    const result = parseWorkspaceURI(`workspace://${uuid}#text/plain`);
+    expect(result).toEqual({ fileID: uuid, mimeType: "text/plain" });
+  });
+});
+
+describe("parseWorkspaceFileID", () => {
+  it("extracts file ID from a full workspace URI", () => {
+    expect(parseWorkspaceFileID("workspace://file-abc-123#image/png")).toBe(
+      "file-abc-123",
+    );
+  });
+
+  it("extracts file ID when no mime type fragment", () => {
+    expect(parseWorkspaceFileID("workspace://file-abc-123")).toBe(
+      "file-abc-123",
+    );
+  });
+
+  it("returns null for non-workspace URIs", () => {
+    expect(parseWorkspaceFileID("https://example.com")).toBeNull();
+    expect(parseWorkspaceFileID("data:image/png;base64,abc")).toBeNull();
+    expect(parseWorkspaceFileID("")).toBeNull();
+  });
+
+  it("is consistent with parseWorkspaceURI for file ID extraction", () => {
+    const uris = [
+      "workspace://abc#image/png",
+      "workspace://abc",
+      "workspace://abc#",
+      "workspace://550e8400-e29b-41d4-a716-446655440000#text/plain",
+    ];
+
+    for (const uri of uris) {
+      const fullParse = parseWorkspaceURI(uri);
+      const idOnly = parseWorkspaceFileID(uri);
+      expect(idOnly).toBe(fullParse?.fileID ?? null);
+    }
+  });
+});
+
+describe("isWorkspaceURI", () => {
+  it("returns true for workspace URIs", () => {
+    expect(isWorkspaceURI("workspace://abc")).toBe(true);
+    expect(isWorkspaceURI("workspace://abc#image/png")).toBe(true);
+  });
+
+  it("returns false for non-workspace values", () => {
+    expect(isWorkspaceURI("https://example.com")).toBe(false);
+    expect(isWorkspaceURI("")).toBe(false);
+    expect(isWorkspaceURI(null)).toBe(false);
+    expect(isWorkspaceURI(undefined)).toBe(false);
+    expect(isWorkspaceURI(123)).toBe(false);
+  });
+});
+
+describe("buildWorkspaceURI", () => {
+  it("builds URI with mime type", () => {
+    expect(buildWorkspaceURI("file-123", "image/png")).toBe(
+      "workspace://file-123#image/png",
+    );
+  });
+
+  it("builds URI without mime type", () => {
+    expect(buildWorkspaceURI("file-123")).toBe("workspace://file-123");
+  });
+
+  it("roundtrips with parseWorkspaceURI", () => {
+    const uri = buildWorkspaceURI("file-abc", "text/plain");
+    const parsed = parseWorkspaceURI(uri);
+    expect(parsed).toEqual({ fileID: "file-abc", mimeType: "text/plain" });
+  });
+});
diff --git a/autogpt_platform/frontend/src/components/contextual/OutputRenderers/renderers/WorkspaceFileRenderer.tsx b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/renderers/WorkspaceFileRenderer.tsx
new file mode 100644
index 000000000000..50aeba47c044
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/contextual/OutputRenderers/renderers/WorkspaceFileRenderer.tsx
@@ -0,0 +1,226 @@
+import { DownloadSimple, FileText } from "@phosphor-icons/react";
+import { type ReactNode, useState } from "react";
+import {
+  OutputRenderer,
+  OutputMetadata,
+  DownloadContent,
+  CopyContent,
+} from "../types";
+import { parseWorkspaceURI, isWorkspaceURI } from "@/lib/workspace-uri";
+import { Skeleton } from "@/components/atoms/Skeleton/Skeleton";
+
+const imageMimeTypes = [
+  "image/jpeg",
+  "image/png",
+  "image/gif",
+  "image/bmp",
+  "image/svg+xml",
+  "image/webp",
+  "image/x-icon",
+];
+
+const videoMimeTypes = [
+  "video/mp4",
+  "video/webm",
+  "video/ogg",
+  "video/quicktime",
+  "video/x-msvideo",
+  "video/x-matroska",
+];
+
+const audioMimeTypes = [
+  "audio/mpeg",
+  "audio/ogg",
+  "audio/wav",
+  "audio/webm",
+  "audio/aac",
+  "audio/flac",
+];
+
+function buildDownloadURL(fileID: string): string {
+  return `/api/proxy/api/workspace/files/${fileID}/download`;
+}
+
+function canRenderWorkspaceFile(value: unknown): boolean {
+  return isWorkspaceURI(value);
+}
+
+function getFileTypeLabel(mimeType: string | null): string {
+  if (!mimeType) return "File";
+  const sub = mimeType.split("/")[1];
+  if (!sub) return "File";
+  return `${sub.toUpperCase()} file`;
+}
+
+function WorkspaceImage({ src, alt }: { src: string; alt: string }) {
+  const [loaded, setLoaded] = useState(false);
+
+  return (
+    <div className="group relative">
+      {!loaded && (
+        <Skeleton className="absolute inset-0 h-full min-h-40 w-full rounded-md" />
+      )}
+      {/* eslint-disable-next-line @next/next/no-img-element */}
+      <img
+        src={src}
+        alt={alt}
+        className={`h-auto max-w-full rounded-md border border-gray-200 ${loaded ? "opacity-100" : "min-h-40 opacity-0"}`}
+        loading="lazy"
+        onLoad={() => setLoaded(true)}
+        onError={() => setLoaded(true)}
+      />
+    </div>
+  );
+}
+
+function WorkspaceVideo({ src, mimeType }: { src: string; mimeType: string }) {
+  const [loaded, setLoaded] = useState(false);
+
+  return (
+    <div className="group relative">
+      {!loaded && (
+        <Skeleton className="absolute inset-0 h-full min-h-40 w-full rounded-md" />
+      )}
+      <video
+        controls
+        className={`h-auto max-w-full rounded-md border border-gray-200 ${loaded ? "opacity-100" : "min-h-40 opacity-0"}`}
+        preload="metadata"
+        onLoadedMetadata={() => setLoaded(true)}
+        onError={() => setLoaded(true)}
+      >
+        <source src={src} type={mimeType} />
+        Your browser does not support the video tag.
+      </video>
+    </div>
+  );
+}
+
+function WorkspaceAudio({ src, mimeType }: { src: string; mimeType: string }) {
+  const [loaded, setLoaded] = useState(false);
+
+  return (
+    <div className="group relative">
+      {!loaded && (
+        <Skeleton className="absolute inset-0 h-full min-h-12 w-full rounded-md" />
+      )}
+      <audio
+        controls
+        preload="metadata"
+        className={`w-full ${loaded ? "opacity-100" : "min-h-12 opacity-0"}`}
+        onLoadedMetadata={() => setLoaded(true)}
+        onError={() => setLoaded(true)}
+      >
+        <source src={src} type={mimeType} />
+        Your browser does not support the audio tag.
+      </audio>
+    </div>
+  );
+}
+
+function renderWorkspaceFile(
+  value: unknown,
+  metadata?: OutputMetadata,
+): ReactNode {
+  const uri = parseWorkspaceURI(String(value));
+  if (!uri) return null;
+
+  const downloadURL = buildDownloadURL(uri.fileID);
+  const mimeType = uri.mimeType || metadata?.mimeType || null;
+
+  if (mimeType && imageMimeTypes.includes(mimeType)) {
+    return (
+      <WorkspaceImage src={downloadURL} alt={metadata?.filename || "Image"} />
+    );
+  }
+
+  if (mimeType && videoMimeTypes.includes(mimeType)) {
+    return <WorkspaceVideo src={downloadURL} mimeType={mimeType} />;
+  }
+
+  if (mimeType && audioMimeTypes.includes(mimeType)) {
+    return <WorkspaceAudio src={downloadURL} mimeType={mimeType} />;
+  }
+
+  // Generic file card with icon and download link
+  const label = getFileTypeLabel(mimeType);
+  return (
+    <div className="flex items-center gap-3 rounded-lg border border-gray-200 bg-gray-50 p-3 dark:border-gray-700 dark:bg-gray-800">
+      <FileText size={28} className="flex-shrink-0 text-gray-500" />
+      <div className="flex min-w-0 flex-1 flex-col">
+        <span className="truncate text-sm font-medium text-gray-900 dark:text-gray-100">
+          {metadata?.filename || label}
+        </span>
+        {mimeType && (
+          <span className="text-xs text-gray-500 dark:text-gray-400">
+            {mimeType}
+          </span>
+        )}
+      </div>
+      <a
+        href={downloadURL}
+        download
+        className="flex-shrink-0 rounded-md p-1.5 text-gray-500 transition-colors hover:bg-gray-200 hover:text-gray-700 dark:hover:bg-gray-700 dark:hover:text-gray-300"
+      >
+        <DownloadSimple size={18} />
+      </a>
+    </div>
+  );
+}
+
+function getCopyContentWorkspaceFile(
+  value: unknown,
+  metadata?: OutputMetadata,
+): CopyContent | null {
+  const uri = parseWorkspaceURI(String(value));
+  if (!uri) return null;
+
+  const downloadURL = buildDownloadURL(uri.fileID);
+  const mimeType =
+    uri.mimeType || metadata?.mimeType || "application/octet-stream";
+
+  return {
+    mimeType,
+    data: async () => {
+      const response = await fetch(downloadURL);
+      if (!response.ok) {
+        throw new Error(`Failed to fetch file: ${response.status}`);
+      }
+      return await response.blob();
+    },
+    alternativeMimeTypes: ["text/plain"],
+    fallbackText: String(value),
+  };
+}
+
+function getDownloadContentWorkspaceFile(
+  value: unknown,
+  metadata?: OutputMetadata,
+): DownloadContent | null {
+  const uri = parseWorkspaceURI(String(value));
+  if (!uri) return null;
+
+  const mimeType =
+    uri.mimeType || metadata?.mimeType || "application/octet-stream";
+  const ext = mimeType.split("/")[1] || "bin";
+  const filename = metadata?.filename || `file.${ext}`;
+
+  return {
+    data: buildDownloadURL(uri.fileID),
+    filename,
+    mimeType,
+  };
+}
+
+function isConcatenableWorkspaceFile(): boolean {
+  return false;
+}
+
+export const workspaceFileRenderer: OutputRenderer = {
+  name: "WorkspaceFileRenderer",
+  priority: 50, // Higher than video (45) and image (40) so it matches first
+  canRender: canRenderWorkspaceFile,
+  render: renderWorkspaceFile,
+  getCopyContent: getCopyContentWorkspaceFile,
+  getDownloadContent: getDownloadContentWorkspaceFile,
+  isConcatenable: isConcatenableWorkspaceFile,
+};
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/FileInput/FileWidget.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/FileInput/FileWidget.tsx
index 9d670add37c1..cbb62a17a4f5 100644
--- a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/FileInput/FileWidget.tsx
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/FileInput/FileWidget.tsx
@@ -1,27 +1,30 @@
 import { WidgetProps } from "@rjsf/utils";
 import { FileInput } from "@/components/atoms/FileInput/FileInput";
+import { useWorkspaceUpload } from "./useWorkspaceUpload";
 
-export const FileWidget = (props: WidgetProps) => {
+export function FileWidget(props: WidgetProps) {
   const { onChange, disabled, readonly, value, schema, formContext } = props;
-
   const { size } = formContext || {};
-
   const displayName = schema?.title || "File";
+  const { handleUploadFile, handleDeleteFile } = useWorkspaceUpload();
 
-  const handleChange = (fileUri: string) => {
-    onChange(fileUri);
-  };
+  function handleChange(fileURI: string) {
+    onChange(fileURI);
+  }
 
   return (
     <FileInput
       variant={size === "large" ? "default" : "compact"}
-      mode="base64"
+      mode="upload"
       value={value}
       placeholder={displayName}
       onChange={handleChange}
+      onDeleteFile={handleDeleteFile}
+      onUploadFile={handleUploadFile}
+      showStorageNote={false}
       className={
         disabled || readonly ? "pointer-events-none opacity-50" : undefined
       }
     />
   );
-};
+}
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/FileInput/useWorkspaceUpload.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/FileInput/useWorkspaceUpload.ts
new file mode 100644
index 000000000000..d8b32e5031c1
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/FileInput/useWorkspaceUpload.ts
@@ -0,0 +1,47 @@
+import {
+  usePostWorkspaceUploadFileToWorkspace,
+  useDeleteWorkspaceDeleteAWorkspaceFile,
+} from "@/app/api/__generated__/endpoints/workspace/workspace";
+import { useToast } from "@/components/molecules/Toast/use-toast";
+import { parseWorkspaceFileID, buildWorkspaceURI } from "@/lib/workspace-uri";
+
+export function useWorkspaceUpload() {
+  const { toast } = useToast();
+
+  const { mutateAsync: uploadMutation } =
+    usePostWorkspaceUploadFileToWorkspace();
+
+  const { mutate: deleteMutation } = useDeleteWorkspaceDeleteAWorkspaceFile({
+    mutation: {
+      onError: () => {
+        toast({
+          title: "Failed to delete file",
+          description: "The file could not be removed from storage.",
+          variant: "destructive",
+        });
+      },
+    },
+  });
+
+  async function handleUploadFile(file: File) {
+    const response = await uploadMutation({ data: { file } });
+    if (response.status !== 200) {
+      throw new Error("Upload failed");
+    }
+    const d = response.data;
+    return {
+      file_name: d.name,
+      size: d.size_bytes,
+      content_type: d.mime_type,
+      file_uri: buildWorkspaceURI(d.file_id, d.mime_type),
+    };
+  }
+
+  function handleDeleteFile(fileURI: string) {
+    const fileID = parseWorkspaceFileID(fileURI);
+    if (!fileID) return;
+    deleteMutation({ fileId: fileID });
+  }
+
+  return { handleUploadFile, handleDeleteFile };
+}
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/GoogleDrivePickerField/GoogleDrivePickerField.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/GoogleDrivePickerField/GoogleDrivePickerField.tsx
index dff6274189cb..94fad2378fae 100644
--- a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/GoogleDrivePickerField/GoogleDrivePickerField.tsx
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/GoogleDrivePickerField/GoogleDrivePickerField.tsx
@@ -1,32 +1,60 @@
 import { BlockUIType } from "@/app/(platform)/build/components/types";
 import { GoogleDrivePickerInput } from "@/components/contextual/GoogleDrivePicker/GoogleDrivePickerInput";
 import { GoogleDrivePickerConfig } from "@/lib/autogpt-server-api";
-import { FieldProps, getUiOptions } from "@rjsf/utils";
+import { FieldProps, getTemplate, getUiOptions, titleId } from "@rjsf/utils";
+import { cleanUpHandleId, getHandleId, updateUiOption } from "../../helpers";
+import { useEdgeStore } from "@/app/(platform)/build/stores/edgeStore";
 
 export const GoogleDrivePickerField = (props: FieldProps) => {
   const { schema, uiSchema, onChange, fieldPathId, formData, registry } = props;
   const uiOptions = getUiOptions(uiSchema);
   const config: GoogleDrivePickerConfig = schema.google_drive_picker_config;
 
+  const { nodeId } = registry.formContext;
   const uiType = registry.formContext?.uiType;
 
+  const TitleFieldTemplate = getTemplate("TitleFieldTemplate", registry);
+
+  const handleId = getHandleId({ uiOptions, id: fieldPathId.$id, schema });
+  const updatedUiSchema = updateUiOption(uiSchema, {
+    handleId,
+    showHandles: !!nodeId,
+  });
+
+  const { isInputConnected } = useEdgeStore();
+  const isConnected = isInputConnected(nodeId, cleanUpHandleId(handleId));
+
   if (uiType === BlockUIType.INPUT) {
     return (
-      <div className="rounded-3xl border border-gray-200 p-2 pl-4 text-xs text-gray-500 hover:cursor-not-allowed">
-        Select files when you run the graph
+      <div className="flex flex-col gap-2">
+        {!isConnected && (
+          <div className="rounded-3xl border border-gray-200 p-2 pl-4 text-xs text-gray-500 hover:cursor-not-allowed">
+            Select files when you run the graph
+          </div>
+        )}
       </div>
     );
   }
 
   return (
-    <div>
-      <GoogleDrivePickerInput
-        config={config}
-        value={formData}
-        onChange={(value) => onChange(value, fieldPathId.path)}
-        className={uiOptions.className}
-        showRemoveButton={true}
+    <div className="flex flex-col gap-2">
+      <TitleFieldTemplate
+        id={titleId(fieldPathId.$id)}
+        title={schema.title || ""}
+        required={false}
+        schema={schema}
+        uiSchema={updatedUiSchema}
+        registry={registry}
       />
+      {!isConnected && (
+        <GoogleDrivePickerInput
+          config={config}
+          value={formData}
+          onChange={(value) => onChange(value, fieldPathId.path)}
+          className={uiOptions.className}
+          showRemoveButton={true}
+        />
+      )}
     </div>
   );
 };
diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/generate-ui-schema.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/generate-ui-schema.ts
index 4012c390686c..f7f6bc86c156 100644
--- a/autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/generate-ui-schema.ts
+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/generate-ui-schema.ts
@@ -44,9 +44,19 @@ export function generateUiSchemaForCustomFields(
         const customFieldId = findCustomFieldId(propSchema);
 
         if (customFieldId) {
+          const hasAnyOfOrOneOf =
+            propSchema.anyOf || propSchema.oneOf ? true : false;
           uiSchema[key] = {
             ...(uiSchema[key] as object),
             "ui:field": customFieldId,
+            ...(hasAnyOfOrOneOf && {
+              "ui:options": {
+                ...((uiSchema[key] as Record<string, unknown>)?.[
+                  "ui:options"
+                ] as object),
+                fieldReplacesAnyOrOneOf: true,
+              },
+            }),
           };
           // Skip further processing for custom fields
           continue;
diff --git a/autogpt_platform/frontend/src/lib/workspace-uri.ts b/autogpt_platform/frontend/src/lib/workspace-uri.ts
new file mode 100644
index 000000000000..c37845fce549
--- /dev/null
+++ b/autogpt_platform/frontend/src/lib/workspace-uri.ts
@@ -0,0 +1,54 @@
+/**
+ * Shared utilities for parsing and constructing workspace:// URIs.
+ *
+ * Format: workspace://{fileID}#{mimeType}
+ *   - fileID: unique identifier for the file
+ *   - mimeType: optional MIME type hint (e.g. "image/png")
+ */
+
+export interface WorkspaceURI {
+  fileID: string;
+  mimeType: string | null;
+}
+
+/**
+ * Parse a workspace:// URI into its components.
+ * Returns null if the string is not a workspace URI.
+ */
+export function parseWorkspaceURI(value: string): WorkspaceURI | null {
+  if (!value.startsWith("workspace://")) return null;
+  const rest = value.slice("workspace://".length);
+  const hashIndex = rest.indexOf("#");
+  if (hashIndex === -1) {
+    return { fileID: rest, mimeType: null };
+  }
+  return {
+    fileID: rest.slice(0, hashIndex),
+    mimeType: rest.slice(hashIndex + 1) || null,
+  };
+}
+
+/**
+ * Extract just the file ID from a workspace:// URI.
+ * Returns null if the string is not a workspace URI.
+ */
+export function parseWorkspaceFileID(uri: string): string | null {
+  const parsed = parseWorkspaceURI(uri);
+  return parsed?.fileID ?? null;
+}
+
+/**
+ * Check if a value is a workspace:// URI string.
+ */
+export function isWorkspaceURI(value: unknown): value is string {
+  return typeof value === "string" && value.startsWith("workspace://");
+}
+
+/**
+ * Build a workspace:// URI from a file ID and optional MIME type.
+ */
+export function buildWorkspaceURI(fileID: string, mimeType?: string): string {
+  return mimeType
+    ? `workspace://${fileID}#${mimeType}`
+    : `workspace://${fileID}`;
+}

From c41ea161cef098186573e8be72960bbbe47cc7a4 Mon Sep 17 00:00:00 2001
From: Lluis Agusti <hi@llu.lu>
Date: Thu, 5 Mar 2026 21:27:40 +0800
Subject: [PATCH 5/7] fix(frontend): guard TodoWrite find callback against
 non-object items

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../app/(platform)/copilot/tools/GenericTool/helpers.ts    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/GenericTool/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/GenericTool/helpers.ts
index 3d5f54cf26dc..94277a2abb3e 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/tools/GenericTool/helpers.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/tools/GenericTool/helpers.ts
@@ -124,8 +124,11 @@ function getInputSummary(toolName: string, input: unknown): string | null {
     case "TodoWrite": {
       const todos = Array.isArray(inp.todos) ? inp.todos : [];
       const active = todos.find(
-        (t: Record<string, unknown>) => t.status === "in_progress",
-      );
+        (t: unknown) =>
+          t !== null &&
+          typeof t === "object" &&
+          (t as Record<string, unknown>).status === "in_progress",
+      ) as Record<string, unknown> | undefined;
       if (active && typeof active.activeForm === "string")
         return active.activeForm;
       if (active && typeof active.content === "string") return active.content;

From 87e4dfb2da361964873b330df101a10ae23b081b Mon Sep 17 00:00:00 2001
From: Lluis Agusti <hi@llu.lu>
Date: Fri, 6 Mar 2026 18:47:17 +0800
Subject: [PATCH 6/7] fix(platform): revert transcript concurrency change, use
 design tokens in FeedbackModal

Revert fire-and-forget transcript upload back to blocking asyncio.shield
per reviewer feedback to avoid concurrency issues. Replace hardcoded
slate color classes with text-muted-foreground design tokens.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../backend/backend/copilot/sdk/service.py    | 36 ++++++++-----------
 .../components/FeedbackModal.tsx              |  6 ++--
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/autogpt_platform/backend/backend/copilot/sdk/service.py b/autogpt_platform/backend/backend/copilot/sdk/service.py
index 4cdf99e5c40f..6656fea288d4 100644
--- a/autogpt_platform/backend/backend/copilot/sdk/service.py
+++ b/autogpt_platform/backend/backend/copilot/sdk/service.py
@@ -827,7 +827,6 @@ async def stream_chat_completion_sdk(
     use_resume = False
     resume_file: str | None = None
     captured_transcript = CapturedTranscript()
-    transcript_upload_scheduled = False
     sdk_cwd = ""
 
     # Acquire stream lock to prevent concurrent streams to the same session
@@ -1437,11 +1436,11 @@ async def _next_msg() -> Any:
                 )
 
             if raw_transcript:
-                # Fire-and-forget: upload in background so the generator
-                # can exit promptly and mark_session_completed() runs
-                # without delay.  Blocking here kept the SSE stream alive
-                # with only heartbeats for up to 30s (the upload timeout).
-                task = asyncio.create_task(
+                # Shield the upload from generator cancellation so a
+                # client disconnect / page refresh doesn't lose the
+                # transcript.  The upload must finish even if the SSE
+                # connection is torn down.
+                await asyncio.shield(
                     _try_upload_transcript(
                         user_id,
                         session_id,
@@ -1449,9 +1448,6 @@ async def _next_msg() -> Any:
                         message_count=len(session.messages),
                     )
                 )
-                _background_tasks.add(task)
-                task.add_done_callback(_background_tasks.discard)
-                transcript_upload_scheduled = True
 
         logger.info(
             "[SDK] [%s] Stream completed successfully with %d messages",
@@ -1531,22 +1527,22 @@ async def _next_msg() -> Any:
                 )
 
         # --- Upload transcript for next-turn --resume ---
-        # Fire-and-forget so the generator exits promptly and
-        # mark_session_completed() in the processor runs without delay.
-        # Previously this awaited the upload (up to 30s timeout), keeping
-        # the SSE stream alive with only heartbeats.
-        if (
-            config.claude_agent_use_resume
-            and user_id
-            and not transcript_upload_scheduled
-        ):
+        # This MUST run in finally so the transcript is uploaded even when
+        # the streaming loop raises an exception.  The CLI uses
+        # appendFileSync, so whatever was written before the error/SIGTERM
+        # is safely on disk and still useful for the next turn.
+        if config.claude_agent_use_resume and user_id:
             try:
+                # Prefer content captured in the Stop hook (read before
+                # cleanup removes the file).  Fall back to the resume
+                # file when the stop hook didn't fire (e.g. error before
+                # completion) so we don't lose the prior transcript.
                 raw_transcript = captured_transcript.raw_content or None
                 if not raw_transcript and use_resume and resume_file:
                     raw_transcript = read_transcript_file(resume_file)
 
                 if raw_transcript and session is not None:
-                    task = asyncio.create_task(
+                    await asyncio.shield(
                         _try_upload_transcript(
                             user_id,
                             session_id,
@@ -1554,8 +1550,6 @@ async def _next_msg() -> Any:
                             message_count=len(session.messages),
                         )
                     )
-                    _background_tasks.add(task)
-                    task.add_done_callback(_background_tasks.discard)
                 else:
                     logger.warning(f"[SDK] No transcript to upload for {session_id}")
             except Exception as upload_err:
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/FeedbackModal.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/FeedbackModal.tsx
index 8c773b1aaf12..fe0e47de107d 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/FeedbackModal.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/FeedbackModal.tsx
@@ -37,7 +37,7 @@ export function FeedbackModal({ isOpen, onSubmit, onCancel }: Props) {
     >
       <Dialog.Content>
         <div className="mx-auto w-[95%] space-y-4">
-          <p className="text-sm text-slate-600">
+          <p className="text-sm text-muted-foreground">
             Your feedback helps us improve. Share details below.
           </p>
           <Textarea
@@ -49,7 +49,9 @@ export function FeedbackModal({ isOpen, onSubmit, onCancel }: Props) {
             className="resize-none"
           />
           <div className="flex items-center justify-between">
-            <p className="text-xs text-slate-400">{comment.length}/2000</p>
+            <p className="text-xs text-muted-foreground">
+              {comment.length}/2000
+            </p>
             <div className="flex gap-2">
               <Button variant="outline" size="sm" onClick={handleClose}>
                 Cancel

From ab5e451f32ebd376e194aaf830b40602bdbfd0fc Mon Sep 17 00:00:00 2001
From: Lluis Agusti <hi@llu.lu>
Date: Fri, 6 Mar 2026 21:01:34 +0800
Subject: [PATCH 7/7] fix(frontend): use findLastIndex in
 splitReasoningAndResponse

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../ChatMessagesContainer/ChatMessagesContainer.tsx      | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/ChatMessagesContainer.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/ChatMessagesContainer.tsx
index f1698a9aceba..df253468ef87 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/ChatMessagesContainer.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/ChatMessagesContainer.tsx
@@ -111,14 +111,7 @@ function splitReasoningAndResponse(parts: MessagePart[]): {
   reasoning: MessagePart[];
   response: MessagePart[];
 } {
-  // Find the index of the last tool part
-  let lastToolIndex = -1;
-  for (let i = parts.length - 1; i >= 0; i--) {
-    if (parts[i].type.startsWith("tool-")) {
-      lastToolIndex = i;
-      break;
-    }
-  }
+  const lastToolIndex = parts.findLastIndex((p) => p.type.startsWith("tool-"));
 
   // No tools → everything is response
   if (lastToolIndex === -1) {