Skip to content

Commit 9910985

Browse files
committed
test(task): cover disposal drain and first-attempt option forwarding
1 parent 1b741fb commit 9910985

4 files changed

Lines changed: 93 additions & 2 deletions

File tree

‎src/api/providers/__tests__/kimi-code.spec.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,8 @@ describe("KimiCodeHandler", () => {
145145

146146
await expect(handler.completePrompt("test", { abortSignal: signal, timeoutMs: 5_000 })).resolves.toBe("retried")
147147

148-
// The retry after the forced refresh keeps the same options.
148+
// Both the initial attempt and the retry after the forced refresh carry the options.
149+
expect(createCompletion).toHaveBeenNthCalledWith(1, expect.anything(), { signal, timeout: 5_000 })
149150
expect(createCompletion).toHaveBeenNthCalledWith(2, expect.anything(), { signal, timeout: 5_000 })
150151
})
151152

‎src/core/task/__tests__/session-title.spec.ts‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -921,6 +921,28 @@ describe("flushPendingSessionTitle", () => {
921921
expect(drained).toBe(true)
922922
})
923923

924+
it("drops a settled pending title when the provider is disposed", async () => {
925+
const recorder = createCompletePromptRecorder(async () => "Generated Title")
926+
let historyItemPersisted = false
927+
const applySpy = vi.fn().mockImplementation(async () => (historyItemPersisted ? "applied" : "not-ready"))
928+
const provider = createTitleProvider({ applySessionTitle: applySpy })
929+
930+
await generateSessionTitle({
931+
provider,
932+
taskId: "task-dispose-pending",
933+
userMessage: "Fix the login bug",
934+
apiConfiguration: testApiConfiguration,
935+
completePrompt: recorder.fn,
936+
})
937+
938+
// The generation already finished, so only the pending entry remains for disposal to drop.
939+
cancelSessionTitlesForProvider(provider)
940+
historyItemPersisted = true
941+
await flushPendingSessionTitle("task-dispose-pending")
942+
943+
expect(applySpy).toHaveBeenCalledTimes(1)
944+
})
945+
924946
it("does nothing when no title is pending", async () => {
925947
await expect(flushPendingSessionTitle("unknown-task")).resolves.toBeUndefined()
926948
})

‎src/core/task/session-title.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,13 @@ export function cancelSessionTitlesForProvider(provider: ClineProvider): void {
131131
entry.userCancelled = true
132132
entry.controller.abort()
133133
}
134+
// Titles whose generation already finished keep their entry until a save flushes or a cancel
135+
// drops it; disposal drops them too, so the released store is never written afterwards.
136+
for (const [taskId, pending] of pendingTitleWrites) {
137+
if (pending.provider === provider) {
138+
pendingTitleWrites.delete(taskId)
139+
}
140+
}
134141
}
135142

136143
/**

‎src/core/webview/__tests__/ClineProvider.taskHistory.spec.ts‎

Lines changed: 62 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { ContextProxy } from "../../config/ContextProxy"
1111
import { Task } from "../../task/Task"
1212
import { ProfileValidator } from "../../../shared/ProfileValidator"
1313
import { ClineProvider } from "../ClineProvider"
14-
import { generateSessionTitle } from "../../task/session-title"
14+
import { flushPendingSessionTitle, generateSessionTitle } from "../../task/session-title"
1515
import * as sessionTitleModule from "../../task/session-title"
1616

1717
// Mock setup
@@ -880,6 +880,67 @@ describe("ClineProvider Task History Synchronization", () => {
880880
expect(getStored("task-dispose")?.title).toBeUndefined()
881881
})
882882

883+
it("waits for a deferred title write before releasing the history store", async () => {
884+
const taskId = "task-dispose-deferred"
885+
let resolveCompletion!: (title: string) => void
886+
const completion = new Promise<string>((resolve) => {
887+
resolveCompletion = resolve
888+
})
889+
const generation = generateSessionTitle({
890+
provider,
891+
taskId,
892+
userMessage: "Original prompt",
893+
apiConfiguration: {
894+
apiProvider: providerIdentifiers.anthropic,
895+
apiModelId: "claude-3-5-sonnet-20241022",
896+
apiKey: "test-api-key",
897+
},
898+
completePrompt: async () => completion,
899+
})
900+
// The title is generated before the history item exists, so it is deferred.
901+
resolveCompletion("Generated Title")
902+
await generation
903+
await provider.updateTaskHistory(createHistoryItem({ id: taskId, task: "Original prompt" }), {
904+
broadcast: false,
905+
})
906+
907+
// Pause the deferred write inside the store.
908+
let releaseWrite!: () => void
909+
const writeGate = new Promise<void>((resolve) => {
910+
releaseWrite = resolve
911+
})
912+
const originalSetTitle = provider.taskHistoryStore.setTitleIfUnset.bind(provider.taskHistoryStore)
913+
vi.spyOn(provider.taskHistoryStore, "setTitleIfUnset").mockImplementation(async (id, title) => {
914+
await writeGate
915+
return originalSetTitle(id, title)
916+
})
917+
const storeEvents: string[] = []
918+
const originalDispose = provider.taskHistoryStore.dispose.bind(provider.taskHistoryStore)
919+
vi.spyOn(provider.taskHistoryStore, "dispose").mockImplementation(() => {
920+
storeEvents.push("store-dispose")
921+
originalDispose()
922+
})
923+
924+
const flush = flushPendingSessionTitle(taskId)
925+
await new Promise((resolve) => setTimeout(resolve, 10))
926+
927+
// Disposal is held open while the deferred write is still running.
928+
let disposed = false
929+
const disposal = provider.dispose().then(() => {
930+
disposed = true
931+
})
932+
await new Promise((resolve) => setTimeout(resolve, 10))
933+
expect(disposed).toBe(false)
934+
expect(storeEvents).toEqual([])
935+
936+
releaseWrite()
937+
await flush
938+
await disposal
939+
940+
expect(storeEvents).toEqual(["store-dispose"])
941+
expect(getStored(taskId)?.title).toBe("Generated Title")
942+
})
943+
883944
it("cancels pending generation and writes no late title when deleting a task", async () => {
884945
await provider.updateTaskHistory(
885946
createHistoryItem({ id: "task-cancel-on-delete", task: "Original prompt" }),

0 commit comments

Comments
 (0)