thinknagent 0.1.12 → 0.1.14

package/Readme.md

@@ -45,6 +45,7 @@ chmod +x (which thinknagent)
 | `--room <roomId>` | ✅ | Room ID to connect to |
 | `--gpu` | ❌ | Enable GPU metrics (requires nvidia-smi) |
 | `--logs <paths>` | ❌ | Comma-separated log file paths to stream |
+| `--app-path <path>` | ❌ | Path to the deployed application folder (to track and display version) |
 
 ---
 
@@ -78,14 +79,15 @@ thinknagent init \
   --logs <YOUR_PM2_LOG_FILE> 
 ```
 
-**With GPU metrics:**
+**With GPU metrics & application version tracking:**
 ```bash
 thinknagent init \
   --server YOUR_APP_SERVER \
   --name my-server \
   --room <roomId> \
   --gpu \
-  --logs <YOUR_SYS_LOG_FILE> 
+  --logs <YOUR_SYS_LOG_FILE> \
+  --app-path /var/www/my-node-app
 ```
 
 Get your `roomId` from the room URL:
@@ -98,24 +100,40 @@ thinknagent start
 ```
 
 Output:
+```
 Starting thinknagent — my-server
 Status: PENDING — waiting for Owner approval
 [agent] Connecting to https://thinkncollab.com...
 [thinknagent] Registered as <agentId> — waiting for Owner approval...
+```
 
 ### Step 3 — Approve in Browser
 
-Go to your room's DevOps Wall:
-https://thinkncollab.com/devops/<roomId>/devops
-
-Click **Approve** on the pending agent in the sidebar.
+1. Go to your room's DevOps Wall:
+   `https://thinkncollab.com/devops/<roomId>/devops`
+2. Click **Approve** on the pending agent in the sidebar.
 
 Once approved:
+```
 [thinknagent] Approved! Role: monitor | Room: <roomId>
 [agent] Active. Role: monitor | Room: <roomId>
 [metrics] Poller started
 [logs] Watching 2 file(s)
 [shell] Bridge ready
+```
+
+### Step 4 — Run with PM2 (Keep Alive)
+
+To run the agent in the background so that all features (metrics, logs, shell) stay permanently active and accessible after you disconnect your terminal session:
+
+```bash
+# Start the agent using PM2
+pm2 start thinknagent --name "thinknagent_logs" -- start
+
+# Save PM2 process list and configure startup
+pm2 save
+pm2 startup
+```
 
 ---
 

package/bin/thinknagent.js

@@ -24,6 +24,7 @@ program
   .option('--room <roomId>', 'Room ID to connect to')
   .option('--gpu',                  'Enable GPU metrics (requires nvidia-smi)')
   .option('--logs <paths>',         'Comma-separated log file paths to stream')
+  .option('--app-path <path>',      'Path to the deployed application folder (to track version)')
   .action(async (opts) => {
     const existing = store.get('agentToken');
     if (existing) {
@@ -40,6 +41,7 @@ program
       gpu:       !!opts.gpu,
       logs:      opts.logs ? opts.logs.split(',').map(s => s.trim()) : [],
       roomId:    opts.room,
+      appPath:   opts.appPath || null,
       alerts:    [
         // sensible defaults — Owner can edit in browser
         { id: 'cpu-high',  metric: 'cpu.usage',      op: 'gt', value: 85, for: 60, severity: 'warning'  },
@@ -58,6 +60,7 @@ program
     console.log(`  Agent ID: ${chalk.white(agentId)}`);
     console.log(`  GPU     : ${cfg.gpu ? chalk.green('enabled') : chalk.gray('disabled')}`);
     console.log(`  Logs    : ${cfg.logs.length ? chalk.white(cfg.logs.join(', ')) : chalk.gray('none')}`);
+    console.log(`  App Path: ${cfg.appPath ? chalk.white(cfg.appPath) : chalk.gray('none')}`);
     console.log(chalk.gray('  ─────────────────────────────────────────'));
     console.log(chalk.yellow('\n  Next step:'));
     console.log('  1. Run: ' + chalk.cyan('thinknagent start'));
@@ -109,6 +112,7 @@ program
     console.log(`  Status  : ${cfg.agentToken ? chalk.green('APPROVED') : chalk.yellow('PENDING')}`);
     console.log(`  GPU     : ${cfg.gpu ? chalk.green('enabled') : chalk.gray('disabled')}`);
     console.log(`  Logs    : ${(cfg.logs||[]).length ? cfg.logs.join(', ') : chalk.gray('none')}`);
+    console.log(`  App Path: ${cfg.appPath ? chalk.white(cfg.appPath) : chalk.gray('none')}`);
     console.log(`  Alerts  : ${(cfg.alerts||[]).length} rule(s)`);
     console.log(chalk.gray('  ────────────────────────────────\n'));
   });

package/lib/agent.js

@@ -7,6 +7,8 @@ const LogWatcher    = require('./logwatcher');
 const AlertEngine   = require('./alerts');
 const ShellBridge   = require('./shell');
 const store         = require('./store');
+const chokidar      = require('chokidar');
+const fs            = require('fs');
 
 // allowed base dirs for log streaming
 // room owner agent:logs_updated se bahar ke paths reject ho jayenge
@@ -121,10 +123,52 @@ class Agent {
       if (this._active) this.logs.start();
     });
 
+    // Start watching the application path for git pulls or package.json updates
+    this._startAppWatcher(cfg);
+
     process.on('SIGTERM', () => this._shutdown('SIGTERM'));
     process.on('SIGINT',  () => this._shutdown('SIGINT'));
   }
 
