Skip to content

Commit 46e7066

Browse files
committed
refactor(task): reuse parent conversation persistence
1 parent 63d1647 commit 46e7066

1 file changed

Lines changed: 10 additions & 27 deletions

File tree

‎src/core/webview/ClineProvider.ts‎

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4137,6 +4137,11 @@ export class ClineProvider
41374137
parent?.awaitingChildId === childTaskId && (parent.status === "delegated" || parent.status === "active")
41384138
const transition = async (firstFileLock: JsonFileLock) => {
41394139
const globalStoragePath = this.contextProxy.globalStorageUri.fsPath
4140+
const parentStorage = { taskId: parentTaskId, globalStoragePath }
4141+
const saveParentTaskMessages = (messages: ClineMessage[], merge: boolean) =>
4142+
saveTaskMessages({ messages, ...parentStorage, merge })
4143+
const saveParentApiMessages = (messages: ApiMessage[], merge: boolean) =>
4144+
saveApiMessages({ messages, ...parentStorage, merge })
41404145

41414146
// 1) Load parent from history and current persisted messages
41424147
const refreshedParent = this.taskHistoryStore.get(parentTaskId)
@@ -4292,9 +4297,7 @@ export class ClineProvider
42924297
}
42934298
}
42944299

4295-
let updatedHistory!: HistoryItem
4296-
let completingParent!: HistoryItem
4297-
let completingChild!: HistoryItem
4300+
let updatedHistory!: HistoryItem, completingParent!: HistoryItem, completingChild!: HistoryItem
42984301
const staleDelegationError = new Error("stale cross-instance delegation")
42994302
const assertCurrentDelegation = (parent: HistoryItem) => {
43004303
if (!isCurrentDelegation(parent)) throw staleDelegationError
@@ -4306,18 +4309,8 @@ export class ClineProvider
43064309
storeLockAcquired: true,
43074310
whileFirstFileLocked: async () => {
43084311
try {
4309-
parentClineMessages = await saveTaskMessages({
4310-
messages: parentClineMessages,
4311-
taskId: parentTaskId,
4312-
globalStoragePath,
4313-
merge: true,
4314-
})
4315-
parentApiMessages = await saveApiMessages({
4316-
messages: parentApiMessages,
4317-
taskId: parentTaskId,
4318-
globalStoragePath,
4319-
merge: true,
4320-
})
4312+
parentClineMessages = await saveParentTaskMessages(parentClineMessages, true)
4313+
parentApiMessages = await saveParentApiMessages(parentApiMessages, true)
43214314

43224315
const current = this.getCurrentTask()
43234316
if (current && current.taskId !== childTaskId) return
@@ -4341,18 +4334,8 @@ export class ClineProvider
43414334
}
43424335
} catch (error) {
43434336
const restorationResults = await Promise.allSettled([
4344-
saveTaskMessages({
4345-
messages: originalParentClineMessages,
4346-
taskId: parentTaskId,
4347-
globalStoragePath,
4348-
merge: false,
4349-
}),
4350-
saveApiMessages({
4351-
messages: originalParentApiMessages,
4352-
taskId: parentTaskId,
4353-
globalStoragePath,
4354-
merge: false,
4355-
}),
4337+
saveParentTaskMessages(originalParentClineMessages, false),
4338+
saveParentApiMessages(originalParentApiMessages, false),
43564339
])
43574340
const restorationErrors = restorationResults.flatMap((result) =>
43584341
result.status === "rejected" ? [result.reason] : [],

0 commit comments

Comments
 (0)