From 32227296bd8f7b6f59b4e92dace4d0f1897502ef Mon Sep 17 00:00:00 2001
From: Taylor Ho <taylorkmho@gmail.com>
Date: Mon, 24 Aug 2026 04:24:12 -0700
Subject: [PATCH] fix(desktop): preserve pop-out code blocks

Co-authored-by: Rizz <302abe414ca6e3134763d2539bfcf145aea2a63fe5f8455204ed602fd40cf381@buzz.block.builderlab.xyz>
Signed-off-by: Taylor Ho <taylorkmho@gmail.com>
---
 .../CompactMessageSummary.tsx                 |  1 +
 .../activityRenderClasses/MessageActivity.tsx |  1 +
 .../ui/activityRenderClasses/PlanActivity.tsx |  1 +
 .../activityRenderClasses/ThoughtActivity.tsx |  1 +
 .../UserMessageBubble.tsx                     |  1 +
 .../tests/e2e/agent-activity-window.spec.ts   | 21 ++++++++++++++++++-
 6 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/desktop/src/features/agents/ui/AgentSessionToolItem/CompactMessageSummary.tsx b/desktop/src/features/agents/ui/AgentSessionToolItem/CompactMessageSummary.tsx
index 3bab08fca3..3d0cb0b8e5 100644
--- a/desktop/src/features/agents/ui/AgentSessionToolItem/CompactMessageSummary.tsx
+++ b/desktop/src/features/agents/ui/AgentSessionToolItem/CompactMessageSummary.tsx
@@ -164,6 +164,7 @@ export function CompactMessageSummary({
             {...bubbleLinkProps}
           >
             <Markdown
+              blockCode
               className={isCompactPreview ? "text-xs leading-4" : "leading-5"}
               content={resolvedContent || "Message content unavailable."}
               interactive={activityWindowMarkdownInteractive()}
diff --git a/desktop/src/features/agents/ui/activityRenderClasses/MessageActivity.tsx b/desktop/src/features/agents/ui/activityRenderClasses/MessageActivity.tsx
index 1d3d38d014..fc8cf18d6d 100644
--- a/desktop/src/features/agents/ui/activityRenderClasses/MessageActivity.tsx
+++ b/desktop/src/features/agents/ui/activityRenderClasses/MessageActivity.tsx
@@ -64,6 +64,7 @@ function MessageItem({
           title={formatTranscriptTimestampTitle(item.timestamp)}
         >
           <Markdown
+            blockCode
             className={isCompactPreview ? "text-xs leading-4" : "leading-5"}
             content={text || " "}
             interactive={activityWindowMarkdownInteractive()}
diff --git a/desktop/src/features/agents/ui/activityRenderClasses/PlanActivity.tsx b/desktop/src/features/agents/ui/activityRenderClasses/PlanActivity.tsx
index 0e1d862e8f..79e692fd83 100644
--- a/desktop/src/features/agents/ui/activityRenderClasses/PlanActivity.tsx
+++ b/desktop/src/features/agents/ui/activityRenderClasses/PlanActivity.tsx
@@ -40,6 +40,7 @@ export function PlanActivity(props: ActivityRenderClassItemProps) {
       <ActivityRowLabel object="plan" openToneScope="tool" verb="Updated" />
       <ActivityRowContent className="pt-1 pb-1.5 text-sm leading-5 text-muted-foreground">
         <Markdown
+          blockCode
           className="leading-5"
           content={props.item.text.trim() || "No plan details."}
           interactive={activityWindowMarkdownInteractive()}
diff --git a/desktop/src/features/agents/ui/activityRenderClasses/ThoughtActivity.tsx b/desktop/src/features/agents/ui/activityRenderClasses/ThoughtActivity.tsx
index 2907cf2a2a..3da04cefca 100644
--- a/desktop/src/features/agents/ui/activityRenderClasses/ThoughtActivity.tsx
+++ b/desktop/src/features/agents/ui/activityRenderClasses/ThoughtActivity.tsx
@@ -25,6 +25,7 @@ export function ThoughtActivity(props: ActivityRenderClassItemProps) {
       <ActivityRowLabel openToneScope="tool" verb={props.item.title} />
       <ActivityRowContent className="pt-1 pb-1.5 text-sm leading-5 text-muted-foreground">
         <Markdown
+          blockCode
           className="leading-5"
           content={props.item.text.trim() || " "}
           interactive={activityWindowMarkdownInteractive()}
diff --git a/desktop/src/features/agents/ui/activityRenderClasses/UserMessageBubble.tsx b/desktop/src/features/agents/ui/activityRenderClasses/UserMessageBubble.tsx
index fa6c8860bd..1f5b8d0930 100644
--- a/desktop/src/features/agents/ui/activityRenderClasses/UserMessageBubble.tsx
+++ b/desktop/src/features/agents/ui/activityRenderClasses/UserMessageBubble.tsx
@@ -156,6 +156,7 @@ export function UserMessageBubble({
           <Markdown
             className={isCompactPreview ? "text-xs leading-4" : "leading-5"}
             content={text || " "}
+            blockCode
             interactive={activityWindowMarkdownInteractive()}
             mediaInset
           />
diff --git a/desktop/tests/e2e/agent-activity-window.spec.ts b/desktop/tests/e2e/agent-activity-window.spec.ts
index 52e3fcf7a9..5adf359720 100644
--- a/desktop/tests/e2e/agent-activity-window.spec.ts
+++ b/desktop/tests/e2e/agent-activity-window.spec.ts
@@ -11,6 +11,7 @@ const COMMUNITY_ID = "e2e-default-community";
 test("keeps dedicated activity windows pinned to their original channel", async ({
   page,
 }) => {
+  await page.setViewportSize({ width: 560, height: 760 });
   await installMockBridge(page, {
     windowLabel: `agent-activity-${AGENT_PUBKEY}-${AGENTS_CHANNEL_ID}`,
     managedAgents: [
@@ -51,7 +52,7 @@ test("keeps dedicated activity windows pinned to their original channel", async
                   sessionUpdate: "agent_message_chunk",
                   content: {
                     type: "text",
-                    text: `Continue in #general or open <buzz://repo?owner=${repositoryOwnerPubkey}&d=relay-tools>`,
+                    text: `Continue in #general or open <buzz://repo?owner=${repositoryOwnerPubkey}&d=relay-tools>\n\n\`\`\`text\nverification-${"x".repeat(120)}-END\n\`\`\``,
                   },
                 },
               },
@@ -163,6 +164,24 @@ test("keeps dedicated activity windows pinned to their original channel", async
   await expect(
     panel.getByRole("button", { name: "Open channel general" }),
   ).toHaveCount(0);
+  const codeBlock = panel
+    .getByTestId("transcript-assistant-message")
+    .locator("pre");
+  await expect(codeBlock).toHaveCount(1);
+  await expect(codeBlock).toContainText("-END");
+  const codeOverflow = await codeBlock.evaluate((element) => ({
+    clientWidth: element.clientWidth,
+    overflowX: getComputedStyle(element).overflowX,
+    scrollWidth: element.scrollWidth,
+  }));
+  expect(codeOverflow.overflowX).toBe("auto");
+  expect(codeOverflow.scrollWidth).toBeGreaterThan(codeOverflow.clientWidth);
+  await codeBlock.evaluate((element) => {
+    element.scrollLeft = element.scrollWidth;
+  });
+  await expect
+    .poll(() => codeBlock.evaluate((element) => element.scrollLeft))
+    .toBeGreaterThan(0);
   const activityWindowUrl = page.url();
 
   await expect(