Merge branch 'main' into dev

packages/server/src/server/session.ts

@@ -220,8 +220,6 @@ function clientSupportsFlexibleEditorIds(appVersion: string | null): boolean {
 
 const WORKSPACE_GIT_WATCH_DEBOUNCE_MS = 500;
 const WORKSPACE_GIT_WATCH_REMOVED_FINGERPRINT = "__removed__";
-const TERMINAL_STREAM_HIGH_WATER_BYTES = 256 * 1024;
-const TERMINAL_STREAM_LOW_WATER_BYTES = 16 * 1024;
 const MAX_TERMINAL_STREAM_SLOTS = 256;
 const pendingAgentInitializations = new Map<string, Promise<ManagedAgent>>();
 
@@ -299,7 +297,6 @@ type ActiveTerminalStream = {
   slot: number;
   unsubscribe: () => void;
   needsSnapshot: boolean;
-  snapshotRetryTimer: ReturnType<typeof setTimeout> | null;
 };
 
 export type SessionRuntimeMetrics = {
@@ -8618,7 +8615,6 @@ export class Session {
       slot,
       unsubscribe: () => {},
       needsSnapshot: true,
-      snapshotRetryTimer: null,
     };
 
     this.activeTerminalStreams.set(slot, activeStream);
@@ -8636,10 +8632,6 @@ export class Session {
       if (activeStream.needsSnapshot || message.data.length === 0) {
         return;
       }
-      if (this.getCurrentBinaryBufferedAmount() >= TERMINAL_STREAM_HIGH_WATER_BYTES) {
-        this.markAllActiveTerminalStreamsForSnapshot();
-        return;
-      }
       this.emitBinary(
         encodeTerminalStreamFrame({
           opcode: TerminalStreamOpcode.Output,
@@ -8647,9 +8639,6 @@ export class Session {
           payload: new Uint8Array(Buffer.from(message.data, "utf8")),
         }),
       );
-      if (this.getCurrentBinaryBufferedAmount() >= TERMINAL_STREAM_HIGH_WATER_BYTES) {
-        this.markAllActiveTerminalStreamsForSnapshot();
-      }
     });
     return slot;
   }
@@ -8662,21 +8651,6 @@ export class Session {
       return;
     }
 
-    if (this.getCurrentBinaryBufferedAmount() > TERMINAL_STREAM_LOW_WATER_BYTES) {
-      if (!activeStream.snapshotRetryTimer) {
-        activeStream.snapshotRetryTimer = setTimeout(() => {
-          activeStream.snapshotRetryTimer = null;
-          this.trySendTerminalSnapshot(activeStream);
-        }, 33);
-      }
-      return;
-    }
-
-    if (activeStream.snapshotRetryTimer) {
-      clearTimeout(activeStream.snapshotRetryTimer);
-      activeStream.snapshotRetryTimer = null;
-    }
-
     const terminal = this.terminalManager?.getTerminal(activeStream.terminalId);
     if (!terminal) {
       this.detachTerminalStream(activeStream.terminalId, { emitExit: true });
@@ -8693,13 +8667,6 @@ export class Session {
     );
   }
 
-  private markAllActiveTerminalStreamsForSnapshot(): void {
-    for (const activeStream of this.activeTerminalStreams.values()) {
-      activeStream.needsSnapshot = true;
-      this.trySendTerminalSnapshot(activeStream);
-    }
-  }
-
   private allocateTerminalSlot(): number | null {
     for (let attempt = 0; attempt < MAX_TERMINAL_STREAM_SLOTS; attempt += 1) {
       const slot = (this.nextTerminalSlot + attempt) % MAX_TERMINAL_STREAM_SLOTS;
@@ -8724,10 +8691,6 @@ export class Session {
     }
     this.activeTerminalStreams.delete(slot);
     this.terminalIdToSlot.delete(terminalId);
-    if (activeStream.snapshotRetryTimer) {
-      clearTimeout(activeStream.snapshotRetryTimer);
-      activeStream.snapshotRetryTimer = null;
-    }
     try {
       activeStream.unsubscribe();
     } catch (error) {