@pixelbyte-software/pixcode 1.50.7 → 1.50.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pixelbyte-software/pixcode",
-  "version": "1.50.7",
+  "version": "1.50.9",
   "description": "Self-hosted AI coding agent control room for Claude Code, Cursor CLI, OpenAI Codex, Gemini CLI, Qwen Code, and OpenCode with chat, files, shell, Git, orchestration, API keys, Telegram, MCP, plugins, themes, and desktop/server deployment.",
   "type": "module",
   "main": "dist-server/server/index.js",
@@ -124,6 +124,7 @@
     "gray-matter": "^4.0.3",
     "jsonwebtoken": "^9.0.2",
     "mime-types": "^3.0.1",
+    "monaco-editor": "^0.55.1",
     "multer": "^2.0.1",
     "node-fetch": "^2.7.0",
     "node-pty": "^1.2.0-beta.12",
@@ -186,7 +187,6 @@
     "katex": "^0.16.25",
     "lint-staged": "^16.3.2",
     "lucide-react": "^0.515.0",
-    "monaco-editor": "^0.55.1",
     "node-gyp": "^12.0.0",
     "postcss": "^8.4.32",
     "qrcode": "^1.5.4",

package/scripts/hermes/pixcode-mcp-server.mjs

@@ -9,6 +9,7 @@ const appRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..',
 const mcpServerPath = path.join(appRoot, 'scripts', 'hermes', 'pixcode-mcp-server.mjs');
 const READBACK_IDLE_STABLE_MS = 2500;
 const DEFAULT_STARTUP_WAIT_MS = 100000;
