codebuff 1.0.218 → 1.0.220

package/dist/cli.js

@@ -26,13 +26,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CLI = void 0;
 const path_1 = require("path");
 const readline = __importStar(require("readline"));
-const constants_1 = require("./common/api-keys/constants");
 const project_file_tree_1 = require("./common/project-file-tree");
 const string_1 = require("./common/util/string");
 const picocolors_1 = require("picocolors");
 const background_process_manager_1 = require("./background-process-manager");
 const chat_storage_1 = require("./chat-storage");
 const checkpoint_manager_1 = require("./checkpoints/checkpoint-manager");
+const api_key_1 = require("./cli-handlers/api-key");
+const checkpoint_1 = require("./cli-handlers/checkpoint");
+const diff_1 = require("./cli-handlers/diff");
+const easter_egg_1 = require("./cli-handlers/easter-egg");
 const client_1 = require("./client");
 const config_1 = require("./config");
 const menu_1 = require("./menu");
@@ -40,9 +43,6 @@ const project_files_1 = require("./project-files");
 const spinner_1 = require("./utils/spinner");
 const terminal_1 = require("./utils/terminal");
 const web_scraper_1 = require("./web-scraper");
-const restoreCheckpointRegex = /^checkpoint\s+(\d+)$/;
-const undoCommands = ['undo', 'u'];
-const redoCommands = ['redo'];
 class CLI {
     client;
     readyPromise;
@@ -139,12 +139,22 @@ class CLI {
     /**
      * Prompts the user with a clean prompt state
      */
-    freshPrompt() {
+    freshPrompt(userInput = '') {
         spinner_1.Spinner.get().stop();
         readline.cursorTo(process.stdout, 0);
-        this.rl.line = '';
+        const rlAny = this.rl;
+        // clear line first
+        rlAny.line = '';
         this.setPrompt();
+        // then prompt
         this.rl.prompt();
+        if (!userInput) {
+            return;
+        }
+        // then rewrite new prompt
+        this.rl.write(' '.repeat(userInput.length)); // hacky way to move cursor
+        rlAny.line = userInput;
+        rlAny._refreshLine();
     }
     async printInitialPrompt(initialInput) {
         if (this.client.user) {
@@ -162,7 +172,7 @@ class CLI {
         }
     }
     async printDiff() {
-        this.handleDiff();
+        (0, diff_1.handleDiff)(this.client.lastChanges);
         this.freshPrompt();
     }
     async handleLine(line) {
@@ -192,33 +202,8 @@ class CLI {
         }
         await this.forwardUserInput(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();
-        try {
-            // Make sure the previous checkpoint is done
-            await checkpoint_manager_1.checkpointManager.getLatestCheckpoint().fileStateIdPromise;
-        }
-        catch (error) {
-            // No latest checkpoint available, no need to wait
-        }
-        // Save the current agent state
-        try {
-            const { checkpoint, created } = await checkpoint_manager_1.checkpointManager.addCheckpoint(this.client.agentState, this.client.lastToolResults, userInput);
-            if (created) {
-                console.log(`[checkpoint #${checkpoint.id} saved]`);
-            }
-        }
-        catch (error) {
-            // Unable to add checkpoint, do not display anything to user
-        }
-    }
     async processCommand(userInput) {
-        if (userInput === 'help' || userInput === 'h') {
+        if (userInput === 'help' || userInput === 'h' || userInput === '/help') {
             (0, menu_1.displayMenu)();
             this.freshPrompt();
             return true;
@@ -238,10 +223,10 @@ class CLI {
             return true;
         }
         // Detect potential API key input first
-        const detectionResult = this.detectApiKey(userInput);
+        const detectionResult = (0, api_key_1.detectApiKey)(userInput);
         if (detectionResult.status !== 'not_found') {
             // If something resembling an API key was detected (valid or just prefix), handle it
-            await this.handleApiKeyInput(detectionResult);
+            await (0, api_key_1.handleApiKeyInput)(this.client, detectionResult, this.readyPromise, this.returnControlToUser.bind(this));
             return true; // Indicate command was handled
         }
         // Continue with other commands if no API key input was detected/handled
@@ -249,113 +234,68 @@ class CLI {
             await this.client.getUsage();
             return true;
         }
-        if (undoCommands.includes(userInput)) {
-            await this.saveCheckpoint(userInput);
-            this.handleUndo();
-            return true;
-        }
-        if (redoCommands.includes(userInput)) {
-            await this.saveCheckpoint(userInput);
-            this.handleRedo();
-            return true;
-        }
         if (userInput === 'quit' || userInput === 'exit' || userInput === 'q') {
             this.handleExit();
             return true;
         }
         if (['diff', 'doff', 'dif', 'iff', 'd'].includes(userInput)) {
-            this.handleDiff();
+            (0, diff_1.handleDiff)(this.client.lastChanges);
             this.freshPrompt();
             return true;
         }
         if (userInput === 'uuddlrlrba' ||
             userInput === 'konami' ||
             userInput === 'codebuffy') {
-            this.showEasterEgg();
+            (0, easter_egg_1.showEasterEgg)(this.returnControlToUser.bind(this));
             return true;
         }
         // Checkpoint commands
-        if (userInput === 'checkpoint list' || userInput === 'checkpoints') {
-            await this.saveCheckpoint(userInput);
-            this.handleCheckpoints();
-            return true;
-        }
-        const restoreMatch = userInput.match(restoreCheckpointRegex);
-        if (restoreMatch) {
-            const id = parseInt(restoreMatch[1], 10);
-            await this.saveCheckpoint(userInput);
-            await this.handleRestoreCheckpoint(id);
-            return true;
-        }
-        if (userInput === 'checkpoint clear') {
-            this.handleClearCheckpoints();
-            return true;
-        }
-        return false;
-    }
-    /**
-     * Detects if the user input contains a known API key pattern.
-     * Returns information about the detected key or prefix.
-     */
-    detectApiKey(userInput) {
-        // Build regex patterns for each key type
-        const keyPatterns = constants_1.API_KEY_TYPES.map((keyType) => {
-            const prefix = constants_1.KEY_PREFIXES[keyType];
-            const length = constants_1.KEY_LENGTHS[keyType];
-            const escapedPrefix = prefix.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
-            return {
-                type: keyType,
-                prefix: prefix,
-                length: length,
-                // Regex to find the key potentially surrounded by whitespace or at start/end
-                regex: new RegExp(`(?:^|\\s)(${escapedPrefix}[^\\s]{${length - prefix.length}})(?:\\s|$)`),
-            };
-        });
-        // Test input against each pattern for a full match
-        for (const patternInfo of keyPatterns) {
-            const match = userInput.match(patternInfo.regex);
-            if (match && match[1]) {
-                // Found a full, valid key pattern
-                return { status: 'found', type: patternInfo.type, key: match[1] };
+        if ((0, checkpoint_1.isCheckpointCommand)(userInput)) {
+            if ((0, checkpoint_1.isCheckpointCommand)(userInput, 'undo')) {
+                await (0, checkpoint_1.saveCheckpoint)(userInput, this.client, this.readyPromise);
+                const toRestore = await (0, checkpoint_1.handleUndo)(this.client, this.rl);
+                this.freshPrompt(toRestore);
+                return true;
             }
-        }
-        // If no full key matched, check if the input *starts* with any known prefix
-        for (const patternInfo of keyPatterns) {
-            if (userInput.includes(patternInfo.prefix)) {
-                // Found a prefix, but it didn't match the full pattern (wrong length/format)
-                return {
-                    status: 'prefix_only',
-                    type: patternInfo.type,
-                    prefix: patternInfo.prefix,
-                    length: patternInfo.length,
-                };
+            if ((0, checkpoint_1.isCheckpointCommand)(userInput, 'redo')) {
+                await (0, checkpoint_1.saveCheckpoint)(userInput, this.client, this.readyPromise);
+                const toRestore = await (0, checkpoint_1.handleRedo)(this.client, this.rl);
+                this.freshPrompt(toRestore);
+                return true;
             }
+            if ((0, checkpoint_1.isCheckpointCommand)(userInput, 'list')) {
+                await (0, checkpoint_1.saveCheckpoint)(userInput, this.client, this.readyPromise);
+                await (0, checkpoint_1.listCheckpoints)();
+                this.freshPrompt();
+                return true;
+            }
+            const restoreMatch = (0, checkpoint_1.isCheckpointCommand)(userInput, 'restore');
+            if (restoreMatch) {
+                const id = parseInt(restoreMatch[1], 10);
+                await (0, checkpoint_1.saveCheckpoint)(userInput, this.client, this.readyPromise);
+                const toRestore = await (0, checkpoint_1.handleRestoreCheckpoint)(id, this.client, this.rl);
+                this.freshPrompt(toRestore);
+                return true;
+            }
+            if ((0, checkpoint_1.isCheckpointCommand)(userInput, 'clear')) {
+                (0, checkpoint_1.handleClearCheckpoints)();
+                this.freshPrompt();
+                return true;
+            }
+            if ((0, checkpoint_1.isCheckpointCommand)(userInput, 'save')) {
+                await (0, checkpoint_1.saveCheckpoint)(userInput, this.client, this.readyPromise, true);
+                (0, checkpoint_1.displayCheckpointMenu)();
+                this.freshPrompt();
+                return true;
+            }
+            (0, checkpoint_1.displayCheckpointMenu)();
+            this.freshPrompt();
+            return true;
         }
-        // No valid key or known prefix detected
-        return { status: 'not_found' };
-    }
-    /**
-     * Handles the result of API key detection.
-     */
-    async handleApiKeyInput(detectionResult) {
-        switch (detectionResult.status) {
-            case 'found':
-                spinner_1.Spinner.get().start();
-                await this.readyPromise;
-                spinner_1.Spinner.get().stop();
-                // Call the client method to add the valid key
-                await this.client.handleAddApiKey(detectionResult.type, detectionResult.key);
-                // Note: client.handleAddApiKey calls returnControlToUser internally
-                break;
-            case 'prefix_only':
-                // Print the warning for incorrect format/length
-                console.log((0, picocolors_1.yellow)(`Input looks like a ${detectionResult.type} API key but has the wrong length or format. Expected ${detectionResult.length} characters starting with "${detectionResult.prefix}".`));
-                this.freshPrompt(); // Give the user a fresh prompt after the warning
-                break;
-        }
+        return false;
     }
     async forwardUserInput(userInput) {
-        await this.saveCheckpoint(userInput);
+        await (0, checkpoint_1.saveCheckpoint)(userInput, this.client, this.readyPromise);
         spinner_1.Spinner.get().start();
         this.client.lastChanges = [];
         const urls = (0, web_scraper_1.parseUrlsFromContent)(userInput);
@@ -397,62 +337,6 @@ class CLI {
         console.log((0, picocolors_1.green)('\nReconnected!'));
         this.returnControlToUser();
     }
-    async handleUndo() {
-        let failed = false;
-        try {
-            await checkpoint_manager_1.checkpointManager.restoreUndoCheckpoint();
-        }
-        catch (error) {
-            failed = true;
-            if (error instanceof checkpoint_manager_1.CheckpointsDisabledError) {
-                console.log((0, picocolors_1.red)(`Checkpoints not enabled: ${error.message}`));
-            }
-            else {
-                console.log((0, picocolors_1.red)(`Unable to undo: ${error.message}`));
-            }
-        }
-        let userInput = '';
-        if (!failed) {
-            const currentCheckpoint = checkpoint_manager_1.checkpointManager.checkpoints[checkpoint_manager_1.checkpointManager.currentCheckpointId - 1];
-            // Restore the agentState
-            this.client.agentState = JSON.parse(currentCheckpoint.agentStateString);
-            this.client.lastToolResults = JSON.parse(currentCheckpoint.lastToolResultsString);
-            console.log((0, picocolors_1.green)(`Checkpoint #${checkpoint_manager_1.checkpointManager.currentCheckpointId} restored.`));
-            userInput =
-                checkpoint_manager_1.checkpointManager.checkpoints[checkpoint_manager_1.checkpointManager.currentCheckpointId - 1]
-                    ?.userInput ?? '';
-        }
-        this.freshPrompt();
-        this.restoreUserInput(userInput);
-    }
-    async handleRedo() {
-        let failed = false;
-        try {
-            await checkpoint_manager_1.checkpointManager.restoreRedoCheckpoint();
-        }
-        catch (error) {
-            failed = true;
-            if (error instanceof checkpoint_manager_1.CheckpointsDisabledError) {
-                console.log((0, picocolors_1.red)(`Checkpoints not enabled: ${error.message}`));
-            }
-            else {
-                console.log((0, picocolors_1.red)(`Unable to redo: ${error.message}`));
-            }
-        }
-        let userInput = '';
-        if (!failed) {
-            const currentCheckpoint = checkpoint_manager_1.checkpointManager.checkpoints[checkpoint_manager_1.checkpointManager.currentCheckpointId - 1];
-            // Restore the agentState
-            this.client.agentState = JSON.parse(currentCheckpoint.agentStateString);
-            this.client.lastToolResults = JSON.parse(currentCheckpoint.lastToolResultsString);
-            console.log((0, picocolors_1.green)(`Checkpoint #${checkpoint_manager_1.checkpointManager.currentCheckpointId} restored.`));
-            userInput =
-                checkpoint_manager_1.checkpointManager.checkpoints[checkpoint_manager_1.checkpointManager.currentCheckpointId - 1]
-                    ?.userInput ?? '';
-        }
-        this.freshPrompt();
-        this.restoreUserInput(userInput);
-    }
     handleKeyPress(str, key) {
         if (key.name === 'escape') {
             this.handleEscKey();
@@ -508,127 +392,6 @@ class CLI {
         }
         spinner_1.Spinner.get().stop();
     }
-    async showEasterEgg() {
-        const text = 'codebuffy';
-        // Utility: clear the terminal screen
-        function clearScreen() {
-            process.stdout.write('\u001b[2J\u001b[0;0H');
-        }
-        const termWidth = process.stdout.columns;
-        const termHeight = process.stdout.rows;
-        const baselineWidth = 80;
-        const baselineHeight = 24;
-        const scaleFactor = Math.min(termWidth / baselineWidth, termHeight / baselineHeight);
-        // Utility: Generate a set of points tracing a "C" shape using an arc.
-        function generateCPath(cx, cy, r, steps) {
-            const points = [];
-            // A typical "C" opens to the right: from 45° to 315° (in radians)
-            const startAngle = Math.PI / 4;
-            const endAngle = (7 * Math.PI) / 4;
-            const angleStep = (endAngle - startAngle) / steps;
-            for (let i = 0; i <= steps; i++) {
-                const angle = startAngle + i * angleStep;
-                const x = Math.floor(cx + r * Math.cos(angle));
-                const y = Math.floor(cy + r * Math.sin(angle));
-                points.push({ x, y });
-            }
-            return points;
-        }
-        // Utility: Generate points along a quadratic Bézier curve.
-        function quadraticBezier(P0, P1, P2, steps) {
-            const points = [];
-            for (let i = 0; i <= steps; i++) {
-                const t = i / steps;
-                const x = Math.round((1 - t) ** 2 * P0.x + 2 * (1 - t) * t * P1.x + t ** 2 * P2.x);
-                const y = Math.round((1 - t) ** 2 * P0.y + 2 * (1 - t) * t * P1.y + t ** 2 * P2.y);
-                points.push({ x, y });
-            }
-            return points;
-        }
-        // Generate a vertical line from startY to endY at a given x.
-        function generateVerticalLine(x, startY, endY) {
-            const points = [];
-            const step = startY < endY ? 1 : -1;
-            for (let y = startY; y !== endY; y += step) {
-                points.push({ x, y });
-            }
-            points.push({ x, y: endY });
-            return points;
-        }
-        // Generate a path approximating a B shape using two quadratic Bézier curves
-        // for the rounded bubbles, and then closing the shape with a vertical spine.
-        function generateBPath(bX, bYTop, bYBottom, bWidth, bGap, stepsPerCurve) {
-            let points = [];
-            const middle = Math.floor((bYTop + bYBottom) / 2);
-            // Upper bubble: from top-left (spine) out then back to the spine at the middle.
-            const upperStart = { x: bX, y: bYTop };
-            const upperControl = {
-                x: bX + bWidth + bGap - 10,
-                y: Math.floor((bYTop + middle) / 2),
-            };
-            const upperEnd = { x: bX, y: middle };
-            const upperCurve = quadraticBezier(upperStart, upperControl, upperEnd, stepsPerCurve);
-            // Lower bubble: from the middle to the bottom.
-            const lowerStart = { x: bX, y: middle };
-            const lowerControl = {
-                x: bX + bWidth + bGap,
-                y: Math.floor((middle + bYBottom) / 2),
-            };
-            const lowerEnd = { x: bX, y: bYBottom };
-            const lowerCurve = quadraticBezier(lowerStart, lowerControl, lowerEnd, stepsPerCurve);
-            // Combine the curves.
-            points = points.concat(upperCurve, lowerCurve);
-            // Add a vertical line from the bottom of the B back up to the top.
-            const closingLine = generateVerticalLine(bX, bYBottom, bYTop);
-            points = points.concat(closingLine);
-            return points;
-        }
-        // Dynamically scale parameters for the shapes.
-        // Use Math.max to ensure values don't get too small.
-        const cCenterX = Math.floor(termWidth * 0.3);
-        const cCenterY = Math.floor(termHeight / 2);
-        const cRadius = Math.max(2, Math.floor(8 * scaleFactor));
-        const cSteps = Math.max(10, Math.floor(30 * scaleFactor));
-        const bX = Math.floor(termWidth * 0.55);
-        const bYTop = Math.floor(termHeight / 2 - 7 * scaleFactor);
-        const bYBottom = Math.floor(termHeight / 2 + 7 * scaleFactor);
-        const bWidth = Math.max(2, Math.floor(8 * scaleFactor));
-        const bGap = Math.max(1, Math.floor(35 * scaleFactor));
-        const bStepsPerCurve = Math.max(10, Math.floor(20 * scaleFactor));
-        // Generate the paths.
-        const fullPath = [
-            ...generateCPath(cCenterX, cCenterY, cRadius, cSteps),
-            ...generateBPath(bX, bYTop, bYBottom, bWidth, bGap, bStepsPerCurve),
-        ];
-        // Array of picocolors functions for random colors.
-        const colors = [picocolors_1.red, picocolors_1.green, picocolors_1.yellow, picocolors_1.blue, picocolors_1.magenta, picocolors_1.cyan];
-        function getRandomColor() {
-            return colors[Math.floor(Math.random() * colors.length)];
-        }
-        // Animation state: index into the fullPath.
-        let index = 0;
-        let completedCycle = false;
-        // Main animation function
-        function animate() {
-            if (index >= fullPath.length) {
-                completedCycle = true;
-                return;
-            }
-            const { x, y } = fullPath[index];
-            const cursorPosition = `\u001b[${y + 1};${x + 1}H`;
-            process.stdout.write(cursorPosition + getRandomColor()(text));
-            index++;
-        }
-        clearScreen();
-        const interval = setInterval(() => {
-            animate();
-            if (completedCycle) {
-                clearInterval(interval);
-                clearScreen();
-                this.returnControlToUser();
-            }
-        }, 100);
-    }
     handleExit() {
         spinner_1.Spinner.get().restoreCursor();
         console.log('\n');
@@ -645,14 +408,15 @@ class CLI {
             }
         }
         const logMessages = [];
-        const totalCredits = Object.values(this.client.creditsByPromptId)
+        const totalCreditsUsedThisSession = Object.values(this.client.creditsByPromptId)
             .flat()
             .reduce((sum, credits) => sum + credits, 0);
-        logMessages.push(`${(0, string_1.pluralize)(totalCredits, 'credit')} used this session.`);
-        if (this.client.limit && this.client.usage && this.client.nextQuotaReset) {
-            const daysUntilReset = Math.max(0, Math.floor((this.client.nextQuotaReset.getTime() - Date.now()) /
-                (1000 * 60 * 60 * 24)));
-            logMessages.push(`${Math.max(0, this.client.limit - this.client.usage)} credits remaining. Renews in ${(0, string_1.pluralize)(daysUntilReset, 'day')}.`);
+        logMessages.push(`${(0, string_1.pluralize)(totalCreditsUsedThisSession, 'credit')} used this session, ${this.client.usageData.remainingBalance.toLocaleString()} credits left.`);
+        if (this.client.usageData.next_quota_reset) {
+            const daysUntilReset = Math.ceil((new Date(this.client.usageData.next_quota_reset).getTime() -
+                Date.now()) /
+                (1000 * 60 * 60 * 24));
+            logMessages.push(`Your free credits will reset in ${(0, string_1.pluralize)(daysUntilReset, 'day')}.`);
         }
         console.log(logMessages.join(' '));
         console.log((0, picocolors_1.green)('Codebuff out!'));
@@ -675,97 +439,6 @@ class CLI {
         }
         this.lastInputTime = currentTime;
     }
-    handleDiff() {
-        if (this.client.lastChanges.length === 0) {
-            console.log((0, picocolors_1.yellow)('No changes found in the last assistant response.'));
-            return;
-        }
-        this.client.lastChanges.forEach((change) => {
-            console.log((0, picocolors_1.bold)(`___${change.path}___`));
-            const lines = change.content
-                .split('\n')
-                .map((line) => (change.type === 'file' ? '+' + line : line));
-            lines.forEach((line) => {
-                if (line.startsWith('+')) {
-                    console.log((0, picocolors_1.green)(line));
-                }
-                else if (line.startsWith('-')) {
-                    console.log((0, picocolors_1.red)(line));
-                }
-                else if (line.startsWith('@@')) {
-                    console.log((0, picocolors_1.cyan)(line));
-                }
-                else {
-                    console.log(line);
-                }
-            });
-        });
-    }
-    // Checkpoint command handlers
-    async handleCheckpoints() {
-        console.log(checkpoint_manager_1.checkpointManager.getCheckpointsAsString());
-        this.freshPrompt();
-    }
-    async handleRestoreCheckpoint(id) {
-        spinner_1.Spinner.get().start();
-        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.freshPrompt();
-            return;
-        }
-        try {
-            // Wait for save before trying to restore checkpoint
-            const latestCheckpoint = checkpoint_manager_1.checkpointManager.getLatestCheckpoint();
-            await latestCheckpoint?.fileStateIdPromise;
-        }
-        catch (error) {
-            // Should never happen
-        }
-        // Restore the agentState
-        this.client.agentState = JSON.parse(checkpoint.agentStateString);
-        this.client.lastToolResults = JSON.parse(checkpoint.lastToolResultsString);
-        let failed = false;
-        try {
-            // Restore file state
-            await checkpoint_manager_1.checkpointManager.restoreCheckointFileState({
-                id: checkpoint.id,
-                resetUndoIds: true,
-            });
-        }
-        catch (error) {
-            failed = true;
-            spinner_1.Spinner.get().stop();
-            console.log((0, picocolors_1.red)(`Unable to restore checkpoint: ${error.message}`));
-        }
-        if (!failed) {
-            spinner_1.Spinner.get().stop();
-            console.log((0, picocolors_1.green)(`Restored to checkpoint #${id}.`));
-        }
-        // Insert the original user input that created this checkpoint
-        this.freshPrompt();
-        this.restoreUserInput(checkpoint.userInput);
-    }
-    restoreUserInput(userInput) {
-        if (!userInput.match(restoreCheckpointRegex) &&
-            !undoCommands.includes(userInput) &&
-            !redoCommands.includes(userInput)) {
-            this.rl.write(' '.repeat(userInput.length)); // hacky way to move cursor
-            const rlAny = this.rl;
-            rlAny.line = userInput;
-            rlAny._refreshLine();
-        }
-    }
-    async handleClearCheckpoints() {
-        checkpoint_manager_1.checkpointManager.clearCheckpoints();
-        console.log('Cleared all checkpoints.');
-        this.freshPrompt();
-    }
 }
 exports.CLI = CLI;
 //# sourceMappingURL=cli.js.map