Revert "Remove request content from UI messages (RooCodeInc#8696)"

This reverts commit 4405f5a.

Author: PretzelVector

src/core/task/Task.ts

@@ -75,7 +75,7 @@ import { RepoPerTaskCheckpointService } from "../../services/checkpoints"
 
 // integrations
 import { DiffViewProvider } from "../../integrations/editor/DiffViewProvider"
-import { findToolName } from "../../integrations/misc/export-markdown"
+import { findToolName, formatContentBlockToMarkdown } from "../../integrations/misc/export-markdown"
 import { RooTerminalProcess } from "../../integrations/terminal/types"
 import { TerminalRegistry } from "../../integrations/terminal/TerminalRegistry"
 
@@ -1859,6 +1859,9 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 			await this.say(
 				"api_req_started",
 				JSON.stringify({
+					request:
+						currentUserContent.map((block) => formatContentBlockToMarkdown(block)).join("\n\n") +
+						"\n\nLoading...",
 					apiProtocol,
 				}),
 			)
@@ -1904,6 +1907,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 			const lastApiReqIndex = findLastIndex(this.clineMessages, (m) => m.say === "api_req_started")
 
 			this.clineMessages[lastApiReqIndex].text = JSON.stringify({
+				request: finalUserContent.map((block) => formatContentBlockToMarkdown(block)).join("\n\n"),
 				apiProtocol,
 			} satisfies ClineApiReqInfo)
 

src/core/task/__tests__/Task.spec.ts

@@ -714,6 +714,7 @@ describe("Cline", () => {
 							tokensOut: 50,
 							cacheWrites: 0,
 							cacheReads: 0,
+							request: "test request",
 						}),
 					},
 				]
@@ -838,6 +839,7 @@ describe("Cline", () => {
 							tokensOut: 50,
 							cacheWrites: 0,
 							cacheReads: 0,
+							request: "test request",
 						}),
 					},
 				]

webview-ui/src/components/chat/ChatRow.tsx

@@ -46,6 +46,8 @@ import { ChatTextArea } from "./ChatTextArea"
 import { MAX_IMAGES_PER_MESSAGE } from "./ChatView"
 import { useSelectedModel } from "../ui/hooks/useSelectedModel"
 import {
+	ChevronRight,
+	ChevronDown,
 	Eye,
 	FileDiff,
 	ListTree,
@@ -321,7 +323,11 @@ export const ChatRowContent = ({
 							getIconSpan("error", errorColor)
 						)
 					) : cost !== null && cost !== undefined ? (
-						getIconSpan("arrow-swap", normalColor)
+						isExpanded ? (
+							<ChevronDown className="w-4 shrink-0" />
+						) : (
+							<ChevronRight className="w-4 shrink-0" />
+						)
 					) : apiRequestFailedMessage ? (
 						getIconSpan("error", errorColor)
 					) : (
@@ -353,7 +359,17 @@ export const ChatRowContent = ({
 			default:
 				return [null, null]
 		}
-	}, [type, isCommandExecuting, message, isMcpServerResponding, apiReqCancelReason, cost, apiRequestFailedMessage, t])
+	}, [
+		type,
+		isCommandExecuting,
+		message,
+		isMcpServerResponding,
+		apiReqCancelReason,
+		cost,
+		apiRequestFailedMessage,
+		t,
+		isExpanded,
+	])
 
 	const headerStyle: React.CSSProperties = {
 		display: "flex",
@@ -1083,7 +1099,13 @@ export const ChatRowContent = ({
 											? 10
 											: 0,
 									justifyContent: "space-between",
-								}}>
+									cursor: "pointer",
+									userSelect: "none",
+									WebkitUserSelect: "none",
+									MozUserSelect: "none",
+									msUserSelect: "none",
+								}}
+								onClick={handleToggleExpand}>
 								<div style={{ display: "flex", alignItems: "center", gap: "10px", flexGrow: 1 }}>
 									{icon}
 									{title}
@@ -1116,6 +1138,17 @@ export const ChatRowContent = ({
 									}
 								/>
 							)}
+
+							{isExpanded && (
+								<div className="ml-6" style={{ marginTop: "10px" }}>
+									<CodeAccordian
+										code={safeJsonParse<any>(message.text)?.request}
+										language="markdown"
+										isExpanded={true}
+										onToggleExpand={handleToggleExpand}
+									/>
+								</div>
+							)}
 						</>
 					)
 				case "api_req_finished":