@yeaft/webchat-agent 0.1.239 → 0.1.241

package/connection/upgrade.js

@@ -15,10 +15,20 @@ const PM2_APP_NAME = 'yeaft-agent';
 // but process.execPath always points to the running node binary.
 const nodeBinDir = dirname(process.execPath);
 const isWin = platform() === 'win32';
-const npmPath = join(nodeBinDir, isWin ? 'npm.cmd' : 'npm');
-const pm2Path = join(nodeBinDir, isWin ? 'pm2.cmd' : 'pm2');
+// Windows: use bare 'npm'/'pm2' + shell:true — cmd.exe finds them via PATH.
+// This was the working pattern before ce58bbc. Absolute paths break when
+// the path contains spaces (e.g., "C:\Program Files\nodejs\npm.cmd").
+// macOS/Linux: use absolute path — launchd/systemd have minimal PATH.
+const npmPath = isWin ? 'npm' : join(nodeBinDir, 'npm');
+const pm2Path = isWin ? 'pm2' : join(nodeBinDir, 'pm2');
 const shellOpt = isWin ? { shell: true } : {};
 
+// Ensure PATH includes nodeBinDir so that `#!/usr/bin/env node` shebangs
+// can locate node in launchd/systemd environments with minimal PATH.
+const currentPath = process.env.PATH || '/usr/bin:/bin:/usr/sbin:/sbin';
+const safePath = currentPath.includes(nodeBinDir) ? currentPath : `${nodeBinDir}:${currentPath}`;
+const safeEnv = { ...process.env, PATH: safePath };
+
 // Shared cleanup logic for restart/upgrade
 function cleanupAndExit(exitCode) {
   setTimeout(() => {
@@ -55,7 +65,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(npmPath, ['view', pkgName, 'version'], { stdio: 'pipe', ...shellOpt }, (err, stdout) => {
+      execFile(npmPath, ['view', pkgName, 'version'], { stdio: 'pipe', env: safeEnv, ...shellOpt }, (err, stdout) => {
         if (err) reject(err); else resolve(stdout.toString().trim());
       });
     });
@@ -83,7 +93,7 @@ export async function handleUpgradeAgent() {
 
     // 判断全局安装 vs 局部安装
     const isGlobalInstall = await new Promise((resolve) => {
-      execFile(npmPath, ['prefix', '-g'], { ...shellOpt }, (err, stdout) => {
+      execFile(npmPath, ['prefix', '-g'], { env: safeEnv, ...shellOpt }, (err, stdout) => {
         if (err) { resolve(false); return; }
         const globalPrefix = stdout.toString().trim().replace(/\\/g, '/');
         resolve(installDir === globalPrefix || installDir === globalPrefix + '/lib');
@@ -103,7 +113,7 @@ export async function handleUpgradeAgent() {
     const isPm2 = !!process.env.pm_id;
     if (isPm2) {
       try {
-        execFileSync(pm2Path, ['delete', PM2_APP_NAME], { stdio: 'pipe', ...shellOpt });
+        execFileSync(pm2Path, ['delete', PM2_APP_NAME], { stdio: 'pipe', env: safeEnv, ...shellOpt });
         console.log(`[Agent] PM2 app deleted to prevent auto-restart during upgrade`);
       } catch {
         console.log(`[Agent] PM2 delete skipped (app may not be registered)`);
@@ -252,17 +262,13 @@ 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="${exportPath}"`,
+    `export PATH="${safePath}"`,
     '',
     '# Redirect all output to log file',
     'exec > "$LOGFILE" 2>&1',

package/index.js

@@ -1,6 +1,6 @@
 import 'dotenv/config';
 import { platform, homedir } from 'os';
-import { existsSync, readFileSync, writeFileSync } from 'fs';
+import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
 import { join, dirname } from 'path';
 import { exec } from 'child_process';
 import { promisify } from 'util';
@@ -138,6 +138,35 @@ async function ensureDependencies() {
   }
 }
 
+// 确保 yeaft-skills 插件已安装/更新
+async function ensureYeaftSkills() {
+  const skillsDir = join(homedir(), '.claude', 'skills', 'yeaft-skills');
+  const REPO_URL = 'https://github.com/yeaft/yeaft-skills.git';
+
+  try {
+    if (!existsSync(skillsDir)) {
+      console.log('[Startup] yeaft-skills not found, installing...');
+      const parentDir = join(homedir(), '.claude', 'skills');
+      mkdirSync(parentDir, { recursive: true });
+      await execAsync(`git clone ${REPO_URL} "${skillsDir}"`, { timeout: 60000 });
+      console.log('[Startup] yeaft-skills installed');
+    } else {
+      console.log('[Startup] yeaft-skills found, checking for updates...');
+      const { stdout } = await execAsync('git pull --ff-only', {
+        cwd: skillsDir,
+        timeout: 30000
+      });
+      if (stdout.includes('Already up to date')) {
+        console.log('[Startup] yeaft-skills is up to date');
+      } else {
+        console.log('[Startup] yeaft-skills updated');
+      }
+    }
+  } catch (e) {
+    console.warn('[Startup] yeaft-skills sync failed (skills will be unavailable):', e.message);
+  }
+}
+
 // 优雅退出
 function cleanup() {
   // 清理所有终端
@@ -176,6 +205,7 @@ process.on('SIGTERM', () => {
 // 启动 - 先确保依赖，再检测能力，再连接
 (async () => {
   await ensureDependencies();
+  await ensureYeaftSkills();
   ctx.agentCapabilities = await detectCapabilities();
   connect();
 })();

package/package.json

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