@pixelbyte-software/pixcode 1.50.4 → 1.50.6

package/dist/index.html

@@ -35,7 +35,7 @@
     
     <!-- Prevent zoom on iOS -->
     <meta name="format-detection" content="telephone=no" />
-    <script type="module" crossorigin src="/assets/index-DYQjBZrd.js"></script>
+    <script type="module" crossorigin src="/assets/index-DVEXTVKy.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/vendor-react-DB6V5Fl1.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-codemirror-CIYNS698.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-xterm-C7tpxJl7.js">

package/dist-server/server/index.js

@@ -69,6 +69,7 @@ import providerRoutes from './modules/providers/provider.routes.js';
 import { createHermesTaskRouter, adapterRegistry, ClaudeCodeA2AAdapter, CodexA2AAdapter, CursorA2AAdapter, GeminiA2AAdapter, OpenCodeA2AAdapter, QwenA2AAdapter, createPreviewProxyRouter, createOrchestrationTaskRouter, createHermesRouter, createWorkflowRouter, } from './modules/orchestration/index.js';
 import networkRoutes from './routes/network.js';
 import telegramRoutes from './routes/telegram.js';
+import { restoreRequestedTunnel } from './services/external-access.js';
 import { restoreBotFromConfig } from './services/telegram/bot.js';
 import { ensurePortOpen } from './utils/port-access.js';
 import { applyAllStoredCredentialsToEnv, } from './services/provider-credentials.js';
@@ -232,6 +233,7 @@ const app = express();
 const server = http.createServer(app);
 const ptySessionsMap = new Map();
 const PTY_SESSION_TIMEOUT = 30 * 60 * 1000;
+const COMPLETED_PTY_SESSION_TTL = 5 * 60 * 1000;
 const SHELL_URL_PARSE_BUFFER_LIMIT = 32768;
 const SHELL_CLI_PROVIDERS = new Set(['claude', 'codex', 'cursor', 'gemini', 'qwen', 'opencode']);
 import { stripAnsiSequences, normalizeDetectedUrl, extractUrlsFromText, shouldAutoOpenUrlFromOutput } from './utils/url-detection.js';
@@ -287,22 +289,24 @@ function detectProviderTerminalState(provider, output) {
             terminalStateReason: 'process_exit',
         };
     }
-    const lastBusy = Math.max(getLastRegexMatchIndex(cleanOutput, /(?:^|\n)\s*[•*]\s*(?:Working|Running|Thinking)\b/giu), getLastRegexMatchIndex(cleanOutput, /\bWorking\s*\([^)]*esc to interrupt[^)]*\)/giu), getLastRegexMatchIndex(cleanOutput, /\bmsg=interrupt\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(getLastRegexMatchIndex(cleanOutput, /(?:^|\n)\s*›(?:\s|$)/gu), 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',
             };
         }
     }
@@ -319,6 +323,42 @@ function detectProviderTerminalState(provider, output) {
         terminalStateReason: 'no_known_marker',
     };
 }
+function resolveProviderTerminalState(session, provider, output) {
+    if (session?.lifecycleState === 'completed' || session?.lifecycleState === 'failed' || session?.lifecycleState === 'exited') {
+        const exitCode = typeof session.exitCode === 'number' ? session.exitCode : null;
+        const terminalFailed = exitCode !== null ? exitCode !== 0 : Boolean(session.exitSignal);
+        return {
+            terminalState: terminalFailed ? 'failed' : 'completed',
+            lifecycleState: session.lifecycleState,
+            isBusy: false,
+            terminalFailed,
+            exitCode,
+            exitSignal: session.exitSignal || null,
+            completedAt: session.completedAt || null,
+            terminalStateReason: terminalFailed ? 'pty_failed' : 'pty_completed',
+        };
+    }
+    const detected = detectProviderTerminalState(provider, output);
+    return {
+        ...detected,
+        lifecycleState: session?.lifecycleState || 'running',
+        terminalFailed: false,
+        exitCode: null,
+        exitSignal: null,
+        completedAt: null,
+    };
+}
+function appendPtySessionBuffer(session, data) {
+    if (!session)
+        return;
+    if (session.buffer.length < 5000) {
+        session.buffer.push(data);
+    }
+    else {
+        session.buffer.shift();
+        session.buffer.push(data);
+    }
+}
 function normalizeShellPermissionMode(value) {
     return typeof value === 'string' ? value.trim() : '';
 }
@@ -524,7 +564,7 @@ app.get('/api/shell/sessions/provider-output', authenticateToken, (req, res) =>
     }
     const rawOutput = matchedSession.buffer.join('').slice(-maxChars);
     const output = stripAnsiSequences(rawOutput);
