Stop scrolling the last frame away when a terminal exits

claude · claude · commit 76087619339b · 2026-07-26T20:42:54.000Z
The "[Terminal process exited]" line cost a row and pushed the top of the
final screen out of view -- and for a coding agent the first line of its
last answer is often the part you wanted to read. Nothing is appended
now; the dead terminal is pinned exactly on its last live frame and the
exit is reported on the tab ("claude (exited)") and by the status-bar
restart indicator.

Terminal tab names also survive an editor restart. Restored panes were
falling back to foreground-process auto-naming, so an agent tab named
"claude" came back as "bash" or "*Terminal 1*"; the explicit title is now
captured and reapplied along with the rest of the terminal's state,
including for terminals restored as already-exited.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,8 @@ Keyboard and mouse input is now parsed by our own `fresh-input-parser` crate ins
   * **`Run Agent…` command** launches a terminal or a coding agent (`claude`, `codex`, `opencode`, `aider`) in your current workspace or a new one, without the full New Workspace dialog.
   * **Non-blocking workspace creation** - creating a workspace no longer freezes the editor; choose **Create & Visit** or **Create in Background** and keep working while it comes up.
 * **Restart an exited terminal in place** - when a terminal's process quits, the status bar offers a clickable `⟳ Restart terminal` (or `⟳ Resume claude`, named after whatever was running, with the exit code when it's non-zero). Click it, run **Restart Terminal Process** from the command palette, or use **View → Terminal → Restart Terminal Process**, and the process comes back in the *same* buffer below the existing scrollback — no new terminal, no lost place. A coding agent with a resume spec rejoins its conversation rather than starting over, exactly as it does when you reopen the editor. Works for plain shells and commands too; a *running* terminal is never restarted. The offer survives quitting the editor — the pane comes back with its transcript and the indicator, deliberately still stopped rather than silently re-running.
+  * A terminal's exit is **no longer written into the output** as a `[Terminal process exited]` line, which cost a row and scrolled the top of the final screen out of view — often the first, most important line of an agent's last answer. The tab reads `claude (exited)` instead, and the dead terminal is left exactly on its last frame.
+  * **Terminal tab names now survive an editor restart** — a restored agent tab stays named `claude` instead of falling back to `bash` / `*Terminal 1*`.
   * **Run Agent… and New Workspace are now one dialog.** A "Launch in" switch at the top chooses the current workspace or a new one; picking a new one reveals the backend tabs, Project Path, Workspace Name and the Advanced fold, and picking the current one hides them, leaving just the agent controls. Both palette commands open the same form — they only differ in where the switch starts.
   * Fixes **Run Agent… → current workspace**, which recorded neither the launch nor the resume argv: that agent used to vanish from the saved workspace entirely, and restarting it produced a bare shell instead of the agent. It now behaves exactly like an agent started in its own new workspace.
 * **Classic Mac (CR) line endings** are now fully supported (#2736, requested by @720720).
diff --git a/crates/fresh-editor/locales/cs.json b/crates/fresh-editor/locales/cs.json
@@ -1640,5 +1640,6 @@
   "status.terminal_resume": "⟳ Obnovit %{program}",
   "status.terminal_restart": "⟳ Restartovat %{program}",
   "status.terminal_restart_shell": "⟳ Restartovat terminál",
-  "status.terminal_restart_code": "%{label} (kód %{code})"
+  "status.terminal_restart_code": "%{label} (kód %{code})",
+  "terminal.tab_exited": "%{name} (ukončeno)"
 }
diff --git a/crates/fresh-editor/locales/de.json b/crates/fresh-editor/locales/de.json
@@ -1640,5 +1640,6 @@
   "status.terminal_resume": "⟳ %{program} fortsetzen",
   "status.terminal_restart": "⟳ %{program} neu starten",
   "status.terminal_restart_shell": "⟳ Terminal neu starten",
-  "status.terminal_restart_code": "%{label} (Code %{code})"
+  "status.terminal_restart_code": "%{label} (Code %{code})",
+  "terminal.tab_exited": "%{name} (beendet)"
 }
diff --git a/crates/fresh-editor/locales/en.json b/crates/fresh-editor/locales/en.json
@@ -1640,5 +1640,6 @@
   "status.terminal_resume": "⟳ Resume %{program}",
   "status.terminal_restart": "⟳ Restart %{program}",
   "status.terminal_restart_shell": "⟳ Restart terminal",
-  "status.terminal_restart_code": "%{label} (exit %{code})"
+  "status.terminal_restart_code": "%{label} (exit %{code})",
+  "terminal.tab_exited": "%{name} (exited)"
 }
