mstro-app 0.3.5 → 0.3.6

package/server/services/websocket/tab-handlers.ts

@@ -7,6 +7,43 @@ import type { HandlerContext } from './handler-context.js';
 import { buildOutputHistory, setupSessionListeners } from './session-handlers.js';
 import type { WebSocketMessage, WSContext } from './types.js';
 
+function buildActiveTabData(
+  regTab: { tabName: string; createdAt: string; order: number; hasUnviewedCompletion?: boolean; sessionId: string },
+  session: ImprovisationSessionManager,
+  worktreePath: string | undefined,
+  worktreeBranch: string | undefined,
+): Record<string, unknown> {
+  return {
+    tabName: regTab.tabName,
+    createdAt: regTab.createdAt,
+    order: regTab.order,
+    hasUnviewedCompletion: regTab.hasUnviewedCompletion,
+    sessionInfo: session.getSessionInfo(),
+    isExecuting: session.isExecuting,
+    outputHistory: buildOutputHistory(session),
+    executionEvents: session.isExecuting ? session.getExecutionEventLog() : undefined,
+    ...(session.isExecuting && session.executionStartTimestamp ? { executionStartTimestamp: session.executionStartTimestamp } : {}),
+    ...(worktreePath ? { worktreePath, worktreeBranch } : {}),
+  };
+}
+
+function buildInactiveTabData(
+  regTab: { tabName: string; createdAt: string; order: number; hasUnviewedCompletion?: boolean; sessionId: string },
+  worktreePath: string | undefined,
+  worktreeBranch: string | undefined,
+): Record<string, unknown> {
+  return {
+    tabName: regTab.tabName,
+    createdAt: regTab.createdAt,
+    order: regTab.order,
+    hasUnviewedCompletion: regTab.hasUnviewedCompletion,
+    sessionId: regTab.sessionId,
+    isExecuting: false,
+    outputHistory: [],
+    ...(worktreePath ? { worktreePath, worktreeBranch } : {}),
+  };
+}
+
 export function handleGetActiveTabs(ctx: HandlerContext, ws: WSContext, workingDir: string): void {
   const registry = ctx.getRegistry(workingDir);
   const allTabs = registry.getAllTabs();
@@ -14,29 +51,11 @@ export function handleGetActiveTabs(ctx: HandlerContext, ws: WSContext, workingD
   const tabs: Record<string, unknown> = {};
   for (const [tabId, regTab] of Object.entries(allTabs)) {
     const session = ctx.sessions.get(regTab.sessionId);
-    if (session) {
-      tabs[tabId] = {
-        tabName: regTab.tabName,
-        createdAt: regTab.createdAt,
-        order: regTab.order,
-        hasUnviewedCompletion: regTab.hasUnviewedCompletion,
-        sessionInfo: session.getSessionInfo(),
-        isExecuting: session.isExecuting,
-        outputHistory: buildOutputHistory(session),
-        executionEvents: session.isExecuting ? session.getExecutionEventLog() : undefined,
-        ...(session.isExecuting && session.executionStartTimestamp ? { executionStartTimestamp: session.executionStartTimestamp } : {}),
-      };
-    } else {
-      tabs[tabId] = {
-        tabName: regTab.tabName,
-        createdAt: regTab.createdAt,
-        order: regTab.order,
-        hasUnviewedCompletion: regTab.hasUnviewedCompletion,
-        sessionId: regTab.sessionId,
-        isExecuting: false,
-        outputHistory: [],
-      };
-    }
+    const worktreePath = ctx.gitDirectories.get(tabId);
+    const worktreeBranch = ctx.gitBranches.get(tabId);
+    tabs[tabId] = session
+      ? buildActiveTabData(regTab, session, worktreePath, worktreeBranch)
+      : buildInactiveTabData(regTab, worktreePath, worktreeBranch);
   }
 
   ctx.send(ws, { type: 'activeTabs', data: { tabs } });
@@ -65,6 +84,8 @@ export function handleSyncPromptText(ctx: HandlerContext, _ws: WSContext, msg: W
 export function handleRemoveTab(ctx: HandlerContext, _ws: WSContext, tabId: string, workingDir: string): void {
   const registry = ctx.getRegistry(workingDir);
   registry.unregisterTab(tabId);
+  ctx.gitDirectories.delete(tabId);
+  ctx.gitBranches.delete(tabId);
 
   ctx.broadcastToAll({
     type: 'tabRemoved',

package/server/services/websocket/terminal-handlers.ts

@@ -1,6 +1,7 @@
 // Copyright (c) 2025-present Mstro, Inc. All rights reserved.
 // Licensed under the MIT License. See LICENSE file for details.
 
+import { platform } from 'node:os';
 import { AnalyticsEvents, trackEvent } from '../analytics.js';
 import { getPTYManager } from '../terminal/pty-manager.js';
 import type { HandlerContext } from './handler-context.js';
@@ -58,7 +59,7 @@ function handleTerminalInit(
   setupTerminalBroadcastListeners(ctx, terminalId);
 
   try {
-    const { shell, cwd, isReconnect } = ptyManager.create(
+    const { shell, cwd, isReconnect, platform } = ptyManager.create(
       terminalId,
       workingDir,
       cols || 80,
@@ -77,8 +78,17 @@ function handleTerminalInit(
     ctx.send(ws, {
       type: 'terminalReady',
       terminalId,
-      data: { shell, cwd, isReconnect }
+      data: { shell, cwd, isReconnect, platform }
     });
+
+    // Send scrollback buffer so reconnecting clients see prior output
+    if (isReconnect) {
+      const scrollback = ptyManager.getScrollback(terminalId);
+      if (scrollback) {
+        ctx.send(ws, { type: 'terminalScrollback', terminalId, data: { scrollback } });
+      }
+    }
+
     trackEvent(AnalyticsEvents.TERMINAL_SESSION_CREATED, {
       shell,
       is_reconnect: isReconnect,
@@ -116,10 +126,17 @@ function handleTerminalReconnect(ctx: HandlerContext, ws: WSContext, terminalId:
     data: {
       shell: sessionInfo.shell,
       cwd: sessionInfo.cwd,
-      isReconnect: true
+      isReconnect: true,
+      platform: platform(),
     }
   });
 
+  // Send scrollback buffer so reconnecting clients see prior output
+  const scrollback = ptyManager.getScrollback(terminalId);
+  if (scrollback) {
+    ctx.send(ws, { type: 'terminalScrollback', terminalId, data: { scrollback } });
+  }
+
   ptyManager.resize(terminalId, sessionInfo.cols, sessionInfo.rows);
 }
 
@@ -269,9 +286,28 @@ function setupTerminalBroadcastListeners(ctx: HandlerContext, terminalId: string
 /**
  * Clean up terminal subscribers for a disconnected WS context.
  * Called from handler.ts handleClose().
+ *
+ * After removing the ws, also cleans up any subscriber Sets that are now empty
+ * and their associated PTY event listeners — preventing stale state accumulation
+ * across repeated connect/disconnect cycles (WebSocket hiccups).
  */
 export function cleanupTerminalSubscribers(ctx: HandlerContext, ws: WSContext): void {
-  for (const subs of ctx.terminalSubscribers.values()) {
+  const emptyTerminals: string[] = [];
+
+  for (const [terminalId, subs] of ctx.terminalSubscribers) {
     subs.delete(ws);
+    if (subs.size === 0) {
+      emptyTerminals.push(terminalId);
+    }
+  }
+
+  // Clean up empty subscriber sets and their PTY event listeners
+  for (const terminalId of emptyTerminals) {
+    ctx.terminalSubscribers.delete(terminalId);
+    const cleanup = ctx.terminalListenerCleanups.get(terminalId);
+    if (cleanup) {
+      cleanup();
+      ctx.terminalListenerCleanups.delete(terminalId);
+    }
   }
 }

package/server/services/websocket/types.ts

@@ -86,6 +86,7 @@ export interface WebSocketMessage {
     // Worktree operations
     | 'gitWorktreeList'
     | 'gitWorktreeCreate'
+    | 'gitWorktreeCreateAndAssign'
     | 'gitWorktreeRemove'
     | 'tabWorktreeSwitch'
     | 'gitWorktreePush'
@@ -105,7 +106,12 @@ export interface WebSocketMessage {
     | 'markTabViewed'
     // Settings message types
     | 'getSettings'
-    | 'updateSettings';
+    | 'updateSettings'
+    // File upload message types (chunked remote uploads)
+    | 'fileUploadStart'
+    | 'fileUploadChunk'
+    | 'fileUploadComplete'
+    | 'fileUploadCancel';
   tabId?: string;
   terminalId?: string;
   // biome-ignore lint/suspicious/noExplicitAny: message envelope carries heterogeneous payloads
@@ -158,6 +164,7 @@ export interface WebSocketResponse {
     | 'contentSearchError'
     | 'definitionResult'
     | 'fileError'
+    | 'terminalScrollback'
     // Terminal sync response types
     | 'terminalCreated'
     | 'terminalClosed'
@@ -190,6 +197,7 @@ export interface WebSocketResponse {
     // Worktree response types
     | 'gitWorktreeListResult'
     | 'gitWorktreeCreated'
+    | 'gitWorktreeCreatedAndAssigned'
     | 'gitWorktreeRemoved'
     | 'tabWorktreeSwitched'
     | 'gitWorktreePushed'
@@ -210,7 +218,11 @@ export interface WebSocketResponse {
     | 'tabStateChanged'
     // Settings response types
     | 'settings'
-    | 'settingsUpdated';
+    | 'settingsUpdated'
+    // File upload response types
+    | 'fileUploadAck'
+    | 'fileUploadReady'
+    | 'fileUploadError';
   tabId?: string;
   terminalId?: string;
   // biome-ignore lint/suspicious/noExplicitAny: message envelope carries heterogeneous payloads