@pixelbyte-software/pixcode 1.50.7 → 1.50.9

package/dist/assets/localMonaco-DFIbtDNp.js

@@ -0,0 +1 @@
+import{loader as r}from"./index-ak1p_4ew.js";import"./vendor-react-DB6V5Fl1.js";const e="/vendor/monaco-editor/min/vs";let o=!1;function i(){o||(r.config({paths:{vs:e}}),o=!0)}export{e as LOCAL_MONACO_BASE_PATH,i as ensureLocalMonaco};

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-CR4j4iu_.js"></script>
+    <script type="module" crossorigin src="/assets/index-CXTCtUku.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

@@ -7,6 +7,7 @@ import path from 'path';
 import os from 'os';
 import http from 'http';
 import net from 'node:net';
+import { createRequire } from 'node:module';
 import { spawn } from 'child_process';
 import express from 'express';
 import { WebSocketServer, WebSocket } from 'ws';
@@ -17,6 +18,8 @@ const __dirname = getModuleDir(import.meta.url);
 // The server source runs from /server, while the compiled output runs from /dist-server/server.
 // Resolving the app root once keeps every repo-level lookup below aligned across both layouts.
 const APP_ROOT = findAppRoot(__dirname);
+const require = createRequire(import.meta.url);
+const MONACO_ASSETS_ROUTE = '/vendor/monaco-editor/min/vs';
 const installMode = fs.existsSync(path.join(APP_ROOT, '.git')) ? 'git' : 'npm';
 const SERVER_VERSION = (() => {
     try {
@@ -32,6 +35,21 @@ const DAEMON_COMMAND_CONTEXT = {
     cliEntry: path.join(APP_ROOT, 'server', 'cli.js'),
     nodeExecPath: process.execPath,
 };
+function resolveMonacoAssetsPath() {
+    const candidates = [
+        path.join(APP_ROOT, 'node_modules', 'monaco-editor', 'min', 'vs'),
+    ];
+    try {
+        const monacoPackagePath = require.resolve('monaco-editor/package.json', {
+            paths: [APP_ROOT, __dirname],
+        });
+        candidates.push(path.join(path.dirname(monacoPackagePath), 'min', 'vs'));
+    }
+    catch {
+        // The editor will show its normal load failure if the dependency is unavailable.
+    }
+    return candidates.find((candidate) => fs.existsSync(path.join(candidate, 'loader.js'))) || null;
+}
 import { c } from './utils/colors.js';
 console.log('SERVER_PORT from env:', process.env.SERVER_PORT);
 import pty from 'node-pty';
@@ -118,6 +136,8 @@ let projectsWatchers = [];
 let projectsWatcherDebounceTimer = null;
 const connectedClients = new Set();
 let isGetProjectsRunning = false; // Flag to prevent reentrant calls
+const STARTUP_INPUT_READY_TIMEOUT_MS = 10 * 60 * 1000;
+const STARTUP_INPUT_POLL_MS = 750;
 // Broadcast progress to all connected WebSocket clients
 function broadcastProgress(progress) {
     const message = JSON.stringify({
@@ -244,6 +264,10 @@ function terminatePtySession(sessionKey, session, reason) {
     if (session.timeoutId) {
         clearTimeout(session.timeoutId);
     }
+    if (session.startupInputTimerId) {
+        clearTimeout(session.startupInputTimerId);
+        session.startupInputTimerId = null;
+    }
     try {
         if (session.pty && session.pty.kill) {
             session.pty.kill();
@@ -360,24 +384,86 @@ function appendPtySessionBuffer(session, data) {
     }
 }
 function normalizeTerminalStartupInput(input) {
-    return `${String(input || '').replace(/(?:\r\n|\r|\n)+$/u, '')}\r`;
+    return `\x15${String(input || '').replace(/(?:\r\n|\r|\n)+$/u, '')}\r`;
 }
-function writeTerminalStartupInput(session, startupInput, reason, delayMs = 500) {
-    if (!session?.pty || !startupInput)
+function readSessionOutputForState(session, maxChars = 12000) {
+    return stripAnsiSequences((session?.buffer || []).join('').slice(-maxChars));
+}
+function shouldWaitForProviderIdle(provider) {
+    return provider === 'codex';
+}
+function isTerminalReadyForStartupInput(session) {
+    if (!session?.pty || session.lifecycleState !== 'running') {
+        return { ready: false, retry: false, terminalState: 'exited' };
+    }
+    const output = readSessionOutputForState(session);
+    const state = resolveProviderTerminalState(session, session.provider, output);
+    if (state.terminalState === 'busy') {
+        return { ready: false, retry: true, terminalState: state.terminalState };
+    }
+    if (state.terminalState === 'idle') {
+        return { ready: true, retry: false, terminalState: state.terminalState };
+    }
+    if (shouldWaitForProviderIdle(session.provider)) {
+        return { ready: false, retry: true, terminalState: state.terminalState };
+    }
+    return { ready: true, retry: false, terminalState: state.terminalState };
+}
+function processTerminalStartupInputQueue(session) {
+    if (!session?.pendingStartupInputs?.length) {
+        session.startupInputTimerId = null;
         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})`);
+    }
+    const item = session.pendingStartupInputs[0];
+    const readiness = isTerminalReadyForStartupInput(session);
+    if (!readiness.ready) {
+        if (!readiness.retry || Date.now() - item.queuedAt > STARTUP_INPUT_READY_TIMEOUT_MS) {
+            session.pendingStartupInputs.shift();
+            session.startupInputTimerId = null;
+            const message = `\r\n\x1b[33m[Pixcode] Startup input was not sent because ${session.provider} is still ${readiness.terminalState || 'unavailable'}.\x1b[0m\r\n`;
+            try {
+                session.ws?.send?.(JSON.stringify({ type: 'output', data: message }));
             }
+            catch { /* websocket gone */ }
+            if (session.pendingStartupInputs.length > 0) {
+                session.startupInputTimerId = setTimeout(() => processTerminalStartupInputQueue(session), STARTUP_INPUT_POLL_MS);
+            }
+            return;
         }
-        catch (error) {
-            console.warn('Failed to submit startup input to visible PTY:', error?.message || error);
-        }
-    }, delayMs);
+        session.startupInputTimerId = setTimeout(() => processTerminalStartupInputQueue(session), STARTUP_INPUT_POLL_MS);
+        return;
+    }
+    session.pendingStartupInputs.shift();
+    session.startupInputTimerId = null;
+    try {
+        session.pty.write(normalizeTerminalStartupInput(item.startupInput));
+        session.updatedAt = Date.now();
+        console.log(`⌨️  Submitted startup input to visible PTY (${item.reason})`);
+    }
+    catch (error) {
+        console.warn('Failed to submit startup input to visible PTY:', error?.message || error);
+    }
+    if (session.pendingStartupInputs.length > 0) {
+        session.startupInputTimerId = setTimeout(() => processTerminalStartupInputQueue(session), STARTUP_INPUT_POLL_MS);
+    }
+}
+function queueTerminalStartupInput(session, startupInput, reason, delayMs = 500) {
+    if (!session?.pty || !startupInput)
+        return;
+    if (!Array.isArray(session.pendingStartupInputs)) {
+        session.pendingStartupInputs = [];
+    }
+    session.pendingStartupInputs.push({
+        startupInput,
+        reason,
+        queuedAt: Date.now(),
+    });
+    if (session.startupInputTimerId)
+        return;
+    session.startupInputTimerId = setTimeout(() => processTerminalStartupInputQueue(session), delayMs);
+}
+function writeTerminalStartupInput(session, startupInput, reason, delayMs = 500) {
+    queueTerminalStartupInput(session, startupInput, reason, delayMs);
 }
 function normalizeShellPermissionMode(value) {
     return typeof value === 'string' ? value.trim() : '';
@@ -664,6 +750,18 @@ app.use('/api/agent', agentRoutes);
 // Static app files served after API routes. Keep dist before public so
 // / and /index.html always resolve to the Pixcode app, not the GitHub Pages
 // landing page that also lives in public/index.html.
+const monacoAssetsPath = resolveMonacoAssetsPath();
+if (monacoAssetsPath) {
+    app.use(MONACO_ASSETS_ROUTE, express.static(monacoAssetsPath, {
+        index: false,
+        setHeaders: (res) => {
+            res.setHeader('Cache-Control', 'public, max-age=31536000, immutable');
+        },
+    }));
+}
+else {
+    console.warn('[monaco] Local Monaco assets not found; code editor loader may fail.');
+}
 app.use(express.static(path.join(APP_ROOT, 'dist'), {
     setHeaders: (res, filePath) => {
         if (filePath.endsWith('.html')) {
@@ -2286,6 +2384,8 @@ function handleShellConnection(ws, request) {
                             });
                         }
                         existingSession.ws = ws;
+                        existingSession.hermesLaunchId = hermesLaunchId || existingSession.hermesLaunchId;
+                        existingSession.updatedAt = Date.now();
                         if (terminalStartupInput && !isPlainShell) {
                             writeTerminalStartupInput(existingSession, terminalStartupInput, 'reused provider session', 350);
                         }
@@ -2501,6 +2601,8 @@ function handleShellConnection(ws, request) {
                         exitSignal: null,
                         completedAt: null,
                         keepAliveUntilExit: false,
+                        pendingStartupInputs: [],
+                        startupInputTimerId: null,
                         updatedAt: Date.now(),
                     });
                     const createdSession = ptySessionsMap.get(ptySessionKey);
@@ -2565,6 +2667,11 @@ function handleShellConnection(ws, request) {
                             session.exitSignal = exitCode.signal || null;
                             session.completedAt = new Date().toISOString();
                             session.updatedAt = Date.now();
+                            if (session.startupInputTimerId) {
+                                clearTimeout(session.startupInputTimerId);
+                                session.startupInputTimerId = null;
+                            }
+                            session.pendingStartupInputs = [];
                             session.pty = null;
                             appendPtySessionBuffer(session, exitMessage);
                         }