diff --git a/crates/fresh-editor/locales/es.json b/crates/fresh-editor/locales/es.json
@@ -1640,5 +1640,6 @@
   "status.terminal_resume": "⟳ Reanudar %{program}",
   "status.terminal_restart": "⟳ Reiniciar %{program}",
   "status.terminal_restart_shell": "⟳ Reiniciar terminal",
-  "status.terminal_restart_code": "%{label} (salida %{code})"
+  "status.terminal_restart_code": "%{label} (salida %{code})",
+  "terminal.tab_exited": "%{name} (finalizado)"
 }
diff --git a/crates/fresh-editor/locales/fr.json b/crates/fresh-editor/locales/fr.json
@@ -1640,5 +1640,6 @@
   "status.terminal_resume": "⟳ Reprendre %{program}",
   "status.terminal_restart": "⟳ Redémarrer %{program}",
   "status.terminal_restart_shell": "⟳ Redémarrer le terminal",
-  "status.terminal_restart_code": "%{label} (code %{code})"
+  "status.terminal_restart_code": "%{label} (code %{code})",
+  "terminal.tab_exited": "%{name} (terminé)"
 }
diff --git a/crates/fresh-editor/locales/it.json b/crates/fresh-editor/locales/it.json
@@ -1640,5 +1640,6 @@
   "status.terminal_resume": "⟳ Riprendi %{program}",
   "status.terminal_restart": "⟳ Riavvia %{program}",
   "status.terminal_restart_shell": "⟳ Riavvia il terminale",
-  "status.terminal_restart_code": "%{label} (uscita %{code})"
+  "status.terminal_restart_code": "%{label} (uscita %{code})",
+  "terminal.tab_exited": "%{name} (terminato)"
 }
diff --git a/crates/fresh-editor/locales/ja.json b/crates/fresh-editor/locales/ja.json
@@ -1640,5 +1640,6 @@
   "status.terminal_resume": "⟳ %{program} を再開",
   "status.terminal_restart": "⟳ %{program} を再起動",
   "status.terminal_restart_shell": "⟳ ターミナルを再起動",
-  "status.terminal_restart_code": "%{label} (終了 %{code})"
+  "status.terminal_restart_code": "%{label} (終了 %{code})",
+  "terminal.tab_exited": "%{name}（終了）"
 }
diff --git a/crates/fresh-editor/locales/ko.json b/crates/fresh-editor/locales/ko.json
@@ -1640,5 +1640,6 @@
   "status.terminal_resume": "⟳ %{program} 이어서",
   "status.terminal_restart": "⟳ %{program} 다시 시작",
   "status.terminal_restart_shell": "⟳ 터미널 다시 시작",
-  "status.terminal_restart_code": "%{label} (종료 %{code})"
+  "status.terminal_restart_code": "%{label} (종료 %{code})",
+  "terminal.tab_exited": "%{name} (종료됨)"
 }
diff --git a/crates/fresh-editor/locales/pt-BR.json b/crates/fresh-editor/locales/pt-BR.json
@@ -1640,5 +1640,6 @@
   "status.terminal_resume": "⟳ Retomar %{program}",
   "status.terminal_restart": "⟳ Reiniciar %{program}",
   "status.terminal_restart_shell": "⟳ Reiniciar terminal",
-  "status.terminal_restart_code": "%{label} (saída %{code})"
+  "status.terminal_restart_code": "%{label} (saída %{code})",
+  "terminal.tab_exited": "%{name} (encerrado)"
 }
diff --git a/crates/fresh-editor/locales/ru.json b/crates/fresh-editor/locales/ru.json
@@ -1640,5 +1640,6 @@
   "status.terminal_resume": "⟳ Возобновить %{program}",
   "status.terminal_restart": "⟳ Перезапустить %{program}",
   "status.terminal_restart_shell": "⟳ Перезапустить терминал",
-  "status.terminal_restart_code": "%{label} (код %{code})"
+  "status.terminal_restart_code": "%{label} (код %{code})",
+  "terminal.tab_exited": "%{name} (завершён)"
 }
diff --git a/crates/fresh-editor/locales/th.json b/crates/fresh-editor/locales/th.json
@@ -1640,5 +1640,6 @@
   "status.terminal_resume": "⟳ กลับเข้า %{program}",
   "status.terminal_restart": "⟳ เริ่ม %{program} ใหม่",
   "status.terminal_restart_shell": "⟳ เริ่มเทอร์มินัลใหม่",
-  "status.terminal_restart_code": "%{label} (ออก %{code})"
+  "status.terminal_restart_code": "%{label} (ออก %{code})",
+  "terminal.tab_exited": "%{name} (ออกแล้ว)"
 }
