@pixelbyte-software/pixcode 1.49.4 → 1.49.5

package/dist-server/server/index.js

@@ -349,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)}`,
@@ -386,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;',
@@ -400,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)}`,
@@ -425,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({
@@ -2111,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) {
@@ -2143,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
@@ -2386,7 +2392,8 @@ function handleShellConnection(ws, request) {
                         projectPath,
                         sessionId,
                         provider,
-                        isPlainShell
+                        isPlainShell,
+                        keepAliveUntilExit: isHermesShellSession,
                     });
                     // Handle data output
                     shellProcess.onData((data) => {
@@ -2498,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(() => {