Skip to content

Commit 7e4c53b

Browse files
committed
fix(task): pass abort signal to condense metadata
1 parent 60a0dcf commit 7e4c53b

2 files changed

Lines changed: 81 additions & 0 deletions

File tree

‎src/core/task/Task.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1555,6 +1555,11 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
15551555
const metadata: ApiHandlerCreateMessageMetadata = {
15561556
mode,
15571557
taskId: this.taskId,
1558+
...(this.currentRequestAbortController?.signal
1559+
? {
1560+
abortSignal: this.currentRequestAbortController.signal,
1561+
}
1562+
: {}),
15581563
...(allTools.length > 0
15591564
? {
15601565
tools: allTools,
@@ -3763,6 +3768,11 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
37633768
const metadata: ApiHandlerCreateMessageMetadata = {
37643769
mode,
37653770
taskId: this.taskId,
3771+
...(this.currentRequestAbortController?.signal
3772+
? {
3773+
abortSignal: this.currentRequestAbortController.signal,
3774+
}
3775+
: {}),
37663776
...(allTools.length > 0
37673777
? {
37683778
tools: allTools,
@@ -3979,6 +3989,11 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
39793989
const contextMgmtMetadata: ApiHandlerCreateMessageMetadata = {
39803990
mode,
39813991
taskId: this.taskId,
3992+
...(this.currentRequestAbortController?.signal
3993+
? {
3994+
abortSignal: this.currentRequestAbortController.signal,
3995+
}
3996+
: {}),
39823997
...(contextMgmtTools.length > 0
39833998
? {
39843999
tools: contextMgmtTools,

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

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { TelemetryService } from "@roo-code/telemetry"
1111

1212
import { Task } from "../Task"
1313
import { createRateLimitClock } from "../RateLimitClock"
14+
import { summarizeConversation } from "../../condense"
1415
import { ClineProvider } from "../../webview/ClineProvider"
1516
import { ApiStreamChunk } from "../../../api/transform/stream"
1617
import { ContextProxy } from "../../config/ContextProxy"
@@ -1796,6 +1797,24 @@ describe("Cline", () => {
17961797
expect(cancelSpy).toHaveBeenCalled()
17971798
})
17981799
describe("abortSignal", () => {
1800+
it("should pass AbortController signal to condenseContext metadata when a current request exists", async () => {
1801+
const task = new Task({
1802+
provider: mockProvider,
1803+
apiConfiguration: mockApiConfig,
1804+
task: "test task",
1805+
startTask: false,
1806+
})
1807+
1808+
task.currentRequestAbortController = new AbortController()
1809+
vi.spyOn(task as any, "getSystemPrompt").mockResolvedValue("mock system prompt")
1810+
1811+
await task.condenseContext()
1812+
1813+
expect(summarizeConversation).toHaveBeenCalled()
1814+
const [options] = vi.mocked(summarizeConversation).mock.calls.at(-1)!
1815+
expect(options.metadata?.abortSignal).toBeInstanceOf(AbortSignal)
1816+
})
1817+
17991818
it("should pass AbortController signal to createMessage metadata", async () => {
18001819
const task = new Task({
18011820
provider: mockProvider,
@@ -1934,6 +1953,53 @@ describe("Cline", () => {
19341953
expect(metadataSignal).toBe(task.currentRequestAbortController!.signal)
19351954
})
19361955
})
1956+
1957+
it("should pass AbortController signal to forced context-management metadata when a current request exists", async () => {
1958+
const task = new Task({
1959+
provider: mockProvider,
1960+
apiConfiguration: mockApiConfig,
1961+
task: "test task",
1962+
startTask: false,
1963+
})
1964+
1965+
task.currentRequestAbortController = new AbortController()
1966+
vi.spyOn(task as any, "getSystemPrompt").mockResolvedValue("mock system prompt")
1967+
vi.spyOn(task as any, "handleContextWindowExceededError").mockRestore?.()
1968+
vi.spyOn(task, "getTokenUsage").mockReturnValue({
1969+
totalCost: 0,
1970+
totalTokensIn: 0,
1971+
totalTokensOut: 0,
1972+
contextTokens: 120000,
1973+
})
1974+
vi.spyOn(mockProvider, "getState").mockResolvedValue({
1975+
apiConfiguration: mockApiConfig,
1976+
mode: "code",
1977+
autoCondenseContext: true,
1978+
autoCondenseContextPercent: 80,
1979+
requestDelaySeconds: 0,
1980+
customModes: [],
1981+
experiments: {},
1982+
disabledTools: [],
1983+
customSupportPrompts: {},
1984+
autoApprovalEnabled: true,
1985+
profileThresholds: {},
1986+
currentApiConfigName: "default",
1987+
})
1988+
1989+
task.apiConversationHistory = [
1990+
{
1991+
role: "user" as const,
1992+
content: [{ type: "text" as const, text: "test message" }],
1993+
ts: Date.now(),
1994+
},
1995+
] as any
1996+
1997+
await (task as any).handleContextWindowExceededError()
1998+
1999+
expect(summarizeConversation).toHaveBeenCalled()
2000+
const [options] = vi.mocked(summarizeConversation).mock.calls.at(-1)!
2001+
expect(options.metadata?.abortSignal).toBeInstanceOf(AbortSignal)
2002+
})
19372003
})
19382004
})
19392005

0 commit comments

Comments
 (0)