@pixelbyte-software/pixcode 1.49.3 → 1.49.5

package/dist-server/server/index.js

@@ -77,6 +77,7 @@ import { restoreBotFromConfig } from './services/telegram/bot.js';
 import { ensurePortOpen } from './utils/port-access.js';
 import { applyAllStoredCredentialsToEnv, } from './services/provider-credentials.js';
 import { primeCliBinPath } from './services/install-jobs.js';
+import { buildHermesPathEnv, primeHermesPath } from './services/hermes-install-jobs.js';
 import { startEnabledPluginServers, stopAllPlugins, getPluginPort } from './utils/plugin-process-manager.js';
 import { initializeDatabase, sessionNamesDb, applyCustomSessionNames, apiKeysDb } from './database/db.js';
 import { setNotificationWebSocketServer } from './services/notification-orchestrator.js';
@@ -348,7 +349,6 @@ function buildHermesShellCommand(kind, env) {
     const configureScript = path.join(APP_ROOT, 'scripts', 'hermes', 'configure-pixcode-mcp.mjs');
     const isWindows = os.platform() === 'win32';
     const quote = isWindows ? shellQuotePowerShell : shellQuotePosix;
-    const configure = `node ${quote(configureScript)}`;
     if (isWindows) {
         const setEnv = [
             `$env:PIXCODE_BASE_URL=${quote(env.PIXCODE_BASE_URL)}`,
@@ -385,10 +385,16 @@ function buildHermesShellCommand(kind, env) {
             'return $null;',
             '}',
         ].join(' ');
+        const configure = [
+            'function Invoke-PixcodeHermesConfigure {',
+            `& node ${quote(configureScript)};`,
+            'if ($LASTEXITCODE -ne 0) { Write-Warning "Pixcode MCP configure failed; starting Hermes anyway."; $global:LASTEXITCODE = 0; }',
+            '}',
+        ].join(' ');
         const installHermesIfMissing = [
             'function Install-HermesIfMissing {',
             '$script:HermesCmd = Resolve-HermesCommand;',
-            'if ($script:HermesCmd) { Write-Host "Hermes already installed:"; & $script:HermesCmd --version; return; }',
+            'if ($script:HermesCmd) { & $script:HermesCmd --version *> $null; return; }',
             '$installer = Join-Path $env:TEMP "pixcode-hermes-install.ps1";',
             'Invoke-WebRequest -Uri "https://raw.githubusercontent.com/NousResearch/hermes-agent/main/scripts/install.ps1" -UseBasicParsing -OutFile $installer;',
             '& powershell.exe -NoProfile -ExecutionPolicy Bypass -File $installer -SkipSetup -Branch main;',
@@ -399,9 +405,9 @@ function buildHermesShellCommand(kind, env) {
             '}',
         ].join(' ');
         if (kind === 'pixcode:hermes:install') {
-            return `${setEnv}; ${resolveHermesCommand}; ${installHermesIfMissing}; Install-HermesIfMissing; ${configure}`;
+            return `${setEnv}; ${resolveHermesCommand}; ${configure}; ${installHermesIfMissing}; Install-HermesIfMissing; Invoke-PixcodeHermesConfigure`;
         }
-        return `${setEnv}; ${resolveHermesCommand}; ${installHermesIfMissing}; Install-HermesIfMissing; ${configure}; & $script:HermesCmd chat --toolsets "hermes-cli,mcp-pixcode"`;
+        return `${setEnv}; ${resolveHermesCommand}; ${configure}; ${installHermesIfMissing}; Install-HermesIfMissing; Invoke-PixcodeHermesConfigure; & $script:HermesCmd`;
     }
     const setEnv = [
         `PIXCODE_BASE_URL=${quote(env.PIXCODE_BASE_URL)}`,
@@ -424,15 +430,15 @@ function buildHermesShellCommand(kind, env) {
     const installHermesIfMissing = [
         'installHermesIfMissing() {',
         'HERMES_CMD="$(resolveHermesCommand 2>/dev/null || true)";',
-        'if [ -n "$HERMES_CMD" ]; then echo "Hermes already installed:"; "$HERMES_CMD" --version 2>/dev/null || true; return 0; fi;',
+        'if [ -n "$HERMES_CMD" ]; then "$HERMES_CMD" --version >/dev/null 2>&1 || true; return 0; fi;',
         'echo "Hermes is not installed. Use Pixcode Settings > Hermes Agent > Install or repair, then start again." >&2;',
         'exit 127;',
         '}',
     ].join(' ');
     if (kind === 'pixcode:hermes:install') {
-        return `${setEnv} sh -lc ${quote(`${resolveHermesCommand} ${installHermesIfMissing} installHermesIfMissing && node ${shellQuotePosix(configureScript)}`)}`;
+        return `${setEnv} sh -lc ${quote(`${resolveHermesCommand} ${installHermesIfMissing} installHermesIfMissing && { node ${shellQuotePosix(configureScript)} || echo "Pixcode MCP configure failed; continuing."; }`)}`;
     }
-    return `${setEnv} sh -lc ${quote(`${resolveHermesCommand} ${installHermesIfMissing} installHermesIfMissing && node ${shellQuotePosix(configureScript)} && "$HERMES_CMD" chat --toolsets "hermes-cli,mcp-pixcode"`)}`;
+    return `${setEnv} sh -lc ${quote(`${resolveHermesCommand} ${installHermesIfMissing} installHermesIfMissing && { node ${shellQuotePosix(configureScript)} || echo "Pixcode MCP configure failed; starting Hermes anyway."; } && "$HERMES_CMD"`)}`;
 }
 // Single WebSocket server that handles both paths
 const wss = new WebSocketServer({
@@ -2110,6 +2116,7 @@ function handleShellConnection(ws, request) {
                 const provider = data.provider || 'claude';
                 let initialCommand = data.initialCommand;
                 const hermesCommand = HERMES_SHELL_COMMANDS.has(initialCommand) ? initialCommand : null;
+                const isHermesShellSession = Boolean(hermesCommand);
                 if (hermesCommand) {
                     const apiKey = getOrCreateHermesApiKey(request?.user?.id);
                     if (!apiKey) {
@@ -2142,7 +2149,7 @@ function handleShellConnection(ws, request) {
                     initialCommand.includes('auth login'));
                 // Include command hash in session key so different commands get separate sessions
                 const commandSuffix = isPlainShell && initialCommand
-                    ? `_cmd_${Buffer.from(initialCommand).toString('base64').slice(0, 16)}`
+                    ? (isHermesShellSession ? '_hermes' : `_cmd_${Buffer.from(initialCommand).toString('base64').slice(0, 16)}`)
                     : '';
                 // Include provider in the key so a fresh "new session" in OpenCode
                 // doesn't reattach to a cached Claude PTY for the same project (or
@@ -2364,17 +2371,17 @@ function handleShellConnection(ws, request) {
                     const termCols = data.cols || 80;
                     const termRows = data.rows || 24;
                     console.log('📐 Using terminal dimensions:', termCols, 'x', termRows);
+                    const shellEnv = buildHermesPathEnv(process.env, {
+                        TERM: 'xterm-256color',
+                        COLORTERM: 'truecolor',
+                        FORCE_COLOR: '3',
+                    });
                     shellProcess = pty.spawn(shell, shellArgs, {
                         name: 'xterm-256color',
                         cols: termCols,
                         rows: termRows,
                         cwd: resolvedProjectPath,
-                        env: {
-                            ...process.env,
-                            TERM: 'xterm-256color',
-                            COLORTERM: 'truecolor',
-                            FORCE_COLOR: '3'
-                        }
+                        env: shellEnv,
                     });
                     console.log('🟢 Shell process started with PTY, PID:', shellProcess.pid);
                     ptySessionsMap.set(ptySessionKey, {
@@ -2385,7 +2392,8 @@ function handleShellConnection(ws, request) {
                         projectPath,
                         sessionId,
                         provider,
-                        isPlainShell
+                        isPlainShell,
+                        keepAliveUntilExit: isHermesShellSession,
                     });
                     // Handle data output
                     shellProcess.onData((data) => {
@@ -2497,6 +2505,11 @@ function handleShellConnection(ws, request) {
         if (ptySessionKey) {
             const session = ptySessionsMap.get(ptySessionKey);
             if (session) {
+                if (session.keepAliveUntilExit) {
+                    console.log('⏳ PTY session kept alive until process exit:', ptySessionKey);
+                    session.ws = null;
+                    return;
+                }
                 console.log('⏳ PTY session kept alive, will timeout in 30 minutes:', ptySessionKey);
                 session.ws = null;
                 session.timeoutId = setTimeout(() => {
@@ -3104,6 +3117,15 @@ async function startServer() {
         catch (err) {
             console.warn('[install-jobs] Failed to prime CLI bin path:', err?.message || err);
         }
+        // Prime Hermes' known install locations separately so the project
+        // terminal can resolve `hermes` even when Windows has not refreshed the
+        // user's PATH for the current Pixcode process.
+        try {
+            primeHermesPath();
+        }
+        catch (err) {
+            console.warn('[install-jobs] Failed to prime Hermes bin path:', err?.message || err);
+        }
         // Restore any previously-configured Telegram bot. This is best-effort:
         // a bad token or network blip should warn, not crash the server.
         restoreBotFromConfig().catch((err) => {