agentlytics 0.2.7 → 0.2.9

package/editors/opencode.js

@@ -36,6 +36,38 @@ function queryDb(sql) {
   }
 }
 
+function extractModelInfo(data) {
+  let modelValue = null;
+  let providerValue = null;
+
+  if (typeof data?.modelID === 'string') {
+    modelValue = data.modelID;
+    providerValue = typeof data.providerID === 'string' ? data.providerID : null;
+  } else if (data?.model && typeof data.model === 'object') {
+    modelValue = typeof data.model.modelID === 'string' ? data.model.modelID : null;
+    providerValue = typeof data.providerID === 'string'
+      ? data.providerID
+      : (typeof data.model.providerID === 'string' ? data.model.providerID : null);
+  } else if (typeof data?.model === 'string') {
+    modelValue = data.model;
+    providerValue = typeof data.providerID === 'string' ? data.providerID : null;
+  }
+
+  return { modelValue, providerValue };
+}
+
+function extractTokenInfo(data) {
+  const tokens = data?.tokens && typeof data.tokens === 'object' ? data.tokens : null;
+  const cache = tokens?.cache && typeof tokens.cache === 'object' ? tokens.cache : null;
+
+  return {
+    inputTokens: tokens?.input,
+    outputTokens: tokens?.output,
+    cacheRead: cache?.read,
+    cacheWrite: cache?.write,
+  };
+}
+
 function getSqliteSessions() {
   return queryDb(
     `SELECT s.id, s.title, s.directory, s.time_created, s.time_updated,
@@ -94,19 +126,18 @@ function getSqliteMessages(sessionId) {
       const content = contentParts.join('\n');
       if (!content) continue;
 
-      let modelValue = null;
-      if (typeof msgData.modelID === 'string') {
-        modelValue = msgData.modelID;
-      } else if (msgData.model && typeof msgData.model === 'object' && msgData.model.modelID) {
-        modelValue = msgData.model.modelID;
-      } else if (typeof msgData.model === 'string') {
-        modelValue = msgData.model;
-      }
+      const { modelValue, providerValue } = extractModelInfo(msgData);
+      const { inputTokens, outputTokens, cacheRead, cacheWrite } = extractTokenInfo(msgData);
 
       result.push({
         role: role === 'user' ? 'user' : role === 'assistant' ? 'assistant' : role,
         content,
         _model: modelValue,
+        _provider: providerValue,
+        _inputTokens: inputTokens,
+        _outputTokens: outputTokens,
+        _cacheRead: cacheRead,
+        _cacheWrite: cacheWrite,
       });
     }
 
@@ -165,12 +196,19 @@ function getMessagesForSession(sessionId) {
   let files;
   try { files = fs.readdirSync(sessionMsgDir).filter(f => f.startsWith('msg_') && f.endsWith('.json')); } catch { return []; }
 
-  const messages = [];
+  const rawMsgs = [];
   for (const file of files) {
     const msgPath = path.join(sessionMsgDir, file);
     const msg = readJson(msgPath);
     if (!msg || !msg.id) continue;
+    rawMsgs.push(msg);
+  }
 
+  // Sort by creation time before building output
+  rawMsgs.sort((a, b) => (a.time?.created || 0) - (b.time?.created || 0));
+
+  const messages = [];
+  for (const msg of rawMsgs) {
     // Get parts for this message
     const msgPartDir = path.join(PART_DIR, msg.id);
     const parts = [];
@@ -213,35 +251,24 @@ function getMessagesForSession(sessionId) {
 
     const content = contentParts.join('\n');
     if (content) {
-      // Extract model value - handle both string and object formats
-      let modelValue = null;
-      if (typeof msg.modelID === 'string') {
-        modelValue = msg.modelID;
-      } else if (msg.model && typeof msg.model === 'object' && msg.model.modelID) {
-        modelValue = msg.model.modelID;
-      } else if (typeof msg.model === 'string') {
-        modelValue = msg.model;
-      }
+      const { modelValue, providerValue } = extractModelInfo(msg);
+      const { inputTokens, outputTokens, cacheRead, cacheWrite } = extractTokenInfo(msg);
 
       messages.push({
         role: msg.role || 'assistant',
         content,
         _model: modelValue,
-        _inputTokens: msg.tokens?.input,
-        _outputTokens: msg.tokens?.output,
-        _cacheRead: msg.tokens?.cache?.read,
-        _cacheWrite: msg.tokens?.cache?.write,
+        _provider: providerValue,
+        _inputTokens: inputTokens,
+        _outputTokens: outputTokens,
+        _cacheRead: cacheRead,
+        _cacheWrite: cacheWrite,
         _finish: msg.finish,
       });
     }
   }
 
-  // Sort by creation time
-  return messages.sort((a, b) => {
-    const aTime = a.time?.created || 0;
-    const bTime = b.time?.created || 0;
-    return aTime - bTime;
-  });
+  return messages;
 }
 
 // ============================================================

package/index.js

@@ -6,11 +6,44 @@ const path = require('path');
 const os = require('os');
 const { execSync } = require('child_process');
 
+// ── Node.js version check ─────────────────────────────────
+const nodeVersion = process.versions.node;
+const [nodeMajor, nodeMinor] = nodeVersion.split('.').map(Number);
+const isNodeSupported =
+  (nodeMajor === 20 && nodeMinor >= 19) ||
+  (nodeMajor === 22 && nodeMinor >= 12) ||
+  nodeMajor === 23 || nodeMajor === 24 || nodeMajor >= 25;
+
+if (!isNodeSupported) {
+  console.error('');
+  console.error(`  \x1b[31m✗ Unsupported Node.js version: v${nodeVersion}\x1b[0m`);
+  console.error('');
+  console.error(`  \x1b[1mAgentlytics requires Node.js 20.19+ or 22.12+\x1b[0m`);
+  console.error(`  \x1b[2mYour current version: v${nodeVersion}\x1b[0m`);
+  console.error('');
+  console.error(`  \x1b[2mTo upgrade, visit: https://nodejs.org\x1b[0m`);
+  console.error(`  \x1b[2mOr use a version manager: nvm install 22\x1b[0m`);
+  console.error('');
+  process.exit(1);
+}
+
 const HOME = os.homedir();
+
+// ── Detect package manager ─────────────────────────────────
+function detectPackageManager() {
+  const ua = process.env.npm_config_user_agent || '';
+  if (ua.startsWith('pnpm/')) return 'pnpm';
+  if (ua.startsWith('yarn/')) return 'yarn';
+  if (ua.startsWith('bun/')) return 'bun';
+  return 'npm';
+}
+const PM = detectPackageManager();
+const PM_RUN = PM === 'npm' ? 'npx' : PM === 'pnpm' ? 'pnpm dlx' : PM === 'yarn' ? 'yarn dlx' : 'bunx';
 const PORT = process.env.PORT || 4637;
 const RELAY_PORT = process.env.RELAY_PORT || 4638;
 const noCache = process.argv.includes('--no-cache');
 const collectOnly = process.argv.includes('--collect');
+const isUiDev = process.argv.includes('--ui-dev');
 const isRelay = process.argv.includes('--relay');
 const joinIndex = process.argv.indexOf('--join');
 const isJoin = joinIndex !== -1;
@@ -47,7 +80,7 @@ if (isRelay) {
     console.log('');
     console.log(chalk.bold('  Share this command with your team:'));
     console.log('');
-    console.log(chalk.cyan(`    npx agentlytics --join ${localIp}:${RELAY_PORT} --username <name>`));
+    console.log(chalk.cyan(`    ${PM_RUN} agentlytics --join ${localIp}:${RELAY_PORT} --username <name>`));
     console.log('');
     console.log(chalk.bold('  MCP server endpoint (add to your AI client):'));
     console.log('');
@@ -76,7 +109,7 @@ if (isJoin) {
     let username = usernameIndex !== -1 ? process.argv[usernameIndex + 1] : null;
 
     if (!relayAddress) {
-      console.error(chalk.red('\n  ✗ Missing relay address. Usage: npx agentlytics --join <host:port> --username <name>\n'));
+      console.error(chalk.red(`\n  ✗ Missing relay address. Usage: ${PM_RUN} agentlytics --join <host:port> --username <name>\n`));
       process.exit(1);
     }
 
@@ -135,15 +168,20 @@ console.log('');
 const publicIndex = path.join(__dirname, 'public', 'index.html');
 const uiDir = path.join(__dirname, 'ui');
 
-if (!collectOnly && !fs.existsSync(publicIndex) && fs.existsSync(uiDir)) {
+if (!collectOnly && !isUiDev && !fs.existsSync(publicIndex) && fs.existsSync(uiDir)) {
   console.log(chalk.cyan('  ⟳ Building dashboard UI (first run)...'));
   try {
     const uiModules = path.join(uiDir, 'node_modules');
     if (fs.existsSync(uiModules)) fs.rmSync(uiModules, { recursive: true, force: true });
     console.log(chalk.dim('    Installing UI dependencies...'));
-    execSync('npm install --no-audit --no-fund', { cwd: uiDir, stdio: 'pipe' });
+    const installCmd = PM === 'npm' ? 'npm install --no-audit --no-fund'
+      : PM === 'pnpm' ? 'pnpm install --no-frozen-lockfile'
+      : PM === 'yarn' ? 'yarn install'
+      : 'bun install';
+    const buildCmd = `${PM} run build`;
+    execSync(installCmd, { cwd: uiDir, stdio: 'pipe' });
     console.log(chalk.dim('    Compiling frontend...'));
-    execSync('npm run build', { cwd: uiDir, stdio: 'pipe' });
+    execSync(buildCmd, { cwd: uiDir, stdio: 'pipe' });
     console.log(chalk.green('  ✓ UI built successfully'));
   } catch (err) {
     console.error(chalk.red('  ✗ UI build failed:'), err.message);
@@ -152,9 +190,9 @@ if (!collectOnly && !fs.existsSync(publicIndex) && fs.existsSync(uiDir)) {
   console.log('');
 }
 
-if (!collectOnly && !fs.existsSync(publicIndex)) {
+if (!collectOnly && !isUiDev && !fs.existsSync(publicIndex)) {
   console.error(chalk.red('  ✗ No built UI found at public/index.html'));
-  console.error(chalk.dim('    Run: cd ui && npm install && npm run build'));
+  console.error(chalk.dim(`    Run: cd ui && ${PM} install && ${PM} run build`));
   process.exit(1);
 }
 
@@ -365,12 +403,12 @@ const BOT_STYLES = [
     }
 
     app.listen(port, '0.0.0.0', () => {
+      if (isUiDev) return;
       const url = `http://localhost:${port}`;
       console.log(chalk.green(`  ✓ Dashboard ready at ${chalk.bold.white(url)}`));
       console.log('');
       console.log(chalk.dim('  Press Ctrl+C to stop\n'));
 
-      // Auto-open browser
       const open = require('open');
       open(url).catch(() => {});
     });