@yeaft/webchat-agent 0.1.208 → 0.1.210

package/cli.js

@@ -19,7 +19,9 @@ const subArgs = args.slice(1);
 // Service management subcommands
 const SERVICE_COMMANDS = ['install', 'uninstall', 'start', 'stop', 'restart', 'status', 'logs'];
 
-if (command === 'upgrade') {
+if (command === 'doctor') {
+  handleDoctorCommand();
+} else if (command === 'upgrade') {
   upgrade();
 } else if (command === '--version' || command === '-v') {
   console.log(pkg.version);
@@ -45,6 +47,7 @@ function printHelp() {
     yeaft-agent restart                Restart installed service
     yeaft-agent status                 Show service status
     yeaft-agent logs                   View service logs (follow mode)
+    yeaft-agent doctor                 Diagnose service configuration
     yeaft-agent upgrade                Upgrade to latest version
     yeaft-agent --version              Show version
 
@@ -82,6 +85,11 @@ async function handleServiceCommand(command, args) {
   }
 }
 
+async function handleDoctorCommand() {
+  const { doctor } = await import('./service.js');
+  doctor();
+}
+
 function parseAndStart(args) {
   // Parse CLI flags → set environment variables (env vars take precedence over flags)
   for (let i = 0; i < args.length; i++) {

package/connection/upgrade.js

@@ -10,6 +10,13 @@ import { stopAgentHeartbeat } from './heartbeat.js';
 
 const PM2_APP_NAME = 'yeaft-agent';
 
+// Derive absolute paths for npm/pm2 from current node executable.
+// In launchd/systemd environments, PATH may not include nvm/node dirs,
+// but process.execPath always points to the running node binary.
+const nodeBinDir = dirname(process.execPath);
+const npmPath = join(nodeBinDir, 'npm');
+const pm2Path = join(nodeBinDir, 'pm2');
+
 // Shared cleanup logic for restart/upgrade
 function cleanupAndExit(exitCode) {
   setTimeout(() => {
@@ -46,7 +53,7 @@ export async function handleUpgradeAgent() {
     const pkgName = ctx.pkgName || '@yeaft/webchat-agent';
     // Check latest version (async to avoid blocking heartbeat)
     const latestVersion = await new Promise((resolve, reject) => {
-      execFile('npm', ['view', pkgName, 'version'], { stdio: 'pipe', shell: process.platform === 'win32' }, (err, stdout) => {
+      execFile(npmPath, ['view', pkgName, 'version'], { stdio: 'pipe' }, (err, stdout) => {
         if (err) reject(err); else resolve(stdout.toString().trim());
       });
     });
@@ -74,7 +81,7 @@ export async function handleUpgradeAgent() {
 
     // 判断全局安装 vs 局部安装
     const isGlobalInstall = await new Promise((resolve) => {
-      execFile('npm', ['prefix', '-g'], { shell: process.platform === 'win32' }, (err, stdout) => {
+      execFile(npmPath, ['prefix', '-g'], (err, stdout) => {
         if (err) { resolve(false); return; }
         const globalPrefix = stdout.toString().trim().replace(/\\/g, '/');
         resolve(installDir === globalPrefix || installDir === globalPrefix + '/lib');
@@ -94,7 +101,7 @@ export async function handleUpgradeAgent() {
     const isPm2 = !!process.env.pm_id;
     if (isPm2) {
       try {
-        execFileSync('pm2', ['delete', PM2_APP_NAME], { shell: process.platform === 'win32', stdio: 'pipe' });
+        execFileSync(pm2Path, ['delete', PM2_APP_NAME], { stdio: 'pipe' });
         console.log(`[Agent] PM2 app deleted to prevent auto-restart during upgrade`);
       } catch {
         console.log(`[Agent] PM2 delete skipped (app may not be registered)`);
@@ -131,6 +138,8 @@ function spawnWindowsUpgradeScript(pkgName, installDir, isGlobalInstall, latestV
   // Determine the target package directory inside node_modules
   const pkgDir = join(installDir, 'node_modules', ...pkgName.split('/')).replace(/\//g, '\\');
 
+  const pm2Win = pm2Path.replace(/\//g, '\\');
+
   const batLines = [
     '@echo off',
     'setlocal',
@@ -178,7 +187,7 @@ function spawnWindowsUpgradeScript(pkgName, installDir, isGlobalInstall, latestV
   // Use Node.js worker for file-level upgrade (avoids EBUSY on directory rename)
   batLines.push(
     'echo [Upgrade] Running upgrade worker at %time%... >> "%LOGFILE%"',
-    'node "%WORKER%" "%PKG%" "%PKG_DIR%" "%LOGFILE%"',
+    `"${process.execPath.replace(/\//g, '\\')}" "%WORKER%" "%PKG%" "%PKG_DIR%" "%LOGFILE%"`,
     'if not "%errorlevel%"=="0" (',
     '  echo [Upgrade] Worker failed with exit code %errorlevel% at %time% >> "%LOGFILE%"',
     '  goto CLEANUP',
@@ -193,8 +202,8 @@ function spawnWindowsUpgradeScript(pkgName, installDir, isGlobalInstall, latestV
     batLines.push(
       'echo [Upgrade] Re-registering agent via PM2... >> "%LOGFILE%"',
       `if exist "${ecoPath}" (`,
-      `  call pm2 start "${ecoPath}" >> "%LOGFILE%" 2>&1`,
-      '  call pm2 save >> "%LOGFILE%" 2>&1',
+      `  call "${pm2Win}" start "${ecoPath}" >> "%LOGFILE%" 2>&1`,
+      `  call "${pm2Win}" save >> "%LOGFILE%" 2>&1`,
       '  echo [Upgrade] PM2 app re-registered at %time% >> "%LOGFILE%"',
       ') else (',
       '  echo [Upgrade] WARNING: ecosystem.config.cjs not found, PM2 not restarted >> "%LOGFILE%"',
@@ -241,12 +250,17 @@ function spawnUnixUpgradeScript(pkgName, installDir, isGlobalInstall, latestVers
   const isLaunchd = platform() === 'darwin' && existsSync(join(process.env.HOME || '', 'Library', 'LaunchAgents', 'com.yeaft.agent.plist'));
   const cwd = isGlobalInstall ? undefined : installDir;
 
+  // Ensure PATH includes the node bin dir (critical for launchd which has minimal PATH)
+  const currentPath = process.env.PATH || '/usr/bin:/bin:/usr/sbin:/sbin';
+  const exportPath = currentPath.includes(nodeBinDir) ? currentPath : `${nodeBinDir}:${currentPath}`;
+
   const shLines = [
     '#!/bin/bash',
     `PID=${pid}`,
     `PKG="${pkgName}@latest"`,
+    `NPM="${npmPath}"`,
     `LOGFILE="${join(configDir, 'logs', 'upgrade.log')}"`,
-    `export PATH="${process.env.PATH}"`,
+    `export PATH="${exportPath}"`,
     '',
     '# Redirect all output to log file',
     'exec > "$LOGFILE" 2>&1',
@@ -285,10 +299,10 @@ function spawnUnixUpgradeScript(pkgName, installDir, isGlobalInstall, latestVers
     );
   }
 
-  // npm install
+  // npm install (use absolute path via $NPM variable)
   const npmCmd = isGlobalInstall
-    ? `npm install -g "$PKG"`
-    : `cd "$INSTALL_DIR" && npm install "$PKG"`;
+    ? `"$NPM" install -g "$PKG"`
+    : `cd "$INSTALL_DIR" && "$NPM" install "$PKG"`;
 
   shLines.push(
     'echo "[Upgrade] Installing $PKG..."',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "0.1.208",
+  "version": "0.1.210",
   "description": "Remote agent for Yeaft WebChat — connects worker machines to the central server",
   "main": "index.js",
   "type": "module",

package/service/doctor.js

@@ -0,0 +1,296 @@
+/**
+ * Service — doctor command
+ * Diagnoses service configuration issues: checks paths, service status, version consistency.
+ */
+import { execSync } from 'child_process';
+import { existsSync, readFileSync, statSync } from 'fs';
+import { join, dirname } from 'path';
+import { platform, homedir } from 'os';
+import { fileURLToPath } from 'url';
+import { SERVICE_NAME } from './config.js';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+// ── Platform-specific service config paths ─────────────────────────────────
+
+function getMacPlistPath() {
+  return join(homedir(), 'Library', 'LaunchAgents', 'com.yeaft.agent.plist');
+}
+
+function getLinuxServicePath() {
+  return join(homedir(), '.config', 'systemd', 'user', `${SERVICE_NAME}.service`);
+}
+
+function getWindowsEcosystemPath() {
+  const appData = process.env.APPDATA || join(homedir(), 'AppData', 'Roaming');
+  return join(appData, SERVICE_NAME, 'ecosystem.config.cjs');
+}
+
+// ── Parse paths from service config files ──────────────────────────────────
+
+/**
+ * Parse node path and cli path from macOS launchd plist.
+ * ProgramArguments is an array: [nodePath, cliPath]
+ */
+function parseMacPaths(plistPath) {
+  const content = readFileSync(plistPath, 'utf-8');
+  const args = [];
+  // Match <string> values inside <array> after ProgramArguments
+  const arrayMatch = content.match(/<key>ProgramArguments<\/key>\s*<array>([\s\S]*?)<\/array>/);
+  if (arrayMatch) {
+    const stringRegex = /<string>(.*?)<\/string>/g;
+    let m;
+    while ((m = stringRegex.exec(arrayMatch[1])) !== null) {
+      args.push(m[1]);
+    }
+  }
+  return { nodePath: args[0] || null, cliPath: args[1] || null };
+}
+
+/**
+ * Parse node path and cli path from Linux systemd unit.
+ * ExecStart=<nodePath> <cliPath>
+ */
+function parseLinuxPaths(servicePath) {
+  const content = readFileSync(servicePath, 'utf-8');
+  const match = content.match(/^ExecStart=(.+)$/m);
+  if (match) {
+    const parts = match[1].trim().split(/\s+/);
+    return { nodePath: parts[0] || null, cliPath: parts[1] || null };
+  }
+  return { nodePath: null, cliPath: null };
+}
+
+/**
+ * Parse node path and cli path from Windows pm2 ecosystem config.
+ * interpreter: '<nodePath>', script: '<cliPath>'
+ */
+function parseWindowsPaths(ecoPath) {
+  const content = readFileSync(ecoPath, 'utf-8');
+  const interpreterMatch = content.match(/interpreter:\s*'([^']+)'/);
+  const scriptMatch = content.match(/script:\s*'([^']+)'/);
+  return {
+    nodePath: interpreterMatch ? interpreterMatch[1].replace(/\\\\/g, '\\') : null,
+    cliPath: scriptMatch ? scriptMatch[1].replace(/\\\\/g, '\\') : null,
+  };
+}
+
+// ── Check helpers ──────────────────────────────────────────────────────────
+
+function isExecutable(filePath) {
+  try {
+    const stat = statSync(filePath);
+    if (platform() === 'win32') {
+      return stat.isFile();
+    }
+    // On Unix, check if any execute bit is set
+    return stat.isFile() && (stat.mode & 0o111) !== 0;
+  } catch {
+    return false;
+  }
+}
+
+function getNodeVersion(nodePath) {
+  try {
+    return execSync(`"${nodePath}" --version`, { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+  } catch {
+    return null;
+  }
+}
+
+function getCliVersion(nodePath, cliPath) {
+  try {
+    return execSync(`"${nodePath}" "${cliPath}" --version`, { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+  } catch {
+    return null;
+  }
+}
+
+function getCurrentNodePath() {
+  return process.execPath;
+}
+
+function getCurrentNodeVersion() {
+  return process.version;
+}
+
+// ── Service status checks ──────────────────────────────────────────────────
+
+function getMacServiceStatus() {
+  try {
+    const output = execSync('launchctl list | grep com.yeaft.agent', {
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+    });
+    if (output.trim()) {
+      const parts = output.trim().split(/\s+/);
+      const pid = parts[0];
+      if (pid !== '-') {
+        return { running: true, pid };
+      }
+      return { running: false, pid: null };
+    }
+    return { running: false, pid: null };
+  } catch {
+    return { running: false, pid: null };
+  }
+}
+
+function getLinuxServiceStatus() {
+  try {
+    const output = execSync(`systemctl --user is-active ${SERVICE_NAME}`, {
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+    }).trim();
+    if (output === 'active') {
+      // Try to get PID
+      let pid = null;
+      try {
+        pid = execSync(`systemctl --user show ${SERVICE_NAME} --property=MainPID --value`, {
+          encoding: 'utf-8',
+          stdio: ['pipe', 'pipe', 'pipe'],
+        }).trim();
+        if (pid === '0') pid = null;
+      } catch {}
+      return { running: true, pid };
+    }
+    return { running: false, pid: null };
+  } catch {
+    return { running: false, pid: null };
+  }
+}
+
+function getWindowsServiceStatus() {
+  try {
+    const output = execSync('pm2 jlist', {
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+    });
+    const apps = JSON.parse(output);
+    const app = Array.isArray(apps) && apps.find(a => a.name === 'yeaft-agent');
+    if (app) {
+      const running = app.pm2_env && app.pm2_env.status === 'online';
+      const pid = running ? app.pid : null;
+      return { running, pid: pid ? String(pid) : null };
+    }
+    return { running: false, pid: null };
+  } catch {
+    return { running: false, pid: null };
+  }
+}
+
+// ── Tilde shorthand for display ────────────────────────────────────────────
+
+function tildeify(filePath) {
+  const home = homedir();
+  if (filePath && filePath.startsWith(home)) {
+    return '~' + filePath.slice(home.length);
+  }
+  return filePath;
+}
+
+// ── Main doctor logic ──────────────────────────────────────────────────────
+
+export function doctor() {
+  const os = platform();
+  let configPath = null;
+  let parsePaths = null;
+  let getServiceStatus = null;
+
+  console.log('');
+
+  // 1. Determine platform and config path
+  if (os === 'darwin') {
+    configPath = getMacPlistPath();
+    parsePaths = parseMacPaths;
+    getServiceStatus = getMacServiceStatus;
+  } else if (os === 'linux') {
+    configPath = getLinuxServicePath();
+    parsePaths = parseLinuxPaths;
+    getServiceStatus = getLinuxServiceStatus;
+  } else if (os === 'win32') {
+    configPath = getWindowsEcosystemPath();
+    parsePaths = parseWindowsPaths;
+    getServiceStatus = getWindowsServiceStatus;
+  } else {
+    console.log(`\u26a0\ufe0f  Unsupported platform: ${os}`);
+    console.log(`   The doctor command supports macOS, Linux, and Windows.`);
+    console.log('');
+    process.exit(1);
+  }
+
+  // 2. Check if service config exists
+  if (!existsSync(configPath)) {
+    console.log(`\u26a0\ufe0f  No service configuration found.`);
+    console.log(`   Run 'yeaft-agent install --server <url> --name <name> --secret <secret>' to set up.`);
+    console.log('');
+    return;
+  }
+
+  console.log(`\u2705 Service installed: ${tildeify(configPath)}`);
+
+  let hasErrors = false;
+
+  // 3. Parse paths from config
+  const { nodePath, cliPath } = parsePaths(configPath);
+
+  // 4. Check node path
+  if (!nodePath) {
+    console.log(`\u274c Node path: not found in service config`);
+    hasErrors = true;
+  } else if (!existsSync(nodePath)) {
+    console.log(`\u274c Node path invalid: ${nodePath} (file not found)`);
+    console.log(`   Current node: ${getCurrentNodePath()} (${getCurrentNodeVersion()})`);
+    hasErrors = true;
+  } else if (!isExecutable(nodePath)) {
+    console.log(`\u274c Node path not executable: ${nodePath}`);
+    console.log(`   Current node: ${getCurrentNodePath()} (${getCurrentNodeVersion()})`);
+    hasErrors = true;
+  } else {
+    const nodeVersion = getNodeVersion(nodePath);
+    console.log(`\u2705 Node path valid: ${nodePath} (${nodeVersion || 'unknown version'})`);
+
+    // 4a. Version consistency check
+    const currentVersion = getCurrentNodeVersion();
+    if (nodeVersion && nodeVersion !== currentVersion) {
+      console.log(`   \u26a0\ufe0f  Version mismatch: service uses ${nodeVersion}, current terminal uses ${currentVersion}`);
+    }
+  }
+
+  // 5. Check cli path
+  if (!cliPath) {
+    console.log(`\u274c CLI path: not found in service config`);
+    hasErrors = true;
+  } else if (!existsSync(cliPath)) {
+    console.log(`\u274c CLI path invalid: ${cliPath} (file not found)`);
+    hasErrors = true;
+  } else {
+    // Try to get CLI version
+    let versionStr = '';
+    if (nodePath && existsSync(nodePath)) {
+      const cliVersion = getCliVersion(nodePath, cliPath);
+      if (cliVersion) versionStr = ` (v${cliVersion})`;
+    }
+    console.log(`\u2705 CLI path valid: ${tildeify(cliPath)}${versionStr}`);
+  }
+
+  // 6. Check service status
+  const status = getServiceStatus();
+  if (status.running) {
+    console.log(`\u2705 Service running: PID ${status.pid}`);
+  } else {
+    console.log(`\u274c Service not running`);
+    hasErrors = true;
+  }
+
+  // 7. Summary
+  console.log('');
+  if (hasErrors) {
+    console.log('Fix: Run the following commands:');
+    console.log('  npm install -g @yeaft/webchat-agent');
+    console.log('  yeaft-agent install --server <your-server-url> --name <your-agent-name> --secret <your-secret>');
+  } else {
+    console.log('All checks passed.');
+  }
+  console.log('');
+}

package/service/index.js

@@ -12,6 +12,7 @@ import {
 import { getSystemdServicePath, linuxInstall, linuxUninstall, linuxStart, linuxStop, linuxRestart, linuxStatus, linuxLogs } from './linux.js';
 import { getLaunchdPlistPath, macInstall, macUninstall, macStart, macStop, macRestart, macStatus, macLogs } from './macos.js';
 import { winInstall, winUninstall, winStart, winStop, winRestart, winStatus, winLogs } from './windows.js';
+import { doctor } from './doctor.js';
 
 export {
   getConfigDir, getLogDir, getConfigPath,
@@ -97,3 +98,5 @@ export function logs() {
   else if (os === 'darwin') macLogs();
   else if (os === 'win32') winLogs();
 }
+
+export { doctor };

package/service.js

@@ -22,5 +22,6 @@ export {
   stop,
   restart,
   status,
-  logs
+  logs,
+  doctor
 } from './service/index.js';