wait for checkpoint to finish saving before running any tools

Author: charleslien

npm-app/src/cli-handlers/checkpoint.ts

@@ -237,6 +237,15 @@ export function handleClearCheckpoints(): void {
   console.log('Cleared all checkpoints.')
 }
 
+export async function waitForPreviousCheckpoint(): Promise<void> {
+  try {
+    // Make sure the previous checkpoint is done
+    await checkpointManager.getLatestCheckpoint().fileStateIdPromise
+  } catch (error) {
+    // No latest checkpoint available, previous checkpoint is guaranteed to be done.
+  }
+}
+
 export async function saveCheckpoint(
   userInput: string,
   client: Client,
@@ -251,12 +260,7 @@ export async function saveCheckpoint(
   await readyPromise
   Spinner.get().stop()
 
-  try {
-    // Make sure the previous checkpoint is done
-    await checkpointManager.getLatestCheckpoint().fileStateIdPromise
-  } catch (error) {
-    // No latest checkpoint available, previous checkpoint is guaranteed to be done.
-  }
+  await waitForPreviousCheckpoint()
 
   // Save the current agent state
   try {

npm-app/src/client.ts

@@ -62,6 +62,7 @@ import { activeBrowserRunner } from './browser-runner'
 import { setMessages } from './chat-storage'
 import { checkpointManager } from './checkpoints/checkpoint-manager'
 import { CLI } from './cli'
+import { waitForPreviousCheckpoint } from './cli-handlers/checkpoint'
 import { backendUrl, websiteUrl } from './config'
 import { CREDENTIALS_PATH, userFromJson } from './credentials'
 import { calculateFingerprint } from './fingerprint'
@@ -1085,26 +1086,26 @@ export class Client {
               toolCall.name === 'str_replace' ||
               toolCall.name === 'create_plan'
             ) {
+              await waitForPreviousCheckpoint()
               // Save lastChanges for `diff` command
               this.lastChanges.push(FileChangeSchema.parse(toolCall.parameters))
               this.hadFileChanges = true
               // Track the changed file path
               this.filesChangedForHook.push(toolCall.parameters.path)
             }
-            if (
-              toolCall.name === 'run_terminal_command' &&
-              toolCall.parameters.mode === 'user'
-            ) {
-              // Special case: when terminal command is run as a user command, then no need to reprompt assistant.
-              this.responseComplete = true
-              isComplete = true
-            }
-            if (
-              toolCall.name === 'run_terminal_command' &&
-              toolCall.parameters.mode === 'assistant' &&
-              toolCall.parameters.process_type === 'BACKGROUND'
-            ) {
-              this.oneTimeFlags[SHOULD_ASK_CONFIG] = true
+            if (toolCall.name === 'run_terminal_command') {
+              await waitForPreviousCheckpoint()
+              if (toolCall.parameters.mode === 'user') {
+                // Special case: when terminal command is run as a user command, then no need to reprompt assistant.
+                this.responseComplete = true
+                isComplete = true
+              }
+              if (
+                toolCall.parameters.mode === 'assistant' &&
+                toolCall.parameters.process_type === 'BACKGROUND'
+              ) {
+                this.oneTimeFlags[SHOULD_ASK_CONFIG] = true
+              }
             }
             const toolResult = await handleToolCall(toolCall)
             toolResults.push(toolResult)