diff --git a/crates/fresh-editor/locales/uk.json b/crates/fresh-editor/locales/uk.json
@@ -1640,5 +1640,6 @@
   "status.terminal_resume": "⟳ Відновити %{program}",
   "status.terminal_restart": "⟳ Перезапустити %{program}",
   "status.terminal_restart_shell": "⟳ Перезапустити термінал",
-  "status.terminal_restart_code": "%{label} (код %{code})"
+  "status.terminal_restart_code": "%{label} (код %{code})",
+  "terminal.tab_exited": "%{name} (завершено)"
 }
diff --git a/crates/fresh-editor/locales/vi.json b/crates/fresh-editor/locales/vi.json
@@ -1640,5 +1640,6 @@
   "status.terminal_resume": "⟳ Tiếp tục %{program}",
   "status.terminal_restart": "⟳ Khởi động lại %{program}",
   "status.terminal_restart_shell": "⟳ Khởi động lại terminal",
-  "status.terminal_restart_code": "%{label} (mã %{code})"
+  "status.terminal_restart_code": "%{label} (mã %{code})",
+  "terminal.tab_exited": "%{name} (đã thoát)"
 }
diff --git a/crates/fresh-editor/locales/zh-CN.json b/crates/fresh-editor/locales/zh-CN.json
@@ -1640,5 +1640,6 @@
   "status.terminal_resume": "⟳ 恢复 %{program}",
   "status.terminal_restart": "⟳ 重启 %{program}",
   "status.terminal_restart_shell": "⟳ 重启终端",
-  "status.terminal_restart_code": "%{label}（退出码 %{code}）"
+  "status.terminal_restart_code": "%{label}（退出码 %{code}）",
+  "terminal.tab_exited": "%{name}（已退出）"
 }
diff --git a/crates/fresh-editor/src/app/async_dispatch.rs b/crates/fresh-editor/src/app/async_dispatch.rs
@@ -1044,6 +1044,7 @@ impl Editor {
                 .filter(|argv| !argv.is_empty())
                 .cloned(),
             ephemeral: window.ephemeral_terminals.contains(&terminal_id),
+            title: None,
         }
     }
 
@@ -1118,64 +1119,19 @@ impl Editor {
                     crate::input::keybindings::KeyContext::Normal;
             }
 
-            // Sync terminal content to buffer (final screen state)
+            // Sync terminal content to buffer (final screen state). This pins
+            // the viewport to the start of the visible screen, so the dead
+            // terminal is pixel-identical to its last live frame.
+            //
+            // Nothing is appended after it, deliberately. This used to write a
+            // "[Terminal process exited]" line into the backing file and then
+            // scroll past the pin to reveal it — which pushed the top of the
+            // screen out of view, and the first line of an agent's last answer
+            // is often the part you wanted. The exit is reported on the tab
+            // title and by the status-bar restart indicator instead, neither of
+            // which costs a row of output.
             self.active_window_mut().sync_terminal_to_buffer(buffer_id);
 
-            // Append exit message to the backing file and reload
-            let exit_msg = "\n[Terminal process exited]\n";
-
-            if let Some(backing_path) = self
-                .active_window()
-                .terminal_backing_files
-                .get(&terminal_id)
-                .cloned()
-            {
-                if let Ok(mut file) =
-                    crate::app::terminal::terminal_backing_fs().open_file_for_append(&backing_path)
-                {
-                    use std::io::Write;
-                    if let Err(e) = file.write_all(exit_msg.as_bytes()) {
-                        tracing::warn!("Failed to write terminal exit message: {}", e);
-                    }
-                }
-
-                // Force reload buffer from file to pick up the exit message
-                if let Err(e) = self.revert_buffer_by_id(buffer_id, &backing_path) {
-                    tracing::warn!("Failed to revert terminal buffer: {}", e);
-                }
-
-                // After revert, scroll the viewport so the just-
-                // appended exit message is visible. sync_terminal_to_buffer
-                // pinned the viewport to the start of the visible screen
-                // (so exit is pixel-identical to the last live frame); the
-                // exit message is appended *after* that pinned region,
-                // so we have to deliberately scroll past the pin to bring
-                // it on-screen. Move the cursor to the new end-of-buffer
-                // and clear the skip_ensure_visible flag the sync path
-                // armed; the next render's ensure_visible will then scroll
-                // the cursor (and the exit-message line above it) into
-                // view.
-                let new_total = self
-                    .windows
-                    .get(&self.active_window)
-                    .and_then(|w| w.buffers.get(&buffer_id))
-                    .map(|s| s.buffer.total_bytes())
-                    .unwrap_or(0);
-                if let Some((mgr, view_states)) = self
-                    .windows
-                    .get_mut(&self.active_window)
-                    .map(|w| &mut w.buffers)
-                    .expect("active window present")
-                    .splits_mut()
-                {
-                    let active_split = mgr.active_split();
-                    if let Some(view_state) = view_states.get_mut(&active_split) {
-                        view_state.cursors.primary_mut().position = new_total;
-                        view_state.viewport.clear_skip_ensure_visible();
-                    }
-                }
-            }
-
             // Ensure buffer remains read-only with no line numbers
             if let Some(state) = self
                 .windows
