draftify-cli 1.0.76 → 1.0.79

package/dist/repl.js

@@ -46,51 +46,13 @@ function getContextForPrompt(dir, prompt) {
         }
     }
     walk(dir, 0);
-    const lowercasePrompt = prompt.toLowerCase();
-    // Check if any specific workspace files are mentioned in the prompt
-    const matchedFiles = allPaths.filter(filePath => {
-        const baseName = path_1.default.basename(filePath).toLowerCase();
-        const nameWithoutExt = path_1.default.parse(baseName).name.toLowerCase();
-        const ext = path_1.default.extname(filePath).toLowerCase();
-        const validExts = [
-            '.ts', '.tsx', '.js', '.jsx', '.css', '.json', '.html',
-            '.py', '.md', '.txt', '.c', '.cpp', '.h', '.java', '.go', '.rs', '.php', '.rb', '.sh'
-        ];
-        if (!validExts.includes(ext))
-            return false;
-        // Check if the prompt contains the full filename (e.g. 'snake.py') or name without ext (e.g. 'snake')
-        return lowercasePrompt.includes(baseName) || (nameWithoutExt.length > 2 && lowercasePrompt.includes(nameWithoutExt));
-    });
-    let filesToRead = [];
-    if (matchedFiles.length > 0) {
-        // If specific files are mentioned, only load those files
-        filesToRead = matchedFiles.slice(0, 5);
-    }
-    // Load the contents of selected files
-    for (const filePath of filesToRead) {
-        const fullPath = path_1.default.resolve(dir, filePath);
-        try {
-            ui_1.ui.fileRead(filePath);
-            const content = fs_1.default.readFileSync(fullPath, 'utf-8');
-            if (content.length < 50000) { // Limit to 50KB per file
-                codeFiles.push({ path: filePath, content });
-            }
-        }
-        catch {
-            // Ignore unreadable files
-        }
-    }
     let structureStr = allPaths.join('\n');
     if (allPaths.length >= maxPaths) {
         structureStr += '\n... (and more files omitted)';
     }
     let combinedCode = `--- PROJECT DIRECTORY STRUCTURE ---\n${structureStr}\n\n`;
-    if (codeFiles.length > 0) {
-        combinedCode += `--- ATTACHED FILE CONTENTS ---\n`;
-        combinedCode += codeFiles.map(f => `--- File: ${f.path} ---\n${f.content}\n`).join('\n');
-    }
     return {
-        fileName: codeFiles.length > 0 ? codeFiles[0].path : "workspace_context",
+        fileName: "workspace_context",
         code: combinedCode
     };
 }
@@ -429,8 +391,30 @@ async function startRepl(initialUsername) {
                 }
                 else if (cmd === "usage") {
                     ui_1.ui.header("Usage & Quota");
-                    console.log(`  Quota: ${(0, kleur_1.cyan)("Infinite")}`);
-                    console.log(`  Tokens used: ${(0, kleur_1.cyan)((0, config_1.getTokensUsed)().toLocaleString())}\n`);
+                    const spinner = (0, ui_1.createSpinner)("Fetching usage...");
+                    spinner.start();
+                    try {
+                        const usage = await (0, api_1.getUserUsage)();
+                        spinner.stop();
+                        if (usage) {
+                            const quotaStr = usage.r1Limit === -1 ? "Infinite" : usage.r1Limit.toLocaleString();
+                            console.log(`  Plan: ${(0, kleur_1.cyan)(usage.plan)}`);
+                            console.log(`  Opus 4.8-level Quota: ${(0, kleur_1.cyan)(quotaStr)} tokens`);
+                            console.log(`  Opus 4.8-level Used: ${(0, kleur_1.cyan)(usage.r1TokensUsed.toLocaleString())} tokens\n`);
+                        }
+                        else {
+                            ui_1.ui.error("Could not fetch usage. Are you logged in?");
+                        }
+                    }
+                    catch (e) {
+                        spinner.stop();
+                        if (e.message === "UNAUTHORIZED") {
+                            ui_1.ui.error("You are not logged in. Please run '/login' first.");
+                        }
+                        else {
+                            ui_1.ui.error("Failed to fetch usage: " + e.message);
+                        }
+                    }
                 }
                 else if (cmd === "chats") {
                     const chats = (0, chats_1.loadChats)();
@@ -655,7 +639,7 @@ async function startRepl(initialUsername) {
                     }
                     if (fs_1.default.existsSync(fullPath)) {
                         let fileContent = fs_1.default.readFileSync(fullPath, 'utf-8');
-                        const searchBlockRegex = /<<<<<<< SEARCH\n([\s\S]*?)\n=======\n([\s\S]*?)\n>>>>>>>/g;
+                        const searchBlockRegex = /<<<<<<< SEARCH>?\r?\n([\s\S]*?)\r?\n=======\r?\n([\s\S]*?)\r?\n>>>>>>>/g;
                         let diffMatch;
                         let diffApplied = false;
                         let hasDiffBlocks = false;
@@ -1041,7 +1025,8 @@ async function startRepl(initialUsername) {
                     promptAdditions.push(`I executed your file system requests. Here are the results:\n${autoExplorationOutputs.join('\n\n')}`);
                     autoPrompt = promptAdditions.join("\n\n");
                 }
-                if (finalDisplayResult) {
+                const isIntermediateExploration = (filesToReadAuto.length > 0 || dirsToListAuto.length > 0) && commandsToRun.length === 0 && questions.length === 0;
+                if (finalDisplayResult && !isIntermediateExploration) {
                     ui_1.ui.box("Draftify AI", finalDisplayResult.split("\n"));
                 }
                 // --- INTERACTIVE MENU FOR QUESTIONS ---

package/dist/utils/api.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.refactorCodeApi = refactorCodeApi;
 exports.getUserProfile = getUserProfile;
+exports.getUserUsage = getUserUsage;
 const config_1 = require("./config");
 const dotenv_1 = __importDefault(require("dotenv"));
 dotenv_1.default.config();
@@ -106,3 +107,24 @@ async function getUserProfile() {
     }
     return null;
 }
+async function getUserUsage() {
+    const token = (0, config_1.getToken)();
+    if (!token)
+        throw new Error("UNAUTHORIZED");
+    // Replace the trailing /api/cli or /api/user/profile with /api/user/usage
+    let apiUrl = (0, config_1.getApiUrl)();
+    apiUrl = apiUrl.replace(/\/api\/.*$/, "/api/user/usage");
+    try {
+        const response = await fetch(apiUrl, {
+            method: "GET",
+            headers: { Authorization: `Bearer ${token}` }
+        });
+        if (response.ok) {
+            return await response.json();
+        }
+    }
+    catch (e) {
+        // Ignore errors
+    }
+    return null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "draftify-cli",
-  "version": "1.0.76",
+  "version": "1.0.79",
   "description": "Draftify AI CLI tool",
   "main": "dist/index.js",
   "bin": {