codecane 1.0.202 → 1.0.204

package/dist/checkpoints/file-manager.js

@@ -3,6 +3,7 @@ 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;
@@ -11,15 +12,21 @@ 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");
+/**
+ * Checks if the native git command is available on the system.
+ * Caches the result to avoid repeated checks.
+ * @returns boolean indicating if git command is available
+ */
 let cachedGitAvailable = null;
 function gitCommandIsAvailable() {
     if (cachedGitAvailable === null) {
         try {
-            (0, child_process_1.execFileSync)('git', ['--version']);
+            (0, child_process_1.execFileSync)('git', ['--version'], { stdio: 'ignore' });
             cachedGitAvailable = true;
         }
         catch (error) {
@@ -28,10 +35,24 @@ function gitCommandIsAvailable() {
     }
     return cachedGitAvailable;
 }
+/**
+ * Generates a unique path for storing the bare git repository based on the project directory.
+ * Uses SHA-256 hashing to create a unique identifier.
+ * @param dir - The project directory path to hash
+ * @returns The full path where the bare repo should be stored
+ */
 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);
 }
+/**
+ * Checks if there are any uncommitted changes in the working directory.
+ * First attempts to use native git commands, falling back to isomorphic-git if unavailable.
+ * @param projectDir - The working tree directory path
+ * @param bareRepoPath - The bare git repository path
+ * @param relativeFilepaths - Array of file paths relative to projectDir to check
+ * @returns Promise resolving to true if there are uncommitted changes, false otherwise
+ */
 async function hasUnsavedChanges({ projectDir, bareRepoPath, relativeFilepaths, }) {
     if (gitCommandIsAvailable()) {
         try {
@@ -61,15 +82,16 @@ async function hasUnsavedChanges({ projectDir, bareRepoPath, relativeFilepaths,
     }
     return false;
 }
+/**
+ * Gets the hash of the latest commit in the repository.
+ * First attempts to use native git commands, falling back to isomorphic-git if unavailable.
+ * @param bareRepoPath - The bare git repository path
+ * @returns Promise resolving to the commit hash
+ */
 async function getLatestCommit({ bareRepoPath, }) {
     if (gitCommandIsAvailable()) {
         try {
-            return (0, child_process_1.execFileSync)('git', [
-                '--git-dir',
-                bareRepoPath,
-                'rev-parse',
-                'HEAD',
-            ])
+            return (0, child_process_1.execFileSync)('git', ['--git-dir', bareRepoPath, 'rev-parse', 'HEAD'], { stdio: ['ignore', 'pipe', 'ignore'] })
                 .toString()
                 .trim();
         }
@@ -79,21 +101,34 @@ async function getLatestCommit({ bareRepoPath, }) {
     }
     return await (0, isomorphic_git_1.resolveRef)({
         fs: fs_1.default,
-        dir: bareRepoPath,
+        gitdir: bareRepoPath,
         ref: 'HEAD',
     });
 }
+/**
+ * Initializes a bare git repository for tracking file changes.
+ * Creates the repository if it doesn't exist, otherwise uses the existing one.
+ * Makes an initial commit of the current file state.
+ * @param projectDir - The working tree directory path
+ * @param relativeFilepaths - Array of file paths relative to projectDir to track
+ */
 async function initializeCheckpointFileManager({ projectDir, relativeFilepaths, }) {
     const bareRepoPath = getBareRepoPath(projectDir);
     // Create the bare repo directory if it doesn't exist
     fs_1.default.mkdirSync(bareRepoPath, { recursive: true });
     try {
         // Check if it's already a valid Git repo
-        await (0, isomorphic_git_1.resolveRef)({ fs: fs_1.default, dir: bareRepoPath, ref: 'HEAD' });
+        await (0, isomorphic_git_1.resolveRef)({ fs: fs_1.default, gitdir: 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 });
+        await (0, isomorphic_git_1.init)({
+            fs: fs_1.default,
+            dir: projectDir,
+            gitdir: bareRepoPath,
+            bare: true,
+            defaultBranch: 'master',
+        });
     }
     // Commit the files in the bare repo
     await storeFileState({
@@ -103,7 +138,14 @@ async function initializeCheckpointFileManager({ projectDir, relativeFilepaths,
         relativeFilepaths,
     });
 }
-async function stageFiles({ projectDir, bareRepoPath, relativeFilepaths, }) {
+/**
+ * Stages all changes in the working directory.
+ * First attempts to use native git commands, falling back to isomorphic-git if unavailable.
+ * @param projectDir - The working tree directory path
+ * @param bareRepoPath - The bare git repository path
+ * @param relativeFilepaths - Array of file paths relative to projectDir to stage
+ */
+async function gitAddAll({ projectDir, bareRepoPath, relativeFilepaths, }) {
     if (gitCommandIsAvailable()) {
         try {
             (0, child_process_1.execFileSync)('git', [
@@ -115,11 +157,11 @@ async function stageFiles({ projectDir, bareRepoPath, relativeFilepaths, }) {
                 projectDir,
                 'add',
                 '.',
-            ]);
+            ], { stdio: 'ignore' });
             return;
         }
         catch (error) {
-            // Failed to add .
+            // Failed to `git add .`
         }
     }
     // Stage files with isomorphic-git
@@ -154,41 +196,72 @@ async function stageFiles({ projectDir, bareRepoPath, relativeFilepaths, }) {
         }
     }
 }
-/**
- * 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, relativeFilepaths: relativeFilepaths, }) {
-    await stageFiles({
-        projectDir,
-        bareRepoPath,
-        relativeFilepaths,
-    });
+async function gitCommit({ projectDir, bareRepoPath, message, }) {
+    if (gitCommandIsAvailable()) {
+        try {
+            (0, child_process_1.execFileSync)('git', [
+                '--git-dir',
+                bareRepoPath,
+                '--work-tree',
+                projectDir,
+                'commit',
+                '-m',
+                message,
+            ], { stdio: 'ignore' });
+        }
+        catch (error) {
+            // Failed to commit, continue to isomorphic-git implementation
+        }
+    }
     const commitHash = await (0, isomorphic_git_1.commit)({
         fs: fs_1.default,
         dir: projectDir,
         gitdir: bareRepoPath,
         author: { name: 'codebuff' },
-        ref: 'refs/heads/master',
         message,
+        ref: '/refs/heads/master',
     });
-    await (0, isomorphic_git_1.checkout)({
-        fs: fs_1.default,
-        dir: projectDir,
-        gitdir: bareRepoPath,
-        ref: commitHash,
-    });
+    if (gitCommandIsAvailable()) {
+        try {
+            (0, child_process_1.execFileSync)('git', [
+                '--git-dir',
+                bareRepoPath,
+                '--work-tree',
+                projectDir,
+                'checkout',
+                'master',
+            ], { stdio: 'ignore' });
+        }
+        catch (error) { }
+    }
+    await (0, isomorphic_git_1.checkout)({ fs: fs_1.default, dir: projectDir, gitdir: bareRepoPath, ref: 'master' });
     return commitHash;
 }
 /**
- * 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.
+ * Creates a new commit with the current state of all tracked files.
+ * Stages all changes and creates a commit with the specified message.
+ * @param projectDir - The working tree directory path
+ * @param bareRepoPath - The bare git repository path
+ * @param message - The commit message
+ * @param relativeFilepaths - Array of file paths relative to projectDir to commit
+ * @returns Promise resolving to the new commit's hash
+ */
+async function storeFileState({ projectDir, bareRepoPath, message, relativeFilepaths: relativeFilepaths, }) {
+    await gitAddAll({
+        projectDir,
+        bareRepoPath,
+        relativeFilepaths,
+    });
+    return await gitCommit({ projectDir, bareRepoPath, message });
+}
+/**
+ * Restores the working directory and index to match the specified commit.
+ * Equivalent to `git reset --hard`
+ * First attempts to use native git commands, falling back to isomorphic-git if unavailable.
+ * @param projectDir - The working tree directory path
+ * @param bareRepoPath - The bare git repository path
+ * @param commit - The commit hash to restore to
+ * @param relativeFilepaths - Array of file paths relative to projectDir to restore
  */
 async function restoreFileState({ projectDir, bareRepoPath, commit, relativeFilepaths, }) {
     let resetDone = false;
@@ -203,30 +276,28 @@ async function restoreFileState({ projectDir, bareRepoPath, commit, relativeFile
                 '--hard',
                 commit,
             ]);
-            resetDone = true;
+            return;
         }
         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,
-        })));
-    }
+    // 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=file-manager.js.map

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

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