@@ -1200,10 +1156,25 @@ impl Editor {
                 // same argv precedence a workspace restore would use. The
                 // reconnect path doesn't need this: it keeps the binding and
                 // respawns from the still-intact terminal-id-keyed maps.
-                let record = self.exited_terminal_record(terminal_id, exit_code);
-                self.active_window_mut()
-                    .exited_terminals
-                    .insert(buffer_id, record);
+                let mut record = self.exited_terminal_record(terminal_id, exit_code);
+                // Report the exit on the tab instead of in the output. An
+                // explicitly-titled tab (an agent, a named plugin terminal)
+                // keeps its name with a marker appended; an auto-named one has
+                // no live process left to read a name from, so it gets the
+                // marker on its current name and stops being auto-updated
+                // (`sync_terminal_titles` only walks live `terminal_buffers`).
+                let window = self.active_window_mut();
+                record.title = window
+                    .terminal_explicit_titles
+                    .contains(&buffer_id)
+                    .then(|| window.buffer_metadata.get(&buffer_id))
+                    .flatten()
+                    .map(|meta| meta.display_name.clone());
+                if let Some(meta) = window.buffer_metadata.get_mut(&buffer_id) {
+                    meta.display_name =
+                        t!("terminal.tab_exited", name = meta.display_name).to_string();
+                }
+                window.exited_terminals.insert(buffer_id, record);
             }
 
             self.set_status_message(t!("terminal.exited", id = terminal_id.0).to_string());
diff --git a/crates/fresh-editor/src/app/terminal.rs b/crates/fresh-editor/src/app/terminal.rs
@@ -1259,6 +1259,21 @@ impl Window {
             state.buffer.set_modified(false);
         }
 
+        // Drop the "(exited)" marker the exit path put on the tab. An
+        // explicitly-titled tab gets its name back verbatim; an auto-named one
+        // is handed back to `sync_terminal_titles`, which re-derives it from
+        // the reborn process on the next frame.
+        match exited.title {
+            Some(title) => {
+                if let Some(meta) = self.buffer_metadata.get_mut(&buffer_id) {
+                    meta.display_name = title;
+                }
+            }
+            None => {
+                self.terminal_explicit_titles.remove(&buffer_id);
+            }
+        }
+
         Some(new_id)
     }
 }
