codebuff 1.0.174 → 1.0.176

package/dist/checkpoint-file-manager.d.ts

@@ -1,19 +1,31 @@
 export declare function getBareRepoPath(dir: string): string;
-export declare function initializeCheckpointFileManager(dir: string): Promise<void>;
+export declare function initializeCheckpointFileManager({ projectDir, relativeFilepaths, }: {
+    projectDir: string;
+    relativeFilepaths: Array<string>;
+}): Promise<void>;
 /**
  * Stores the current state of all files in the project as a git commit
+ * (git add . && git commit)
  * @param message The commit message to use for this file state
  * @returns A promise that resolves to the id hash that can be used to restore this file state
  */
-export declare function storeFileState(projectDir: string, bareRepoPath: string, message: string): Promise<string>;
+export declare function storeFileState({ projectDir, bareRepoPath, message, relativeFilepaths: relativeFilepaths, }: {
+    projectDir: string;
+    bareRepoPath: string;
+    message: string;
+    relativeFilepaths: Array<string>;
+}): Promise<string>;
 /**
  * Resets the index and working directory to the specified commit.
+ * (git reset --hard)
+ * TODO redo this jsdoc
  * @param dir - The working tree directory path.
  * @param gitdir - The git directory path (typically the .git folder).
  * @param commit - The commit hash to reset to.
  */