package/dist/cli.d.ts

@@ -18,11 +18,15 @@ export declare class CLI {
     private initReadlineInterface;
     private completer;
     private setPrompt;
+    /**
+     * Prompts the user with a clean prompt state
+     */
+    private freshPrompt;
     printInitialPrompt(initialInput?: string): Promise<void>;
     printDiff(): Promise<void>;
     private handleLine;
     private handleUserInput;
-    private beforeProcessCommand;
+    private saveCheckpoint;
     private processCommand;
     private forwardUserInput;
     private returnControlToUser;

package/dist/cli.js

@@ -40,6 +40,7 @@ const spinner_1 = require("./utils/spinner");
 const terminal_1 = require("./utils/terminal");
 const web_scraper_1 = require("./web-scraper");
 const assert_1 = require("assert");
+const restoreCheckpointRegex = /^checkpoint\s+(\d+)$/;
 class CLI {
     client;
     readyPromise;
@@ -124,6 +125,16 @@ class CLI {
     setPrompt() {
         this.rl.setPrompt((0, picocolors_1.green)(`${(0, path_1.parse)((0, project_files_1.getProjectRoot)()).base} > `));
     }
+    /**
+     * Prompts the user with a clean prompt state
+     */
+    freshPrompt() {
+        spinner_1.Spinner.get().stop();
+        readline.cursorTo(process.stdout, 0);
+        this.rl.line = '';
+        this.setPrompt();
+        this.rl.prompt();
+    }
     async printInitialPrompt(initialInput) {
         if (this.client.user) {
             (0, menu_1.displayGreeting)(this.costMode, this.client.user.name);
@@ -133,7 +144,7 @@ class CLI {
             await this.client.login();
             return;
         }
-        this.rl.prompt();
+        this.freshPrompt();
         if (initialInput) {
             process.stdout.write(initialInput + '\n');
             this.handleUserInput(initialInput);
@@ -141,7 +152,7 @@ class CLI {
     }
     async printDiff() {
         this.handleDiff();
-        this.rl.prompt();
+        this.freshPrompt();
     }
     async handleLine(line) {
         this.detectPasting();
@@ -167,34 +178,35 @@ class CLI {
         }
         await this.forwardUserInput(userInput);
     }
-    async beforeProcessCommand(userInput) {
+    async saveCheckpoint(userInput) {
+        if (checkpoint_manager_1.checkpointManager.disabledReason !== null) {
+            return;
+        }
         spinner_1.Spinner.get().start();
         await this.readyPromise;
         spinner_1.Spinner.get().stop();
-        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!`));
-            }
+        // 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(`[checkpoint #${checkpoint.id} saved]`);
         }
     }
     async processCommand(userInput) {
-        await this.beforeProcessCommand(userInput);
         if (userInput === 'help' || userInput === 'h') {
             (0, menu_1.displayMenu)();
-            this.rl.prompt();
+            this.freshPrompt();
             return true;
         }
         if (userInput === 'login' || userInput === 'signin') {
             await this.client.login();
+            checkpoint_manager_1.checkpointManager.clearCheckpoints();
             return true;
         }
         if (userInput === 'logout' || userInput === 'signout') {
             await this.client.logout();
-            this.rl.prompt();
+            this.freshPrompt();
             return true;
         }
         if (userInput.startsWith('ref-')) {
@@ -206,6 +218,7 @@ class CLI {
             return true;
         }
         if (userInput === 'undo' || userInput === 'u') {
+            await this.saveCheckpoint(userInput);
             this.handleUndo();
             return true;
         }
@@ -215,7 +228,7 @@ class CLI {
         }
         if (['diff', 'doff', 'dif', 'iff', 'd'].includes(userInput)) {
             this.handleDiff();
-            this.rl.prompt();
+            this.freshPrompt();
             return true;
         }
         if (userInput === 'uuddlrlrba' ||
@@ -226,12 +239,14 @@ class CLI {
         }
         // Checkpoint commands
         if (userInput === 'checkpoint list' || userInput === 'checkpoints') {
+            await this.saveCheckpoint(userInput);
             this.handleCheckpoints();
             return true;
         }
-        const restoreMatch = userInput.match(/^checkpoint\s+(\d+)$/);
+        const restoreMatch = userInput.match(restoreCheckpointRegex);
         if (restoreMatch) {
             const id = parseInt(restoreMatch[1], 10);
+            await this.saveCheckpoint(userInput);
             await this.handleRestoreCheckpoint(id);
             return true;
         }
@@ -242,6 +257,7 @@ class CLI {
         return false;
     }
     async forwardUserInput(userInput) {
+        await this.saveCheckpoint(userInput);
         spinner_1.Spinner.get().start();
         this.client.lastChanges = [];
         const urls = (0, web_scraper_1.parseUrlsFromContent)(userInput);
@@ -266,15 +282,14 @@ class CLI {
         }
         this.client.showUsageWarning();
         console.log();
-        this.rl.prompt();
+        this.freshPrompt();
     }
     returnControlToUser() {
-        this.rl.prompt();
+        this.freshPrompt();
         this.isReceivingResponse = false;
         if (this.stopResponse) {
             this.stopResponse();
         }
-        spinner_1.Spinner.get().stop();
     }
     onWebSocketError() {
         spinner_1.Spinner.get().stop();
@@ -290,11 +305,22 @@ class CLI {
         this.returnControlToUser();
     }
     async handleUndo() {
+        if (checkpoint_manager_1.checkpointManager.disabledReason !== null) {
+            console.log((0, picocolors_1.red)(`Checkpoints not enabled: ${checkpoint_manager_1.checkpointManager.disabledReason}`));
+            this.freshPrompt();
+            return;
+        }
+        const checkpoint = checkpoint_manager_1.checkpointManager.getLatestCheckpoint();
+        if (checkpoint === null) {
+            console.log((0, picocolors_1.red)('Unable to undo: internal error: no checkpoints found'));
+            this.freshPrompt();
+            return;
+        }
         // Get previous checkpoint number (not including undo command)
-        const checkpointId = checkpoint_manager_1.checkpointManager.getLatestCheckpoint().id - 1;
+        const checkpointId = checkpoint.id - 1;
         if (checkpointId < 1) {
             console.log((0, picocolors_1.red)('Nothing to undo.'));
-            this.rl.prompt();
+            this.freshPrompt();
             return;
         }
         await this.handleRestoreCheckpoint(checkpointId);
@@ -337,7 +363,7 @@ class CLI {
             else {
                 this.lastSigintTime = now;
                 console.log('\nPress Ctrl-C again to exit');
-                this.rl.prompt();
+                this.freshPrompt();
             }
         }
     }
@@ -533,18 +559,18 @@ class CLI {
     // Checkpoint command handlers
     async handleCheckpoints() {
         console.log(checkpoint_manager_1.checkpointManager.getCheckpointsAsString());
-        this.rl.prompt();
+        this.freshPrompt();
     }
     async handleRestoreCheckpoint(id) {
-        if (!checkpoint_manager_1.checkpointManager.enabled) {
-            console.log((0, picocolors_1.red)(`Checkpoints not enabled: project too large`));
-            this.rl.prompt();
+        if (checkpoint_manager_1.checkpointManager.disabledReason !== null) {
+            console.log((0, picocolors_1.red)(`Checkpoints not enabled: ${checkpoint_manager_1.checkpointManager.disabledReason}`));
+            this.freshPrompt();
             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();
+            this.freshPrompt();
             return;
         }
         // Wait for save before trying to restore checkpoint
@@ -553,8 +579,10 @@ class CLI {
         await this.restoreAgentStateAndFiles(checkpoint);
         console.log((0, picocolors_1.green)(`Restored to checkpoint #${id}.`));
         // Insert the original user input that created this checkpoint
-        this.rl.prompt();
-        this.rl.write(checkpoint.userInput);
+        this.freshPrompt();
+        if (!checkpoint.userInput.match(restoreCheckpointRegex)) {
+            this.rl.write(checkpoint.userInput);
+        }
     }
     async restoreAgentStateAndFiles(checkpoint) {
         // Restore the agentState
@@ -568,7 +596,8 @@ class CLI {
     }
     async handleClearCheckpoints() {
         checkpoint_manager_1.checkpointManager.clearCheckpoints();
-        this.rl.prompt();
+        console.log('Cleared all checkpoints.');
+        this.freshPrompt();
     }
 }
 exports.CLI = CLI;