-
Notifications
You must be signed in to change notification settings - Fork 2.9k
feat: add DeleteQueuedMessage IPC command #11464
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.
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
roomote
wants to merge
2
commits into
main
Choose a base branch
from
feature/CLO-913-delete-queued-message-ipc
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+133
−1
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| import { describe, it, expect, vi, beforeEach } from "vitest" | ||
| import * as vscode from "vscode" | ||
|
|
||
| import { API } from "../api" | ||
| import { ClineProvider } from "../../core/webview/ClineProvider" | ||
|
|
||
| vi.mock("vscode") | ||
| vi.mock("../../core/webview/ClineProvider") | ||
|
|
||
| describe("API - DeleteQueuedMessage Command", () => { | ||
| let api: API | ||
| let mockOutputChannel: vscode.OutputChannel | ||
| let mockProvider: ClineProvider | ||
| let mockRemoveMessage: ReturnType<typeof vi.fn> | ||
| let mockLog: ReturnType<typeof vi.fn> | ||
|
|
||
| beforeEach(() => { | ||
| mockOutputChannel = { | ||
| appendLine: vi.fn(), | ||
| } as unknown as vscode.OutputChannel | ||
|
|
||
| mockRemoveMessage = vi.fn().mockReturnValue(true) | ||
|
|
||
| mockProvider = { | ||
| context: {} as vscode.ExtensionContext, | ||
| postMessageToWebview: vi.fn().mockResolvedValue(undefined), | ||
| on: vi.fn(), | ||
| getCurrentTaskStack: vi.fn().mockReturnValue([]), | ||
| getCurrentTask: vi.fn().mockReturnValue({ | ||
| messageQueueService: { | ||
| removeMessage: mockRemoveMessage, | ||
| }, | ||
| }), | ||
| viewLaunched: true, | ||
| } as unknown as ClineProvider | ||
|
|
||
| mockLog = vi.fn() | ||
|
|
||
| api = new API(mockOutputChannel, mockProvider, undefined, true) | ||
| ;(api as any).log = mockLog | ||
| }) | ||
|
|
||
| it("should remove a queued message by id", () => { | ||
| const messageId = "msg-abc-123" | ||
|
|
||
| api.deleteQueuedMessage(messageId) | ||
|
|
||
| expect(mockRemoveMessage).toHaveBeenCalledWith(messageId) | ||
| expect(mockRemoveMessage).toHaveBeenCalledTimes(1) | ||
| }) | ||
|
|
||
| it("should handle missing current task gracefully", () => { | ||
| ;(mockProvider.getCurrentTask as ReturnType<typeof vi.fn>).mockReturnValue(undefined) | ||
|
|
||
| // Should not throw | ||
| expect(() => api.deleteQueuedMessage("msg-abc-123")).not.toThrow() | ||
| }) | ||
|
|
||
| it("should handle non-existent message id gracefully", () => { | ||
| mockRemoveMessage.mockReturnValue(false) | ||
|
|
||
| // Should not throw even when removeMessage returns false | ||
| expect(() => api.deleteQueuedMessage("non-existent-id")).not.toThrow() | ||
| expect(mockRemoveMessage).toHaveBeenCalledWith("non-existent-id") | ||
| }) | ||
| }) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -95,6 +95,10 @@ export class API extends EventEmitter<RooCodeEvents> implements RooCodeAPI { | |||||||||||||||||||||||
| this.log(`[API] SendMessage -> ${data.text}`) | ||||||||||||||||||||||||
| await this.sendMessage(data.text, data.images) | ||||||||||||||||||||||||
| break | ||||||||||||||||||||||||
| case TaskCommandName.DeleteQueuedMessage: | ||||||||||||||||||||||||
| this.log(`[API] DeleteQueuedMessage -> ${data}`) | ||||||||||||||||||||||||
| this.deleteQueuedMessage(data) | ||||||||||||||||||||||||
| break | ||||||||||||||||||||||||
| } | ||||||||||||||||||||||||
| }) | ||||||||||||||||||||||||
| } | ||||||||||||||||||||||||
|
|
@@ -194,6 +198,10 @@ export class API extends EventEmitter<RooCodeEvents> implements RooCodeAPI { | |||||||||||||||||||||||
| await this.sidebarProvider.postMessageToWebview({ type: "invoke", invoke: "sendMessage", text, images }) | ||||||||||||||||||||||||
| } | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| public deleteQueuedMessage(messageId: string) { | ||||||||||||||||||||||||
| this.sidebarProvider.getCurrentTask()?.messageQueueService.removeMessage(messageId) | ||||||||||||||||||||||||
| } | ||||||||||||||||||||||||
|
Comment on lines
+201
to
+203
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. P2: If
Suggested change
|
||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| public async pressPrimaryButton() { | ||||||||||||||||||||||||
| await this.sidebarProvider.postMessageToWebview({ type: "invoke", invoke: "primaryButtonClick" }) | ||||||||||||||||||||||||
| } | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
P2: This handler should be wrapped in try/catch like cte's other IPC command handlers (see
GetCommands/GetModes/GetModelsin #11279). Without it, an exception fromremoveMessagewould propagate unhandled to the IPC server. Also, usecommand.datainstead ofdatato stay consistent with the refactor in #11162.