Skip to content

fix: allow new tasks to bypass queued messages and add clear all button #9016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: allow new tasks to bypass queued messages and add clear all button #9016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/core/message-queue/MessageQueueService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,11 @@ export class MessageQueueService extends EventEmitter<QueueEvents> {
return this._messages.length === 0
}

public clearAll(): void {
this._messages = []
this.emit("stateChanged", this._messages)
}

public dispose(): void {
this._messages = []
this.removeAllListeners()
Expand Down
4 changes: 4 additions & 0 deletions src/core/webview/webviewMessageHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3155,6 +3155,10 @@ export const webviewMessageHandler = async (
provider.getCurrentTask()?.messageQueueService.removeMessage(message.text ?? "")
break
}
case "clearQueuedMessages": {
provider.getCurrentTask()?.messageQueueService.clearAll()
break
}
case "editQueuedMessage": {
if (message.payload) {
const { id, text, images } = message.payload as EditQueuedMessagePayload
Expand Down
1 change: 1 addition & 0 deletions src/shared/WebviewMessage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ export interface WebviewMessage {
| "openRouterImageGenerationSelectedModel"
| "queueMessage"
| "removeQueuedMessage"
| "clearQueuedMessages"
| "editQueuedMessage"
| "dismissUpsell"
| "getDismissedUpsells"
Expand Down
10 changes: 5 additions & 5 deletions webview-ui/src/components/chat/ChatView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,11 +608,11 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
text = text.trim()

if (text || images.length > 0) {
// Queue message if:
// - Task is busy (sendingDisabled)
// - API request in progress (isStreaming)
// - Queue has items (preserve message order during drain)
if (sendingDisabled || isStreaming || messageQueue.length > 0) {
// Check if this is a new task request (no existing messages)
const isNewTask = messagesRef.current.length === 0

// Allow starting new tasks even if queue has items
if (!isNewTask && (sendingDisabled || isStreaming || messageQueue.length > 0)) {
try {
console.log("queueMessage", text, images)
vscode.postMessage({ type: "queueMessage", text, images })
Expand Down
17 changes: 16 additions & 1 deletion webview-ui/src/components/chat/QueuedMessages.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { useTranslation } from "react-i18next"
import { QueuedMessage } from "@roo-code/types"

import { Button } from "@src/components/ui"
import { vscode } from "@src/utils/vscode"

import Thumbnails from "../common/Thumbnails"

Expand Down Expand Up @@ -41,7 +42,21 @@ export const QueuedMessages = ({ queue, onRemove, onUpdate }: QueuedMessagesProp

return (
<div className="px-[15px] py-[10px] pr-[6px]" data-testid="queued-messages">
<div className="text-vscode-descriptionForeground text-md mb-2">{t("queuedMessages.title")}</div>
<div className="flex justify-between items-center mb-2">
<div className="text-vscode-descriptionForeground text-md">{t("queuedMessages.title")}</div>
{queue.length > 0 && (
<Button
variant="ghost"
size="sm"
onClick={() => {
// Clear all messages via backend
vscode.postMessage({ type: "clearQueuedMessages" })
}}
className="text-xs">
{t("queuedMessages.clearAll", "Clear All")}
Copy link

@ellipsis-dev ellipsis-dev bot Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove inline fallback string in the translation call. Use translation keys defined in external language files rather than providing 'Clear All' as a fallback inline.

Suggested change
{t("queuedMessages.clearAll", "Clear All")}
{t("queuedMessages.clearAll")}

This comment was generated because it violated a code review rule: irule_C0ez7Rji6ANcGkkX.

</Button>
)}
</div>
<div className="flex flex-col gap-2 max-h-[300px] overflow-y-auto pr-2">
{queue.map((message, index) => {
const editState = getEditState(message.id, message.text)
Expand Down