@pixelbyte-software/pixcode 1.49.10 → 1.50.0

package/dist-server/server/index.js

@@ -319,6 +319,30 @@ function resolvePublicBaseUrl(request) {
     const host = headers['x-forwarded-host'] || headers.host || `127.0.0.1:${process.env.SERVER_PORT || process.env.PORT || '3001'}`;
     return `${proto}://${String(host).split(',')[0].trim()}`;
 }
+function resolveHermesMcpBaseUrl() {
+    const configured = process.env.PIXCODE_INTERNAL_BASE_URL || process.env.PIXCODE_HERMES_BASE_URL;
+    if (configured)
+        return configured.replace(/\/$/, '');
+    return `http://127.0.0.1:${process.env.SERVER_PORT || process.env.PORT || '3001'}`;
+}
+function quoteBashArg(value) {
+    return `'${String(value).replace(/'/g, "'\\''")}'`;
+}
+function quotePowerShellArg(value) {
+    return `"${String(value).replace(/`/g, '``').replace(/\$/g, '`$').replace(/"/g, '`"')}"`;
+}
+const HERMES_CLI_COMMAND_PATTERN = /^hermes(?:\s+[A-Za-z0-9._:/=@+-]+)*\s*$/;
+function isHermesCliCommand(command) {
+    return typeof command === 'string' && HERMES_CLI_COMMAND_PATTERN.test(command.trim());
+}
+function buildHermesCliCommand(command) {
+    const hermesCommand = typeof command === 'string' && command.trim() ? command.trim() : 'hermes';
+    const configureScript = path.join(APP_ROOT, 'scripts', 'hermes', 'configure-pixcode-mcp.mjs');
+    if (os.platform() === 'win32') {
+        return `& ${quotePowerShellArg(process.execPath)} ${quotePowerShellArg(configureScript)} *> $null; ${hermesCommand}`;
+    }
+    return `${quoteBashArg(process.execPath)} ${quoteBashArg(configureScript)} >/dev/null 2>&1; exec ${hermesCommand}`;
+}
 function getOrCreateHermesApiKey(userId) {
     if (!userId)
         return null;
@@ -407,6 +431,45 @@ app.post('/api/shell/sessions/terminate', authenticateToken, (req, res) => {
     const killedSessions = killProviderPtySessions(projectPath, provider);
     res.json({ success: true, killedSessions });
 });
+app.get('/api/shell/sessions/provider-output', authenticateToken, (req, res) => {
+    const provider = String(req.query.provider || 'claude');
+    const projectPath = typeof req.query.projectPath === 'string' && req.query.projectPath.trim()
+        ? req.query.projectPath.trim()
+        : null;
+    const maxChars = Math.min(20000, Math.max(1000, Number.parseInt(String(req.query.maxChars || '12000'), 10) || 12000));
+    if (!SHELL_CLI_PROVIDERS.has(provider)) {
+        return res.status(400).json({ error: 'Unsupported provider' });
+    }
+    const requestedProjectPath = projectPath ? path.resolve(projectPath) : null;
+    let matchedSession = null;
+    for (const session of ptySessionsMap.values()) {
+        if (session?.provider === provider &&
+            !session?.isPlainShell &&
+            (!requestedProjectPath || path.resolve(session.projectPath || os.homedir()) === requestedProjectPath)) {
+            if (!matchedSession || (session.updatedAt || 0) > (matchedSession.updatedAt || 0)) {
+                matchedSession = session;
+            }
+        }
+    }
+    if (!matchedSession) {
+        return res.json({
+            active: false,
+            provider,
+            projectPath: requestedProjectPath,
+            output: '',
+            message: 'No active provider terminal session found for this project.',
+        });
+    }
+    const rawOutput = matchedSession.buffer.join('').slice(-maxChars);
+    res.json({
+        active: true,
+        provider,
+        projectPath: path.resolve(matchedSession.projectPath || os.homedir()),
+        sessionId: matchedSession.sessionId || null,
+        updatedAt: matchedSession.updatedAt || null,
+        output: stripAnsiSequences(rawOutput),
+    });
+});
 // Authentication routes (public)
 app.use('/api/auth', authRoutes);
 // Projects API Routes (protected)
@@ -2012,10 +2075,14 @@ function handleShellConnection(ws, request) {
                 const provider = data.provider || 'claude';
                 const initialCommand = data.initialCommand;
                 const isPlainShell = data.isPlainShell || (!!initialCommand && !hasSession) || provider === 'plain-shell';
+                const isHermesCliLaunch = isPlainShell && isHermesCliCommand(initialCommand);
                 const forceNewSession = Boolean(data.forceNewSession);
                 const shellPermissionMode = normalizeShellPermissionMode(data.permissionMode);
                 const shellSkipPermissions = Boolean(data.skipPermissions);
                 const shellPermissionFlags = buildProviderShellPermissionFlags(provider, shellPermissionMode, shellSkipPermissions);
+                const hermesApiKey = isHermesCliLaunch
+                    ? getOrCreateHermesApiKey(request.user?.id ?? request.user?.userId ?? null)
+                    : null;
                 urlDetectionBuffer = '';
                 announcedAuthUrls.clear();
                 // Login commands should never reuse cached sessions — each login
@@ -2131,7 +2198,9 @@ function handleShellConnection(ws, request) {
                     let shellCommand;
                     if (isPlainShell) {
                         // Plain shell mode without an initial command must stay interactive.
-                        shellCommand = initialCommand || null;
+                        shellCommand = isHermesCliLaunch
+                            ? buildHermesCliCommand(initialCommand)
+                            : initialCommand || null;
                     }
                     else if (provider === 'cursor') {
                         const command = buildProviderShellCommand('cursor-agent', shellPermissionFlags);
@@ -2257,6 +2326,11 @@ function handleShellConnection(ws, request) {
                         TERM: 'xterm-256color',
                         COLORTERM: 'truecolor',
                         FORCE_COLOR: '3',
+                        ...(isHermesCliLaunch ? {
+                            PIXCODE_BASE_URL: resolveHermesMcpBaseUrl(),
+                            PIXCODE_API_KEY: hermesApiKey || '',
+                            PIXCODE_APP_ROOT: APP_ROOT,
+                        } : {}),
                     });
                     shellProcess = pty.spawn(shell, shellArgs, {
                         name: 'xterm-256color',
@@ -2276,12 +2350,14 @@ function handleShellConnection(ws, request) {
                         provider,
                         isPlainShell,
                         keepAliveUntilExit: false,
+                        updatedAt: Date.now(),
                     });
                     // Handle data output
                     shellProcess.onData((data) => {
                         const session = ptySessionsMap.get(ptySessionKey);
                         if (!session)
                             return;
+                        session.updatedAt = Date.now();
                         if (session.buffer.length < 5000) {
                             session.buffer.push(data);
                         }