@yeaft/webchat-agent 0.1.669 → 0.1.670

package/index.js

@@ -126,7 +126,8 @@ async function detectCapabilities() {
   return capabilities;
 }
 
-// 确保依赖已安装（特别是 optionalDependencies 如 node-pty）
+// 确保依赖已安装。node-pty 已被 @homebridge/node-pty-prebuilt-multiarch
+// 取代（regular dep + 全平台预编译），不再需要 optionalDependency 的特判。
 async function ensureDependencies() {
   const agentDir = new URL('.', import.meta.url).pathname.replace(/^\/([A-Z]:)/, '$1');
   const nodeModulesPath = join(agentDir, 'node_modules');
@@ -140,20 +141,6 @@ async function ensureDependencies() {
     } catch (e) {
       console.warn('[Startup] npm install failed:', e.message);
     }
-    return;
-  }
-
-  // 检查 node-pty 是否可用（optionalDependency，可能需要编译）
-  try {
-    await import('node-pty');
-  } catch (e) {
-    console.log('[Startup] node-pty not available, attempting install...');
-    try {
-      await execAsync('npm install node-pty', { cwd: agentDir, timeout: 120000 });
-      console.log('[Startup] node-pty installed successfully');
-    } catch (installErr) {
-      console.warn('[Startup] node-pty install failed (terminal will be unavailable):', installErr.message);
-    }
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "0.1.669",
+  "version": "0.1.670",
   "description": "Remote agent for Yeaft WebChat — connects worker machines to the central server",
   "main": "index.js",
   "type": "module",
@@ -10,8 +10,7 @@
   },
   "scripts": {
     "start": "node index.js",
-    "dev": "nodemon index.js",
-    "postinstall": "node scripts/check-pty.js"
+    "dev": "nodemon index.js"
   },
   "engines": {
     "node": ">=22.5.0"
@@ -55,13 +54,11 @@
     "ext": "js"
   },
   "dependencies": {
+    "@homebridge/node-pty-prebuilt-multiarch": "^0.13.1",
     "dotenv": "^16.3.1",
     "tweetnacl": "^1.0.3",
     "tweetnacl-util": "^0.15.1",
     "uuid": "^11.1.0",
     "ws": "^8.16.0"
-  },
-  "optionalDependencies": {
-    "node-pty": "^1.0.0"
   }
 }

package/terminal.js

@@ -4,15 +4,20 @@ import { join, dirname } from 'path';
 import { createRequire } from 'module';
 import ctx from './context.js';
 
+// Package name of the PTY backend. We use the Homebridge prebuilt fork
+// because upstream node-pty ships no Linux prebuilds and falls back to
+// node-gyp + C++20, which silently fails on older toolchains. The fork
+// ships prebuilds for darwin/linux/win32 across x64/arm64 (incl. musl).
+const PTY_PKG = '@homebridge/node-pty-prebuilt-multiarch';
+
 // Ensure spawn-helper has executable permission on Unix systems.
 // npm may strip execute bits from prebuilt binaries, causing
 // "posix_spawnp failed" on macOS/Linux.
