osai-agent 4.2.30 → 4.2.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "osai-agent",
-  "version": "4.2.30",
+  "version": "4.2.32",
   "type": "module",
   "description": "OS AI Agent - YOUR AI AGENT",
   "main": "src/index.js",

package/src/commands/run.js

@@ -11,6 +11,7 @@ import { toHttpUrl } from '../services/server-url.js';
 import { MODES } from '../utils/constants.js';
 import { printNotLoggedIn } from '../ui/terminal.js';
 import { disableMouseReporting } from '../ui/mouse-scroll.js';
+import WebSocket from 'ws';
 import { logger } from '../utils/logger.js';
 
 export const run = async ({ server: serverOverride, noConfirm = false, osOverride, coding = false, fromSession = null, local = false } = {}) => {
@@ -33,15 +34,26 @@ export const run = async ({ server: serverOverride, noConfirm = false, osOverrid
 
   if (!effectiveLocal && token && server) {
     try {
-      const res = await fetch(`${server}/auth/check-status`, {
-        headers: { 'Authorization': `Bearer ${token}` }
+      const wsUrl = server.replace('http://', 'ws://').replace('https://', 'wss://');
+      await new Promise((resolve, reject) => {
+        const ws = new WebSocket(`${wsUrl}/ws`, { handshakeTimeout: 5000 });
+        const timeout = setTimeout(() => { ws.close(); resolve(); }, 3000);
+        ws.on('open', () => ws.send(JSON.stringify({ type: 'REGISTER', token })));
+        ws.on('message', (data) => {
+          try {
+            const msg = JSON.parse(data.toString());
+            if (msg.type === 'REGISTERED') { clearTimeout(timeout); ws.close(); resolve(); }
+            else if (msg.type === 'ERROR') { clearTimeout(timeout); ws.close(); reject(new Error(msg.message)); }
+          } catch { resolve(); }
+        });
+        ws.on('error', () => { clearTimeout(timeout); resolve(); });
       });
-      const data = await res.json();
-      if (data.status === 'disabled') {
-        console.log(chalk.red(`\n  ${data.error}\n`));
+    } catch (err) {
+      if (err.message.toLowerCase().includes('disabled')) {
+        console.log(chalk.red(`\n  ${err.message}\n`));
         process.exit(1);
       }
-    } catch {}
+    }
   }
 
   const resumedMode = Object.values(MODES).includes(fromSession?.mode) ? fromSession.mode : null;

package/src/commands/usage.js

@@ -15,7 +15,7 @@ export const usageStats = async ({ server, days, json }) => {
   console.log(chalk.hex('#4a9eff').bold(`\n  Admin — Usage Stats (last ${summary.period_days} days)\n`));
   console.log(`  ${chalk.white('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━')}`);
 
-  const activePct = summary.total_users > 0 ? Math.round(summary.active / summary.total_users * 100) : 0;
+  const activePct = summary.total_users > 0 ? Math.round((summary.active || 0) / summary.total_users * 100) : 0;
   const proPct = summary.total_users > 0 ? Math.round(summary.pro / summary.total_users * 100) : 0;
 
   console.log(
@@ -30,7 +30,7 @@ export const usageStats = async ({ server, days, json }) => {
   );
   console.log(
     `  Sessions: ${chalk.white(summary.total_sessions)}` +
-    `  |  Commands: ${chalk.white(summary.total_commands.toLocaleString())}` +
+    `  |  Commands: ${chalk.white((summary.total_commands || 0).toLocaleString())}` +
     `  |  Pro keys claimed: ${chalk.white(summary.claimed_pro_keys)}`
   );
 
@@ -41,12 +41,21 @@ export const usageStats = async ({ server, days, json }) => {
     return;
   }
 
-  const header = `  ${chalk.dim('Email'.padEnd(36))}${chalk.dim('Plan'.padEnd(6))}${chalk.dim('Status'.padEnd(9))}${chalk.dim('Logs'.padEnd(6))}${chalk.dim('Cmd'.padEnd(8))}${chalk.dim('Last active')}`;
+  const header =
+    `  ${chalk.dim('Email'.padEnd(36))}  ` +
+    `${chalk.dim('Plan'.padEnd(5))}  ` +
+    `${chalk.dim('Status'.padEnd(8))}  ` +
+    `${chalk.dim('Logs')}  ` +
+    `${chalk.dim('Cmd')}  ` +
+    `${chalk.dim('Last active')}`;
   console.log(header);
 
   for (const u of users) {
-    const planBadge = u.plan === 'pro' ? chalk.hex('#ff9e64')('pro') : chalk.gray('free');
-    const statusBadge = u.status === 'disabled' ? chalk.red('disabled') : chalk.green('active');
+    const planStr = u.plan === 'pro' ? 'pro' : 'free';
+    const statusStr = !u.status || u.status === 'active' ? 'active' : 'disabled';
+    const planBadge = planStr === 'pro' ? chalk.hex('#ff9e64')(planStr.padEnd(5)) : chalk.gray(planStr.padEnd(5));
+    const statusBadge = statusStr === 'disabled' ? chalk.red(statusStr.padEnd(8)) : chalk.green(statusStr.padEnd(8));
+
     const lastActive = u.last_active
       ? (() => {
           const d = new Date(u.last_active);
@@ -59,15 +68,17 @@ export const usageStats = async ({ server, days, json }) => {
         })()
       : chalk.gray('never');
 
-    const logsStr = u.total_logs > 0 ? chalk.white(u.total_logs) : chalk.gray('0');
-    const cmdStr = u.total_commands > 0 ? chalk.white(u.total_commands) : chalk.gray('0');
+    const logsRaw = u.total_logs > 0 ? String(u.total_logs) : '0';
+    const cmdRaw = u.total_commands > 0 ? String(u.total_commands) : '0';
+    const logsStr = u.total_logs > 0 ? chalk.white(logsRaw.padStart(2)) : chalk.gray(logsRaw.padStart(2));
+    const cmdStr = u.total_commands > 0 ? chalk.white(cmdRaw.padStart(4)) : chalk.gray(cmdRaw.padStart(4));
 
     console.log(
-      `  ${chalk.white(u.email.padEnd(36))}` +
-      `${planBadge.padEnd(6)}` +
-      `${statusBadge.padEnd(9)}` +
-      `${logsStr.padEnd(6)}` +
-      `${cmdStr.padEnd(8)}` +
+      `  ${chalk.white(u.email.padEnd(36))}  ` +
+      `${planBadge}  ` +
+      `${statusBadge}  ` +
+      `${logsStr}  ` +
+      `${cmdStr}  ` +
       `${lastActive}`
     );
   }