Skip to content

Commit a46474a

Browse files
committed
fix(api): keep api origin on queued input from the webview route
1 parent 83b203e commit a46474a

8 files changed

Lines changed: 145 additions & 6 deletions

File tree

‎packages/types/src/vscode-extension-host.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ export interface ExtensionMessage {
126126
| "switchTab"
127127
| "toggleAutoApprove"
128128
invoke?: "newChat" | "sendMessage" | "primaryButtonClick" | "secondaryButtonClick" | "setChatBoxMessage"
129+
/** Origin of an `invoke: "sendMessage"` request. Absent means the interactive webview. */
130+
origin?: QueuedMessage["origin"]
129131
/**
130132
* Partial state updates are allowed to reduce message size (e.g. omit large fields like taskHistory).
131133
* The webview is responsible for merging.
@@ -657,6 +659,8 @@ export interface WebviewMessage {
657659
askResponse?: ClineAskResponse
658660
apiConfiguration?: ProviderSettings
659661
images?: string[]
662+
/** Origin of a `queueMessage` request. Absent means the interactive webview. */
663+
origin?: QueuedMessage["origin"]
660664
bool?: boolean
661665
value?: number
662666
stepIndex?: number
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
import type { Mock } from "vitest"
2+
import { describe, it, expect, vi, beforeEach } from "vitest"
3+
4+
vi.mock("vscode", () => ({
5+
window: {
6+
showWarningMessage: vi.fn(),
7+
showErrorMessage: vi.fn(),
8+
},
9+
workspace: {
10+
workspaceFolders: [{ uri: { fsPath: "/mock/workspace" } }],
11+
getConfiguration: vi.fn().mockReturnValue({
12+
get: vi.fn(),
13+
update: vi.fn(),
14+
}),
15+
},
16+
Uri: {
17+
file: vi.fn((path) => ({ fsPath: path })),
18+
},
19+
env: {
20+
uriScheme: "vscode",
21+
},
22+
}))
23+
24+
vi.mock("../../../mentions/resolveImageMentions", () => ({
25+
resolveImageMentions: vi.fn(async (payload: { text: string; images?: string[] }) => ({
26+
text: payload.text,
27+
images: payload.images,
28+
})),
29+
}))
30+
31+
import { webviewMessageHandler } from "../webviewMessageHandler"
32+
import type { ClineProvider } from "../ClineProvider"
33+
import type { WebviewMessage } from "@roo-code/types"
34+
import { MessageQueueService } from "../../message-queue/MessageQueueService"
35+
36+
describe("webviewMessageHandler - queueMessage origin", () => {
37+
let mockClineProvider: ClineProvider
38+
let messageQueueService: MessageQueueService
39+
40+
beforeEach(() => {
41+
vi.clearAllMocks()
42+
43+
messageQueueService = new MessageQueueService()
44+
45+
mockClineProvider = {
46+
getCurrentTask: vi.fn().mockReturnValue({ messageQueueService }),
47+
postMessageToWebview: vi.fn(),
48+
contextProxy: {
49+
getValue: vi.fn(),
50+
setValue: vi.fn(),
51+
globalStorageUri: { fsPath: "/mock/storage" },
52+
},
53+
getState: vi.fn().mockResolvedValue({
54+
maxImageFileSize: 5,
55+
maxTotalImageSize: 20,
56+
}),
57+
log: vi.fn(),
58+
} as unknown as ClineProvider
59+
})
60+
61+
it("stores api origin on the queued message", async () => {
62+
const message: WebviewMessage = { type: "queueMessage", text: "steer the task", images: [], origin: "api" }
63+
64+
await webviewMessageHandler(mockClineProvider, message)
65+
66+
expect((mockClineProvider.getCurrentTask as Mock)().messageQueueService).toBe(messageQueueService)
67+
expect(messageQueueService.messages).toMatchObject([{ text: "steer the task", origin: "api" }])
68+
})
69+
70+
it("keeps webview input unattributed so it can still answer approval asks", async () => {
71+
const message: WebviewMessage = { type: "queueMessage", text: "human note", images: [] }
72+
73+
await webviewMessageHandler(mockClineProvider, message)
74+
75+
expect(messageQueueService.messages).toHaveLength(1)
76+
expect(messageQueueService.messages[0].text).toBe("human note")
77+
expect(messageQueueService.messages[0].origin).toBeUndefined()
78+
})
79+
})

‎src/core/webview/webviewMessageHandler.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3802,7 +3802,9 @@ export const webviewMessageHandler = async (
38023802

38033803
case "queueMessage": {
38043804
const resolved = await resolveIncomingImages({ text: message.text, images: message.images })
3805-
provider.getCurrentTask()?.messageQueueService.addMessage(resolved.text, resolved.images)
3805+
provider.getCurrentTask()?.messageQueueService.addMessage(resolved.text, resolved.images, {
3806+
origin: message.origin,
3807+
})
38063808
break
38073809
}
38083810
case "removeQueuedMessage": {

‎src/extension/__tests__/api-send-message.spec.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ describe("API - SendMessage Command", () => {
5151
expect(mockPostMessageToWebview).toHaveBeenCalledWith({
5252
type: "invoke",
5353
invoke: "sendMessage",
54+
origin: "api",
5455
text: messageText,
5556
images: undefined,
5657
})
@@ -70,6 +71,7 @@ describe("API - SendMessage Command", () => {
7071
expect(mockPostMessageToWebview).toHaveBeenCalledWith({
7172
type: "invoke",
7273
invoke: "sendMessage",
74+
origin: "api",
7375
text: messageText,
7476
images,
7577
})
@@ -88,6 +90,7 @@ describe("API - SendMessage Command", () => {
8890
expect(mockPostMessageToWebview).toHaveBeenCalledWith({
8991
type: "invoke",
9092
invoke: "sendMessage",
93+
origin: "api",
9194
text: undefined,
9295
images,
9396
})
@@ -101,6 +104,7 @@ describe("API - SendMessage Command", () => {
101104
expect(mockPostMessageToWebview).toHaveBeenCalledWith({
102105
type: "invoke",
103106
invoke: "sendMessage",
107+
origin: "api",
104108
text: undefined,
105109
images: undefined,
106110
})
@@ -127,6 +131,7 @@ describe("API - SendMessage Command", () => {
127131
expect(mockPostMessageToWebview).toHaveBeenCalledWith({
128132
type: "invoke",
129133
invoke: "sendMessage",
134+
origin: "api",
130135
text: messageText,
131136
images: undefined,
132137
})
@@ -148,6 +153,7 @@ describe("API - SendMessage Command", () => {
148153
expect(mockPostMessageToWebview).toHaveBeenCalledWith({
149154
type: "invoke",
150155
invoke: "sendMessage",
156+
origin: "api",
151157
text: messageText,
152158
images,
153159
})

‎src/extension/__tests__/api.spec.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ describe("API.sendMessage", () => {
102102
expect(postMessageToWebview).toHaveBeenCalledWith({
103103
type: "invoke",
104104
invoke: "sendMessage",
105+
origin: "api",
105106
text: "Done with the follow-up",
106107
images: undefined,
107108
})
@@ -123,6 +124,7 @@ describe("API.sendMessage", () => {
123124
expect(postMessageToWebview).toHaveBeenCalledWith({
124125
type: "invoke",
125126
invoke: "sendMessage",
127+
origin: "api",
126128
text: "Start over",
127129
images: undefined,
128130
})

‎src/extension/api.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,13 @@ export class API extends EventEmitter<RooCodeEvents> implements RooCodeAPI {
352352
return
353353
}
354354

355-
await this.sidebarProvider.postMessageToWebview({ type: "invoke", invoke: "sendMessage", text, images })
355+
await this.sidebarProvider.postMessageToWebview({
356+
type: "invoke",
357+
invoke: "sendMessage",
358+
text,
359+
images,
360+
origin: "api",
361+
})
356362
}
357363

358364
public deleteQueuedMessage(messageId: string) {

‎webview-ui/src/components/chat/ChatView.tsx‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,15 @@ import { getCostBreakdownIfNeeded } from "@src/utils/costFormatting"
2020
import { batchNearby } from "@src/utils/batchNearby"
2121
import { isBoundary, isIgnorableBetweenTargets } from "@src/utils/chatBatchingPredicates"
2222

23-
import type { ClineAsk, ClineSayTool, ClineMessage, ExtensionMessage, AudioType, SuggestionItem } from "@roo-code/types"
23+
import type {
24+
ClineAsk,
25+
ClineSayTool,
26+
ClineMessage,
27+
ExtensionMessage,
28+
AudioType,
29+
SuggestionItem,
30+
QueuedMessage,
31+
} from "@roo-code/types"
2432
import { getCompletionCheckpoint, getSuggestionMode, hasUsableAnswer, isRetiredProvider } from "@roo-code/types"
2533

2634
import { findLast } from "@roo/array"
@@ -640,7 +648,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
640648
* @param images - Array of image data URLs to send with the message
641649
*/
642650
const handleSendMessage = useCallback(
643-
(text: string, images: string[]) => {
651+
(text: string, images: string[], origin?: QueuedMessage["origin"]) => {
644652
text = text.trim()
645653

646654
if (text || images.length > 0) {
@@ -664,7 +672,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
664672
) {
665673
try {
666674
console.log("queueMessage", text, images)
667-
vscode.postMessage({ type: "queueMessage", text, images })
675+
vscode.postMessage({ type: "queueMessage", text, images, origin })
668676
setInputValue("")
669677
setSelectedImages([])
670678
} catch (error) {
@@ -937,7 +945,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
937945
handleChatReset()
938946
break
939947
case "sendMessage":
940-
handleSendMessage(message.text ?? "", message.images ?? [])
948+
handleSendMessage(message.text ?? "", message.images ?? [], message.origin)
941949
break
942950
case "setChatBoxMessage":
943951
handleSetChatBoxMessage(message.text ?? "", message.images ?? [])

‎webview-ui/src/components/chat/__tests__/ChatView.spec.tsx‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1157,6 +1157,38 @@ describe("ChatView - Message Queueing Tests", () => {
11571157
)
11581158
})
11591159

1160+
it("keeps api origin when an API sendMessage request is queued", async () => {
1161+
const { getByTestId } = renderChatView()
1162+
1163+
mockPostMessage({
1164+
clineMessages: [
1165+
{ type: "say", say: "task", ts: Date.now() - 2000, text: "Initial task" },
1166+
{
1167+
type: "say",
1168+
say: "api_req_started",
1169+
ts: Date.now(),
1170+
text: JSON.stringify({ apiProtocol: "anthropic" }), // No cost = still streaming
1171+
},
1172+
],
1173+
})
1174+
1175+
await waitFor(() => {
1176+
expect(getByTestId("chat-textarea")).toBeInTheDocument()
1177+
})
1178+
vscodePostMessageMock.cleanup()
1179+
1180+
await dispatchExtensionMessage({ type: "invoke", invoke: "sendMessage", text: "steer", origin: "api" })
1181+
1182+
await waitFor(() => {
1183+
expect(vscode.postMessage).toHaveBeenCalledWith({
1184+
type: "queueMessage",
1185+
text: "steer",
1186+
images: [],
1187+
origin: "api",
1188+
})
1189+
})
1190+
})
1191+
11601192
it("sends messages normally when API request is complete (cost present)", async () => {
11611193
const { getByTestId } = renderChatView()
11621194

0 commit comments

Comments
 (0)