@taj-special/dravix-code 1.2.4 → 1.2.5

package/dist/cli/index.js

@@ -3,26 +3,15 @@ import * as path from 'path';
 import { randomBytes } from 'crypto';
 import { execSync } from 'child_process';
 import chalk from 'chalk';
-import { banner, printHelp, printError, colors, VERSION } from '../utils/display.js';
+import { banner, printHelp, printError, colors } from '../utils/display.js';
 import { startRepl } from './repl.js';
-import { isLoggedIn, logout, saveConfig, AUTH_URL } from '../services/auth.js';
+import { isLoggedIn, logout, getSavedUser, saveConfig, checkPlan, AUTH_URL } from '../services/auth.js';
+import { checkUsage, usageBar, fmtNum, formatResetTime } from '../services/usage.js';
 const POLL_URL = 'https://dravix.app/cli-auth.php';
 const SPINNER = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
 function link(url) {
     return `\x1b]8;;${url}\x1b\\${url}\x1b]8;;\x1b\\`;
 }
-function cx(s) {
-    const cols = process.stdout.columns ?? 80;
-    return ' '.repeat(Math.max(0, Math.floor((cols - s.length) / 2)));
-}
-function drawStars(count) {
-    const starChars = ['✦', '✧', '⋆', '·'];
-    for (let i = 0; i < count; i++) {
-        const cols = process.stdout.columns ?? 80;
-        const x = Math.floor(Math.random() * (cols - 10)) + 5;
-        console.log(' '.repeat(x) + colors.subtext(starChars[Math.floor(Math.random() * starChars.length)]));
-    }
-}
 async function pollSession(sessionId) {
     try {
         const res = await fetch(`${POLL_URL}?action=poll&session=${sessionId}`);
@@ -36,58 +25,47 @@ async function pollSession(sessionId) {
 }
 async function showWelcome() {
     const cols = process.stdout.columns ?? 80;
-    const rows = process.stdout.rows ?? 24;
-    const boxW = Math.min(cols - 6, 70);
-    const indent = ' '.repeat(Math.max(0, Math.floor((cols - boxW) / 2)));
+    const W = Math.min(cols, 64);
+    const P = colors.primary;
+    const PB = colors.primary.bold;
+    const DIM = colors.muted;
+    const G = colors.success;
+    const White = colors.text;
+    const Muted = colors.muted;
+    const line = () => DIM('  ' + '─'.repeat(W - 4));
+    const pad = (s, w) => s + ' '.repeat(Math.max(w - s.length, 0));
     console.clear();
-    // Stars
-    drawStars(5);
-    // Brand
-    console.log(cx('Taj Special') + colors.subtext('Taj Special'));
-    // Logo
-    const logoLines = [
-        '██████╗ ██████╗  █████╗ ██╗   ██╗██╗██╗  ██╗',
-        '██╔══██╗██╔══██╗██╔══██╗██║   ██║██║╚██╗██╔╝',
-        '██║  ██║██████╔╝███████║██║   ██║██║ ╚███╔╝',
-        '██║  ██║██╔══██╗██╔══██║╚██╗ ██╔╝██║ ██╔██╗',
-        '██████╔╝██║  ██║██║  ██║ ╚████╔╝ ██║██╔╝ ██╗',
-        '╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═╝  ╚═══╝  ╚═╝╚═╝  ╚═╝',
-    ];
-    for (const line of logoLines) {
-        console.log(cx(line) + colors.primary.bold(line));
-    }
-    // CODE subtitle
-    console.log(cx('C O D E') + colors.accent.bold('C O D E'));
-    // More stars
-    drawStars(3);
-    console.log('');
-    // Input box (centered)
-    const innerW = boxW - 6;
-    const placeholder = 'Ask me anything...';
-    const display = placeholder.length > innerW ? placeholder.slice(0, innerW - 1) + '…' : placeholder;
-    const pPad = ' '.repeat(Math.max(innerW - display.length, 0));
-    console.log(indent + colors.dim('╭' + '─'.repeat(boxW - 2) + '╮'));
-    console.log(indent + colors.dim('│') + '  ' + colors.subtext(display) + pPad + '  ' + colors.dim('│'));
-    console.log(indent + colors.dim('│') + '  ' + colors.primary('Build') + colors.muted(' · ') + colors.text('Dravix Auto') + colors.muted(' (Titanium + Quantum)') + '  ' + colors.dim('│'));
-    console.log(indent + colors.dim('╰' + '─'.repeat(boxW - 2) + '╯'));
-    console.log('');
-    // Shortcuts
-    console.log(indent +
-        colors.primary('Tab') + colors.muted(' mode  ') +
-        colors.primary('Ctrl+P') + colors.muted(' settings  ') +
-        colors.primary('@') + colors.muted(' file  ') +
-        colors.primary('$') + colors.muted(' agent  ') +
-        colors.primary('/') + colors.muted(' commands'));
-    console.log('');
-    // CTA
+    banner();
+    console.log('  ' + White.bold('Welcome to Dravix Code') + Muted('  — your AI coding partner'));
+    console.log('  ' + Muted('Works like Claude Code, Cursor, Copilot — but in your terminal.') + '\n');
+    const boxW = Math.min(W - 4, 58);
+    const inner = boxW - 2;
+    const BC = DIM;
+    const row = (icon, text) => {
+        const content = ` ${icon}  ${text}`;
+        const padded = pad(content, inner);
+        return '  ' + BC('│') + White(padded) + BC('│');
+    };
+    console.log('  ' + BC('╭' + '─'.repeat(boxW - 2) + '╮'));
+    console.log('  ' + BC('│') + P(pad('  Capabilities', inner)) + BC('│'));
+    console.log('  ' + BC('├' + '─'.repeat(boxW - 2) + '┤'));
+    console.log(row(G('✓'), 'Write, edit and create code with AI'));
+    console.log(row(G('✓'), 'Search and understand any codebase'));
+    console.log(row(G('✓'), 'Run commands and fix errors automatically'));
+    console.log(row(G('✓'), 'Read files, folders and project structure'));
+    console.log(row(G('✓'), 'Works with TypeScript, Python, Go and more'));
+    console.log('  ' + BC('╰' + '─'.repeat(boxW - 2) + '╯') + '\n');
+    console.log('  ' + Muted('Powered by  ') +
+        P.bold('Dravix 3 Titanium') +
+        Muted('  +  ') +
+        P.bold('Dravix 3.5 Quantum'));
+    console.log(line() + '\n');
+    console.log('  ' + Muted('Sign in with your Google account to get started.') + '\n');
     const enterKey = chalk.bgHex('#312e81').hex('#c7d2fe').bold('  Enter  ');
-    const escKey = colors.dim(' Esc ');
-    console.log(indent + enterKey + colors.muted('  Sign in with Google'));
-    console.log(indent + escKey + colors.muted('       Cancel'));
-    // Bottom bar
-    const bottomLeft = '~' + path.basename(process.cwd());
-    const bottomRight = 'v' + VERSION;
-    process.stdout.write(`\x1b[${rows};1H\x1b[2K` + colors.muted(bottomLeft) + ' '.repeat(Math.max(cols - bottomLeft.length - bottomRight.length, 2)) + colors.muted(bottomRight));
+    const escKey = chalk.hex('#374151').bold(' Esc ');
+    console.log('  ' + enterKey + Muted('  Sign in with Google'));
+    console.log('  ' + escKey + Muted('       Cancel') + '\n');
+    console.log(line() + '\n');
     return new Promise((resolve) => {
         process.stdin.setRawMode(true);
         process.stdin.resume();
@@ -113,43 +91,27 @@ async function showWelcome() {
 async function browserAuth() {
     const sessionId = randomBytes(16).toString('hex');
     const authUrl = `${AUTH_URL}?session=${sessionId}`;
+    const DIM = colors.muted;
+    const W = colors.text;
+    const P = colors.primary;
     const cols = process.stdout.columns ?? 80;
-    const rows = process.stdout.rows ?? 24;
-    const boxW = Math.min(cols - 6, 70);
-    const indent = ' '.repeat(Math.max(0, Math.floor((cols - boxW) / 2)));
+    const line = DIM('  ' + '─'.repeat(Math.min(cols - 4, 51)));
     console.clear();
-    drawStars(4);
-    console.log(cx('Taj Special') + colors.subtext('Taj Special'));
-    const logoLines = [
-        '██████╗ ██████╗  █████╗ ██╗   ██╗██╗██╗  ██╗',
-        '██╔══██╗██╔══██╗██╔══██╗██║   ██║██║╚██╗██╔╝',
-        '██║  ██║██████╔╝███████║██║   ██║██║ ╚███╔╝',
-        '██║  ██║██╔══██╗██╔══██║╚██╗ ██╔╝██║ ██╔██╗',
-        '██████╔╝██║  ██║██║  ██║ ╚████╔╝ ██║██╔╝ ██╗',
-        '╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═╝  ╚═══╝  ╚═╝╚═╝  ╚═╝',
-    ];
-    for (const line of logoLines) {
-        console.log(cx(line) + colors.primary.bold(line));
-    }
-    console.log(cx('C O D E') + colors.accent.bold('C O D E'));
-    drawStars(2);
-    console.log('');
-    // Auth steps box
-    console.log(indent + colors.dim('╭' + '─'.repeat(boxW - 2) + '╮'));
-    console.log(indent + colors.dim('│') + '  ' + colors.text('Step 1 — ') + colors.muted('Open this link in your browser:') + '  ' + colors.dim('│'));
-    console.log(indent + colors.dim('│') + '  ' + colors.primary(link(authUrl)) + '  ' + colors.dim('│'));
-    console.log(indent + colors.dim('│') + '  ' + colors.dim('Step 2 — Sign in and authorize') + '  ' + colors.dim('│'));
-    console.log(indent + colors.dim('│') + '  ' + colors.dim('Step 3 — Return here (auto-connects)') + '  ' + colors.dim('│'));
-    console.log(indent + colors.dim('╰' + '─'.repeat(boxW - 2) + '╯'));
-    console.log('');
-    // Spinner
+    banner();
+    console.log(line);
+    console.log('\n  ' + DIM('Step 1 — ') + W('Open this link in your browser:') + '\n');
+    console.log('  ' + colors.primary(link(authUrl)) + '\n');
+    console.log('  ' + DIM('Step 2 — ') + W('Sign in to your Dravix account and authorize access'));
+    console.log('  ' + DIM('Step 3 — ') + W('Return here — authentication completes automatically') + '\n');
+    console.log(line + '\n');
     let frameIdx = 0;
     await new Promise((resolve, reject) => {
         let done = false;
         const spinnerInterval = setInterval(() => {
             if (done)
                 return;
-            process.stdout.write(`\r  ${colors.muted(SPINNER[frameIdx++ % SPINNER.length])}  ${colors.muted('Waiting for authentication...')}`);
+            process.stdout.write(`\r  ${colors.muted(SPINNER[frameIdx % SPINNER.length])}  ${colors.muted('Waiting for authentication...')}`);
+            frameIdx++;
         }, 80);
         const poll = async () => {
             if (done)
@@ -160,7 +122,8 @@ async function browserAuth() {
                 clearInterval(spinnerInterval);
                 process.stdout.write('\r\x1b[K');
                 saveConfig({ token: result.token, name: result.name, email: result.email });
-                console.log('  ' + colors.success('✓') + '  ' + colors.text('Signed in as ') + colors.primary.bold(result.name));
+                console.log('  ' + colors.success('✓') + '  ' + W('Signed in as ') + colors.primary.bold(result.name) + DIM('  ·  ') + colors.muted(result.email));
+                console.log(DIM('\n  ' + '─'.repeat(47)) + '\n');
                 resolve();
                 return;
             }
@@ -171,7 +134,8 @@ async function browserAuth() {
             if (!done) {
                 done = true;
                 clearInterval(spinnerInterval);
-                reject(new Error('Authentication timed out.'));
+                process.stdout.write('\r\x1b[K');
+                reject(new Error('Authentication timed out after 5 minutes.'));
             }
         }, 300_000);
     });
@@ -196,7 +160,10 @@ async function main() {
     }
     let justAuthenticated = false;
     if (arg === '--login') {
-        if (!isLoggedIn()) {
+        if (isLoggedIn()) {
+            banner();
+        }
+        else {
             await browserAuth();
             justAuthenticated = true;
         }
@@ -205,55 +172,55 @@ async function main() {
         await browserAuth();
         justAuthenticated = true;
     }
+    const { name, email } = getSavedUser();
     const cwd = (arg && !arg.startsWith('--')) ? path.resolve(arg) : process.cwd();
-    // Draw the clean centered app screen
-    const cols = process.stdout.columns ?? 80;
+    const token = (await import('../services/auth.js')).getToken() ?? '';
+    const [plan, usage] = await Promise.all([
+        email ? checkPlan(email) : Promise.resolve('Free'),
+        token ? checkUsage(token) : Promise.resolve(null),
+    ]);
+    const C = colors.primary;
+    const DIM = colors.muted;
+    const W = colors.text;
+    const planBadge = plan === 'Plus'
+        ? colors.accent.bold('Plus')
+        : colors.muted('Free');
     const rows = process.stdout.rows ?? 24;
-    const boxW = Math.min(cols - 6, 70);
-    const indent = ' '.repeat(Math.max(0, Math.floor((cols - boxW) / 2)));
-    console.clear();
-    drawStars(5);
-    console.log(cx('Taj Special') + colors.subtext('Taj Special'));
-    const logoLines = [
-        '██████╗ ██████╗  █████╗ ██╗   ██╗██╗██╗  ██╗',
-        '██╔══██╗██╔══██╗██╔══██╗██║   ██║██║╚██╗██╔╝',
-        '██║  ██║██████╔╝███████║██║   ██║██║ ╚███╔╝',
-        '██║  ██║██╔══██╗██╔══██║╚██╗ ██╔╝██║ ██╔██╗',
-        '██████╔╝██║  ██║██║  ██║ ╚████╔╝ ██║██╔╝ ██╗',
-        '╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═╝  ╚═══╝  ╚═╝╚═╝  ╚═╝',
-    ];
-    for (const line of logoLines) {
-        console.log(cx(line) + colors.primary.bold(line));
+    const cols = process.stdout.columns ?? 80;
+    // FULL-SCREEN: clear everything, set scroll region to entire terminal
+    process.stdout.write('\x1b[2J'); // Clear entire screen
+    process.stdout.write(`\x1b[1;${rows}r`); // Scroll region = entire terminal
+    process.stdout.write('\x1b[1;1H'); // Move to top-left
+    // Draw the app (ONE logo only)
+    banner();
+    console.log(DIM('  ' + '─'.repeat(45)));
+    console.log(colors.muted('  User    ') + W(name ?? 'Unknown') + DIM('  ·  ') + colors.muted(email ?? ''));
+    console.log(colors.muted('  Plan    ') + planBadge);
+    if (usage) {
+        const { bar, pct } = usageBar(usage.tokens_used, usage.limit);
+        const barColor = pct >= 80 ? colors.error
+            : pct >= 50 ? colors.warn
+                : colors.success;
+        const resetStr = formatResetTime(usage);
+        console.log(colors.muted('  Tokens  ') +
+            barColor(bar) + '  ' +
+            colors.subtext(fmtNum(usage.tokens_used) + ' / ' + fmtNum(usage.limit)) +
+            DIM('  ·  resets in ' + resetStr));
     }
-    console.log(cx('C O D E') + colors.accent.bold('C O D E'));
-    drawStars(3);
-    console.log('');
-    // Input box
-    const innerW = boxW - 6;
-    const placeholder = 'Ask me anything...';
-    const display = placeholder.length > innerW ? placeholder.slice(0, innerW - 1) + '…' : placeholder;
-    const pPad = ' '.repeat(Math.max(innerW - display.length, 0));
-    console.log(indent + colors.dim('╭' + '─'.repeat(boxW - 2) + '╮'));
-    console.log(indent + colors.dim('│') + '  ' + colors.subtext(display) + pPad + '  ' + colors.dim('│'));
-    console.log(indent + colors.dim('│') + '  ' + colors.primary('Build') + colors.muted(' · ') + colors.text('Dravix Auto') + colors.muted(' (Titanium + Quantum)') + '  ' + colors.dim('│'));
-    console.log(indent + colors.dim('╰' + '─'.repeat(boxW - 2) + '╯'));
-    console.log('');
-    // Shortcuts
-    console.log(indent +
-        colors.primary('Tab') + colors.muted(' mode  ') +
-        colors.primary('Ctrl+P') + colors.muted(' settings  ') +
-        colors.primary('@') + colors.muted(' file  ') +
-        colors.primary('$') + colors.muted(' agent  ') +
-        colors.primary('/') + colors.muted(' commands'));
-    console.log('');
-    // Tip
-    console.log(indent +
-        colors.primary('●') + colors.muted(' Tip  ') +
-        colors.text('Use syntax ') + colors.primary('{env:VAR_NAME}') + colors.text(' to reference variables'));
-    // Bottom bar
-    const bottomLeft = '~' + path.basename(cwd);
-    const bottomRight = 'v' + VERSION;
-    process.stdout.write(`\x1b[${rows};1H\x1b[2K` + colors.muted(bottomLeft) + ' '.repeat(Math.max(cols - bottomLeft.length - bottomRight.length, 2)) + colors.muted(bottomRight));
+    console.log(colors.muted('  Project ') + W(path.basename(cwd)));
+    console.log(colors.muted('  Path    ') + DIM(cwd));
+    console.log(DIM('  ' + '─'.repeat(45)));
+    console.log(colors.muted('  ') + C('Tab') + colors.muted(' path complete  ') + C('@') + colors.muted(' file picker  ') + C('Ctrl+C') + colors.muted(' cancel  ') + C('/help') + colors.muted(' commands'));
+    process.stdout.write('\n');
+    // Start REPL and handle cleanup on exit
+    const cleanup = () => {
+        process.stdout.write('\x1b[r'); // Reset scroll region
+        process.stdout.write('\x1b[2J'); // Clear screen
+        process.stdout.write('\x1b[1;1H'); // Move to top
+    };
+    process.on('exit', cleanup);
+    process.on('SIGINT', () => { cleanup(); process.exit(0); });
+    process.on('SIGTERM', () => { cleanup(); process.exit(0); });
     await startRepl(cwd);
 }
 main().catch((err) => {

package/dist/utils/display.js

@@ -20,35 +20,16 @@ export const colors = {
     text: chalk.hex('#e2e8f0'),
     subtext: chalk.hex('#94a3b8'),
 };
-function cx(s) {
-    const cols = process.stdout.columns ?? 80;
-    return ' '.repeat(Math.max(0, Math.floor((cols - s.length) / 2)));
-}
-function drawStars(count) {
-    const starChars = ['✦', '✧', '⋆', '·'];
-    for (let i = 0; i < count; i++) {
-        const cols = process.stdout.columns ?? 80;
-        const x = Math.floor(Math.random() * (cols - 10)) + 5;
-        console.log(' '.repeat(x) + colors.subtext(starChars[Math.floor(Math.random() * starChars.length)]));
-    }
-}
 export function banner() {
-    console.log('\n');
-    drawStars(4);
-    console.log(cx('Taj Special') + colors.subtext('Taj Special'));
-    const logoLines = [
-        '██████╗ ██████╗  █████╗ ██╗   ██╗██╗██╗  ██╗',
-        '██╔══██╗██╔══██╗██╔══██╗██║   ██║██║╚██╗██╔╝',
-        '██║  ██║██████╔╝███████║██║   ██║██║ ╚███╔╝',
-        '██║  ██║██╔══██╗██╔══██║╚██╗ ██╔╝██║ ██╔██╗',
-        '██████╔╝██║  ██║██║  ██║ ╚████╔╝ ██║██╔╝ ██╗',
-        '╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═╝  ╚═══╝  ╚═╝╚═╝  ╚═╝',
-    ];
-    for (const line of logoLines) {
-        console.log(cx(line) + colors.primary.bold(line));
-    }
-    console.log(cx('C O D E') + colors.accent.bold('C O D E'));
-    drawStars(3);
+    console.log(colors.primary.bold(`
+  ██████╗ ██████╗  █████╗ ██╗   ██╗██╗██╗  ██╗
+  ██╔══██╗██╔══██╗██╔══██╗██║   ██║██║╚██╗██╔╝
+  ██║  ██║██████╔╝███████║██║   ██║██║ ╚███╔╝
+  ██║  ██║██╔══██╗██╔══██║╚██╗ ██╔╝██║ ██╔██╗
+  ██████╔╝██║  ██║██║  ██║ ╚████╔╝ ██║██╔╝ ██╗
+  ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═╝  ╚═══╝  ╚═╝╚═╝  ╚═╝`));
+    console.log(colors.primary.bold('  Code') + colors.muted(`  v${VERSION}  ·  `) + colors.accent('AI-powered coding assistant'));
+    console.log(colors.dim('  ─────────────────────────────────────────────\n'));
 }
 export function printAI(chunk) {
     process.stdout.write(colors.ai(chunk));
@@ -82,7 +63,6 @@ export function printOpResult(result) {
         const labelStr = colors.subtext('  Updated  ');
         const statPad = statStr ? '   ' + statStr : '';
         console.log(iconStr + labelStr + pathStr + statPad);
-        // Compact mode: only show diff if changes are large (>30 lines)
         const totalChanges = displayAdds + displayRemoves;
         if (totalChanges > 30) {
             if (result.linesBefore !== undefined && result.linesAfter !== undefined) {

package/dist/utils/layout.js

@@ -14,10 +14,23 @@ export class ChatLayout {
     makeSep() {
         return chalk.hex('#374151')('  ' + '─'.repeat(Math.max(this.cols - 4, 40)));
     }
+    /** Full-screen mode: hide everything outside the app */
+    enterFullScreen() {
+        this.rows = process.stdout.rows ?? 24;
+        this.cols = process.stdout.columns ?? 80;
+        // Clear entire screen first
+        process.stdout.write('\x1b[2J');
+        // Set scroll region to ENTIRE terminal (rows 1 to rows)
+        // This hides everything outside the app
+        process.stdout.write(`\x1b[1;${this.rows}r`);
+        // Move to top-left
+        process.stdout.write('\x1b[1;1H');
+    }
     /** Call once at the start of startRepl — sets scroll region + draws divider. */
     init() {
         this.rows = process.stdout.rows ?? 24;
         this.cols = process.stdout.columns ?? 80;
+        // Set scroll region for chat (excluding bottom 3 rows for divider/input/hints)
         process.stdout.write(`\x1b[1;${this.scrollEnd}r`);
         this.redrawDivider();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taj-special/dravix-code",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "AI-powered coding assistant CLI — Dravix Code",
   "type": "module",
   "bin": {
@@ -16,7 +16,6 @@
     "prepublishOnly": "tsc"
   },
   "dependencies": {
-    "@taj-special/dravix-code": "^1.2.0",
     "chalk": "^5.3.0"
   },
   "devDependencies": {