@pixelbyte-software/pixcode 1.50.5 → 1.50.7

package/server/index.js

@@ -352,11 +352,12 @@ function detectProviderTerminalState(provider, output) {
         };
     }
 
-    const lastBusy = Math.max(
-        getLastRegexMatchIndex(cleanOutput, /(?:^|\n)\s*[•*]\s*(?:Working|Running|Thinking)\b/giu),
+    const lastWeakBusy = getLastRegexMatchIndex(cleanOutput, /(?:^|\n)\s*[•*]\s*(?:Working|Running|Thinking)\b/giu);
+    const lastStrongBusy = Math.max(
         getLastRegexMatchIndex(cleanOutput, /\bWorking\s*\([^)]*esc to interrupt[^)]*\)/giu),
         getLastRegexMatchIndex(cleanOutput, /\bmsg=interrupt\b/giu),
     );
+    const lastBusy = Math.max(lastWeakBusy, lastStrongBusy);
 
     if (provider === 'codex') {
         const lastPrompt = Math.max(
@@ -364,20 +365,20 @@ function detectProviderTerminalState(provider, output) {
             getLastRegexMatchIndex(cleanOutput, /(?:^|\n)\s*❯(?:\s|$)/gu),
         );
 
-        if (lastBusy >= 0) {
-            const isBusy = lastPrompt <= lastBusy;
+        if (lastPrompt >= 0) {
+            const isBusy = lastStrongBusy > lastPrompt;
             return {
                 terminalState: isBusy ? 'busy' : 'idle',
                 isBusy,
-                terminalStateReason: isBusy ? 'codex_busy_marker_after_prompt' : 'codex_prompt_after_busy_marker',
+                terminalStateReason: isBusy ? 'codex_strong_busy_marker_after_prompt' : 'codex_prompt_after_busy_marker',
             };
         }
 
-        if (lastPrompt >= 0 && /(?:Initialized|Baseline check passed|I did not modify files|Use \/skills)/iu.test(cleanOutput)) {
+        if (lastBusy >= 0) {
             return {
-                terminalState: 'idle',
-                isBusy: false,
-                terminalStateReason: 'codex_idle_prompt',
+                terminalState: 'busy',
+                isBusy: true,
+                terminalStateReason: 'codex_busy_marker_without_prompt',
             };
         }
     }
@@ -434,6 +435,26 @@ function appendPtySessionBuffer(session, data) {
     }
 }
 
+function normalizeTerminalStartupInput(input) {
+    return `${String(input || '').replace(/(?:\r\n|\r|\n)+$/u, '')}\r`;
+}
+
+function writeTerminalStartupInput(session, startupInput, reason, delayMs = 500) {
+    if (!session?.pty || !startupInput) return;
+    const submittedInput = normalizeTerminalStartupInput(startupInput);
+    setTimeout(() => {
+        try {
+            if (session.pty && session.lifecycleState === 'running') {
+                session.pty.write(submittedInput);
+                session.updatedAt = Date.now();
+                console.log(`⌨️  Submitted startup input to visible PTY (${reason})`);
+            }
+        } catch (error) {
+            console.warn('Failed to submit startup input to visible PTY:', error?.message || error);
+        }
+    }, delayMs);
+}
+
 function normalizeShellPermissionMode(value) {
     return typeof value === 'string' ? value.trim() : '';
 }
@@ -2386,6 +2407,9 @@ function handleShellConnection(ws, request) {
                 const startupInput = typeof data.startupInput === 'string' && data.startupInput.trim()
                     ? data.startupInput.trim()
                     : null;
+                const startupInputDelivery = data.startupInputDelivery === 'terminal' ? 'terminal' : 'command';
+                const commandStartupInput = startupInputDelivery === 'command' ? startupInput : null;
+                const terminalStartupInput = startupInputDelivery === 'terminal' ? startupInput : null;
                 const hermesLaunchId = Number.isFinite(Number(data.hermesLaunchId)) && Number(data.hermesLaunchId) > 0
                     ? Number(data.hermesLaunchId)
                     : null;
@@ -2473,6 +2497,9 @@ function handleShellConnection(ws, request) {
                         }
 
                         existingSession.ws = ws;
+                        if (terminalStartupInput && !isPlainShell) {
+                            writeTerminalStartupInput(existingSession, terminalStartupInput, 'reused provider session', 350);
+                        }
 
                         return;
                     }
@@ -2550,8 +2577,8 @@ function handleShellConnection(ws, request) {
                             } else {
                                 shellCommand = `${command} resume "${sessionId}" || ${command}`;
                             }
-                        } else if (startupInput) {
-                            shellCommand = `${command} ${quoteShellArgForPlatform(startupInput)}`;
+                        } else if (commandStartupInput) {
+                            shellCommand = `${command} ${quoteShellArgForPlatform(commandStartupInput)}`;
                         } else {
                             shellCommand = command;
                         }
@@ -2683,6 +2710,10 @@ function handleShellConnection(ws, request) {
                         keepAliveUntilExit: false,
                         updatedAt: Date.now(),
                     });
+                    const createdSession = ptySessionsMap.get(ptySessionKey);
+                    if (terminalStartupInput && !isPlainShell) {
+                        writeTerminalStartupInput(createdSession, terminalStartupInput, 'new provider session', 4500);
+                    }
 
                     // Handle data output
                     shellProcess.onData((data) => {
@@ -2749,6 +2780,11 @@ function handleShellConnection(ws, request) {
                     shellProcess.onExit((exitCode) => {
                         console.log('🔚 Shell process exited with code:', exitCode.exitCode, 'signal:', exitCode.signal);
                         const session = ptySessionsMap.get(ptySessionKey);
+                        if (session?.pty && session.pty !== shellProcess) {
+                            console.log('↩️  Ignoring stale PTY exit for replacement session:', ptySessionKey);
+                            return;
+                        }
+
                         const exitMessage = `\r\n\x1b[33mProcess exited with code ${exitCode.exitCode}${exitCode.signal ? ` (${exitCode.signal})` : ''}\x1b[0m\r\n`;
                         if (session) {
                             session.lifecycleState = exitCode.exitCode === 0 && !exitCode.signal ? 'completed' : 'failed';

package/server/modules/orchestration/hermes/hermes.routes.ts

@@ -30,6 +30,7 @@ type HermesTerminalLaunchEvent = {
   projectPath: string | null;
   prompt: string | null;
   startupInput: string | null;
+  forceNewSession: boolean;
   permissionMode: string | null;
   skipPermissions: boolean;
   bypassPermissions: boolean;
@@ -473,6 +474,7 @@ export function createHermesRouter(options: HermesRouterOptions = {}): Router {
     const prompt = readTrimmedString(body.prompt ?? body.reason);
     const requestedStartupInput = readTrimmedString(body.startupInput ?? body.input);
     const startupInput = requestedStartupInput ?? (isLegacyPromptLikelyStartupInput(prompt) ? prompt : null);
+    const forceNewSession = readBoolean(body.forceNewSession ?? body.newSession ?? body.freshSession);
     const bypassPermissions = readBoolean(body.bypassPermissions);
     const skipPermissions = readBoolean(body.skipPermissions) || bypassPermissions;
     const requestedPermissionMode = readTrimmedString(body.permissionMode);
@@ -484,6 +486,7 @@ export function createHermesRouter(options: HermesRouterOptions = {}): Router {
       projectPath,
       prompt,
       startupInput,
+      forceNewSession,
       permissionMode,
       skipPermissions,
       bypassPermissions,