-    const terminalState = detectProviderTerminalState(provider, output);
+    const terminalState = resolveProviderTerminalState(matchedSession, provider, output);
     res.json({
         active: true,
         provider,
@@ -2202,24 +2242,29 @@ function handleShellConnection(ws, request) {
                 }
                 const existingSession = (isLoginCommand || forceNewSession) ? null : ptySessionsMap.get(ptySessionKey);
                 if (existingSession) {
-                    console.log('♻️  Reconnecting to existing PTY session:', ptySessionKey);
-                    shellProcess = existingSession.pty;
-                    clearTimeout(existingSession.timeoutId);
-                    ws.send(JSON.stringify({
-                        type: 'output',
-                        data: `\x1b[36m[Reconnected to existing session]\x1b[0m\r\n`
-                    }));
-                    if (existingSession.buffer && existingSession.buffer.length > 0) {
-                        console.log(`📜 Sending ${existingSession.buffer.length} buffered messages`);
-                        existingSession.buffer.forEach(bufferedData => {
-                            ws.send(JSON.stringify({
-                                type: 'output',
-                                data: bufferedData
-                            }));
-                        });
+                    if (!existingSession.pty || existingSession.lifecycleState === 'completed' || existingSession.lifecycleState === 'failed') {
+                        ptySessionsMap.delete(ptySessionKey);
+                    }
+                    else {
+                        console.log('♻️  Reconnecting to existing PTY session:', ptySessionKey);
+                        shellProcess = existingSession.pty;
+                        clearTimeout(existingSession.timeoutId);
+                        ws.send(JSON.stringify({
+                            type: 'output',
+                            data: `\x1b[36m[Reconnected to existing session]\x1b[0m\r\n`
+                        }));
+                        if (existingSession.buffer && existingSession.buffer.length > 0) {
+                            console.log(`📜 Sending ${existingSession.buffer.length} buffered messages`);
+                            existingSession.buffer.forEach(bufferedData => {
+                                ws.send(JSON.stringify({
+                                    type: 'output',
+                                    data: bufferedData
+                                }));
+                            });
+                        }
+                        existingSession.ws = ws;
+                        return;
                     }
-                    existingSession.ws = ws;
-                    return;
                 }
                 console.log('[INFO] Starting shell in:', projectPath);
                 console.log('📋 Session info:', hasSession ? `Resume session ${sessionId}` : (isPlainShell ? 'Plain shell mode' : 'New session'));
@@ -2425,6 +2470,10 @@ function handleShellConnection(ws, request) {
                         hermesLaunchId,
                         provider,
                         isPlainShell,
+                        lifecycleState: 'running',
+                        exitCode: null,
+                        exitSignal: null,
+                        completedAt: null,
                         keepAliveUntilExit: false,
                         updatedAt: Date.now(),
                     });
@@ -2434,13 +2483,7 @@ function handleShellConnection(ws, request) {
                         if (!session)
                             return;
                         session.updatedAt = Date.now();
-                        if (session.buffer.length < 5000) {
-                            session.buffer.push(data);
-                        }
-                        else {
-                            session.buffer.shift();
-                            session.buffer.push(data);
-                        }
+                        appendPtySessionBuffer(session, data);
                         if (session.ws && session.ws.readyState === WebSocket.OPEN) {
                             let outputData = data;
                             const cleanChunk = stripAnsiSequences(data);
@@ -2481,16 +2524,41 @@ 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';
+                            session.exitCode = typeof exitCode.exitCode === 'number' ? exitCode.exitCode : null;
+                            session.exitSignal = exitCode.signal || null;
+                            session.completedAt = new Date().toISOString();
+                            session.updatedAt = Date.now();
+                            session.pty = null;
+                            appendPtySessionBuffer(session, exitMessage);
+                        }
                         if (session && session.ws && session.ws.readyState === WebSocket.OPEN) {
                             session.ws.send(JSON.stringify({
                                 type: 'output',
-                                data: `\r\n\x1b[33mProcess exited with code ${exitCode.exitCode}${exitCode.signal ? ` (${exitCode.signal})` : ''}\x1b[0m\r\n`
+                                data: exitMessage
                             }));
                         }
                         if (session && session.timeoutId) {
                             clearTimeout(session.timeoutId);
                         }
-                        ptySessionsMap.delete(ptySessionKey);
+                        if (session) {
+                            session.ws = null;
+                            session.timeoutId = setTimeout(() => {
+                                const current = ptySessionsMap.get(ptySessionKey);
+                                if (current && current.lifecycleState !== 'running') {
+                                    ptySessionsMap.delete(ptySessionKey);
+                                }
+                            }, COMPLETED_PTY_SESSION_TTL);
+                        }
+                        else {
+                            ptySessionsMap.delete(ptySessionKey);
+                        }
                         shellProcess = null;
                     });
                 }
@@ -3195,6 +3263,9 @@ async function startServer() {
             catch (err) {
                 console.log(`${c.dim('[INFO]')} Port-access helper failed: ${err?.message || err}`);
             }
+            restoreRequestedTunnel({ port: Number(SERVER_PORT) }).catch((err) => {
+                console.warn('[external-access] tunnel restore failed:', err?.message || err);
+            });
             console.log(`${c.tip('[TIP]')}  Run "pixcode status" for full configuration details`);
             console.log('');
             // Start watching the projects folder for changes