Skip to content

Commit c85a1e5

Browse files
committed
refactor(core): centralize active task callbacks
1 parent da36581 commit c85a1e5

4 files changed

Lines changed: 30 additions & 3 deletions

File tree

‎packages/core/src/async-task-tracker.spec.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,16 @@ describe("AsyncTaskTracker", () => {
3838
await drain
3939
expect(drained).toBe(true)
4040
})
41+
42+
it("stops guarded callbacks before draining tracked work", async () => {
43+
const tracker = new AsyncTaskTracker()
44+
const callback = vi.fn(async (value: string) => value.length)
45+
expect(tracker.isActive).toBe(true)
46+
await expect(tracker.runIfActive(callback, "active")).resolves.toBe(6)
47+
48+
await tracker.closeAndDrain()
49+
expect(tracker.isActive).toBe(false)
50+
await expect(tracker.runIfActive(callback, "closed")).resolves.toBeUndefined()
51+
expect(callback).toHaveBeenCalledOnce()
52+
})
4153
})

‎packages/core/src/async-task-tracker.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
export class AsyncTaskTracker {
22
private readonly tasks = new Set<Promise<unknown>>()
3+
private active = true
4+
5+
get isActive(): boolean {
6+
return this.active
7+
}
38

49
track<T>(task: Promise<T>): Promise<T> {
510
this.tasks.add(task)
@@ -10,7 +15,16 @@ export class AsyncTaskTracker {
1015
return task
1116
}
1217

18+
runIfActive<T, Result>(callback: (value: T) => Promise<Result>, value: T): Promise<Result | undefined> {
19+
return this.active ? callback(value) : Promise.resolve(undefined)
20+
}
21+
1322
async drain(): Promise<void> {
1423
while (this.tasks.size) await Promise.allSettled(this.tasks)
1524
}
25+
26+
async closeAndDrain(): Promise<void> {
27+
this.active = false
28+
await this.drain()
29+
}
1630
}

‎src/__tests__/ClineProvider.history-resume-delegation.spec.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ describe("History resume delegation - parent metadata transitions", () => {
230230
expect(afterUnlock).toHaveBeenCalledOnce()
231231

232232
Reflect.set(provider, "_disposed", true)
233+
await (Reflect.get(provider, "runs") as { closeAndDrain: () => Promise<void> }).closeAndDrain()
233234
await expect(
234235
provider.runLockedDelegationTransition(
235236
"parent-disposed-success",

‎src/core/webview/ClineProvider.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,11 +266,11 @@ export class ClineProvider
266266
return this.runDelegationTransition(parentTaskId, () =>
267267
this.taskHistoryStore.withTaskFileLock(parentTaskId, transition).then(
268268
async (result) => {
269-
if (!this._disposed) await afterUnlock(result)
269+
await this.runs!.runIfActive(afterUnlock, result)
270270
return result
271271
},
272272
async (error) => {
273-
if (!this._disposed) await afterUnlockError(error)
273+
await this.runs!.runIfActive(afterUnlockError, error)
274274
throw error
275275
},
276276
),
@@ -875,7 +875,7 @@ export class ClineProvider
875875
// Reject any tasks still waiting for a scheduler permit so they don't
876876
// hold the event loop after the provider is torn down.
877877
this.taskScheduler.cancelQueued()
878-
await this.runs?.drain()
878+
await this.runs?.closeAndDrain()
879879

880880
// Clear all tasks from the stack. The first pop goes through evictCurrentTask()
881881
// so an active delegated child is marked interrupted before the extension shuts down,

0 commit comments

Comments
 (0)