-// TODO: Remove this workaround once node-pty ships with correct permissions.
 function ensureSpawnHelperPermissions() {
   if (platform() === 'win32') return;
   try {
     const cjsRequire = createRequire(import.meta.url);
-    const ptyPkgPath = dirname(cjsRequire.resolve('node-pty/package.json'));
+    const ptyPkgPath = dirname(cjsRequire.resolve(`${PTY_PKG}/package.json`));
     const targets = [
       join(ptyPkgPath, 'prebuilds', `${platform()}-${arch()}`, 'spawn-helper'),
       join(ptyPkgPath, 'build', 'Release', 'spawn-helper'),
@@ -30,11 +35,15 @@ function ensureSpawnHelperPermissions() {
   }
 }
 
-// 动态加载 node-pty (optionalDependency)
+// Load PTY backend. With the prebuilt fork this is essentially never
+// expected to fail at runtime — it's a regular `dependencies` entry and
+// every supported (platform, abi) combination ships a prebuilt binary.
+// We still catch and degrade so a single missing binary doesn't crash
+// the whole agent on an exotic host.
 export async function loadNodePty() {
   if (ctx.nodePty !== null) return ctx.nodePty;
   try {
-    let pty = await import('node-pty');
+    let pty = await import(PTY_PKG);
     if (pty.default) pty = pty.default;
     ensureSpawnHelperPermissions();
     ctx.nodePty = pty;
@@ -69,7 +78,7 @@ export async function handleTerminalCreate(msg) {
       type: 'terminal_error',
       conversationId,
       terminalId,
-      message: 'node-pty is not installed. Run: npm install node-pty'
+      message: 'Terminal backend is not installed. Run: npm install'
     });
     return;
   }

package/scripts/check-pty.js

@@ -1,87 +0,0 @@
-#!/usr/bin/env node
-/**
- * agent/scripts/check-pty.js — postinstall sanity check for node-pty.
- *
- * Why this exists:
- *   `node-pty` is an optionalDependency. npm install swallows install
- *   failures silently — when the native module fails to build (e.g.
- *   Linux x64, where node-pty's tarball ships no prebuilds and the
- *   host g++ is too old to compile C++20), the agent loses its
- *   `terminal` capability with zero user-facing signal. The web UI's
- *   Terminal tab silently disappears.
- *
- *   This postinstall script makes that failure visible: if we're on a
- *   platform where node-pty was supposed to install but didn't, print
- *   a clear warning with the recovery command. We never fail the
- *   install — pty is genuinely optional, and required-feature mode
- *   would block users who don't need a Terminal tab.
- *
- * Exit code is always 0 — we only print, never abort.
- */
-
-import { existsSync } from 'fs';
-import { createRequire } from 'module';
-import { platform } from 'os';
-
-const require = createRequire(import.meta.url);
-
-function tryResolveNodePty() {
-  try {
-    return require.resolve('node-pty');
-  } catch {
-    return null;
-  }
-}
-
-function tryLoadBinary() {
-  // node-pty's lib/index.js does `require('../build/Release/pty.node')`
-  // — if the binary is missing or ABI-incompatible, that throws. We
-  // mimic the load eagerly so the warning fires at install time, not
-  // at agent startup.
-  try {
-    require('node-pty');
-    return { ok: true };
-  } catch (e) {
-    return { ok: false, error: e.message };
-  }
-}
-
-const resolved = tryResolveNodePty();
-if (!resolved) {
-  // node-pty was never installed at all — npm skipped it for the
-  // current platform/engine combination.
-  const plat = platform();
-  if (plat === 'linux' || plat === 'darwin' || plat === 'win32') {
-    console.warn('');
-    console.warn('  ⚠  node-pty was not installed on this host.');
-    console.warn('     The agent will run, but the web UI Terminal tab');
-    console.warn('     will be hidden (terminal capability missing).');
-    if (plat === 'linux') {
-      console.warn('');
-      console.warn('     Linux fix: install a C++20-capable compiler');
-      console.warn('     (g++-10 or newer) and rebuild:');
-      console.warn('');
-      console.warn('       sudo apt-get install -y g++-10');
-      console.warn('       CXX=g++-10 npm install node-pty --include=optional');
-    } else {
-      console.warn('');
-      console.warn('     Reinstall to retry:  npm install node-pty');
-    }
-    console.warn('');
-  }
-  process.exit(0);
-}
-
-const loaded = tryLoadBinary();
-if (!loaded.ok) {
-  console.warn('');
-  console.warn('  ⚠  node-pty resolved but failed to load native binary.');
-  console.warn(`     Error: ${loaded.error}`);
-  console.warn('     The agent will run without Terminal tab support.');
-  console.warn('     Recover: npm rebuild node-pty');
-  console.warn('');
-  process.exit(0);
-}
-
-// Silent on success — clean install output.
-process.exit(0);