Skip to content

Commit 669a286

Browse files
committed
Fix error message not showing after canceling API request
1 parent f1c7975 commit 669a286

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

src/core/Cline.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -936,6 +936,8 @@ export class Cline extends EventEmitter<ClineEvents> {
936936
if (this.isStreaming && this.diffViewProvider.isEditing) {
937937
await this.diffViewProvider.revertChanges()
938938
}
939+
// Save the countdown message in the automatic retry or other content
940+
await this.saveClineMessages()
939941
}
940942

941943
// Tools

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -591,8 +591,13 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
591591
case "api_req_deleted": // aggregated api_req metrics from deleted messages
592592
return false
593593
case "api_req_retry_delayed":
594-
// Only show the retry message if it's the last message
595-
return message === modifiedMessages.at(-1)
594+
// Only show the retry message if it's the last message or the last messages is api_req_retry_delayed+resume_task
595+
const last1 = modifiedMessages.at(-1)
596+
const last2 = modifiedMessages.at(-2)
597+
if (last1?.ask === "resume_task" && last2 === message) {
598+
return true
599+
}
600+
return message === last1
596601
case "text":
597602
// Sometimes cline returns an empty text message, we don't want to render these. (We also use a say text for user messages, so in case they just sent images we still render that)
598603
if ((message.text ?? "") === "" && (message.images?.length ?? 0) === 0) {

0 commit comments

Comments
 (0)