diff --git a/.tmp/Roo-Code b/.tmp/Roo-Code
new file mode 160000
index 0000000000..86debeef43
--- /dev/null
+++ b/.tmp/Roo-Code
@@ -0,0 +1 @@
+Subproject commit 86debeef43acbea9bdc1aa4b38d514541e164c91
diff --git a/src/core/task/Task.ts b/src/core/task/Task.ts
index 2dd9e55c0b..2c698cbc64 100644
--- a/src/core/task/Task.ts
+++ b/src/core/task/Task.ts
@@ -1935,6 +1935,16 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 					const iterator = stream[Symbol.asyncIterator]()
 					let item = await iterator.next()
 					while (!item.done) {
+						// Check if task is paused and wait if necessary
+						while (this.isPaused) {
+							// Wait for 100ms before checking again
+							await delay(100)
+							// Check if abort was requested while paused
+							if (this.abort) {
+								break
+							}
+						}
+
 						const chunk = item.value
 						item = await iterator.next()
 						if (!chunk) {
diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts
index 119668d668..5ea63755fd 100644
--- a/src/core/webview/ClineProvider.ts
+++ b/src/core/webview/ClineProvider.ts
@@ -2650,12 +2650,40 @@ export class ClineProvider
 		}
 	}
 
-	public resumeTask(taskId: string): void {
-		// Use the existing showTaskWithId method which handles both current and
-		// historical tasks.
-		this.showTaskWithId(taskId).catch((error) => {
-			this.log(`Failed to resume task ${taskId}: ${error.message}`)
-		})
+	public async pauseTask(): Promise<void> {
+		const task = this.getCurrentTask()
+		if (!task) {
+			return
+		}
+
+		this.log(`[pauseTask] pausing task ${task.taskId}`)
+
+		// Set the task as paused
+		task.isPaused = true
+
+		// Emit pause event for tracking
+		task.emit(RooCodeEventName.TaskPaused, task.taskId)
+
+		// Update the UI to reflect the paused state
+		await this.postStateToWebview()
+	}
+
+	public async resumeTask(): Promise<void> {
+		const task = this.getCurrentTask()
+		if (!task) {
+			return
+		}
+
+		this.log(`[resumeTask] resuming task ${task.taskId}`)
+
+		// Set the task as not paused
+		task.isPaused = false
+
+		// Emit resume event for tracking
+		task.emit(RooCodeEventName.TaskUnpaused, task.taskId)
+
+		// Update the UI to reflect the resumed state
+		await this.postStateToWebview()
 	}
 
 	// Modes
diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts
index c3e57c67a2..b6277995a9 100644
--- a/src/core/webview/webviewMessageHandler.ts
+++ b/src/core/webview/webviewMessageHandler.ts
@@ -1003,6 +1003,12 @@ export const webviewMessageHandler = async (
 		case "cancelTask":
 			await provider.cancelTask()
 			break
+		case "pauseTask":
+			await provider.pauseTask()
+			break
+		case "resumeTask":
+			await provider.resumeTask()
+			break
 		case "allowedCommands": {
 			// Validate and sanitize the commands array
 			const commands = message.commands ?? []
diff --git a/src/shared/WebviewMessage.ts b/src/shared/WebviewMessage.ts
index d43a2fce04..59dc9770ce 100644
--- a/src/shared/WebviewMessage.ts
+++ b/src/shared/WebviewMessage.ts
@@ -76,6 +76,8 @@ export interface WebviewMessage {
 		| "openFile"
 		| "openMention"
 		| "cancelTask"
+		| "pauseTask"
+		| "resumeTask"
 		| "updateVSCodeSetting"
 		| "getVSCodeSetting"
 		| "vsCodeSetting"
diff --git a/webview-ui/src/components/chat/ChatView.tsx b/webview-ui/src/components/chat/ChatView.tsx
index d358c68f1c..5df28cf816 100644
--- a/webview-ui/src/components/chat/ChatView.tsx
+++ b/webview-ui/src/components/chat/ChatView.tsx
@@ -78,6 +78,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 	ref,
 ) => {
 	const isMountedRef = useRef(true)
+	const [isPaused, setIsPaused] = useState(false)
 
 	const [audioBaseUri] = useState(() => {
 		const w = window as any
@@ -459,6 +460,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 			setEnableButtons(false)
 			setPrimaryButtonText(undefined)
 			setSecondaryButtonText(undefined)
+			setIsPaused(false)
 		}
 	}, [messages.length])
 
@@ -578,6 +580,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 		setSelectedImages([])
 		setClineAsk(undefined)
 		setEnableButtons(false)
+		setIsPaused(false)
 		// Do not reset mode here as it should persist.
 		// setPrimaryButtonText(undefined)
 		// setSecondaryButtonText(undefined)
@@ -728,8 +731,14 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 			const trimmedInput = text?.trim()
 
 			if (isStreaming) {
-				vscode.postMessage({ type: "cancelTask" })
-				setDidClickCancel(true)
+				// If paused, resume; otherwise pause
+				if (isPaused) {
+					vscode.postMessage({ type: "resumeTask" })
+					setIsPaused(false)
+				} else {
+					vscode.postMessage({ type: "pauseTask" })
+					setIsPaused(true)
+				}
 				return
 			}
 
@@ -767,7 +776,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 			setClineAsk(undefined)
 			setEnableButtons(false)
 		},
-		[clineAsk, startNewTask, isStreaming],
+		[clineAsk, startNewTask, isStreaming, isPaused],
 	)
 
 	const { info: model } = useSelectedModel(apiConfiguration)
@@ -1945,26 +1954,69 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 										</StandardTooltip>
 									)}
 									{(secondaryButtonText || isStreaming) && (
-										<StandardTooltip
-											content={
-												isStreaming
-													? t("chat:cancel.tooltip")
-													: secondaryButtonText === t("chat:startNewTask.title")
-														? t("chat:startNewTask.tooltip")
-														: secondaryButtonText === t("chat:reject.title")
-															? t("chat:reject.tooltip")
-															: secondaryButtonText === t("chat:terminate.title")
-																? t("chat:terminate.tooltip")
-																: undefined
-											}>
-											<VSCodeButton
-												appearance="secondary"
-												disabled={!enableButtons && !(isStreaming && !didClickCancel)}
-												className={isStreaming ? "flex-[2] ml-0" : "flex-1 ml-[6px]"}
-												onClick={() => handleSecondaryButtonClick(inputValue, selectedImages)}>
-												{isStreaming ? t("chat:cancel.title") : secondaryButtonText}
-											</VSCodeButton>
-										</StandardTooltip>
+										<>
+											{isStreaming && (
+												<StandardTooltip
+													content={
+														isPaused
+															? t("chat:resume.tooltip", {
+																	defaultValue: "Resume the AI's response",
+																})
+															: t("chat:pause.tooltip", {
+																	defaultValue: "Pause the AI's response",
+																})
+													}>
+													<VSCodeButton
+														appearance="secondary"
+														disabled={didClickCancel}
+														className="flex-1 mr-[6px]"
+														onClick={() =>
+															handleSecondaryButtonClick(inputValue, selectedImages)
+														}>
+														{isPaused
+															? t("chat:resume.title", { defaultValue: "Resume" })
+															: t("chat:pause.title", { defaultValue: "Pause" })}
+													</VSCodeButton>
+												</StandardTooltip>
+											)}
+											{isStreaming && (
+												<StandardTooltip content={t("chat:cancel.tooltip")}>
+													<VSCodeButton
+														appearance="secondary"
+														disabled={didClickCancel}
+														className="flex-1 ml-[6px]"
+														onClick={() => {
+															vscode.postMessage({ type: "cancelTask" })
+															setDidClickCancel(true)
+															setIsPaused(false)
+														}}>
+														{t("chat:cancel.title")}
+													</VSCodeButton>
+												</StandardTooltip>
+											)}
+											{!isStreaming && secondaryButtonText && (
+												<StandardTooltip
+													content={
+														secondaryButtonText === t("chat:startNewTask.title")
+															? t("chat:startNewTask.tooltip")
+															: secondaryButtonText === t("chat:reject.title")
+																? t("chat:reject.tooltip")
+																: secondaryButtonText === t("chat:terminate.title")
+																	? t("chat:terminate.tooltip")
+																	: undefined
+													}>
+													<VSCodeButton
+														appearance="secondary"
+														disabled={!enableButtons}
+														className="flex-1 ml-[6px]"
+														onClick={() =>
+															handleSecondaryButtonClick(inputValue, selectedImages)
+														}>
+														{secondaryButtonText}
+													</VSCodeButton>
+												</StandardTooltip>
+											)}
+										</>
 									)}
 								</>
 							)}
diff --git a/webview-ui/src/i18n/locales/en/chat.json b/webview-ui/src/i18n/locales/en/chat.json
index 7bd0cde9d3..a03959f1ae 100644
--- a/webview-ui/src/i18n/locales/en/chat.json
+++ b/webview-ui/src/i18n/locales/en/chat.json
@@ -92,6 +92,14 @@
 		"title": "Cancel",
 		"tooltip": "Cancel the current operation"
 	},
+	"pause": {
+		"title": "Pause",
+		"tooltip": "Pause the AI's response"
+	},
+	"resume": {
+		"title": "Resume",
+		"tooltip": "Resume the AI's response"
+	},
 	"editMessage": {
 		"placeholder": "Edit your message..."
 	},