wtt-connect 0.2.52 → 0.2.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wtt-connect",
-  "version": "0.2.52",
+  "version": "0.2.54",
   "private": false,
   "description": "WTT-native connector daemon for Codex, Claude Code, Cursor, Gemini, ACP, and other coding agent surfaces.",
   "type": "module",

package/src/service-manager.js

@@ -274,8 +274,7 @@ function restartCloudSandboxEntry(entry) {
     `export PATH=${shellQuote(runtimePath())}`,
     `mkdir -p ${shellQuote(entry.workDir)} ${shellQuote(path.dirname(entry.pidFile))} ${shellQuote(path.dirname(entry.logFile))}`,
     `cd ${shellQuote(entry.workDir)}`,
-    `nohup ${shellQuote(process.execPath)} ${shellQuote(bin)} start --env-file ${shellQuote(entry.envFile)} >> ${shellQuote(entry.logFile)} 2>&1 < /dev/null &`,
-    `echo $! > ${shellQuote(entry.pidFile)}`,
+    `nohup ${shellQuote(process.execPath)} ${shellQuote(bin)} start --env-file ${shellQuote(entry.envFile)} >> ${shellQuote(entry.logFile)} 2>&1 < /dev/null & echo $! > ${shellQuote(entry.pidFile)}`,
   ].join('; ');
   const result = spawnSync('bash', ['-lc', script], { encoding: 'utf8' });
   if (result.status !== 0) {

package/src/terminal-session.js

@@ -1,11 +1,14 @@
 import os from 'node:os';
 import path from 'node:path';
 import fs from 'node:fs';
+import { fileURLToPath, pathToFileURL } from 'node:url';
 import { createRequire } from 'node:module';
 import { log } from './logger.js';
 
 const require = createRequire(import.meta.url);
+const moduleDir = path.dirname(fileURLToPath(import.meta.url));
 let nodePty = null;
+let nodePtyPackageJson = null;
 
 export class TerminalSessionManager {
   constructor(config, sendJson) {
@@ -31,8 +34,8 @@ export class TerminalSessionManager {
     const rows = clampInt(msg.rows, 10, 80, 28);
 
     try {
-      ensureNodePtyHelperExecutable();
       const pty = await loadNodePty();
+      ensureNodePtyHelperExecutable();
       const proc = pty.spawn(shell, [], {
         name: 'xterm-256color',
         cols,
@@ -122,12 +125,24 @@ export class TerminalSessionManager {
 
 async function loadNodePty() {
   if (nodePty) return nodePty;
-  try {
-    nodePty = await import('node-pty');
-    return nodePty;
-  } catch (err) {
-    throw new Error(`node-pty is not installed or failed to load; terminal sessions are unavailable in this runtime: ${err.message}`);
+  const errors = [];
+  for (const candidate of nodePtyCandidates()) {
+    try {
+      if (candidate.kind === 'require') {
+        nodePty = require(candidate.spec);
+      } else {
+        nodePty = await import(candidate.spec);
+      }
+      nodePtyPackageJson = candidate.packageJson || resolveNodePtyPackageJson(candidate.spec);
+      return nodePty.default && nodePty.default.spawn ? nodePty.default : nodePty;
+    } catch (err) {
+      errors.push(`${candidate.label}: ${err.message}`);
+    }
   }
+
+  throw new Error(
+    `node-pty is not installed or failed to load; terminal sessions are unavailable in this runtime: ${errors.join('; ')}`,
+  );
 }
 
 function resolveDir(dir) {
@@ -153,7 +168,7 @@ function clampInt(value, min, max, fallback) {
 function ensureNodePtyHelperExecutable() {
   if (os.platform() !== 'darwin') return;
   try {
-    const pkg = require.resolve('node-pty/package.json');
+    const pkg = nodePtyPackageJson || resolveNodePtyPackageJson('node-pty');
     const arch = os.arch() === 'arm64' ? 'arm64' : 'x64';
     const helper = path.join(path.dirname(pkg), 'prebuilds', `darwin-${arch}`, 'spawn-helper');
     if (fs.existsSync(helper)) fs.chmodSync(helper, 0o755);
@@ -161,3 +176,73 @@ function ensureNodePtyHelperExecutable() {
     // node-pty may be source-built or installed in a different layout.
   }
 }
+
+function nodePtyCandidates() {
+  const candidates = [
+    { kind: 'import', spec: 'node-pty', label: 'default node resolution', packageJson: null },
+  ];
+
+  for (const root of globalModuleRoots()) {
+    addNodePtyCandidate(candidates, path.join(root, 'node-pty'));
+    addNodePtyCandidate(candidates, path.join(root, '@google', 'gemini-cli', 'node_modules', 'node-pty'));
+  }
+
+  return candidates;
+}
+
+function addNodePtyCandidate(candidates, packageDir) {
+  const packageJson = path.join(packageDir, 'package.json');
+  if (!fs.existsSync(packageJson)) return;
+  candidates.push({
+    kind: 'require',
+    spec: packageDir,
+    label: packageDir,
+    packageJson,
+  });
+  const libIndex = path.join(packageDir, 'lib', 'index.js');
+  if (fs.existsSync(libIndex)) {
+    candidates.push({
+      kind: 'import',
+      spec: pathToFileURL(libIndex).href,
+      label: libIndex,
+      packageJson,
+    });
+  }
+}
+
+function globalModuleRoots() {
+  const roots = new Set();
+  const addRoot = (root) => {
+    if (root && fs.existsSync(root)) roots.add(fs.realpathSync(root));
+  };
+
+  const localRoot = path.resolve(moduleDir, '..', '..');
+  addRoot(localRoot);
+  addRoot(path.join(process.execPath ? path.dirname(path.dirname(process.execPath)) : '', 'lib', 'node_modules'));
+
+  if (process.env.npm_config_prefix) {
+    addRoot(path.join(process.env.npm_config_prefix, 'lib', 'node_modules'));
+  }
+  if (process.env.PREFIX) {
+    addRoot(path.join(process.env.PREFIX, 'lib', 'node_modules'));
+  }
+  if (process.env.HOME) {
+    addRoot(path.join(process.env.HOME, '.local', 'lib', 'node_modules'));
+    addRoot(path.join(process.env.HOME, '.npm-global', 'lib', 'node_modules'));
+  }
+
+  return Array.from(roots);
+}
+
+function resolveNodePtyPackageJson(spec) {
+  try {
+    return require.resolve('node-pty/package.json');
+  } catch {
+    if (spec && spec !== 'node-pty') {
+      const packageDir = spec.endsWith('node-pty') ? spec : path.dirname(path.dirname(fileURLToPath(spec)));
+      const packageJson = path.join(packageDir, 'package.json');
+      if (fs.existsSync(packageJson)) return packageJson;
+    }
+    return null;
+  }
+}