osai-agent 4.2.28 → 4.2.30

package/package.json

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

package/src/commands/admin.js

@@ -43,6 +43,7 @@ const adminFetch = async (serverArg, path, method = 'GET', body = null, pathPref
   return data;
 };
 
+export { adminFetch };
 export const listUsers = async ({ server }) => {
   const data = await adminFetch(server, '/admin/users');
   const users = data.users || [];

package/src/commands/run.js

@@ -31,6 +31,19 @@ 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 data = await res.json();
+      if (data.status === 'disabled') {
+        console.log(chalk.red(`\n  ${data.error}\n`));
+        process.exit(1);
+      }
+    } catch {}
+  }
+
   const resumedMode = Object.values(MODES).includes(fromSession?.mode) ? fromSession.mode : null;
   const resumedOS = fromSession?.os;
   const userOS = osOverride || resumedOS || config.get('os') || detectDefaultOS();

package/src/commands/usage.js

@@ -0,0 +1,75 @@
+import chalk from 'chalk';
+import { adminFetch } from './admin.js';
+
+export const usageStats = async ({ server, days, json }) => {
+  const daysVal = Math.min(Math.max(parseInt(days || '7', 10) || 7, 1), 365);
+  const qs = daysVal !== 7 ? `?days=${daysVal}` : '';
+  const data = await adminFetch(server, `/admin/usage-stats${qs}`, 'GET', null, '/auth');
+  const { summary, users } = data;
+
+  if (json) {
+    console.log(JSON.stringify(data, null, 2));
+    return;
+  }
+
+  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 proPct = summary.total_users > 0 ? Math.round(summary.pro / summary.total_users * 100) : 0;
+
+  console.log(
+    `  Users:  ${chalk.white(summary.total_users)}` +
+    `  (${chalk.green(`${summary.active} active`)} ` +
+    `· ${chalk.red(`${summary.disabled} disabled`)})`
+  );
+  console.log(
+    `  Plans:  ${chalk.white(summary.free)} free` +
+    ` · ${chalk.hex('#ff9e64')(`${summary.pro} pro`)}` +
+    `  (${chalk.gray(`${proPct}%`)} pro, ${chalk.gray(`+${summary.new_users} new`)})`
+  );
+  console.log(
+    `  Sessions: ${chalk.white(summary.total_sessions)}` +
+    `  |  Commands: ${chalk.white(summary.total_commands.toLocaleString())}` +
+    `  |  Pro keys claimed: ${chalk.white(summary.claimed_pro_keys)}`
+  );
+
+  console.log(`  ${chalk.white('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━')}\n`);
+
+  if (users.length === 0) {
+    console.log(chalk.yellow('  No users found.\n'));
+    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')}`;
+  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 lastActive = u.last_active
+      ? (() => {
+          const d = new Date(u.last_active);
+          const now = Date.now();
+          const diff = now - d.getTime();
+          if (diff < 60000) return 'just now';
+          if (diff < 3600000) return `${Math.floor(diff / 60000)}m ago`;
+          if (diff < 86400000) return `${Math.floor(diff / 3600000)}h ago`;
+          return d.toLocaleDateString();
+        })()
+      : 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');
+
+    console.log(
+      `  ${chalk.white(u.email.padEnd(36))}` +
+      `${planBadge.padEnd(6)}` +
+      `${statusBadge.padEnd(9)}` +
+      `${logsStr.padEnd(6)}` +
+      `${cmdStr.padEnd(8)}` +
+      `${lastActive}`
+    );
+  }
+  console.log();
+};

package/src/index.js

@@ -27,6 +27,7 @@ import { stopSubagent } from './commands/stop-subagent.js';
 import { claimProKey } from './commands/pro.js';
 import { deleteAccount } from './commands/account.js';
 import { listUsers, disableUser, enableUser, generateProKeys } from './commands/admin.js';
+import { usageStats } from './commands/usage.js';
 import minimist from 'minimist';
 import updateNotifier from 'update-notifier';
 import { createRequire } from 'module';
@@ -144,6 +145,15 @@ switch (cmd) {
     }
     break;
 
+  case 'usage':
+    if (args._[1] === 'stats') {
+      await usageStats({ server: args.server, days: args.days, json: args.json });
+    } else {
+      console.log('Usage: osai-agent usage stats [--days 7] [--json]');
+      process.exit(1);
+    }
+    break;
+
   case 'admin':
     if (args._[1] === 'users') {
       await listUsers({ server: args.server });
@@ -193,9 +203,10 @@ switch (cmd) {
     console.log('  skills          Manage skills');
     console.log('  mcp             Manage MCP servers');
     console.log('  stop-subagent   Stop a running subagent');
-    console.log('  pro             Activate a pro access code');
-    console.log('  account delete  Permanently delete your account and all data');
-    console.log();
+  console.log('  pro             Activate a pro access code');
+  console.log('  usage stats     Show admin usage statistics (--days 7, --json)');
+  console.log('  account delete  Permanently delete your account and all data');
+  console.log();
     process.exit(cmd ? 1 : 0);
 }