diff --git a/crates/fresh-editor/src/app/window/mod.rs b/crates/fresh-editor/src/app/window/mod.rs
@@ -112,6 +112,10 @@ pub struct ExitedTerminal {
     pub resume: Option<Vec<String>>,
     /// Whether the dead terminal was ephemeral (plugin/Orchestrator-created).
     pub ephemeral: bool,
+    /// The tab title as it read *before* the exit marker was appended, so a
+    /// restart can put it back. `None` for an auto-named tab, which re-derives
+    /// its name from the reborn process.
+    pub title: Option<String>,
 }
 
 impl ExitedTerminal {
diff --git a/crates/fresh-editor/src/app/workspace.rs b/crates/fresh-editor/src/app/workspace.rs
@@ -22,6 +22,7 @@
 //!
 //! Performance: O(1) ≈ 10ms (lazy load) vs O(n) ≈ 1000ms (log replay)
 
+use rust_i18n::t;
 use std::collections::{HashMap, HashSet};
 use std::path::{Path, PathBuf};
 use std::time::Instant;
@@ -932,6 +933,7 @@ impl crate::app::window::Window {
 
         // Create buffer for this terminal
         let buffer_id = self.create_terminal_buffer_detached(terminal_id);
+        self.apply_restored_terminal_title(buffer_id, terminal.title.as_deref());
 
         // Load backing file directly as read-only buffer (skip log replay)
         // The backing file already contains complete terminal state from last workspace
@@ -976,7 +978,14 @@ impl crate::app::window::Window {
         // Build the buffer the normal way, then drop the live binding the way
         // the exit path does — the PTY this id names no longer exists.
         let buffer_id = self.create_terminal_buffer_detached(terminal_id);
+        self.apply_restored_terminal_title(buffer_id, terminal.title.as_deref());
         self.load_terminal_backing_file_as_buffer(buffer_id, &backing_path);
+        // A restored-dead tab shows the same "(exited)" marker a tab that died
+        // in this session does — the state is identical, so it must read
+        // identically.
+        if let Some(meta) = self.buffer_metadata.get_mut(&buffer_id) {
+            meta.display_name = t!("terminal.tab_exited", name = meta.display_name).to_string();
+        }
         self.terminal_buffers.remove(&buffer_id);
         self.exited_terminals.insert(
             buffer_id,
@@ -993,11 +1002,30 @@ impl crate::app::window::Window {
                 // A restored terminal is re-persisted by the branch above on
                 // the next save, so it must not be treated as throwaway.
                 ephemeral: false,
+                title: terminal.title.clone(),
             },
         );
         Some(buffer_id)
     }
 
+    /// Re-apply a terminal tab's persisted explicit title after restore.
+    ///
+    /// Without this a restored agent tab falls back to foreground-process
+    /// auto-naming: `bash` / `node` while it runs, and a bare `*Terminal N*`
+    /// once it has exited and there is no foreground process left to read.
+    /// `None` leaves the tab auto-named, which is what it was before the save.
+    fn apply_restored_terminal_title(&mut self, buffer_id: BufferId, title: Option<&str>) {
+        let Some(title) = title.filter(|t| !t.is_empty()) else {
+            return;
+        };
+        if let Some(meta) = self.buffer_metadata.get_mut(&buffer_id) {
+            meta.display_name = title.to_string();
+        }
+        // Mark it explicit so `sync_terminal_titles` leaves it alone, exactly
+        // as `create_plugin_terminal` does for a freshly-launched agent.
+        self.terminal_explicit_titles.insert(buffer_id);
+    }
+
     /// Load a terminal backing file directly as a read-only buffer.
     ///
     /// This is used for fast workspace restore - we load the pre-rendered backing
@@ -2362,6 +2390,16 @@ impl crate::app::window::Window {
                     .get(&terminal_id)
                     .filter(|argv| !argv.is_empty())
                     .map(|argv| crate::workspace::AgentResume { argv: argv.clone() });
+                // Only an *explicit* title is worth persisting; auto-named
+                // tabs re-derive theirs from the live process after restore.
+                let title = self
+                    .terminal_buffers
+                    .iter()
+                    .find(|(_, tb)| tb.terminal_id == terminal_id)
+                    .map(|(b, _)| *b)
+                    .filter(|b| self.terminal_explicit_titles.contains(b))
+                    .and_then(|b| self.buffer_metadata.get(&b))
+                    .map(|meta| meta.display_name.clone());
                 terminals.push(SerializedTerminalWorkspace {
                     terminal_index: idx,
                     cwd,
@@ -2373,6 +2411,7 @@ impl crate::app::window::Window {
                     command,
                     agent_resume,
                     exited: None,
+                    title,
                 });
             }
         }
@@ -2418,6 +2457,9 @@ impl crate::app::window::Window {
                 exited: Some(crate::workspace::ExitedTerminalState {
                     exit_code: exited.exit_code,
                 }),
+                // The pre-exit tab title, not the "(exited)" form the tab is
+                // showing now — restore re-applies the marker itself.
+                title: exited.title.clone(),
             });
         }
 
diff --git a/crates/fresh-editor/src/workspace.rs b/crates/fresh-editor/src/workspace.rs
diff --git a/crates/fresh-editor/tests/e2e/restart_exited_terminal.rs b/crates/fresh-editor/tests/e2e/restart_exited_terminal.rs
diff --git a/crates/fresh-editor/tests/e2e/terminal.rs b/crates/fresh-editor/tests/e2e/terminal.rs
diff --git a/docs/features/terminal.md b/docs/features/terminal.md

Original file line number	Diff line number	Diff line change
`@@ -1640,5 +1640,6 @@`
`1640`	`1640`	`"status.terminal_resume": "⟳ Obnovit %{program}",`
`1641`	`1641`	`"status.terminal_restart": "⟳ Restartovat %{program}",`
`1642`	`1642`	`"status.terminal_restart_shell": "⟳ Restartovat terminál",`
`1643`		`- "status.terminal_restart_code": "%{label} (kód %{code})"`
	`1643`	`+ "status.terminal_restart_code": "%{label} (kód %{code})",`
	`1644`	`+ "terminal.tab_exited": "%{name} (ukončeno)"`
`1644`	`1645`	`}`