Connected picker names a specific live session; renderer username/port
can lag the authenticated bridge endpoint, so reuseOnly must not reject
on endpoint mismatch before attaching to that session.
Co-authored-by: Cursor <cursoragent@cursor.com>
Host-ready only refreshes an already-issued external token so cold-start enable cannot write a short-lived discovery token before resolveHostCredentials rotates it.
Co-authored-by: Cursor <cursoragent@cursor.com>
Endpoint-only Connected picker attempts must not fall through to a
fresh SSH dial. Also correct zh-CN/zh-TW Connected section labels.
Co-authored-by: Cursor <cursoragent@cursor.com>
Ignore Catty/CLI authToken from onBridgeHostReady and re-assert the cancel flag after scoped metadata cleanup so soft-revoke stays intact.
Co-authored-by: Cursor <cursoragent@cursor.com>
Issue a rotatable external-only TCP token on enable, soft-revoke it on disable without killing long-lived stdio sockets, force external sockets onto the reserved chat scope, and only seed empty external metadata when the scope key was never written.
Co-authored-by: Cursor <cursoragent@cursor.com>
Reject disabled/in-flight scope resurrection, move session sync to App mount, cancel the external chat session on stop, and broadcast approval cards to main + settings windows.
Co-authored-by: Cursor <cursoragent@cursor.com>
Serialize enable/disable, cancel in-flight external work on stop, refresh discovery env for live permission mode, sync all terminals from TerminalLayer, host confirm approvals globally, and treat Claude local/project scope as upgradeable.
Co-authored-by: Cursor <cursoragent@cursor.com>
Skip rebroadcast when HTTP proxy settings are unchanged across windows, and force rejectUnauthorized onto the tunneled target TLS hop when allowInsecure is set.
Co-authored-by: Cursor <cursoragent@cursor.com>
Keep app-wide external hosts when a Catty sidebar push arrives, and re-read discovery permissionMode so long-lived stdio clients pick up Safety changes without restart.
Co-authored-by: Cursor <cursoragent@cursor.com>
In terminal-worker mode mirror renderer session payloads into
__external_mcp__ and seed from other chat scopes when the live map is empty.
Co-authored-by: Cursor <cursoragent@cursor.com>
Lets Windows users (and others) route Google Drive / OneDrive / GitHub sync and AI provider traffic through system or custom proxies without touching SSH ProxyJump settings.
Co-authored-by: Cursor <cursoragent@cursor.com>
In terminal-worker mode the main-process sessions map can be empty; avoid
overwriting renderer-pushed __external_mcp__ metadata with an empty sync.
Co-authored-by: Cursor <cursoragent@cursor.com>
Merge prior scoped host metadata when syncing live sessions, and parse
Claude Environment: KEY=VALUE blocks so configured entries are not
misclassified as missing discovery env.
Co-authored-by: Cursor <cursoragent@cursor.com>
Do not fall back to the expected launcher path when the existing Grok
entry carries args; that masked conflicts as configured.
Co-authored-by: Cursor <cursoragent@cursor.com>
Keep disabled same-name entries visible to classifiers so one-click setup
can mcp remove them before writing the discovery-env launcher config.
Co-authored-by: Cursor <cursoragent@cursor.com>
Parse Scope/Args from `claude mcp get`, remove the blocking scope before
re-adding with discovery env, and treat non-empty Args as a conflict.
Co-authored-by: Cursor <cursoragent@cursor.com>
Treat launcher-only Codex/Claude/Grok entries as not_configured so one-click
setup can remove and re-add them with NETCATTY_EXTERNAL_MCP_DISCOVERY_FILE.
Co-authored-by: Cursor <cursoragent@cursor.com>
Always show reserved-scope approval cards in Catty, stop rewriting
discovery after startup errors, and fail closed when an explicit discovery
env path is missing instead of falling back to another profile.
Co-authored-by: Cursor <cursoragent@cursor.com>
Drop unsupported `-s` from `claude mcp get`, treat only starting/running as
enabled for RPC gates, and reject launcher commands that carry extra args.
Co-authored-by: Cursor <cursoragent@cursor.com>
Disconnect marked external sockets on disable, await in-flight stop before
re-enable, write Claude MCP entries to user scope, and stop spawning client
CLIs on the quiet status poll.
Co-authored-by: Cursor <cursoragent@cursor.com>
Expose the existing catalog MCP as a Settings-managed local bridge with
discovery lifecycle, one-click client setup, and reserved external scope
so third-party agents can use Netcatty without a sidebar chat session.
Co-authored-by: Cursor <cursoragent@cursor.com>
Local Terminal used a per-session hostId, so autocomplete history never
accumulated, and the store never imported ~/.zsh_history. Stabilize the
hostId and seed from local histfiles so prefix suggestions match Ghostty.
Closes#2037
Co-authored-by: Cursor <cursoragent@cursor.com>
Do not trim password values when validating auth forms or attaching
credentials to SSH connect options, so a single-space password works
(issue #2036).
Co-authored-by: Cursor <cursoragent@cursor.com>
Detect complete password prompts on the last line independently of the
whole-chunk promptCandidateBytes cap, so a large stale prefix plus a
sudo/password prompt is not dropped during Ctrl+C drain.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: let script waits match the visible startup screen
Auto-login scripts that wait for bastion menus already on screen were
timing out because startup snapshot sync marked the whole buffer as
consumed. Replace the script buffer with the current viewport so waits
can match visible text while still ignoring scrolled-off scrollback.
Fixes#1960
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: keep startup viewport waitable across sync races
Address Codex review on #2035: merge the visible snapshot with any
output that arrives during the snapshot IPC (e.g. bastion BEL), and seed
the whole viewport as fresh so waitFor* can match headers beyond the
512-byte tail slack on long menus.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: do not seed buffer-fallback scrollback as visible screen
When the renderer misses the snapshot request, requestScreenSnapshot
returns the full script buffer, not the viewport. Mark that path and
keep the consumed baseline so scrolled-off keywords cannot rematch.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: preserve live output during fallback snapshot sync
Baseline only the pre-sync buffer length on empty/fallback snapshots so
bytes that arrive while waiting for the snapshot stay matchable, matching
the viewport path's trailingFresh behavior.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: keep waitForPrompt scoped to the live tail after seeding
Seeded full-viewport freshness is for waitFor/waitForText/waitForRegex
only. waitForAny still uses the 512-byte tail window so an older prompt
still visible above long-running output cannot satisfy waitForPrompt.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: advance scan offset when consuming a preserved startup prompt
waitForPrompt could resolve a seeded live-tail prompt without consuming
the viewport above it, so a later waitForText rematched older visible
lines. Advance scanOffset through the preserved prompt end.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: consume the full seeded viewport after startup prompt
When waitForPrompt resolves a preserved live-tail prompt, advance
scanOffset through the entire seeded snapshot — not just the prompt —
so later waitForText cannot rematch older visible text after the prompt.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: keep sync-race trailingFresh outside seeded viewport
seededLength must end at the visible snapshot so waitForPrompt does not
consume bytes that arrived during the snapshot IPC. Those trailingFresh
bytes stay matchable for later waitForText/waitForRegex.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: dedupe trailingFresh against blank-padded viewport snapshots
Full-viewport snapshots often end with blank rows after live content, so
a plain endsWith check missed sync-race duplicates. Compare after
stripping trailing blank lines before appending trailingFresh.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: let generic waitForAny match the full seeded viewport
Tail-only freshness is for waitForPrompt (allowPreservedTailMatch).
Generic waitForAny must still see menu labels near the top of a long
seeded startup screen, matching waitForText/waitForRegex.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: trim partial overlap from sync-race trailingFresh
When the viewport snapshot already contains a prefix of trailingFresh,
append only the non-overlapping suffix so waitForText cannot rematch a
phantom duplicate of the overlapped text.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: match partial trailingFresh overlap against full viewport
Use the unstripped viewport when trimming sync-race prefixes so an
overlapped trailing newline is not left behind as a phantom blank line.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: keep waitForPrompt from rematching short seeded prompts
After live output clears preservedTailMatch, currentTailFreshBoundary
must start at seededLength so a short startup prompt cannot satisfy
waitForPrompt through the normal 512-byte window.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: invalidate preserved prompts once scanOffset passes them
If waitForText/waitForRegex already consumed output after a preserved
startup prompt, clear that prompt via advanceScanOffset so waitForPrompt
cannot reuse it. markOutputConsumedThrough still keeps the one-shot
startup prompt for waitForPrompt.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: trim blank-padded overlap without dropping duplicate sync markers
Use syncStartText to keep genuinely new duplicate suffixes during snapshot
sync, while still trimming blank-padded and partial overlaps from trailingFresh.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: treat scrollback-backed stale viewports as pre-sync
When syncStart has scrollback above the visible suffix, a stale snapshot can
still equal that suffix without matching syncStart exactly — keep trailingFresh
so duplicate markers printed during the IPC round-trip are not trimmed away.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: invalidate startup seed after automated script input
sendLine/send must not leave the seeded viewport or preserved prompt
matchable, or common send-then-wait scripts can complete against pre-command
output. Keep sync-race trailingFresh beyond seededLength still waitable.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: keep long sync-race output waitable after startup prompt
After waitForPrompt consumes the preserved prompt, re-seed remaining
trailingFresh so markers ahead of a >512-byte burst stay matchable. Also
consume all buffered bytes on automated input, including pre-input trailingFresh.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Cursor <cursoragent@cursor.com>
When multiple restore controls are preserved, peel complete leading
restore sequences that are a suffix of preserved from the password
prefix so droppedBytes stay accurate and restores are not re-emitted.
Co-authored-by: Cursor <cursoragent@cursor.com>
Hold incomplete CSI with password prefixes, but drop standalone SGR
fragments so they cannot leak into a later shell prompt. Restore/OSC
prefixes remain holdable alone.
Co-authored-by: Cursor <cursoragent@cursor.com>
Only strip a full preserved restore prefix from password holds, and when
discarding a mid-CSI held prefix also consume the CSI final byte so
shell prompts are not corrupted.
Co-authored-by: Cursor <cursoragent@cursor.com>
When a drain chunk preserves alternate-screen restore and also holds a
password prefix on the same line, strip the overlapping restore from
pending so droppedBytes stay accurate and restore is not re-emitted.
Co-authored-by: Cursor <cursoragent@cursor.com>
Styled prompts can split mid-CSI (Pass + ESC[ / 0mword:). Hold both
the password-prefix body and the trailing control prefix so the prompt
still completes across chunks during Ctrl+C drain.
Co-authored-by: Cursor <cursoragent@cursor.com>
Password prompts often emit nothing further until the user types, so
dropping a complete prompt while waiting for promptQuietMs leaves a
blank terminal. Resume immediately on complete password candidates.
Co-authored-by: Cursor <cursoragent@cursor.com>
Match password-prefix candidates after stripAnsi so SGR-styled chunks
like ESC[31mPass still hold across chunks, while keeping raw pending
bytes for display when the prompt completes.
Co-authored-by: Cursor <cursoragent@cursor.com>
Classify keyword bodies without punctuation/spaces so full-width
colon targets do not collapse minLen to 1 and hold lone "p"/"pa".
Co-authored-by: Cursor <cursoragent@cursor.com>