codebuff 1.0.176 → 1.0.178

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

@@ -0,0 +1,73 @@
+import { AgentState } from '../common/types/agent-state';
+/**
+ * Interface representing a checkpoint of agent state
+ */
+export interface Checkpoint {
+    agentStateString: string;
+    /** Promise resolving to the git commit hash for this checkpoint */
+    fileStateIdPromise: Promise<string>;
+    /** Number of messages in the agent's history at checkpoint time */
+    historyLength: number;
+    id: number;
+    timestamp: number;
+    /** User input that triggered this checkpoint */
+    userInput: string;
+}
+/**
+ * Manages checkpoints of agent state and file state using git operations in a worker thread.
+ * Each checkpoint contains both the agent's conversation state and a git commit
+ * representing the state of all tracked files at that point.
+ */
+export declare class CheckpointManager {
+    checkpoints: Array<Checkpoint>;
+    private bareRepoPath;
+    enabled: boolean;
+    /** Worker thread for git operations */
+    private worker;
+    /**
+     * Initialize or return the existing worker thread
+     * @returns The worker thread instance
+     */
+    private initWorker;
+    /**
+     * Execute an operation in the worker thread with timeout handling
+     * @param message - The message describing the operation to perform
+     * @returns A promise that resolves with the operation result
+     * @throws Error if the operation fails or times out
+     */
+    private runWorkerOperation;
+    /**
+     * Get the path to the bare git repository used for storing file states
+     * @returns The bare repo path
+     */
+    private getBareRepoPath;
+    /**
+     * Add a new checkpoint of the current agent and file state
+     * @param agentState - The current agent state to checkpoint
+     * @param userInput - The user input that triggered this checkpoint
+     * @returns The created checkpoint, or null if checkpointing is disabled
+     */
+    addCheckpoint(agentState: AgentState, userInput: string): Promise<Checkpoint | null>;
+    /**
+     * Get the most recent checkpoint
+     * @returns The most recent checkpoint or null if none exist
+     */
+    getLatestCheckpoint(): Checkpoint | null;
+    /**
+     * Restore the file state from a specific checkpoint
+     * @param id - The ID of the checkpoint to restore
+     * @returns True if restoration succeeded, false if checkpoint not found
+     */
+    restoreCheckointFileState(id: number): Promise<boolean>;
+    /**
+     * Clear all checkpoints
+     */
+    clearCheckpoints(): void;
+    /**
+     * Get a formatted string representation of all checkpoints
+     * @param detailed Whether to include detailed information about each checkpoint
+     * @returns A formatted string representation of all checkpoints
+     */
+    getCheckpointsAsString(detailed?: boolean): string;
+}
+export declare const checkpointManager: CheckpointManager;

package/dist/checkpoints/checkpoint-manager.js

