@pixelbyte-software/pixcode 1.48.3 → 1.48.4

package/scripts/smoke/pixcode-workbench-1-48.mjs

@@ -40,9 +40,13 @@ assert.match(workbench, /openEditorTabs|activeEditorPath/, 'Workbench editor sho
 assert.doesNotMatch(workbench, /<ChatInterface/, 'Right workbench panel should not render the chat composer.');
 assert.match(workbench, /WorkbenchCliPanel/, 'Right workbench panel should render the CLI terminal panel.');
 assert.match(workbench, /setIsTerminalOpen\(true\)/, 'CLI picker should give way to a full-height terminal after the user starts a provider.');
-assert.match(workbench, /onClose=\{\(\) => setIsTerminalOpen\(false\)\}/, 'Closing the workbench terminal should return to the CLI picker.');
+assert.match(workbench, /onClose=\{closeTerminal\}/, 'Closing the workbench terminal should return to the CLI picker.');
 assert.match(workbench, /WorkbenchCliPanelToolbar/, 'CLI terminal should keep history and new-session actions visible.');
-assert.match(workbench, /startNewCliSession/, 'CLI terminal should support starting a fresh provider session from the right pane.');
+assert.match(workbench, /WORKBENCH_CLI_STATE_STORAGE_KEY/, 'CLI terminal should remember per-project open state across workspace switches.');
+assert.match(workbench, /openNewCliSessionPicker/, 'CLI terminal plus should return to provider selection before starting a fresh session.');
+assert.match(workbench, /terminateCurrentCliSession\(selectedProvider\)/, 'CLI terminal plus should terminate the existing provider PTY before showing selection.');
+assert.match(workbench, /forceNewSession=\{terminalLaunch\.forceNewSession\}/, 'Fresh CLI sessions should bypass the cached default PTY.');
+assert.match(serverIndex, /\/api\/shell\/sessions\/terminate/, 'Backend should expose an authenticated endpoint to terminate cached provider PTYs immediately.');
 assert.doesNotMatch(shellTerminal, /new WebglAddon\(\)/, 'Workbench terminal should use the stable xterm renderer.');
 assert.match(workbench, /setActivityPanel\('explorer'\)/, 'Selecting a project should return the side panel to Explorer.');
 assert.match(gitPanelHeader, /compact/, 'Workbench Source Control should have compact icon-only controls.');
@@ -64,5 +68,7 @@ assert.doesNotMatch(orchestration, /A2A|a2a/, 'Orchestration page should not pre
 assert.match(serverIndex, /app\.use\('\/hermes', createHermesTaskRouter\(\)\)/, 'Internal task router should be mounted behind Hermes.');
 assert.doesNotMatch(serverIndex, /app\.use\('\/a2a'/, 'Server should not expose the old A2A route.');
 assert.match(hermesRoutes, /createHermesRouter/, 'Hermes should have a dedicated orchestration API router.');
+assert.match(serverIndex, /forceNewSession/, 'Shell backend should support explicit fresh-session launches from the workbench.');
+assert.match(serverIndex, /killProviderPtySessions/, 'Shell backend should terminate old provider PTYs when a fresh CLI session is requested.');
 
 console.log('pixcode workbench 1.48 smoke passed');

package/scripts/smoke/vscode-workbench-polish.mjs

@@ -98,8 +98,14 @@ for (const token of ['closeOtherWorkspaces', 'closeAllWorkspaces']) {
 
 assert.match(
   workspaceTabsSource,
-  /self-center/,
-  'Workspace add button should be vertically centered in the tab strip.',
+  /items-center justify-center/,
+  'Workspace add button should center its plus icon instead of rendering an off-center bare icon.',
+);
+
+assert.match(
+  workspaceTabsSource,
+  /border-r border-border/,
+  'Workspace add button should read as part of the tab strip instead of a floating bare button.',
 );
 
 assert.match(
@@ -156,8 +162,8 @@ assert.match(
 
 assert.match(
   workbench,
-  /onClose=\{\(\) => setIsTerminalOpen\(false\)\}/,
-  'Right CLI terminal close button should return to the picker instead of leaving a dead reconnect overlay.',
+  /onClose=\{closeTerminal\}/,
+  'Right CLI terminal close button should return to the picker through the persisted close flow.',
 );
 
 assert.match(
@@ -174,8 +180,26 @@ assert.match(
 
 assert.match(
   workbench,
-  /startNewCliSession/,
-  'Right CLI panel should expose a one-click new CLI session action.',
+  /WORKBENCH_CLI_STATE_STORAGE_KEY/,
+  'Right CLI panel should persist per-project terminal state when switching workspaces.',
+);
+
+assert.match(
+  workbench,
+  /openNewCliSessionPicker/,
+  'Right CLI panel toolbar plus should stop the current terminal view and return to CLI selection.',
+);
+
+assert.match(
+  workbench,
+  /terminateCurrentCliSession\(selectedProvider\)/,
+  'Right CLI panel toolbar plus should explicitly terminate the current provider PTY before showing the picker.',
+);
+
+assert.match(
+  workbench,
+  /forceNewSession=\{terminalLaunch\.forceNewSession\}/,
+  'Right CLI panel should mark explicitly started new sessions so the backend does not reconnect the old PTY.',
 );
 
 assert.match(
@@ -186,8 +210,8 @@ assert.match(
 
 assert.match(
   workbench,
-  /onNewSession=\{startNewCliSession\}/,
-  'Right CLI terminal toolbar should wire the plus button to a new CLI session.',
+  /onNewSession=\{openNewCliSessionPicker\}/,
+  'Right CLI terminal toolbar should wire the plus button to the new-session picker flow.',
 );
 
 assert.doesNotMatch(

package/server/index.js

@@ -285,8 +285,44 @@ const server = http.createServer(app);
 const ptySessionsMap = new Map();
 const PTY_SESSION_TIMEOUT = 30 * 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';
 
+function terminatePtySession(sessionKey, session, reason) {
+    if (!session) return false;
+
+    console.log(`🧹 Terminating PTY session (${reason}):`, sessionKey);
+    if (session.timeoutId) {
+        clearTimeout(session.timeoutId);
+    }
+
+    try {
+        if (session.pty && session.pty.kill) {
+            session.pty.kill();
+        }
+    } catch (error) {
+        console.warn('Failed to kill PTY session:', error.message);
+    }
+
+    ptySessionsMap.delete(sessionKey);
+    return true;
+}
+
+function killProviderPtySessions(projectPath, provider) {
+    let killed = 0;
+    for (const [sessionKey, session] of ptySessionsMap.entries()) {
+        if (
+            session?.projectPath === projectPath &&
+            session?.provider === provider &&
+            !session?.isPlainShell
+        ) {
+            killed += terminatePtySession(sessionKey, session, 'fresh provider session') ? 1 : 0;
+        }
+    }
+
+    return killed;
+}
+
 // Single WebSocket server that handles both paths
 const wss = new WebSocketServer({
     server,
@@ -358,6 +394,18 @@ app.get('/health', (req, res) => {
 // Optional API key validation (if configured)
 app.use('/api', validateApiKey);
 
+app.post('/api/shell/sessions/terminate', authenticateToken, (req, res) => {
+    const provider = req.body?.provider || 'claude';
+    const projectPath = req.body?.projectPath || os.homedir();
+
+    if (!SHELL_CLI_PROVIDERS.has(provider)) {
+        return res.status(400).json({ error: 'Unsupported provider' });
+    }
+
+    const killedSessions = killProviderPtySessions(projectPath, provider);
+    res.json({ success: true, killedSessions });
+});
+
 // Authentication routes (public)
 app.use('/api/auth', authRoutes);
 
@@ -2044,6 +2092,7 @@ function handleShellConnection(ws) {
                 const provider = data.provider || 'claude';
                 const initialCommand = data.initialCommand;
                 const isPlainShell = data.isPlainShell || (!!initialCommand && !hasSession) || provider === 'plain-shell';
+                const forceNewSession = Boolean(data.forceNewSession && !isPlainShell);
                 urlDetectionBuffer = '';
                 announcedAuthUrls.clear();
 
@@ -2077,14 +2126,16 @@ function handleShellConnection(ws) {
                 if (isLoginCommand) {
                     const oldSession = ptySessionsMap.get(ptySessionKey);
                     if (oldSession) {
-                        console.log('🧹 Cleaning up existing login session:', ptySessionKey);
-                        if (oldSession.timeoutId) clearTimeout(oldSession.timeoutId);
-                        if (oldSession.pty && oldSession.pty.kill) oldSession.pty.kill();
-                        ptySessionsMap.delete(ptySessionKey);
+                        terminatePtySession(ptySessionKey, oldSession, 'fresh login');
+                    }
+                } else if (forceNewSession) {
+                    const killedSessions = killProviderPtySessions(projectPath, provider);
+                    if (killedSessions > 0) {
+                        console.log(`🧹 Fresh ${provider} session requested; terminated ${killedSessions} cached PTY session(s).`);
                     }
                 }
 
-                const existingSession = isLoginCommand ? null : ptySessionsMap.get(ptySessionKey);
+                const existingSession = (isLoginCommand || forceNewSession) ? null : ptySessionsMap.get(ptySessionKey);
                 if (existingSession) {
                     console.log('♻️  Reconnecting to existing PTY session:', ptySessionKey);
                     shellProcess = existingSession.pty;
@@ -2292,7 +2343,9 @@ function handleShellConnection(ws) {
                         buffer: [],
                         timeoutId: null,
                         projectPath,
-                        sessionId
+                        sessionId,
+                        provider,
+                        isPlainShell
                     });
 
                     // Handle data output