Skip to content

Commit 23613e5

Browse files
committed
test: cover exact retry message lookup
1 parent f852ba2 commit 23613e5

4 files changed

Lines changed: 61 additions & 7 deletions

File tree

‎src/core/task/Task.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ import { validateAndFixToolResultIds } from "./validateToolResultIds"
138138
import { mergeConsecutiveApiMessages } from "./mergeConsecutiveApiMessages"
139139
import { prepareApiConversationMessage } from "./apiConversationHistory"
140140
import { shouldAddUserMessageToHistory } from "./messageCounting"
141-
import { decideMidStreamFailure, MAX_MID_STREAM_RETRIES } from "./midStreamRetry"
141+
import { decideMidStreamFailure, findRetryRequestMessageIndex, MAX_MID_STREAM_RETRIES } from "./midStreamRetry"
142142
import { type TaskExecutionContext } from "./providerHandoff"
143143

144144
const MAX_EXPONENTIAL_BACKOFF_SECONDS = 600 // 10 minutes
@@ -3688,9 +3688,9 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
36883688
// automatic retry budget. Remove the user message this request
36893689
// added first so it is not duplicated in history on retry.
36903690
if (requestMessageId) {
3691-
const requestMessageIndex = this.apiConversationHistory.findIndex(
3692-
(message) =>
3693-
message.messageId === requestMessageId && message.role === "user",
3691+
const requestMessageIndex = findRetryRequestMessageIndex(
3692+
this.apiConversationHistory,
3693+
requestMessageId,
36943694
)
36953695
if (requestMessageIndex === -1) {
36963696
await this.say(

‎src/core/task/__tests__/Task.spec.ts‎

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,16 @@ describe("Cline", () => {
777777
it("stops and restores history when the approved retry deletion cannot be persisted", async () => {
778778
const task = await createMidStreamRetryTask()
779779
task["saveApiConversationHistory"] = vi.fn().mockImplementation(async (merge = true) => merge)
780-
vi.spyOn(task, "ask").mockResolvedValue({ response: "yesButtonClicked" } satisfies TaskAskResult)
780+
const summaryMessage = {
781+
role: "user" as const,
782+
content: [{ type: "text" as const, text: "context summary" }],
783+
messageId: "summary-after-request",
784+
isSummary: true,
785+
}
786+
vi.spyOn(task, "ask").mockImplementation(async () => {
787+
task.apiConversationHistory.push(summaryMessage)
788+
return { response: "yesButtonClicked" } satisfies TaskAskResult
789+
})
781790
const saySpy = vi.spyOn(task, "say")
782791
const attemptSpy = vi
783792
.spyOn(task, "attemptApiRequest")
@@ -789,7 +798,28 @@ describe("Cline", () => {
789798
expect(attemptSpy).toHaveBeenCalledTimes(4)
790799
expect(task["saveApiConversationHistory"]).toHaveBeenCalledWith(false)
791800
expect(saySpy).toHaveBeenCalledWith("error", "Failed to persist conversation history before retrying.")
792-
expect(task.apiConversationHistory).toHaveLength(1)
801+
expect(task.apiConversationHistory).toHaveLength(2)
802+
expect(task.apiConversationHistory[0]?.role).toBe("user")
803+
expect(task.apiConversationHistory[1]).toEqual(summaryMessage)
804+
expect(task.messageCounts.user).toBe(1)
805+
})
806+
807+
it("stops when the owned request message cannot be located by id", async () => {
808+
const task = await createMidStreamRetryTask()
809+
vi.spyOn(task, "ask").mockImplementation(async () => {
810+
task.apiConversationHistory[0]!.messageId = "replaced-request-id"
811+
return { response: "yesButtonClicked" } satisfies TaskAskResult
812+
})
813+
const saySpy = vi.spyOn(task, "say")
814+
const attemptSpy = vi
815+
.spyOn(task, "attemptApiRequest")
816+
.mockImplementation(() => midStreamFailingRequest(new Error("Overloaded")))
817+
818+
const result = await task.recursivelyMakeClineRequests([{ type: "text", text: "original user request" }])
819+
820+
expect(result).toBe(false)
821+
expect(attemptSpy).toHaveBeenCalledTimes(4)
822+
expect(saySpy).toHaveBeenCalledWith("error", "Failed to locate the API request in conversation history.")
793823
expect(task.messageCounts.user).toBe(1)
794824
})
795825

‎src/core/task/__tests__/midStreamRetry.spec.ts‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { describe, expect, it } from "vitest"
22

3-
import { decideMidStreamFailure, MAX_MID_STREAM_RETRIES } from "../midStreamRetry"
3+
import { decideMidStreamFailure, findRetryRequestMessageIndex, MAX_MID_STREAM_RETRIES } from "../midStreamRetry"
44

55
describe("decideMidStreamFailure", () => {
66
it.each([0, 1, 2])("retries attempt %i", (attempt) => {
@@ -11,3 +11,20 @@ describe("decideMidStreamFailure", () => {
1111
expect(decideMidStreamFailure(MAX_MID_STREAM_RETRIES)).toBe("ask")
1212
})
1313
})
14+
15+
describe("findRetryRequestMessageIndex", () => {
16+
const messages = [
17+
{ messageId: "other-user", role: "user" },
18+
{ messageId: "request", role: "user" },
19+
{ messageId: "request", role: "assistant" },
20+
]
21+
22+
it("finds the exact user request", () => {
23+
expect(findRetryRequestMessageIndex(messages, "request")).toBe(1)
24+
})
25+
26+
it("does not match a different id or a non-user message", () => {
27+
expect(findRetryRequestMessageIndex(messages, "missing")).toBe(-1)
28+
expect(findRetryRequestMessageIndex([{ messageId: "request", role: "assistant" }], "request")).toBe(-1)
29+
})
30+
})

‎src/core/task/midStreamRetry.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,10 @@ export type MidStreamFailureDecision = "retry" | "ask"
55
export function decideMidStreamFailure(retryAttempt: number): MidStreamFailureDecision {
66
return retryAttempt < MAX_MID_STREAM_RETRIES ? "retry" : "ask"
77
}
8+
9+
export function findRetryRequestMessageIndex(
10+
messages: Array<{ messageId?: string; role?: string }>,
11+
requestMessageId: string,
12+
): number {
13+
return messages.findIndex((message) => message.messageId === requestMessageId && message.role === "user")
14+
}

0 commit comments

Comments
 (0)