@@ -0,0 +1,193 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkpointManager = exports.CheckpointManager = void 0;
+const path_1 = require("path");
+const picocolors_1 = require("picocolors");
+const worker_threads_1 = require("worker_threads");
+const project_file_tree_1 = require("../common/project-file-tree");
+const file_manager_1 = require("./file-manager");
+const project_files_1 = require("../project-files");
+/**
+ * Manages checkpoints of agent state and file state using git operations in a worker thread.
+ * Each checkpoint contains both the agent's conversation state and a git commit
+ * representing the state of all tracked files at that point.
+ */
+class CheckpointManager {
+    checkpoints = [];
+    bareRepoPath = null;
+    enabled = true;
+    /** Worker thread for git operations */
+    worker = null;
+    /**
+     * Initialize or return the existing worker thread
+     * @returns The worker thread instance
+     */
+    initWorker() {
+        if (!this.worker) {
+            // NOTE: Uses the built worker-script-project-context.js within dist.
+            // So you need to run `bun run build` before running locally.
+            const workerPath = __filename.endsWith('.ts')
+                ? (0, path_1.join)(__dirname, '../../dist', 'workers/checkpoint-worker.js')
+                : (0, path_1.join)(__dirname, '../workers/checkpoint-worker.js');
+            this.worker = new worker_threads_1.Worker(workerPath);
+        }
+        return this.worker;
+    }
+    /**
+     * Execute an operation in the worker thread with timeout handling
+     * @param message - The message describing the operation to perform
+     * @returns A promise that resolves with the operation result
+     * @throws Error if the operation fails or times out
+     */
+    async runWorkerOperation(message) {
+        const worker = this.initWorker();
+        return new Promise((resolve, reject) => {
+            const timeoutMs = 30000; // 30 seconds timeout
+            const handler = (response) => {
+                if (response.success) {
+                    resolve(response.result);
+                }
+                else {
+                    reject(new Error(response.error));
+                }
+                worker.off('message', handler);
+            };
+            worker.on('message', handler);
+            worker.postMessage(message);
+            // Add timeout
+            setTimeout(() => {
+                worker.off('message', handler);
+                reject(new Error('Worker operation timed out'));
+            }, timeoutMs);
+        });
+    }
+    /**
+     * Get the path to the bare git repository used for storing file states
+     * @returns The bare repo path
+     */
+    getBareRepoPath() {
+        if (!this.bareRepoPath) {
+            this.bareRepoPath = (0, file_manager_1.getBareRepoPath)((0, project_files_1.getProjectRoot)());
+        }
+        return this.bareRepoPath;
+    }
+    /**
+     * Add a new checkpoint of the current agent and file state
+     * @param agentState - The current agent state to checkpoint
+     * @param userInput - The user input that triggered this checkpoint
+     * @returns The created checkpoint, or null if checkpointing is disabled
+     */
+    async addCheckpoint(agentState, userInput) {
+        if (!this.enabled) {
+            return null;
+        }
+        const id = this.checkpoints.length + 1;
+        const projectDir = (0, project_files_1.getProjectRoot)();
+        const bareRepoPath = this.getBareRepoPath();
+        const relativeFilepaths = (0, project_file_tree_1.getAllFilePaths)(agentState.fileContext.fileTree);
+        if (relativeFilepaths.length >= project_file_tree_1.DEFAULT_MAX_FILES) {
+            this.enabled = false;
+            return null;
+        }
+        const needToStage = await (0, file_manager_1.hasUnsavedChanges)({
+            projectDir,
+            bareRepoPath,
+            relativeFilepaths,
+        });
+        if (!needToStage && this.checkpoints.length > 0) {
+            return null;
+        }
+        const fileStateIdPromise = needToStage
+            ? this.runWorkerOperation({
+                type: 'store',
+                projectDir,
+                bareRepoPath,
+                message: `Checkpoint ${id}`,
+                relativeFilepaths,
+            })
+            : (0, file_manager_1.getLatestCommit)({ bareRepoPath });
+        const checkpoint = {
+            agentStateString: JSON.stringify(agentState),
+            fileStateIdPromise,
+            historyLength: agentState.messageHistory.length,
+            id,
+            timestamp: Date.now(),
+            userInput,
+        };
+        this.checkpoints.push(checkpoint);
+        return checkpoint;
+    }
+    /**
+     * Get the most recent checkpoint
+     * @returns The most recent checkpoint or null if none exist
+     */
+    getLatestCheckpoint() {
+        if (!this.enabled) {
+            return null;
+        }
+        return this.checkpoints.length === 0
+            ? null
+            : this.checkpoints[this.checkpoints.length - 1];
+    }
+    /**
+     * Restore the file state from a specific checkpoint
+     * @param id - The ID of the checkpoint to restore
+     * @returns True if restoration succeeded, false if checkpoint not found
+     */
+    async restoreCheckointFileState(id) {
+        const checkpoint = this.checkpoints[id - 1];
+        if (!checkpoint) {
+            return false;
+        }
+        const relativeFilepaths = (0, project_file_tree_1.getAllFilePaths)(JSON.parse(checkpoint.agentStateString).fileContext
+            .fileTree);
+        await this.runWorkerOperation({
+            type: 'restore',
+            projectDir: (0, project_files_1.getProjectRoot)(),
+            bareRepoPath: this.getBareRepoPath(),
+            commit: await checkpoint.fileStateIdPromise,
+            relativeFilepaths,
+        });
+        return true;
+    }
+    /**
+     * Clear all checkpoints
+     */
+    clearCheckpoints() {
+        this.checkpoints = [];
+    }
+    /**
+     * Get a formatted string representation of all checkpoints
+     * @param detailed Whether to include detailed information about each checkpoint
+     * @returns A formatted string representation of all checkpoints
+     */
+    getCheckpointsAsString(detailed = false) {
+        if (!this.enabled) {
+            return (0, picocolors_1.red)('Checkpoints not enabled: project too large.');
+        }
+        if (this.checkpoints.length === 0) {
+            return (0, picocolors_1.yellow)('No checkpoints available.');
+        }
+        const lines = [(0, picocolors_1.bold)((0, picocolors_1.underline)('Agent State Checkpoints:')), ''];
+        this.checkpoints.forEach((checkpoint) => {
+            const date = new Date(checkpoint.timestamp);
+            const formattedDate = date.toLocaleString();
+            const userInputOneLine = checkpoint.userInput.replaceAll('\n', ' ');
+            const userInput = userInputOneLine.length > 50
+                ? userInputOneLine.substring(0, 47) + '...'
+                : userInputOneLine;
+            lines.push(`${(0, picocolors_1.cyan)((0, picocolors_1.bold)(`#${checkpoint.id}`))} ${(0, picocolors_1.gray)(`[${formattedDate}]`)}:`);
+            lines.push(`  ${(0, picocolors_1.blue)('Input')}: ${userInput}`);
+            if (detailed) {
+                const messageCount = checkpoint.historyLength;
+                lines.push(`  ${(0, picocolors_1.blue)('Messages')}: ${messageCount}`);
+            }
+            lines.push(''); // Empty line between checkpoints
+        });
+        return lines.join('\n');
+    }
+}
+exports.CheckpointManager = CheckpointManager;
+// Export a singleton instance for use throughout the application
+exports.checkpointManager = new CheckpointManager();
+//# sourceMappingURL=checkpoint-manager.js.map

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

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

package/dist/{checkpoint-file-manager.d.ts → checkpoints/file-manager.d.ts}

@@ -1,4 +1,13 @@
+import fs from 'fs';
 export declare function getBareRepoPath(dir: string): string;
+export declare function hasUnsavedChanges({ projectDir, bareRepoPath, relativeFilepaths, }: {
+    projectDir: string;
+    bareRepoPath: string;
+    relativeFilepaths: Array<string>;
+}): Promise<boolean>;
+export declare function getLatestCommit({ bareRepoPath, }: {
+    bareRepoPath: string;
+}): Promise<string>;
 export declare function initializeCheckpointFileManager({ projectDir, relativeFilepaths, }: {
     projectDir: string;
     relativeFilepaths: Array<string>;
@@ -29,3 +38,4 @@ export declare function restoreFileState({ projectDir, bareRepoPath, commit, rel
     commit: string;
     relativeFilepaths: Array<string>;
 }): Promise<void>;
+export { fs };

package/dist/{checkpoint-file-manager.js → checkpoints/file-manager.js}

@@ -3,29 +3,88 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.fs = void 0;
 exports.getBareRepoPath = getBareRepoPath;
+exports.hasUnsavedChanges = hasUnsavedChanges;
+exports.getLatestCommit = getLatestCommit;
 exports.initializeCheckpointFileManager = initializeCheckpointFileManager;
 exports.storeFileState = storeFileState;
 exports.restoreFileState = restoreFileState;
 const crypto_1 = require("crypto");
 const fs_1 = __importDefault(require("fs"));
+exports.fs = fs_1.default;
 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");
+const project_files_1 = require("../project-files");
+let cachedGitAvailable = null;
 function gitCommandIsAvailable() {
-    try {
-        (0, child_process_1.execFileSync)('which', ['git']);
-        return true;
-    }
-    catch (error) {
-        return false;
+    if (cachedGitAvailable === null) {
+        try {
+            (0, child_process_1.execFileSync)('git', ['--version']);
+            cachedGitAvailable = true;
+        }
+        catch (error) {
+            cachedGitAvailable = false;
+        }
     }
+    return cachedGitAvailable;
 }
 function getBareRepoPath(dir) {
     const bareRepoName = (0, crypto_1.createHash)('sha256').update(dir).digest('hex');
     return (0, path_1.join)((0, project_files_1.getProjectDataDir)(), bareRepoName);
 }
+async function hasUnsavedChanges({ projectDir, bareRepoPath, relativeFilepaths, }) {
+    if (gitCommandIsAvailable()) {
+        try {
+            const output = (0, child_process_1.execFileSync)('git', [
+                '--git-dir',
+                bareRepoPath,
+                '--work-tree',
+                projectDir,
+                'status',
+                '--porcelain',
+            ]).toString();
+            return output.trim().length > 0;
+        }
+        catch (error) {
+            // error running git
+        }
+    }
+    for (const [, , workdirStatus, stageStatus] of await (0, isomorphic_git_1.statusMatrix)({
+        fs: fs_1.default,
+        dir: projectDir,
+        gitdir: bareRepoPath,
+        filepaths: relativeFilepaths,
+    })) {
+        if (workdirStatus !== stageStatus) {
+            return true;
+        }
+    }
+    return false;
+}
+async function getLatestCommit({ bareRepoPath, }) {
+    if (gitCommandIsAvailable()) {
+        try {
+            return (0, child_process_1.execFileSync)('git', [
+                '--git-dir',
+                bareRepoPath,
+                'rev-parse',
+                'HEAD',
+            ])
+                .toString()
+                .trim();
+        }
+        catch (error) {
+            // unable to get head
+        }
+    }
+    return await (0, isomorphic_git_1.resolveRef)({
+        fs: fs_1.default,
+        dir: bareRepoPath,
+        ref: 'HEAD',
+    });
+}
 async function initializeCheckpointFileManager({ projectDir, relativeFilepaths, }) {
     const bareRepoPath = getBareRepoPath(projectDir);
     // Create the bare repo directory if it doesn't exist
@@ -46,7 +105,26 @@ async function initializeCheckpointFileManager({ projectDir, relativeFilepaths,
         relativeFilepaths,
     });
 }
-async function stageFilesIndividually({ projectDir, bareRepoPath, relativeFilepaths, }) {
+async function stageFiles({ projectDir, bareRepoPath, relativeFilepaths, }) {
+    if (gitCommandIsAvailable()) {
+        try {
+            (0, child_process_1.execFileSync)('git', [
+                '--git-dir',
+                bareRepoPath,
+                '--work-tree',
+                projectDir,
+                '-C',
+                projectDir,
+                'add',
+                '.',
+            ]);
+            return;
+        }
+        catch (error) {
+            // Failed to add .
+        }
+    }
+    // Stage files with isomorphic-git
     // Get status of all files in the project directory
     const currStatusMatrix = await (0, isomorphic_git_1.statusMatrix)({
         fs: fs_1.default,
@@ -85,32 +163,11 @@ async function stageFilesIndividually({ projectDir, bareRepoPath, relativeFilepa
  * @returns A promise that resolves to the id hash that can be used to restore this file state
  */
 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,
-        });
-    }
+    await stageFiles({
+        projectDir,
+        bareRepoPath,
+        relativeFilepaths,
+    });
     const commitHash = await (0, isomorphic_git_1.commit)({
         fs: fs_1.default,
         dir: projectDir,
@@ -174,4 +231,4 @@ async function restoreFileState({ projectDir, bareRepoPath, commit, relativeFile
         })));
     }
 }
-//# sourceMappingURL=checkpoint-file-manager.js.map
+//# sourceMappingURL=file-manager.js.map

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

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

package/dist/cli.js

@@ -31,7 +31,7 @@ const constants_1 = require("./common/constants");
 const project_file_tree_1 = require("./common/project-file-tree");
 const string_1 = require("./common/util/string");
 const chat_storage_1 = require("./chat-storage");
-const checkpoints_1 = require("./checkpoints");
+const checkpoint_manager_1 = require("./checkpoints/checkpoint-manager");
 const client_1 = require("./client");
 const config_1 = require("./config");
 const menu_1 = require("./menu");
@@ -171,12 +171,14 @@ class CLI {
         spinner_1.Spinner.get().start();
         await this.readyPromise;
         spinner_1.Spinner.get().stop();
-        // Make sure the previous checkpoint is done
-        await checkpoints_1.checkpointManager.getLatestCheckpoint()?.fileStateIdPromise;
-        // Save the current agent state
-        const checkpoint = await checkpoints_1.checkpointManager.addCheckpoint(this.client.agentState, userInput);
-        if (checkpoint.enabled) {
-            console.log((0, picocolors_1.green)(`Checkpoint #${checkpoint.id} saved!`));
+        if (checkpoint_manager_1.checkpointManager.enabled) {
+            // Make sure the previous checkpoint is done
+            await checkpoint_manager_1.checkpointManager.getLatestCheckpoint()?.fileStateIdPromise;
+            // Save the current agent state
+            const checkpoint = await checkpoint_manager_1.checkpointManager.addCheckpoint(this.client.agentState, userInput);
+            if (checkpoint) {
+                console.log((0, picocolors_1.green)(`Checkpoint #${checkpoint.id} saved!`));
+            }
         }
     }
     async processCommand(userInput) {
@@ -289,7 +291,7 @@ class CLI {
     }
     async handleUndo() {
         // Get previous checkpoint number (not including undo command)
-        const checkpointId = checkpoints_1.checkpointManager.getLatestCheckpoint().id - 1;
+        const checkpointId = checkpoint_manager_1.checkpointManager.getLatestCheckpoint().id - 1;
         if (checkpointId < 1) {
             console.log((0, picocolors_1.red)('Nothing to undo.'));
             this.rl.prompt();
@@ -530,24 +532,24 @@ class CLI {
     }
     // Checkpoint command handlers
     async handleCheckpoints() {
-        console.log(checkpoints_1.checkpointManager.getCheckpointsAsString());
+        console.log(checkpoint_manager_1.checkpointManager.getCheckpointsAsString());
         this.rl.prompt();
     }
     async handleRestoreCheckpoint(id) {
-        const checkpoint = checkpoints_1.checkpointManager.getCheckpoint(id);
+        if (!checkpoint_manager_1.checkpointManager.enabled) {
+            console.log((0, picocolors_1.red)(`Checkpoints not enabled: project too large`));
+            this.rl.prompt();
+            return;
+        }
+        const checkpoint = checkpoint_manager_1.checkpointManager.checkpoints[id - 1];
         if (!checkpoint) {
             console.log((0, picocolors_1.red)(`Checkpoint #${id} not found.`));
             this.rl.prompt();
             return;
         }
         // Wait for save before trying to restore checkpoint
-        const latestCheckpoint = checkpoints_1.checkpointManager.getLatestCheckpoint();
+        const latestCheckpoint = checkpoint_manager_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
@@ -558,14 +560,14 @@ class CLI {
         // Restore the agentState
         this.client.agentState = JSON.parse(checkpoint.agentStateString);
         // Restore file state
-        if (!(await checkpoints_1.checkpointManager.restoreCheckointFileState(checkpoint.id))) {
+        if (!(await checkpoint_manager_1.checkpointManager.restoreCheckointFileState(checkpoint.id))) {
             throw new assert_1.AssertionError({
                 message: `Internal error: checkpoint ${checkpoint.id} not found`,
             });
         }
     }
     async handleClearCheckpoints() {
-        checkpoints_1.checkpointManager.clearCheckpoints();
+        checkpoint_manager_1.checkpointManager.clearCheckpoints();
         this.rl.prompt();
     }
 }