Extract resetPTYStateLocked to dedup 4 identical cleanup blocks

andyrewlee · claude · andyrewlee · commit a6671299a657 · 2026-04-04T18:58:12.000-07:00
Co-Authored-By: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/internal/ui/center/model_lifecycle.go b/internal/ui/center/model_lifecycle.go
@@ -202,13 +202,7 @@ func (m *Model) Close() {
 				tab.ptyTraceFile = nil
 				tab.ptyTraceClosed = true
 			}
-			tab.pendingOutput = nil
-			tab.pendingOutputBytes = 0
-			tab.clearCatchUpLocked()
-			tab.ptyBytesReceived = 0
-			tab.ptyBytesSettled = 0
-			tab.ptyNoiseTrailing = nil
-			tab.actorQueuedBytes = 0
+			tab.resetPTYStateLocked()
 			tab.DiffViewer = nil
 			tab.Terminal = nil
 			tab.cachedSnap = nil
diff --git a/internal/ui/center/model_tab.go b/internal/ui/center/model_tab.go
@@ -212,6 +212,19 @@ func (t *Tab) normalizePTYAccountingLocked() {
 	}
 }
 
+func (t *Tab) resetPTYStateLocked() {
+	if t == nil {
+		return
+	}
+	t.pendingOutput = nil
+	t.pendingOutputBytes = 0
+	t.clearCatchUpLocked()
+	t.ptyBytesReceived = 0
+	t.ptyBytesSettled = 0
+	t.ptyNoiseTrailing = nil
+	t.actorQueuedBytes = 0
+}
+
 func (t *Tab) clearCatchUpLocked() {
 	if t == nil {
 		return
@@ -396,13 +409,7 @@ func (m *Model) CleanupWorkspace(ws *data.Workspace) {
 			tab.ptyTraceFile = nil
 			tab.ptyTraceClosed = true
 		}
-		tab.pendingOutput = nil
-		tab.pendingOutputBytes = 0
-		tab.clearCatchUpLocked()
-		tab.ptyBytesReceived = 0
-		tab.ptyBytesSettled = 0
-		tab.actorQueuedBytes = 0
-		tab.ptyNoiseTrailing = nil
+		tab.resetPTYStateLocked()
 		tab.DiffViewer = nil
 		tab.Terminal = nil
 		tab.cachedSnap = nil
diff --git a/internal/ui/center/model_tabs_actions.go b/internal/ui/center/model_tabs_actions.go
@@ -56,13 +56,7 @@ func (m *Model) closeTabAt(index int) tea.Cmd {
 	tab.cachedSnap = nil
 	tab.Workspace = nil
 	tab.Running = false
-	tab.pendingOutput = nil
-	tab.pendingOutputBytes = 0
-	tab.clearCatchUpLocked()
-	tab.ptyBytesReceived = 0
-	tab.ptyBytesSettled = 0
-	tab.ptyNoiseTrailing = nil
-	tab.actorQueuedBytes = 0
+	tab.resetPTYStateLocked()
 	tab.mu.Unlock()
 	tab.markClosed()
 
diff --git a/internal/ui/center/model_tabs_session.go b/internal/ui/center/model_tabs_session.go
@@ -43,13 +43,7 @@ func (m *Model) detachTab(tab *Tab, index int) tea.Cmd {
 	tab.Running = false
 	tab.Detached = true
 	tab.reattachInFlight = false
-	tab.pendingOutput = nil
-	tab.pendingOutputBytes = 0
-	tab.clearCatchUpLocked()
-	tab.ptyBytesReceived = 0
-	tab.ptyBytesSettled = 0
-	tab.ptyNoiseTrailing = nil
-	tab.actorQueuedBytes = 0
+	tab.resetPTYStateLocked()
 	if tab.Agent != nil && tab.SessionName == "" {
 		tab.SessionName = tab.Agent.Session
 	}
