@phenx-inc/ctlsurf 0.1.21 → 0.2.0

package/out/renderer/assets/{index-DK9wLFFm.css → index-BzF7I1my.css}

@@ -7504,6 +7504,117 @@ html, body, #root {
   overflow: hidden;
 }
 
+/* Terminal tabs wrapper */
+.terminal-tabs-wrapper {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+}
+
+.terminal-tab-bar {
+  display: flex;
+  align-items: center;
+  gap: 1px;
+  padding: 2px 4px;
+  background: #16161e;
+  border-bottom: 1px solid #292e42;
+  flex-shrink: 0;
+  overflow-x: auto;
+  min-height: 28px;
+}
+
+.terminal-tab {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  padding: 3px 8px;
+  font-size: 11px;
+  color: #565f89;
+  background: transparent;
+  border-radius: 4px;
+  cursor: pointer;
+  white-space: nowrap;
+  user-select: none;
+}
+
+.terminal-tab:hover {
+  background: #1f2335;
+  color: #a9b1d6;
+}
+
+.terminal-tab.active {
+  background: #1a1b26;
+  color: #c0caf5;
+}
+
+.terminal-tab-label {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+}
+
+.terminal-tab-dot {
+  display: inline-block;
+  width: 6px;
+  height: 6px;
+  border-radius: 50%;
+}
+
+.terminal-tab-dot.active {
+  background: #9ece6a;
+}
+
+.terminal-tab-dot.exited {
+  background: #565f89;
+}
+
+.terminal-tab-close {
+  background: none;
+  border: none;
+  color: inherit;
+  font-size: 14px;
+  line-height: 1;
+  cursor: pointer;
+  padding: 0 2px;
+  border-radius: 3px;
+  opacity: 0.5;
+}
+
+.terminal-tab-close:hover {
+  opacity: 1;
+  background: rgba(247, 118, 142, 0.2);
+  color: #f7768e;
+}
+
+.terminal-tab-add {
+  background: none;
+  border: none;
+  color: #565f89;
+  font-size: 16px;
+  cursor: pointer;
+  padding: 2px 6px;
+  border-radius: 4px;
+  line-height: 1;
+}
+
+.terminal-tab-add:hover {
+  background: #1f2335;
+  color: #a9b1d6;
+}
+
+.terminal-tabs-content {
+  flex: 1;
+  display: flex;
+  overflow: hidden;
+}
+
+.terminal-tab-panel {
+  flex-direction: column;
+  overflow: hidden;
+}
+
 /* Terminal container */
 .terminal-container {
   width: 100%;

package/out/renderer/assets/{javascript-CiHhG2a9.js → javascript-bPY5C4uq.js}

@@ -1,5 +1,5 @@
-import { conf as conf$1, language as language$1 } from "./typescript-422MU_YO.js";
-import "./index-DwSsD_Xm.js";
+import { conf as conf$1, language as language$1 } from "./typescript-Ckc6emP2.js";
+import "./index-BsdOeO0U.js";
 const conf = conf$1;
 const language = {
   // Set defaultToken to invalid to see what you do not tokenize yet

package/out/renderer/assets/{jsonMode-DdDRlbXP.js → jsonMode-BmJotb6E.js}

@@ -1,6 +1,6 @@
-import { c as createWebWorker, l as languages, e as editor } from "./index-DwSsD_Xm.js";
-import { f as DocumentFormattingEditProvider, g as DocumentRangeFormattingEditProvider, C as CompletionAdapter, H as HoverAdapter, b as DocumentSymbolAdapter, d as DocumentColorAdapter, F as FoldingRangeAdapter, S as SelectionRangeAdapter, e as DiagnosticsAdapter } from "./lspLanguageFeatures-Dljhj5Gh.js";
-import { a, D, h, R, c, i, j, t, k } from "./lspLanguageFeatures-Dljhj5Gh.js";
+import { c as createWebWorker, l as languages, e as editor } from "./index-BsdOeO0U.js";
+import { f as DocumentFormattingEditProvider, g as DocumentRangeFormattingEditProvider, C as CompletionAdapter, H as HoverAdapter, b as DocumentSymbolAdapter, d as DocumentColorAdapter, F as FoldingRangeAdapter, S as SelectionRangeAdapter, e as DiagnosticsAdapter } from "./lspLanguageFeatures-hoVZfVKv.js";
+import { a, D, h, R, c, i, j, t, k } from "./lspLanguageFeatures-hoVZfVKv.js";
 const STOP_WHEN_IDLE_FOR = 2 * 60 * 1e3;
 class WorkerManager {
   constructor(defaults) {

package/out/renderer/assets/{liquid-BP5mb-uD.js → liquid-Cja_Pzh3.js}

@@ -1,4 +1,4 @@
-import { l as languages } from "./index-DwSsD_Xm.js";
+import { l as languages } from "./index-BsdOeO0U.js";
 const EMPTY_ELEMENTS = [
   "area",
   "base",

package/out/renderer/assets/{lspLanguageFeatures-Dljhj5Gh.js → lspLanguageFeatures-hoVZfVKv.js}

@@ -1,4 +1,4 @@
-import { R as Range$1, l as languages, e as editor, U as Uri, M as MarkerSeverity } from "./index-DwSsD_Xm.js";
+import { R as Range$1, l as languages, e as editor, U as Uri, M as MarkerSeverity } from "./index-BsdOeO0U.js";
 var DocumentUri;
 (function(DocumentUri2) {
   function is(value) {

package/out/renderer/assets/{mdx-D4u3N7dt.js → mdx-C0s81MOq.js}

@@ -1,4 +1,4 @@
-import { l as languages } from "./index-DwSsD_Xm.js";
+import { l as languages } from "./index-BsdOeO0U.js";
 const conf = {
   comments: {
     blockComment: ["{/*", "*/}"]

package/out/renderer/assets/{python-BQDHXVwp.js → python-CulkBOJr.js}

@@ -1,4 +1,4 @@
-import { l as languages } from "./index-DwSsD_Xm.js";
+import { l as languages } from "./index-BsdOeO0U.js";
 const conf = {
   comments: {
     lineComment: "#",

package/out/renderer/assets/{razor-BfXW9cDc.js → razor-czmzhwVZ.js}

@@ -1,4 +1,4 @@
-import { l as languages } from "./index-DwSsD_Xm.js";
+import { l as languages } from "./index-BsdOeO0U.js";
 const EMPTY_ELEMENTS = [
   "area",
   "base",

package/out/renderer/assets/{tsMode-BGTjG8Ow.js → tsMode-B90EqYGx.js}

@@ -1,4 +1,4 @@
-import { c as createWebWorker, e as editor, U as Uri, a as MarkerTag, M as MarkerSeverity, l as languages, t as typescriptDefaults, R as Range } from "./index-DwSsD_Xm.js";
+import { c as createWebWorker, e as editor, U as Uri, a as MarkerTag, M as MarkerSeverity, l as languages, t as typescriptDefaults, R as Range } from "./index-BsdOeO0U.js";
 class WorkerManager {
   constructor(_modeId, _defaults) {
     this._modeId = _modeId;

package/out/renderer/assets/{typescript-422MU_YO.js → typescript-Ckc6emP2.js}

@@ -1,4 +1,4 @@
-import { l as languages } from "./index-DwSsD_Xm.js";
+import { l as languages } from "./index-BsdOeO0U.js";
 const conf = {
   wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g,
   comments: {

package/out/renderer/assets/{xml-B6EKhHiy.js → xml-CKh-JyGN.js}

@@ -1,4 +1,4 @@
-import { l as languages } from "./index-DwSsD_Xm.js";
+import { l as languages } from "./index-BsdOeO0U.js";
 const conf = {
   comments: {
     blockComment: ["<!--", "-->"]

package/out/renderer/assets/{yaml-LkO_eGYb.js → yaml-B49zLim4.js}

@@ -1,4 +1,4 @@
-import { l as languages } from "./index-DwSsD_Xm.js";
+import { l as languages } from "./index-BsdOeO0U.js";
 const conf = {
   comments: {
     lineComment: "#"

package/out/renderer/index.html

@@ -4,8 +4,8 @@
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>ctlsurf-worker</title>
-  <script type="module" crossorigin src="./assets/index-DwSsD_Xm.js"></script>
-  <link rel="stylesheet" crossorigin href="./assets/index-DK9wLFFm.css">
+  <script type="module" crossorigin src="./assets/index-BsdOeO0U.js"></script>
+  <link rel="stylesheet" crossorigin href="./assets/index-BzF7I1my.css">
 </head>
 <body>
   <div id="root"></div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phenx-inc/ctlsurf",
-  "version": "0.1.21",
+  "version": "0.2.0",
   "description": "Agent-agnostic terminal and desktop app for ctlsurf — run Claude Code, Codex, or any coding agent with live session logging and remote control",
   "main": "out/main/index.js",
   "bin": {

package/src/main/headless.ts

@@ -99,10 +99,10 @@ async function main() {
   tui.init()
 
   const orchestrator = new Orchestrator(settingsDir, {
-    onPtyData: (data) => {
+    onPtyData: (_tabId, data) => {
       tui.writePtyData(data)
     },
-    onPtyExit: (code) => {
+    onPtyExit: (_tabId, code) => {
       tui.destroy()
       console.log(`Agent exited with code ${code}`)
       orchestrator.shutdown().then(() => process.exit(code))
@@ -126,14 +126,15 @@ async function main() {
   if (args.baseUrl) orchestrator.overrideBaseUrl(args.baseUrl)
 
   // Spawn agent with PTY sized to fit the TUI content area
+  const HEADLESS_TAB = 'headless'
   const ptySize = tui.getPtySize()
-  await orchestrator.spawnAgent(agent, args.cwd)
-  orchestrator.resizePty(ptySize.cols, ptySize.rows)
+  await orchestrator.spawnAgent(HEADLESS_TAB, agent, args.cwd)
+  orchestrator.resizePty(HEADLESS_TAB, ptySize.cols, ptySize.rows)
 
   // For coding agents, send an initial prompt to kick-start them
   if (isCodingAgent(agent)) {
     setTimeout(() => {
-      orchestrator.writePty('hello\r')
+      orchestrator.writePty(HEADLESS_TAB, 'hello\r')
     }, 1000)
   }
 
@@ -160,7 +161,7 @@ async function main() {
       if (SCROLL_UP_RE.test(str) || SCROLL_DOWN_RE.test(str)) {
         return
       }
-      orchestrator.writePty(str)
+      orchestrator.writePty(HEADLESS_TAB, str)
     })
   }
 
@@ -170,7 +171,7 @@ async function main() {
     const rows = process.stdout.rows || 24
     tui.resize(cols, rows)
     const size = tui.getPtySize()
-    orchestrator.resizePty(size.cols, size.rows)
+    orchestrator.resizePty(HEADLESS_TAB, size.cols, size.rows)
   })
 
   // Graceful shutdown

package/src/main/index.ts

@@ -1,4 +1,4 @@
-import { app, BrowserWindow, ipcMain, dialog } from 'electron'
+import { app, BrowserWindow, ipcMain, dialog, nativeImage } from 'electron'
 import path from 'path'
 import fs from 'fs'
 
@@ -19,17 +19,88 @@ import { Orchestrator } from './orchestrator'
 
 let mainWindow: BrowserWindow | null = null
 
+// ─── Project badge on dock/taskbar icon ──────────
+
+function getProjectAbbrev(cwdPath: string): string {
+  const folderName = cwdPath.split('/').filter(Boolean).pop() || ''
+  if (!folderName) return ''
+
+  // Split on hyphens, underscores, dots, camelCase boundaries
+  const words = folderName
+    .replace(/([a-z])([A-Z])/g, '$1 $2') // camelCase → separate words
+    .split(/[-_.\s]+/)
+    .filter(Boolean)
+
+  if (words.length >= 2) {
+    // Multiple words → take initials (up to 4)
+    return words.slice(0, 4).map(w => w[0]).join('').toUpperCase()
+  }
+
+  // Single word: if short (<=3 chars) use as-is, otherwise first 2 chars
+  const word = words[0]
+  if (word.length <= 3) return word.toUpperCase()
+  return word.slice(0, 2).toUpperCase()
+}
+
+function createOverlayIcon(text: string): Electron.NativeImage {
+  // Create a 32x32 overlay with text for Windows/Linux
+  const size = 32
+  const canvas = Buffer.alloc(size * size * 4, 0) // RGBA
+
+  // Fill with a semi-transparent dark background circle
+  for (let y = 0; y < size; y++) {
+    for (let x = 0; x < size; x++) {
+      const cx = x - size / 2
+      const cy = y - size / 2
+      const dist = Math.sqrt(cx * cx + cy * cy)
+      if (dist <= size / 2) {
+        const idx = (y * size + x) * 4
+        canvas[idx] = 122     // R (blue-ish)
+        canvas[idx + 1] = 162 // G
+        canvas[idx + 2] = 247 // B
+        canvas[idx + 3] = 220 // A
+      }
+    }
+  }
+
+  return nativeImage.createFromBuffer(canvas, { width: size, height: size })
+}
+
+function updateProjectBadge(cwdPath: string | null): void {
+  if (!cwdPath) return
+  const abbrev = getProjectAbbrev(cwdPath)
+
+  // macOS: dock badge shows text directly
+  if (process.platform === 'darwin' && app.dock) {
+    app.dock.setBadge(abbrev)
+  }
+
+  // Windows: overlay icon on taskbar
+  if (process.platform === 'win32' && mainWindow) {
+    mainWindow.setOverlayIcon(createOverlayIcon(abbrev), abbrev)
+  }
+
+  // All platforms: update window title
+  if (mainWindow) {
+    const folderName = cwdPath.split('/').filter(Boolean).pop() || 'ctlsurf-worker'
+    mainWindow.setTitle(`ctlsurf-worker — ${folderName}`)
+  }
+}
+
 // ─── Orchestrator (shared logic) ──────────────────
 
 const orchestrator = new Orchestrator(
   getSettingsDir(true),
   {
-    onPtyData: (data) => mainWindow?.webContents.send('pty:data', data),
-    onPtyExit: (code) => mainWindow?.webContents.send('pty:exit', code),
+    onPtyData: (tabId, data) => mainWindow?.webContents.send('pty:data', tabId, data),
+    onPtyExit: (tabId, code) => mainWindow?.webContents.send('pty:exit', tabId, code),
     onWorkerStatus: (status) => mainWindow?.webContents.send('worker:status', status),
     onWorkerMessage: (message) => mainWindow?.webContents.send('worker:message', message),
     onWorkerRegistered: (data) => mainWindow?.webContents.send('worker:registered', data),
-    onCwdChanged: () => mainWindow?.webContents.send('app:cwdChanged'),
+    onCwdChanged: () => {
+      mainWindow?.webContents.send('app:cwdChanged')
+      updateProjectBadge(orchestrator.cwd)
+    },
   }
 )
 
@@ -65,21 +136,25 @@ function createWindow(): void {
 
 // ─── IPC Handlers ──────────────────────────────────
 
-ipcMain.handle('pty:spawn', async (_event, agent: AgentConfig, cwd: string) => {
-  await orchestrator.spawnAgent(agent, cwd)
+ipcMain.handle('pty:spawn', async (_event, tabId: string, agent: AgentConfig, cwd: string) => {
+  await orchestrator.spawnAgent(tabId, agent, cwd)
   return { ok: true }
 })
 
-ipcMain.handle('pty:write', (_event, data: string) => {
-  orchestrator.writePty(data)
+ipcMain.handle('pty:write', (_event, tabId: string, data: string) => {
+  orchestrator.writePty(tabId, data)
+})
+
+ipcMain.handle('pty:resize', (_event, tabId: string, cols: number, rows: number) => {
+  orchestrator.resizePty(tabId, cols, rows)
 })
 
-ipcMain.handle('pty:resize', (_event, cols: number, rows: number) => {
-  orchestrator.resizePty(cols, rows)
+ipcMain.handle('pty:kill', async (_event, tabId: string) => {
+  await orchestrator.killTab(tabId)
 })
 
-ipcMain.handle('pty:kill', async () => {
-  await orchestrator.killAgent()
+ipcMain.handle('pty:setActiveTab', (_event, tabId: string) => {
+  orchestrator.setActiveTab(tabId)
 })
 
 ipcMain.handle('agents:list', () => getBuiltinAgents())
@@ -279,7 +354,6 @@ app.whenReady().then(() => {
   if (process.platform === 'darwin' && app.dock) {
     const iconPath = path.join(__dirname, '../../resources/icon.png')
     try {
-      const { nativeImage } = require('electron')
       app.dock.setIcon(nativeImage.createFromPath(iconPath))
     } catch { /* ignore */ }
   }

package/src/main/orchestrator.ts

@@ -30,14 +30,22 @@ export interface SettingsData {
 }
 
 export interface OrchestratorEvents {
-  onPtyData: (data: string) => void
-  onPtyExit: (code: number) => void
+  onPtyData: (tabId: string, data: string) => void
+  onPtyExit: (tabId: string, code: number) => void
   onWorkerStatus: (status: string) => void
   onWorkerMessage: (message: IncomingMessage) => void
   onWorkerRegistered: (data: { worker_id: string; folder_id: string | null; status: string }) => void
   onCwdChanged: () => void
 }
 
+interface TabState {
+  ptyManager: PtyManager
+  agent: AgentConfig
+  cwd: string
+  termStreamBuffer: string
+  termStreamTimer: ReturnType<typeof setTimeout> | null
+}
+
 // ─── Orchestrator ─────────────────────────────────
 
 const DEFAULT_PROFILES: Record<string, Profile> = {
@@ -61,7 +69,8 @@ export class Orchestrator {
   readonly workerWs: WorkerWsClient
 
   // State
-  private ptyManager: PtyManager | null = null
+  private tabs = new Map<string, TabState>()
+  private activeTabId: string | null = null
   private currentAgent: AgentConfig | null = null
   private currentCwd: string | null = null
   private settings: SettingsData = {
@@ -69,10 +78,6 @@ export class Orchestrator {
     profiles: { ...DEFAULT_PROFILES },
   }
 
-  // Terminal stream batching
-  private termStreamBuffer = ''
-  private termStreamTimer: ReturnType<typeof setTimeout> | null = null
-
   constructor(settingsDir: string, events: OrchestratorEvents) {
     this.settingsDir = settingsDir
     this.events = events
@@ -88,8 +93,9 @@ export class Orchestrator {
         this.workerWs.sendAck(message.id)
 
         if (message.type === 'prompt' || message.type === 'task_dispatch') {
-          if (this.ptyManager) {
-            this.ptyManager.write(message.content + '\r')
+          const activeTab = this.activeTabId ? this.tabs.get(this.activeTabId) : null
+          if (activeTab) {
+            activeTab.ptyManager.write(message.content + '\r')
             this.bridge.feedInput(message.content)
           }
         }
@@ -102,7 +108,8 @@ export class Orchestrator {
         }
       },
       onTerminalInput: (data: string) => {
-        this.ptyManager?.write(data)
+        const activeTab = this.activeTabId ? this.tabs.get(this.activeTabId) : null
+        activeTab?.ptyManager.write(data)
       },
     })
 
@@ -280,37 +287,48 @@ export class Orchestrator {
     return { ok: true }
   }
 
-  // ─── PTY & Agent ────────────────────────────────
+  // ─── PTY & Agent (multi-tab) ─────────────────────
 
-  async spawnAgent(agent: AgentConfig, cwd: string): Promise<void> {
-    if (this.ptyManager) {
-      this.bridge.endSession()
-      this.ptyManager.kill()
+  async spawnAgent(tabId: string, agent: AgentConfig, cwd: string): Promise<void> {
+    // Kill existing PTY on this tab if any
+    const existing = this.tabs.get(tabId)
+    if (existing) {
+      if (existing.termStreamTimer) clearTimeout(existing.termStreamTimer)
+      existing.ptyManager.kill()
+      this.tabs.delete(tabId)
     }
 
     this.currentAgent = agent
     const prevCwd = this.currentCwd
     this.currentCwd = cwd
+    this.activeTabId = tabId
     if (prevCwd !== cwd) {
       this.events.onCwdChanged()
     }
 
-    this.ptyManager = new PtyManager(agent, cwd)
+    const ptyManager = new PtyManager(agent, cwd)
+    const tab: TabState = { ptyManager, agent, cwd, termStreamBuffer: '', termStreamTimer: null }
+    this.tabs.set(tabId, tab)
 
-    this.ptyManager.onData((data: string) => {
-      this.events.onPtyData(data)
-      this.bridge.feedOutput(data)
-      this.streamTerminalData(data)
+    ptyManager.onData((data: string) => {
+      this.events.onPtyData(tabId, data)
+      if (tabId === this.activeTabId) {
+        this.bridge.feedOutput(data)
+        this.streamTerminalData(tabId, data)
+      }
     })
 
-    const thisPtyManager = this.ptyManager
-
-    this.ptyManager.onExit(async (exitCode: number) => {
-      this.events.onPtyExit(exitCode)
-      this.bridge.endSession()
-      if (thisPtyManager === this.ptyManager && this.currentAgent && isCodingAgent(this.currentAgent)) {
-        this.workerWs.disconnect()
+    ptyManager.onExit(async (exitCode: number) => {
+      this.events.onPtyExit(tabId, exitCode)
+      if (tabId === this.activeTabId) {
+        this.bridge.endSession()
+        if (this.currentAgent && isCodingAgent(this.currentAgent)) {
+          this.workerWs.disconnect()
+        }
       }
+      // Clean up tab state
+      const t = this.tabs.get(tabId)
+      if (t?.termStreamTimer) clearTimeout(t.termStreamTimer)
     })
 
     this.bridge.startSession()
@@ -323,26 +341,51 @@ export class Orchestrator {
     }
   }
 
-  writePty(data: string): void {
-    this.ptyManager?.write(data)
-    this.bridge.feedInput(data)
+  writePty(tabId: string, data: string): void {
+    this.tabs.get(tabId)?.ptyManager.write(data)
+    if (tabId === this.activeTabId) {
+      this.bridge.feedInput(data)
+    }
   }
 
-  resizePty(cols: number, rows: number): void {
-    this.ptyManager?.resize(cols, rows)
-    this.bridge.resize(cols, rows)
-    this.workerWs.sendTerminalResize(cols, rows)
+  resizePty(tabId: string, cols: number, rows: number): void {
+    this.tabs.get(tabId)?.ptyManager.resize(cols, rows)
+    if (tabId === this.activeTabId) {
+      this.bridge.resize(cols, rows)
+      this.workerWs.sendTerminalResize(cols, rows)
+    }
   }
 
-  async killAgent(): Promise<void> {
-    this.bridge.endSession()
-    this.ptyManager?.kill()
-    this.ptyManager = null
-    if (this.currentAgent && isCodingAgent(this.currentAgent)) {
-      this.workerWs.disconnect()
+  async killTab(tabId: string): Promise<void> {
+    const tab = this.tabs.get(tabId)
+    if (!tab) return
+    if (tab.termStreamTimer) clearTimeout(tab.termStreamTimer)
+    tab.ptyManager.kill()
+    this.tabs.delete(tabId)
+    if (tabId === this.activeTabId) {
+      this.bridge.endSession()
+      if (isCodingAgent(tab.agent)) {
+        this.workerWs.disconnect()
+      }
+      // Switch active to another tab if available
+      const remaining = [...this.tabs.keys()]
+      this.activeTabId = remaining.length > 0 ? remaining[remaining.length - 1] : null
     }
   }
 
+  setActiveTab(tabId: string): void {
+    this.activeTabId = tabId
+    const tab = this.tabs.get(tabId)
+    if (tab) {
+      this.currentAgent = tab.agent
+      this.currentCwd = tab.cwd
+    }
+  }
+
+  getTabIds(): string[] {
+    return [...this.tabs.keys()]
+  }
+
   // ─── Worker WebSocket ───────────────────────────
 
   connectWorkerWs(agent: AgentConfig, cwd: string): void {
@@ -375,15 +418,17 @@ export class Orchestrator {
     }
   }
 
-  private streamTerminalData(data: string): void {
-    this.termStreamBuffer += data
-    if (!this.termStreamTimer) {
-      this.termStreamTimer = setTimeout(() => {
-        if (this.termStreamBuffer) {
-          this.workerWs.sendTerminalData(this.termStreamBuffer)
-          this.termStreamBuffer = ''
+  private streamTerminalData(tabId: string, data: string): void {
+    const tab = this.tabs.get(tabId)
+    if (!tab) return
+    tab.termStreamBuffer += data
+    if (!tab.termStreamTimer) {
+      tab.termStreamTimer = setTimeout(() => {
+        if (tab.termStreamBuffer) {
+          this.workerWs.sendTerminalData(tab.termStreamBuffer)
+          tab.termStreamBuffer = ''
         }
-        this.termStreamTimer = null
+        tab.termStreamTimer = null
       }, TERM_STREAM_INTERVAL_MS)
     }
   }
@@ -392,12 +437,11 @@ export class Orchestrator {
 
   async shutdown(): Promise<void> {
     this.bridge.endSession()
-    this.ptyManager?.kill()
-    this.ptyManager = null
-    this.workerWs.disconnect()
-    if (this.termStreamTimer) {
-      clearTimeout(this.termStreamTimer)
-      this.termStreamTimer = null
+    for (const [, tab] of this.tabs) {
+      if (tab.termStreamTimer) clearTimeout(tab.termStreamTimer)
+      tab.ptyManager.kill()
     }
+    this.tabs.clear()
+    this.workerWs.disconnect()
   }
 }