-export declare function gitResetHard({ dir, gitdir, commit, }: {
-    dir: string;
-    gitdir: string;
+export declare function restoreFileState({ projectDir, bareRepoPath, commit, relativeFilepaths, }: {
+    projectDir: string;
+    bareRepoPath: string;
     commit: string;
+    relativeFilepaths: Array<string>;
 }): Promise<void>;

package/dist/checkpoint-file-manager.js

@@ -1,116 +1,126 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBareRepoPath = getBareRepoPath;
 exports.initializeCheckpointFileManager = initializeCheckpointFileManager;
 exports.storeFileState = storeFileState;
-exports.gitResetHard = gitResetHard;
-const crypto = __importStar(require("crypto"));
-const fs = __importStar(require("fs"));
-const git = __importStar(require("isomorphic-git"));
-const path = __importStar(require("path"));
+exports.restoreFileState = restoreFileState;
+const crypto_1 = require("crypto");
+const fs_1 = __importDefault(require("fs"));
+const isomorphic_git_1 = require("isomorphic-git");
+const path_1 = require("path");
+const child_process_1 = require("child_process");
 const project_files_1 = require("./project-files");
+function gitCommandIsAvailable() {
+    try {
+        (0, child_process_1.execFileSync)('which', ['git']);
+        return true;
+    }
+    catch (error) {
+        return false;
+    }
+}
 function getBareRepoPath(dir) {
-    const bareRepoName = crypto.createHash('sha256').update(dir).digest('hex');
-    return path.join((0, project_files_1.getProjectDataDir)(), bareRepoName);
+    const bareRepoName = (0, crypto_1.createHash)('sha256').update(dir).digest('hex');
+    return (0, path_1.join)((0, project_files_1.getProjectDataDir)(), bareRepoName);
 }
-async function initializeCheckpointFileManager(dir) {
-    const bareRepoPath = getBareRepoPath(dir);
+async function initializeCheckpointFileManager({ projectDir, relativeFilepaths, }) {
+    const bareRepoPath = getBareRepoPath(projectDir);
     // Create the bare repo directory if it doesn't exist
-    fs.mkdirSync(bareRepoPath, { recursive: true });
+    fs_1.default.mkdirSync(bareRepoPath, { recursive: true });
     try {
         // Check if it's already a valid Git repo
-        await git.resolveRef({ fs, dir: bareRepoPath, ref: 'HEAD' });
-        return; // Exit if the repository exists
+        await (0, isomorphic_git_1.resolveRef)({ fs: fs_1.default, dir: bareRepoPath, ref: 'HEAD' });
     }
     catch (error) {
         // Bare repo doesn't exist yet
+        await (0, isomorphic_git_1.init)({ fs: fs_1.default, dir: bareRepoPath, bare: true });
     }
-    // Initialize a bare repository
-    await git.init({ fs, dir: bareRepoPath, bare: true });
     // Commit the files in the bare repo
-    await storeFileState(dir, bareRepoPath, 'Initial Commit');
+    await storeFileState({
+        projectDir,
+        bareRepoPath,
+        message: 'Initial Commit',
+        relativeFilepaths,
+    });
 }
-async function stageFilesIndividually(projectDir, bareRepoPath) {
+async function stageFilesIndividually({ projectDir, bareRepoPath, relativeFilepaths, }) {
     // Get status of all files in the project directory
-    const statusMatrix = await git.statusMatrix({
-        fs,
+    const currStatusMatrix = await (0, isomorphic_git_1.statusMatrix)({
+        fs: fs_1.default,
         dir: projectDir,
         gitdir: bareRepoPath,
+        filepaths: relativeFilepaths,
     });
-    await Promise.all(statusMatrix.map(async ([filepath, , workdirStatus, stageStatus]) => {
+    for (const [filepath, , workdirStatus, stageStatus] of currStatusMatrix) {
         if (workdirStatus === stageStatus) {
-            return;
+            continue;
         }
         if (workdirStatus === 2) {
-            // existing file different from HEAD
+            // Existing file different from HEAD
             try {
-                return git.add({
-                    fs,
-                    dir: projectDir,
-                    gitdir: bareRepoPath,
-                    filepath,
-                });
+                await (0, isomorphic_git_1.add)({ fs: fs_1.default, dir: projectDir, gitdir: bareRepoPath, filepath });
             }
             catch (error) {
-                // error adding file
+                // error adding files
             }
         }
         else if (workdirStatus === 0) {
-            // deleted file
+            // Deleted file
             try {
-                git.remove({
-                    fs,
-                    dir: projectDir,
-                    gitdir: bareRepoPath,
-                    filepath,
-                });
+                await (0, isomorphic_git_1.remove)({ fs: fs_1.default, dir: projectDir, gitdir: bareRepoPath, filepath });
             }
             catch (error) {
-                // error adding file
+                // error removing file
             }
         }
-    }));
+    }
 }
 /**
  * Stores the current state of all files in the project as a git commit
+ * (git add . && git commit)
  * @param message The commit message to use for this file state
  * @returns A promise that resolves to the id hash that can be used to restore this file state
  */
-async function storeFileState(projectDir, bareRepoPath, message) {
-    await stageFilesIndividually(projectDir, bareRepoPath);
-    const commitHash = await git.commit({
-        fs,
+async function storeFileState({ projectDir, bareRepoPath, message, relativeFilepaths: relativeFilepaths, }) {
+    let added = false;
+    if (gitCommandIsAvailable()) {
+        try {
+            (0, child_process_1.execFileSync)('git', [
+                '--git-dir',
+                bareRepoPath,
+                '--work-tree',
+                projectDir,
+                '-C',
+                projectDir,
+                'add',
+                '.',
+            ]);
+            added = true;
+        }
+        catch (error) {
+            // Failed to add .
+        }
+    }
+    if (!added) {
+        await stageFilesIndividually({
+            projectDir,
+            bareRepoPath,
+            relativeFilepaths,
+        });
+    }
+    const commitHash = await (0, isomorphic_git_1.commit)({
+        fs: fs_1.default,
         dir: projectDir,
         gitdir: bareRepoPath,
         author: { name: 'codebuff' },
         ref: 'refs/heads/master',
         message,
     });
-    await git.checkout({
-        fs,
+    await (0, isomorphic_git_1.checkout)({
+        fs: fs_1.default,
         dir: projectDir,
         gitdir: bareRepoPath,
         ref: commitHash,
@@ -119,21 +129,49 @@ async function storeFileState(projectDir, bareRepoPath, message) {
 }
 /**
  * Resets the index and working directory to the specified commit.
+ * (git reset --hard)
+ * TODO redo this jsdoc
  * @param dir - The working tree directory path.
  * @param gitdir - The git directory path (typically the .git folder).
  * @param commit - The commit hash to reset to.
  */
-async function gitResetHard({ dir, gitdir, commit, }) {
-    // Update the working directory to reflect the specified commit
-    await git.checkout({
-        fs,
-        dir,
-        gitdir,
-        ref: commit,
-        force: true,
-    });
-    // Reset the index to match the specified commit
-    const files = await git.listFiles({ fs, dir, gitdir });
-    await Promise.all(files.map((filepath) => git.resetIndex({ fs, dir, gitdir, filepath, ref: commit })));
+async function restoreFileState({ projectDir, bareRepoPath, commit, relativeFilepaths, }) {
+    let resetDone = false;
+    if (gitCommandIsAvailable()) {
+        try {
+            (0, child_process_1.execFileSync)('git', [
+                '--git-dir',
+                bareRepoPath,
+                '--work-tree',
+                projectDir,
+                'reset',
+                '--hard',
+                commit,
+            ]);
+            resetDone = true;
+        }
+        catch (error) {
+            // Failed to use git, continue to isomorphic-git implementation
+        }
+    }
+    if (!resetDone) {
+        // Update the working directory to reflect the specified commit
+        await (0, isomorphic_git_1.checkout)({
+            fs: fs_1.default,
+            dir: projectDir,
+            gitdir: bareRepoPath,
+            ref: commit,
+            filepaths: relativeFilepaths,
+            force: true,
+        });
+        // Reset the index to match the specified commit
+        await Promise.all(relativeFilepaths.map((filepath) => (0, isomorphic_git_1.resetIndex)({
+            fs: fs_1.default,
+            dir: projectDir,
+            gitdir: bareRepoPath,
+            filepath,
+            ref: commit,
+        })));
+    }
 }
 //# sourceMappingURL=checkpoint-file-manager.js.map

package/dist/checkpoint-file-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"checkpoint-file-manager.js","sourceRoot":"","sources":["../src/checkpoint-file-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"checkpoint-file-manager.js","sourceRoot":"","sources":["../src/checkpoint-file-manager.ts"],"names":[],"mappings":"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"}

package/dist/checkpoints.d.ts

@@ -4,6 +4,7 @@ import { AgentState } from './common/types/agent-state';
  */
 export interface Checkpoint {
     agentStateString: string;
+    enabled: boolean;
     fileStateIdPromise: Promise<string>;
     historyLength: number;
     id: number;
@@ -24,7 +25,7 @@ export declare class CheckpointManager {
      * @param userInput - The user input associated with this checkpoint
      * @returns The ID of the created checkpoint
      */
-    addCheckpoint(agentState: AgentState, userInput: string): Promise<number>;
+    addCheckpoint(agentState: AgentState, userInput: string): Promise<Checkpoint>;
     /**
      * Get a checkpoint by ID
      * @param id The checkpoint ID
@@ -41,7 +42,7 @@ export declare class CheckpointManager {
      * @returns The most recent checkpoint or null if none exist
      */
     getLatestCheckpoint(): Checkpoint | null;
-    restoreFileState(id: number): Promise<boolean>;
+    restoreCheckointFileState(id: number): Promise<boolean>;
     /**
      * Clear all checkpoints
      */

package/dist/checkpoints.js

@@ -1,31 +1,9 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkpointManager = exports.CheckpointManager = void 0;
 const picocolors_1 = require("picocolors");
-const checkpointFileManager = __importStar(require("./checkpoint-file-manager"));
+const project_file_tree_1 = require("./common/project-file-tree");
+const checkpoint_file_manager_1 = require("./checkpoint-file-manager");
 const project_files_1 = require("./project-files");
 /**
  * Simple in-memory checkpoint manager for agent states
@@ -36,8 +14,7 @@ class CheckpointManager {
     bareRepoPath = null;
     getBareRepoPath() {
         if (!this.bareRepoPath) {
-            this.bareRepoPath =
-                checkpointFileManager.getBareRepoPath((0, project_files_1.getProjectRoot)());
+            this.bareRepoPath = (0, checkpoint_file_manager_1.getBareRepoPath)((0, project_files_1.getProjectRoot)());
         }
         return this.bareRepoPath;
     }
@@ -50,9 +27,17 @@ class CheckpointManager {
     async addCheckpoint(agentState, userInput) {
         // Use incremental ID starting at 1
         const id = this.nextId++;
-        const fileStateIdPromise = checkpointFileManager.storeFileState((0, project_files_1.getProjectRoot)(), this.getBareRepoPath(), `Checkpoint ${id}`);
+        const relativeFilepaths = (0, project_file_tree_1.getAllFilePaths)(agentState.fileContext.fileTree);
+        const enabled = relativeFilepaths.length < project_file_tree_1.DEFAULT_MAX_FILES;
+        const fileStateIdPromise = enabled ? (0, checkpoint_file_manager_1.storeFileState)({
+            projectDir: (0, project_files_1.getProjectRoot)(),
+            bareRepoPath: this.getBareRepoPath(),
+            message: `Checkpoint ${id}`,
+            relativeFilepaths: (0, project_file_tree_1.getAllFilePaths)(agentState.fileContext.fileTree),
+        }) : Promise.resolve('');
         const checkpoint = {
             agentStateString: JSON.stringify(agentState), // Deep clone to prevent reference issues
+            enabled,
             fileStateIdPromise,
             historyLength: agentState.messageHistory.length,
             id,
@@ -61,7 +46,7 @@ class CheckpointManager {
         };
         // Add to map
         this.checkpoints.set(id, checkpoint);
-        return id;
+        return checkpoint;
     }
     /**
      * Get a checkpoint by ID
@@ -89,15 +74,18 @@ class CheckpointManager {
     getLatestCheckpoint() {
         return this.checkpoints.get(this.nextId - 1) || null;
     }
-    async restoreFileState(id) {
+    async restoreCheckointFileState(id) {
         const checkpoint = this.getCheckpoint(id);
         if (!checkpoint) {
             return false;
         }
-        await checkpointFileManager.gitResetHard({
-            dir: (0, project_files_1.getProjectRoot)(),
-            gitdir: this.getBareRepoPath(),
+        const relativeFilepaths = (0, project_file_tree_1.getAllFilePaths)(JSON.parse(checkpoint.agentStateString).fileContext
+            .fileTree);
+        await (0, checkpoint_file_manager_1.restoreFileState)({
+            projectDir: (0, project_files_1.getProjectRoot)(),
+            bareRepoPath: this.getBareRepoPath(),
             commit: await checkpoint.fileStateIdPromise,
+            relativeFilepaths,
         });
         return true;
     }

package/dist/checkpoints.js.map

@@ -1 +1 @@
-{"version":3,"file":"checkpoints.js","sourceRoot":"","sources":["../src/checkpoints.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"checkpoints.js","sourceRoot":"","sources":["../src/checkpoints.ts"],"names":[],"mappings":"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"}

package/dist/cli.d.ts

@@ -18,7 +18,6 @@ export declare class CLI {
     private initReadlineInterface;
     private completer;
     private setPrompt;
-    private promptWithCheckpointNumber;
     printInitialPrompt(initialInput?: string): Promise<void>;
     printDiff(): Promise<void>;
     private handleLine;

package/dist/cli.js

@@ -36,7 +36,6 @@ const client_1 = require("./client");
 const config_1 = require("./config");
 const menu_1 = require("./menu");
 const project_files_1 = require("./project-files");
-const tool_handlers_1 = require("./tool-handlers");
 const spinner_1 = require("./utils/spinner");
 const terminal_1 = require("./utils/terminal");
 const web_scraper_1 = require("./web-scraper");
@@ -123,11 +122,7 @@ class CLI {
         return [matchingTokens, lastWord];
     }
     setPrompt() {
-        this.rl.setPrompt((0, picocolors_1.green)(`${(0, path_1.parse)((0, project_files_1.getProjectRoot)()).base} (checkpoint ${checkpoints_1.checkpointManager.getNextId()}) > `));
-    }
-    promptWithCheckpointNumber() {
-        this.setPrompt();
-        this.rl.prompt();
+        this.rl.setPrompt((0, picocolors_1.green)(`${(0, path_1.parse)((0, project_files_1.getProjectRoot)()).base} > `));
     }
     async printInitialPrompt(initialInput) {
         if (this.client.user) {
@@ -138,7 +133,7 @@ class CLI {
             await this.client.login();
             return;
         }
-        this.promptWithCheckpointNumber();
+        this.rl.prompt();
         if (initialInput) {
             process.stdout.write(initialInput + '\n');
             this.handleUserInput(initialInput);
@@ -146,7 +141,7 @@ class CLI {
     }
     async printDiff() {
         this.handleDiff();
-        this.promptWithCheckpointNumber();
+        this.rl.prompt();
     }
     async handleLine(line) {
         this.detectPasting();
@@ -179,13 +174,16 @@ class CLI {
         // Make sure the previous checkpoint is done
         await checkpoints_1.checkpointManager.getLatestCheckpoint()?.fileStateIdPromise;
         // Save the current agent state
-        await checkpoints_1.checkpointManager.addCheckpoint(this.client.agentState, userInput);
+        const checkpoint = await checkpoints_1.checkpointManager.addCheckpoint(this.client.agentState, userInput);
+        if (checkpoint.enabled) {
+            console.log((0, picocolors_1.green)(`Checkpoint #${checkpoint.id} saved!`));
+        }
     }
     async processCommand(userInput) {
         await this.beforeProcessCommand(userInput);
         if (userInput === 'help' || userInput === 'h') {
             (0, menu_1.displayMenu)();
-            this.promptWithCheckpointNumber();
+            this.rl.prompt();
             return true;
         }
         if (userInput === 'login' || userInput === 'signin') {
@@ -194,7 +192,7 @@ class CLI {
         }
         if (userInput === 'logout' || userInput === 'signout') {
             await this.client.logout();
-            this.promptWithCheckpointNumber();
+            this.rl.prompt();
             return true;
         }
         if (userInput.startsWith('ref-')) {
@@ -215,7 +213,7 @@ class CLI {
         }
         if (['diff', 'doff', 'dif', 'iff', 'd'].includes(userInput)) {
             this.handleDiff();
-            this.promptWithCheckpointNumber();
+            this.rl.prompt();
             return true;
         }
         if (userInput === 'uuddlrlrba' ||
@@ -239,34 +237,6 @@ class CLI {
             this.handleClearCheckpoints();
             return true;
         }
-        const runPrefix = '/run ';
-        const bangPrefix = '!';
-        const hasRunPrefix = userInput.startsWith(runPrefix);
-        const hasBangPrefix = userInput.startsWith(bangPrefix);
-        if (hasRunPrefix ||
-            hasBangPrefix ||
-            (!constants_1.SKIPPED_TERMINAL_COMMANDS.some((cmd) => userInput.toLowerCase().startsWith(cmd)) &&
-                !userInput.includes('error ') &&
-                !userInput.includes("'") &&
-                userInput.split(' ').length <= 5)) {
-            let commandToRun = userInput;
-            if (hasRunPrefix) {
-                commandToRun = userInput.replace(runPrefix, '');
-            }
-            else if (hasBangPrefix) {
-                commandToRun = userInput.replace(bangPrefix, '');
-            }
-            const { result, stdout } = await (0, tool_handlers_1.handleRunTerminalCommand)({ command: commandToRun }, 'user', 'user', (0, project_files_1.getProjectRoot)());
-            if (result !== 'command not found') {
-                this.promptWithCheckpointNumber();
-                return true;
-            }
-            else if (hasRunPrefix || hasBangPrefix) {
-                process.stdout.write(stdout);
-                this.promptWithCheckpointNumber();
-                return true;
-            }
-        }
         return false;
     }
     async forwardUserInput(userInput) {
@@ -294,10 +264,10 @@ class CLI {
         }
         this.client.showUsageWarning();
         console.log();
-        this.promptWithCheckpointNumber();
+        this.rl.prompt();
     }
     returnControlToUser() {
-        this.promptWithCheckpointNumber();
+        this.rl.prompt();
         this.isReceivingResponse = false;
         if (this.stopResponse) {
             this.stopResponse();
@@ -322,7 +292,7 @@ class CLI {
         const checkpointId = checkpoints_1.checkpointManager.getLatestCheckpoint().id - 1;
         if (checkpointId < 1) {
             console.log((0, picocolors_1.red)('Nothing to undo.'));
-            this.promptWithCheckpointNumber();
+            this.rl.prompt();
             return;
         }
         await this.handleRestoreCheckpoint(checkpointId);
@@ -365,7 +335,7 @@ class CLI {
             else {
                 this.lastSigintTime = now;
                 console.log('\nPress Ctrl-C again to exit');
-                this.promptWithCheckpointNumber();
+                this.rl.prompt();
             }
         }
     }
@@ -561,29 +531,34 @@ class CLI {
     // Checkpoint command handlers
     async handleCheckpoints() {
         console.log(checkpoints_1.checkpointManager.getCheckpointsAsString());
-        this.promptWithCheckpointNumber();
+        this.rl.prompt();
     }
     async handleRestoreCheckpoint(id) {
         const checkpoint = checkpoints_1.checkpointManager.getCheckpoint(id);
         if (!checkpoint) {
             console.log((0, picocolors_1.red)(`Checkpoint #${id} not found.`));
-            this.promptWithCheckpointNumber();
+            this.rl.prompt();
             return;
         }
         // Wait for save before trying to restore checkpoint
         const latestCheckpoint = checkpoints_1.checkpointManager.getLatestCheckpoint();
         await latestCheckpoint?.fileStateIdPromise;
+        if (!latestCheckpoint?.enabled) {
+            console.log((0, picocolors_1.red)(`Checkpoints not enabled: project too large`));
+            this.rl.prompt();
+            return;
+        }
         await this.restoreAgentStateAndFiles(checkpoint);
         console.log((0, picocolors_1.green)(`Restored to checkpoint #${id}.`));
         // Insert the original user input that created this checkpoint
-        this.promptWithCheckpointNumber();
+        this.rl.prompt();
         this.rl.write(checkpoint.userInput);
     }
     async restoreAgentStateAndFiles(checkpoint) {
         // Restore the agentState
         this.client.agentState = JSON.parse(checkpoint.agentStateString);
         // Restore file state
-        if (!(await checkpoints_1.checkpointManager.restoreFileState(checkpoint.id))) {
+        if (!(await checkpoints_1.checkpointManager.restoreCheckointFileState(checkpoint.id))) {
             throw new assert_1.AssertionError({
                 message: `Internal error: checkpoint ${checkpoint.id} not found`,
             });
@@ -591,7 +566,7 @@ class CLI {
     }
     async handleClearCheckpoints() {
         checkpoints_1.checkpointManager.clearCheckpoints();
-        this.promptWithCheckpointNumber();
+        this.rl.prompt();
     }
 }
 exports.CLI = CLI;