- Store null presentation tombstones so clears override stale snapshots
- Compare selected AI session identity for cross-scope history resumes
- Attach selection overlay after xterm runtime exists; skip copy-on-select
while preserveSelectionOnInput restores the selection
- Align system-sidebar hibernation source contract with resolvedSession
Auto-focus no longer claims keyboard focus when the caret is in the AI/side
panel. Selection overlay and copy-on-select move into TerminalSelectionAIOverlay
so clearing selection (e.g. focusing the AI input) does not re-render the whole
Terminal tree.
A cloned SSH session whose first connection fails before the inherited
cd is consumed lost the directory on manual retry: startReconnect(manual)
calls prepareRestoredReconnect(), which clears restoreCwdIntentRef for
non-restored sessions, and the initial-cwd prep only ran at runtime boot.
Re-run prepareInitialCwdIntent() in the manual branch; it no-ops once the
cwd was consumed or when there is no pending inherited cwd.
- hostById is a Map, not a function: my previous commit called it as
hostById(id), throwing TypeError on every Copy Tab / Split. Use
hostById.get(id), and fall back to terminalHosts for ephemeral hosts absent
from the saved-host map (P1)
- classify the DETECTED host.distro (not getEffectiveHostDistro, which returns
a cosmetic manual override) when deciding the network-device probe gate, so a
pinned Linux icon can't re-enable the exec channel on a Huawei/Cisco host (P1)
- clear pendingInitialCwd via app state when the inherited cd is consumed
(report the new cwd through onTerminalCwdChange), so shells that never emit
OSC 7 don't keep the transient seed and re-inject a stale dir on remount (P2)
Adds regression tests: Map-based hostById, network-device gate (deviceType,
detected distro, ephemeral terminalHosts).
- Local clones now inherit the live tracked cwd: expose getSessionRestoreCwd
(the OSC 7 cwd map, which is never mirrored onto session.lastCwd) and feed it
into captureInheritedCwd as the primary source, so Copy Tab / Split of a
running local terminal open in its current dir, not the launch dir (P1)
- Gate the SSH /proc probe like the app's own cwd-probe path: never probe
network devices (Huawei VRP etc. can drop the session on the extra exec
channel) and consult the SSH banner for unclassified hosts (P1)
- Mark the inherited cd consumed only when it is actually sent (from the
restore-cwd consumption callback), so a failed first connect can re-arm the
intent on retry instead of starting in the login dir (P2)
* feat(terminal): suggest Network Device Mode via a session-header tip
When a connected host is classified as a network device (auto-detected
vendor banner/os-release, or a manual distro-icon override) but Network
Device Mode is off, show a non-blocking one-line tip at the top of the
session. The user can enable the mode (persisted to the host) or dismiss
it; we only suggest once per host.
Driven by the host's effective distro so it also previews without real
hardware: set a host's device icon to a network vendor and reconnect.
- domain: shouldSuggestNetworkDeviceMode (exact vendor match, once-per-host)
- application/state: networkDeviceModeSuggestion persistence boundary
- TerminalView: header tip + reserve top offset so it never covers output
- i18n: terminal.networkDevice.tip.* for en/zh-CN/zh-TW/ru
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix(terminal): gate network device mode tip to plain SSH sessions
Codex review: the suggestion tip used the host's effective distro (incl.
manual icon override), so a Mosh/ET/serial/telnet session with a
network-vendor classification would still offer it and persist a
host-level deviceType:'network'. The Host Details toggle is exposed only
for plain SSH hosts, so this could set a hidden mode that surprises later
SSH reconnects. Add an effectiveProtocol gate to shouldSuggestNetworkDeviceMode
and pass effectiveTerminalProtocol from TerminalView. (#2367)
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix(terminal): make network device tip gate effective and popup/multi-pane safe
Addresses Codex re-review on the tip:
- The effectiveProtocol gate was dead: ctx never carried
effectiveTerminalProtocol, so it was always undefined (unrestricted).
Derive it from the host via resolveEffectiveTerminalProtocol instead.
- Suppress the tip when host updates are unavailable (detached popup has no
onUpdateHost) so Enable can't silently no-op; plumb canUpdateHost through ctx.
- Sync dismiss/enable across panes/windows for the same host via an in-process
subscription in the suggestion persistence module. (#2367)
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix(terminal): make network device tip once-per-host, ephemeral- and multi-window-safe
Addresses Codex re-review round 3 on the tip:
- Exclude ephemeral deep-link/quick-connect hosts (isSavedVaultHost): they are
not in the persisted vault array, so Enable would silently no-op even though
canUpdateHost is true.
- Track first display separately from user interaction: record "shown" silently
on first display so simply closing the session no longer re-nags on every
reconnect, while the showing instance keeps the tip until the user acts.
- Propagate resolve/dismiss across separate BrowserWindows (#/session-window)
via a native storage-event listener that diffs newly handled host ids.
(#2367)
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix(terminal): don't touch localStorage at import; keep network tip clear of speed dial
Addresses Codex re-review round 4:
- P1: networkDeviceModeSuggestion read localStorage at module scope
(knownHandledIds initializer), which threw ReferenceError under the Node
test runner and broke `npm test`. Initialize it lazily inside the existing
browser-only window guard instead.
- P2: when the host info bar is hidden and search is closed the full-width tip
strip overlapped the compact speed-dial toggle (top-right) and swallowed its
clicks. Reserve right-side clearance for the toggle via a pure
resolveNetworkDeviceTipRightInset helper (with unit test).
(#2367)
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix(terminal): drop network tip once the host is classified elsewhere
Addresses Codex re-review round 5: while the tip is latched open, enabling
Network Device Mode from Host Details or a synced pane updates the host to
deviceType:'network', but the eligibility effect's early return kept the tip
(and its now-redundant Enable action) visible. Clear the latch whenever
host.deviceType becomes 'network'. (#2367)
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix(terminal): persist only the deviceType override, not the effective host
Addresses Codex re-review round 5 (P1): the tip's Enable spread the *effective*
session host (group defaults / proxy profile already materialized) into
onUpdateHost, so mergeTerminalHostUpdate froze every inherited field
(credentials, appearance, proxyConfig) as host-level overrides and later
group/profile changes stopped propagating. Send a sparse
{ id, deviceType: 'network' } update instead. (#2367)
Co-authored-by: Cursor <cursoragent@cursor.com>
* refactor(terminal): move network device tip lifecycle into a state hook; per-host keys
Addresses Codex re-review round 6:
- P1 (architecture): TerminalView no longer imports the persistence API or owns
the handled-state subscription/eligibility/writes. Extract
useNetworkDeviceModeSuggestion under application/state; the component consumes
{ visible, enable, dismiss } and keeps only view glue (sparse host update +
toast), per AGENTS.md's layer boundaries.
- P2 (cross-window clobber): persist one key per host instead of a single shared
array. localStorage has no atomic read-modify-write, so concurrent appends
from two windows could drop a marker; independent keys never clobber, and the
storage event recovers the host id directly from the key.
(#2367)
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix(terminal): keep Enter reconnect working after disconnect
Disconnected sessions advertised "Press Enter to reconnect" but often
swallowed the key when focus left xterm (body blur or dialog controls),
and an open terminal search bar globally hid the hint and disabled the
shortcut. Give the disconnected overlay a focus sink + local Enter
handler, and stop treating search-open as a global reconnect gate while
still leaving real buttons/inputs alone.
Closes#2544Closes#2546
* fix(terminal): stop disconnected dialog focus theft
Only claim Enter-reconnect focus when it is already lost or still inside
this session tree, and restore xterm focus when the overlay unmounts.
Avoid stealing focus from other panes/side panels on disconnect.
* fix(terminal): restore dialog focus only when overlay leaves
Split claim/restore effects so showLogs/error rerenders no longer
yank focus off dialog buttons onto xterm mid-interaction.
* fix(terminal): restore Enter-reconnect focus in popup terminals
Popup Terminal windows lack data-session-id ancestors. Walk up from
the dialog to the local xterm root so claim/restore still work there.
* fix: address Codex review on PR #2550
* fix: address Codex review on PR #2550
* fix: address Codex review on PR #2550
* fix: address Codex review on PR #2550
---------
Co-authored-by: netcatty-bot <308658023+netcatty-bot@users.noreply.github.com>
Prefer waking the terminal runtime so executor encoding (including
bracketed-paste mode checks) is used, instead of inventing paste markers
on a blind backend fallback path.
Skip terminal focus steal during multi-tab snippet fan-out and restore the
original pane afterward. Trap Tab focus inside the quick-add drawer and
restore the opener element on close.
Load @xterm/addon-image in the shared xterm runtime so remote programs can
draw real raster images (kitten icat, chafa --format kitty, image previews
in file managers and TUIs) instead of ANSI approximations.
- domain/terminalInlineImages.ts owns the limits and turns TerminalSettings
into addon options; disabled settings resolve to null so the addon is not
loaded at all and the terminal keeps advertising no graphics capability.
- The addon is loaded right after term.open, before the WebGL renderer, so it
patches IRenderService.setRenderer first and its canvas layers survive every
DOM <-> WebGL swap (deferred WebGL, soft-hide suspend, context-loss rebuild).
It is disposed before term.dispose so bitmaps never outlive their terminal.
- Hibernate restores a tab from a text-only snapshot, which cannot carry image
data. XTermRuntime.hasInlineImages reads the live image cache, and Terminal
degrades such a session to soft-hide: hibernateRuntime takes the soft-hide
branch, canFinishHibernate re-checks after every async step, and an eviction
request leaves the session soft-hidden. The block lifts by itself once the
cache is emptied by a terminal reset or FIFO eviction.
- Settings > Terminal > Inline Images exposes the master switch, per-protocol
switches (Kitty / SIXEL / iTerm IIP) and the memory limits, translated for
en, zh-CN, zh-TW and ru. Protocol switches cloud-sync; the memory limits stay
local like the other per-device renderer tuning.
Co-authored-by: Wine Fox <fox@ling.plus>
Add missing Terminal snapshot-effect deps, drop unused cursorAuthMode
deps in SettingsAITab, and remove dead test imports/state so dev lint
starts clean.
* fix(terminal): batch hidden log output
* fix(terminal): preserve ordered hidden output
* fix(terminal): bound hidden output overhead
* fix(terminal): respect custom tab stops in timestamps
* fix(terminal): preserve terminal parser state
* fix(terminal): preserve hidden output boundaries
* fix(terminal): retain batching with prompt formatting
* fix(terminal): preserve prompt boundaries through transforms
* fix(terminal): handle unbatched prompt output
* fix(terminal): preserve batched prompt and time boundaries
* fix(terminal): retain background timestamp boundaries
* fix(terminal): preserve visible timestamp boundaries
* fix(terminal): separate shell output from tui frames
* fix(terminal): separate output after tui exit
* fix(terminal): preserve prompts across output slices
* fix(terminal): flush output before context reads
* fix(terminal): time-slice timestamp marker cleanup
* fix(terminal): preserve prompt columns after bare LF
* fix(terminal): preserve background write yielding
* fix(terminal): retain yields across timestamp boundaries
* perf(terminal): scan output boundaries once
* fix(terminal): track prompt cursor movement
* fix(terminal): resume prompt scan after resets
* fix(terminal): preserve stateful prompt ordering
* fix(terminal): drain close output before capture
* fix(terminal): measure control-only prompt prefixes
* fix(terminal): preserve prompt control boundaries
* fix(terminal): preserve prompt mode toggles
* fix(terminal): bound hidden batches and unfocus policy
Always drain write-coalescer size caps even when scheduled frames are gated,
keep unfocused-but-visible panes on throttled batching instead of per-chunk
force flush, compute prompt starts on post-transform display data, and model
full-width wrap so prompt-on-newline does not insert a blank line.
* perf(terminal): skip off-path timestamps and share alt-screen probes
When host line timestamps are disabled, write plain bytes without the
segmenter/marker hot path. Reuse one alt-screen CSI probe per coalesced
chunk for frame split and schedule mode, and reuse a single full-batch
visual-row measure on the single-segment batched timestamp path.
* fix(terminal): read line-timestamp enable from live hostRef
Session data handlers close over boot-time ctx.host, so toolbar/vault
toggles of showLineTimestamps were ignored. Prefer hostRef.current for
the marker hot-path gate and keep hostRef synced on every Terminal render.
* perf(terminal): per-second timestamp ledger while gutter is off
When line timestamps are hidden, keep a lightweight one-stamp-per-second
ledger without xterm markers. Opening the gutter materializes recent
ledger entries into markers for paint; while visible, keep per-line
markers for accuracy.
* perf(terminal): separate timestamp record from gutter paint
Always record a one-stamp-per-second ledger on the write path with no
xterm markers. Gutter rendering maps the ledger to visible rows, so open
and closed modes share the same cheap record path.
* fix(terminal): fill gutter gaps with previous second stamp
When painting line timestamps from the per-second ledger, blank rows
between stamps inherit the preceding stamp's label so multi-line output
in the same second is fully labeled.
* fix(terminal): stop empty gutter paint and false scrollback rebase
Only rebase ledger anchors when the buffer is actually full and baseY
grows from top trim — not when baseY rises while the buffer is still
growing (which deleted MOTD/login stamps on scroll). Cap gutter paint at
the last content line so empty viewport rows past the cursor stay blank.
* fix(terminal): soft-wrap stamp placement and sparse reflow anchors
Estimate ledger lines with visual-row measurement so narrow terminals
do not pin the next second on a wrap continuation. After each write,
attach at most one xterm marker per stamped second so reflow and
scrollback trim keep anchors honest without per-line marker storms.
* fix(terminal): ignore alt-screen rows when placing timestamp anchors
Stamp line estimates froze incorrectly through vim/less alt-screen
output, so sparse reflow markers landed far below the restored normal
buffer. Skip visual-row advancement while DEC alt-screen is active,
key one-stamp-per-second from the batch arrival date, and only attach
anchors still present in the ledger after capacity trim.
* fix(terminal): seed stamp lines from normal buffer when already on alt
When a write begins on the alternate screen, active cursor is the TUI
row — freezing that through 1049 leave mis-pinned sparse anchors and
dropped them past normal bufferLength. Seed and restore stamp estimates
from buffer.normal, and cover multi-write already-on-alt leave+prompt.
* fix(terminal): keep same-chunk pre-enter line on alt leave
Leave CSI must not always re-read pre-write buffer.normal: when enter
happened in the same walk, the frozen estimate already includes normal
advances before the TUI. Only restore buffer.normal when the write
started already on the alternate screen.
* fix(terminal): pure alt stamp transitions that never rewind lines
Stamp estimates stay in normal-buffer coordinates: seed once (active or
buffer.normal when already on alt), freeze while alt is active, and on
leave only clear altActive — never re-read the live term mid-walk.
Export applyAltScreenAction with a table-driven unit test covering
spurious leave, plus write-path cases for already-on-alt, same-chunk
pre-enter advance, and leave-without-enter.
* fix(sftp): follow terminal cwd on macOS/BSD remotes and first open
The "follow terminal directory" probe read the interactive shell's cwd
only via /proc, which does not exist on macOS/BSD remotes, so
getSessionPwd fell back to the home directory (or failed) and the SFTP
panel never tracked the terminal. Add an lsof fallback (read_shell_cwd)
so the probe works on non-Linux remotes; Linux keeps using /proc.
Also fix the first open: while the panel is closed the per-command cwd
probe does not run, so activeTerminalCwd can be stale (login home) even
after the terminal cd-ed elsewhere. On that stale value the follow sync
saw currentPath === terminalCwd and did nothing, leaving the panel at
home. Force one fresh backend probe when the panel first becomes visible
for a connected remote, and re-sync on reopen.
Fixes#2335
Co-authored-by: Cursor Agent <cursor-agent@cursor.com>
* fix(sftp): keep first-open follow from snapping back to stale cwd
Addresses PR review: the first-open resync navigated to the freshly
probed terminal cwd but left the stale `activeTerminalCwd` cache (login
home) in place. Because the one-shot ref was already set, a later
dependency change that re-runs the normal follow sync (e.g. closing an
editor toggles hasActiveWork) would navigate the pane back to that stale
home. Mark the stale cached cwd as already handled before navigating so
the normal sync no-ops until the live cwd catches up;
invalidateInFlightFollowSync clears the guard once activeTerminalCwd
actually changes, letting follow resume.
Co-authored-by: Cursor Agent <cursor-agent@cursor.com>
* fix(sftp): re-check follow eligibility before first-open navigation
Addresses PR review: the first-open resync awaited a fresh terminal-cwd
probe but only re-validated the connection afterward. If the panel was
hidden or interactive work started (editor/dialog) while the probe was
in flight, it still navigated, moving the pane while the follow feature's
own visible/work guards say it should be paused.
Add a live followStillEligible() check (generation, follow enabled/
allowed, visible, no active work, same connection) that gates both the
post-probe continuation and the navigateTo call via shouldApply, matching
the normal follow path. Reset the one-shot guard when bailing mid-probe
so the resync can retry once follow is eligible again.
Co-authored-by: Cursor Agent <cursor-agent@cursor.com>
* test(host-details): align auth row assertion with unified row height
The HostDetailsSection row was unified to `flex h-12 ... px-3` (#2378)
but HostDetailsConnectionSections.test still expected the old
`min-h-12 ... px-3 py-2` class, failing lint-and-test on main. Update the
regex to match the shipped markup.
Co-authored-by: Cursor Agent <cursor-agent@cursor.com>
* fix(sftp): harden terminal cwd resync
---------
Co-authored-by: Cursor Agent <cursor-agent@cursor.com>
Co-authored-by: bincxz <16399091+binaricat@users.noreply.github.com>
* fix(ui): open AI silent sessions in an attach terminal popup
Tray jumps for hidden MCP sessions attach the existing terminal popup
to the live PTY instead of activating a tab-less main-window surface.
Output is rebound to the popup and restored when the popup closes.
* fix(terminal): register rebindOutput handlers under worker mode
Worker-enabled builds returned early from terminalBridge.registerHandlers
without registering rebind/restore IPC, so the first AI silent-session
attach popup always failed with "No handler registered". Register those
handlers in both paths and rebind display routing via terminalWorkerManager.
* fix(terminal): harden AI attach popup for worker mode lifecycle
Address codex review P1s: resume flow control before restoring output,
route exit/events to the rebound renderer, and replay home scrollback
via a snapshot request before rebinding display output.
* fix(terminal): restore attach routing on popup close and dual-notify exit
Hardening for AI observe popups: restore output from BrowserWindow closed
lifecycle (not only React cleanup), keep attach home for exit events so
main/tray lifecycle updates, and resume paused backend flow on attach.
* fix(terminal): resume flow on attach restore and close snapshot gaps
Resume backend output when attach popups are force-closed, fan out
lifecycle exit events to home+display in non-worker mode, and pause
during snapshot→rebind so live bytes are not dropped from the popup.
* fix(terminal): harden attach restore and worker lifecycle edges
Prefer live display for ZMODEM dialogs after rebind, dual-notify worker
crash exits to attach-home, and avoid clearing attach-home when restore
targets a dead renderer.
* fix(terminal): sync observe-popup state home and fan out SSH exits
Push popup serializations home before restore, fall back to hibernate
snapshots, settle briefly after pause for worker handoff, and dual-notify
SSH exits to attach-home owners in non-worker mode.
* fix(terminal): fan out exits for mosh/telnet/et attach owners
Use shared fanout for in-process protocol exits so attach-home and
display renderers both receive netcatty:exit under non-worker mode.
* fix(terminal): restore attach only onto main app windows
Avoid routing silent-session output to settings/prewarm windows when the
original home renderer is gone; fall back only to registered main windows.
* fix(terminal): harden silent session popup handoff
* fix(terminal): close observed popup with session
* fix(terminal): keep observe popup from reconnecting
* fix(terminal): preserve cleared observe snapshots
* fix(terminal): route transfer prompts to observer
* fix(terminal): keep context after observe restore