+const CODEX_PROMPT_INPUT_PENDING_REASON = 'codex_prompt_input_pending';
 
 const tools = [
   {
@@ -140,7 +141,7 @@ const tools = [
         },
         startIfNeeded: {
           type: 'boolean',
-          description: 'When true, Pixcode starts the managed Hermes gateway before probing.',
+          description: 'When false, only probe an already-running gateway. Defaults to true so Pixcode keeps Hermes REST ready.',
         },
       },
       additionalProperties: false,
@@ -218,13 +219,29 @@ function getLastMatchIndex(text, pattern) {
   return lastIndex;
 }
 
-function inferTerminalState(provider, terminalOutput) {
+function normalizePromptInput(value) {
+  return String(value || '').replace(/(?:\r\n|\r|\n)+$/u, '').trim();
+}
+
+function hasCodexPromptInputPending(output, expectedInput) {
+  const expected = normalizePromptInput(expectedInput);
+  if (!expected) return false;
+  const match = String(output || '').match(/(?:^|\n)[^\S\r\n]*[›❯][ \t]+([^\r\n]+)[\r\n]*$/u);
+  if (!match) return false;
+  return normalizePromptInput(match[1]) === expected;
+}
+
+function inferTerminalState(provider, terminalOutput, expectedInput = null) {
   if (!terminalOutput) return 'unknown';
+  const output = String(terminalOutput.output || '');
+  if (provider === 'codex' && hasCodexPromptInputPending(output, expectedInput)) {
+    terminalOutput.terminalStateReason = terminalOutput.terminalStateReason || CODEX_PROMPT_INPUT_PENDING_REASON;
+    return 'busy';
+  }
   if (typeof terminalOutput.terminalState === 'string') return terminalOutput.terminalState;
   if (typeof terminalOutput.isBusy === 'boolean') return terminalOutput.isBusy ? 'busy' : 'idle';
   if (terminalOutput.active === false) return terminalOutput.output ? 'idle' : 'unknown';
 
-  const output = String(terminalOutput.output || '');
   if (!output.trim()) return 'unknown';
   if (/Process exited with code/iu.test(output)) return 'idle';
 
@@ -240,6 +257,10 @@ function inferTerminalState(provider, terminalOutput) {
       getLastMatchIndex(output, /(?:^|\n)\s*›(?:\s|$)/gu),
       getLastMatchIndex(output, /(?:^|\n)\s*❯(?:\s|$)/gu),
     );
+    if (hasCodexPromptInputPending(output, expectedInput)) {
+      terminalOutput.terminalStateReason = terminalOutput.terminalStateReason || CODEX_PROMPT_INPUT_PENDING_REASON;
+      return 'busy';
+    }
     if (lastPrompt >= 0) return lastStrongBusy > lastPrompt ? 'busy' : 'idle';
     if (lastBusy >= 0) return 'busy';
     return 'unknown';
@@ -249,13 +270,13 @@ function inferTerminalState(provider, terminalOutput) {
   return 'unknown';
 }
 
-function isTerminalReadbackFinal(provider, terminalOutput) {
-  const terminalState = inferTerminalState(provider, terminalOutput);
+function isTerminalReadbackFinal(provider, terminalOutput, expectedInput = null) {
+  const terminalState = inferTerminalState(provider, terminalOutput, expectedInput);
   return terminalState === 'idle' || terminalState === 'completed' || terminalState === 'exited' || terminalState === 'failed';
 }
 
-function isTerminalReadbackHardFinal(provider, terminalOutput) {
-  const terminalState = inferTerminalState(provider, terminalOutput);
+function isTerminalReadbackHardFinal(provider, terminalOutput, expectedInput = null) {
+  const terminalState = inferTerminalState(provider, terminalOutput, expectedInput);
   return terminalState === 'completed' || terminalState === 'exited' || terminalState === 'failed' || Boolean(terminalOutput?.terminalFailed);
 }
 
@@ -269,7 +290,7 @@ function getReadbackFingerprint(terminalOutput) {
   ].join('\n---pixcode-readback---\n');
 }
 
-async function waitForProviderTerminalOutput(provider, projectPath, waitMs, launchId = null) {
+async function waitForProviderTerminalOutput(provider, projectPath, waitMs, launchId = null, expectedInput = null) {
   const startedAt = Date.now();
   let latestOutput = null;
   let stableFingerprint = null;
@@ -285,8 +306,8 @@ async function waitForProviderTerminalOutput(provider, projectPath, waitMs, laun
       error: error instanceof Error ? error.message : String(error),
     }));
 
-    if (latestOutput?.output && isTerminalReadbackFinal(provider, latestOutput)) {
-      if (isTerminalReadbackHardFinal(provider, latestOutput)) {
+    if (latestOutput?.output && isTerminalReadbackFinal(provider, latestOutput, expectedInput)) {
+      if (isTerminalReadbackHardFinal(provider, latestOutput, expectedInput)) {
         stableFinal = true;
         break;
       }
@@ -307,7 +328,7 @@ async function waitForProviderTerminalOutput(provider, projectPath, waitMs, laun
   } while (Date.now() - startedAt < waitMs);
 
   if (latestOutput && !latestOutput.terminalState) {
-    latestOutput.terminalState = inferTerminalState(provider, latestOutput);
+    latestOutput.terminalState = inferTerminalState(provider, latestOutput, expectedInput);
   }
   if (latestOutput && typeof latestOutput.isBusy !== 'boolean') {
     latestOutput.isBusy = latestOutput.terminalState === 'busy';
@@ -436,10 +457,10 @@ async function callTool(name, args = {}) {
     const requestedWaitMs = Number(args.waitForCompletionMs ?? args.waitForOutputMs ?? defaultWaitMs);
     const waitForOutputMs = Math.min(600000, Math.max(0, requestedWaitMs));
     if (waitForOutputMs > 0) {
-      terminalOutput = await waitForProviderTerminalOutput(provider, projectPath, waitForOutputMs, launchId);
+      terminalOutput = await waitForProviderTerminalOutput(provider, projectPath, waitForOutputMs, launchId, startupInput);
     }
     const terminalOutputFinal = terminalOutput
-      ? Boolean(terminalOutput.terminalOutputFinal ?? isTerminalReadbackFinal(provider, terminalOutput))
+      ? Boolean(terminalOutput.terminalOutputFinal ?? isTerminalReadbackFinal(provider, terminalOutput, startupInput))
       : false;
     return textResult(JSON.stringify({
       launched: true,
@@ -495,7 +516,7 @@ async function callTool(name, args = {}) {
       body: JSON.stringify({
         projectPath: args.projectPath || null,
         input: args.input || null,
-        startIfNeeded: args.startIfNeeded === true,
+        startIfNeeded: args.startIfNeeded !== false,
       }),
     });
     return textResult(JSON.stringify(body, null, 2));

package/scripts/smoke/code-editor-vscode-engine.mjs

@@ -6,6 +6,7 @@ const read = (path) => fs.readFileSync(path, 'utf8');
 const packageJson = JSON.parse(read('package.json'));
 const surface = read('src/components/code-editor/view/subcomponents/CodeEditorSurface.tsx');
 const editor = read('src/components/code-editor/view/CodeEditor.tsx');
+const localMonaco = read('src/components/code-editor/utils/localMonaco.ts');
 
 const allDeps = {
   ...(packageJson.dependencies ?? {}),
@@ -21,6 +22,36 @@ assert.match(
   'Normal file editing should lazy-load Monaco instead of keeping a CodeMirror-only surface.',
 );
 
+assert.match(
+  surface,
+  /ensureLocalMonaco\(\)/,
+  'Monaco should be configured before mount so Linux/self-hosted installs do not depend on the CDN loader.',
+);
+
+assert.match(
+  localMonaco,
+  /LOCAL_MONACO_BASE_PATH\s*=\s*['"]\/vendor\/monaco-editor\/min\/vs['"]/,
+  "Code editor should load Monaco from Pixcode's same-origin vendor route.",
+);
+
+assert.match(
+  localMonaco,
+  /loader\.config\(\{\s*paths:\s*\{\s*vs:\s*LOCAL_MONACO_BASE_PATH/s,
+  'Code editor should point @monaco-editor/react at the local Monaco loader path.',
+);
+
+assert.doesNotMatch(
+  localMonaco,
+  /https:\/\/cdn\.jsdelivr\.net|unpkg\.com|from ['"]monaco-editor/,
+  'Local Monaco setup should not use a remote CDN or import the full monaco-editor barrel.',
+);
+
+assert.match(
+  read('server/index.js'),
+  /\/vendor\/monaco-editor\/min\/vs[\s\S]*express\.static/,
+  'Server should serve Monaco loader and workers from the same-origin vendor route.',
+);
+
 assert.match(
   surface,
   /onMount=\{handleMonacoMount\}/,

package/scripts/smoke/hermes-mcp-pixcode-roundtrip.mjs

@@ -127,7 +127,28 @@ const server = createServer(async (req, res) => {
         provider: 'codex',
         projectPath: '/root/pixcode',
         terminalState: 'idle',
-        output: 'OpenAI Codex\n› /init\n\n• Ran npm test\n\n› Implement {feature}\n',
+        output: 'OpenAI Codex\n› /init\n',
+      },
+      {
+        active: true,
+        provider: 'codex',
+        projectPath: '/root/pixcode',
+        terminalState: 'idle',
+        output: 'OpenAI Codex\n› /init\n',
+      },
+      {
+        active: true,
+        provider: 'codex',
+        projectPath: '/root/pixcode',
+        terminalState: 'idle',
+        output: 'OpenAI Codex\n› /init\n',
+      },
+      {
+        active: true,
+        provider: 'codex',
+        projectPath: '/root/pixcode',
+        terminalState: 'idle',
+        output: 'OpenAI Codex\n› /init\n',
       },
       {
         active: true,

package/scripts/smoke/hermes-settings-commands.mjs

@@ -34,6 +34,16 @@ assert.match(
   /pixcode:hermes-terminal[\s\S]+command[\s\S]+title/,
   'Hermes settings should dispatch command and title to the workbench terminal.',
 );
+assert.match(
+  settingsTab,
+  /ensureGatewayReady/,
+  'Hermes settings should automatically start/probe the REST API gateway when Hermes is installed.',
+);
+assert.match(
+  settingsTab,
+  /startIfNeeded:\s*true/,
+  'Hermes settings should start the REST API gateway through Pixcode when checking gateway readiness.',
+);
 assert.match(
   settingsModal,
   /<HermesSettingsTab onClose=\{onClose\} \/>/,
@@ -74,6 +84,11 @@ assert.match(
   /pixcode_read_cli_terminal/,
   'Pixcode MCP should expose a terminal transcript reader so Hermes can report provider CLI output.',
 );
+assert.match(
+  pixcodeMcpServer,
+  /startIfNeeded:\s*args\.startIfNeeded !== false/,
+  'Pixcode MCP gateway probes should start the managed REST gateway by default unless Hermes explicitly opts out.',
+);
 assert.match(
   pixcodeMcpServer,
   /Use this instead of Hermes shell\/proc\/skill execution/,
@@ -94,6 +109,11 @@ assert.match(
   /lastStrongBusy[\s\S]+lastPrompt[\s\S]+\?\s*'busy'\s*:\s*'idle'/,
   'Codex readback should ignore weak spinner remnants once the prompt has returned.',
 );
+assert.match(
+  pixcodeMcpServer,
+  /codex_prompt_input_pending/,
+  'Codex readback should not treat a prompt line with typed-but-unsubmitted input as final output.',
+);
 assert.match(
   serverIndex,
   /lastStrongBusy[\s\S]+lastPrompt[\s\S]+\?\s*'busy'\s*:\s*'idle'/,
@@ -109,6 +129,11 @@ assert.match(
   /requestedLaunchId[\s\S]+session\.hermesLaunchId === requestedLaunchId/,
   'Provider output API should filter by Hermes terminal launch id when supplied.',
 );
+assert.match(
+  serverIndex,
+  /existingSession\.hermesLaunchId = hermesLaunchId \|\| existingSession\.hermesLaunchId/,
+  'Reused visible provider PTYs should be rebound to the latest Hermes launch id so MCP readback follows the current request.',
+);
 assert.match(
   serverIndex,
   /lifecycleState/,
@@ -244,6 +269,26 @@ assert.match(
   /writeTerminalStartupInput/,
   'Shell backend should submit Hermes startup input directly into reused visible PTYs.',
 );
+assert.match(
+  serverIndex,
+  /queueTerminalStartupInput/,
+  'Shell backend should queue Hermes startup input until the visible provider terminal is ready instead of writing blindly after a fixed delay.',
+);
+assert.match(
+  serverIndex,
+  /STARTUP_INPUT_READY_TIMEOUT_MS/,
+  'Queued provider startup input should have a bounded readiness timeout.',
+);
+assert.match(
+  serverIndex,
+  /resolveProviderTerminalState[\s\S]+terminalState === 'busy'/,
+  'Queued startup input should inspect the provider terminal state and avoid sending while the CLI is busy.',
+);
+assert.match(
+  serverIndex,
+  /\\x15/,
+  'Provider startup input should clear any half-typed prompt line before typing the requested work.',
+);
 assert.match(
   serverIndex,
   /startupInputDelivery === 'terminal'[\s\S]+writeTerminalStartupInput/,

package/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';
@@ -23,6 +24,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 {
@@ -38,6 +41,23 @@ const DAEMON_COMMAND_CONTEXT = {
     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);
@@ -153,6 +173,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) {
@@ -298,6 +320,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) {
@@ -436,23 +462,97 @@ 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) 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})`);
+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 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);
             }
-        } catch (error) {
-            console.warn('Failed to submit startup input to visible PTY:', error?.message || error);
+            return;
         }
-    }, 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) {
@@ -808,6 +908,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')) {
@@ -2497,6 +2609,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);
                         }
@@ -2708,6 +2822,8 @@ function handleShellConnection(ws, request) {
                         exitSignal: null,
                         completedAt: null,
                         keepAliveUntilExit: false,
+                        pendingStartupInputs: [],
+                        startupInputTimerId: null,
                         updatedAt: Date.now(),
                     });
                     const createdSession = ptySessionsMap.get(ptySessionKey);
@@ -2792,6 +2908,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);
                         }