+  _startAppWatcher(cfg) {
+    if (!cfg.appPath) return;
+
+    try {
+      const resolvedPath = path.resolve(cfg.appPath);
+      const gitHeadPath  = path.join(resolvedPath, '.git', 'HEAD');
+      const gitIndex     = path.join(resolvedPath, '.git', 'index');
+      const pkgJsonPath  = path.join(resolvedPath, 'package.json');
+
+      const filesToWatch = [];
+      if (fs.existsSync(gitHeadPath)) filesToWatch.push(gitHeadPath);
+      if (fs.existsSync(gitIndex)) filesToWatch.push(gitIndex);
+      if (fs.existsSync(pkgJsonPath)) filesToWatch.push(pkgJsonPath);
+
+      if (filesToWatch.length === 0) return;
+
+      console.log(`[agent] Watching application path for version changes: ${resolvedPath}`);
+      const watcher = chokidar.watch(filesToWatch, {
+        persistent: true,
+        ignoreInitial: true,
+      });
+
+      let debounceTimeout = null;
+      watcher.on('change', (filePath) => {
+        console.log(`[agent] Detected app file change: ${filePath}. Recalculating version...`);
+        if (debounceTimeout) clearTimeout(debounceTimeout);
+        debounceTimeout = setTimeout(() => {
+          const newVersion = Connection.getDeployedAppVersion(cfg.appPath);
+          console.log(`[agent] Reporting updated app version: ${newVersion}`);
+          this.conn.emit('agent:meta_update', { appVersion: newVersion });
+        }, 2000);
+      });
+
+      this._appWatcher = watcher;
+    } catch (err) {
+      console.warn(`[agent] Failed to initialize application path watcher: ${err.message}`);
+    }
+  }
+
   _onReady(role, roomId) {
     if (this._active) {
       console.log(`[agent] Reconnected. Role: ${role}`);
@@ -152,6 +196,11 @@ class Agent {
     this.metrics.stop();
     this.logs.stop();
     this.shell.killAll();
+    if (this._appWatcher) {
+      try {
+        this._appWatcher.close();
+      } catch (e) {}
+    }
     this.conn.socket?.disconnect();
     process.exit(0);
   }

package/lib/connect.js

@@ -2,6 +2,45 @@
 
 const { io }   = require('socket.io-client');
 const store    = require('./store');
+const { execSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+
+function getDeployedAppVersion(appPath) {
+  try {
+    const resolvedPath = path.resolve(appPath || process.cwd());
+    let pkgVersion = '';
+    let gitCommit = '';
+
+    const pkgJsonPath = path.join(resolvedPath, 'package.json');
+    if (fs.existsSync(pkgJsonPath)) {
+      try {
+        const pkg = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf8'));
+        pkgVersion = pkg.version || '';
+      } catch (e) {}
+    }
+
+    try {
+      gitCommit = execSync('git log -n 1 --format="%h - %s" --no-color', {
+        cwd: resolvedPath,
+        stdio: ['ignore', 'pipe', 'ignore'],
+        timeout: 2000,
+        encoding: 'utf8'
+      }).trim();
+    } catch (e) {}
+
+    if (pkgVersion && gitCommit) {
+      return `v${pkgVersion} (${gitCommit})`;
+    } else if (pkgVersion) {
+      return `v${pkgVersion}`;
+    } else if (gitCommit) {
+      return gitCommit;
+    }
+    return 'unknown';
+  } catch (err) {
+    return 'unknown';
+  }
+}
 
 const NAMESPACE = '/devops';
 const RECONNECT_DELAY = 5000;
@@ -34,18 +73,19 @@ class Connection {
     reconnection: true,
     reconnectionDelay: RECONNECT_DELAY,
     reconnectionAttempts: Infinity,
-   auth: (cb) => {
-  const freshCfg = store.read();
-  console.log('[debug] Reconnecting with token:', !!freshCfg.agentToken, 'agentId:', freshCfg.agentId);
-  cb({
-    agentId:    freshCfg.agentId,
-    agentToken: freshCfg.agentToken || null,
-    name:       freshCfg.name,
-    hostname:   require('os').hostname(),
-    version:    require('../package.json').version,
-    roomId:     freshCfg.roomId || null,
-  });
-}
+    auth: (cb) => {
+      const freshCfg = store.read();
+      console.log('[debug] Reconnecting with token:', !!freshCfg.agentToken, 'agentId:', freshCfg.agentId);
+      cb({
+        agentId:    freshCfg.agentId,
+        agentToken: freshCfg.agentToken || null,
+        name:       freshCfg.name,
+        hostname:   require('os').hostname(),
+        version:    require('../package.json').version,
+        roomId:     freshCfg.roomId || null,
+        appVersion: getDeployedAppVersion(freshCfg.appPath),
+      });
+    }
   });
 
   this._bind();
@@ -133,4 +173,5 @@ s.on('agent:approved', ({ agentToken, role, roomId }) => {
   }
 }
 
+Connection.getDeployedAppVersion = getDeployedAppVersion;
 module.exports = Connection;

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "thinknagent",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "ThinkNCollab server agent — metrics, logs, alerts, shell bridge",
   "main": "lib/agent.js",
-  "author": "ThinkNCollab Team <team@thinkncollab.com>",
+  "author": "ThinkNCollab Team <raman@thinkncollab.com>",
   "bin": {
-    "thinknagent": "./bin/thinknagent.js"
+    "thinknagent": "bin/thinknagent.js"
   },
   "scripts": {
     "start": "node bin/thinknagent.js start",
@@ -25,6 +25,11 @@
   "engines": {
     "node": ">=18.0.0"
   },
-  "keywords": ["thinkncollab", "devops", "monitoring", "agent"],
+  "keywords": [
+    "thinkncollab",
+    "devops",
+    "monitoring",
+    "agent"
+  ],
   "license": "MIT"
 }