Commit Graph
2977 Commits
Author SHA1 Message Date
bincxz 2f3ba0e581 Scope script log cleanup to each run 2026-07-09 17:15:18 +08:00
bincxz cf34c14f3a Ignore stale script actions after completion 2026-07-09 16:58:15 +08:00
bincxz f696163674 Update lockfile for CI npm install 2026-07-09 16:47:33 +08:00
bincxz b18c3e8c4f Merge remote-tracking branch 'origin/main' into codex/fix-script-stop-rerun-2052 2026-07-09 16:41:12 +08:00
bincxz e658d008dc Clean up script logs after stopping runs 2026-07-09 16:39:36 +08:00
陈大猫 a82b006428 Merge pull request #2045 from binaricat/feature/sftp-connected-hosts-picker
feat: show live terminal hosts in SFTP picker
2026-07-09 16:38:51 +08:00
bincxzandCursor 78554e6d37 fix: compare SFTP picker sessions positionally for memoization
Same-host Connected preference depends on session order; ignoring
reorder left the picker bound to a stale sourceSessionId.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-09 16:27:34 +08:00
bincxz 0c7f69dc8f Fix rerunning stopped automation scripts 2026-07-09 16:27:23 +08:00
陈大猫 45a38237ad Merge pull request #2047 from binaricat/cursor/c95e2aa1
feat: External MCP for Codex, Claude, Cursor, and Grok
2026-07-09 16:24:29 +08:00
陈大猫 74eeecb190 Merge pull request #2058 from binaricat/codex/fix-jump-auth-error-attribution
Fix jump host auth failure attribution
2026-07-09 16:24:09 +08:00
bincxzandCursor 584ccf9482 fix: skip endpoint match for reuseOnly SFTP Connected probes
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>
2026-07-09 16:21:44 +08:00
bincxz 21350d64db Fix jump host auth failure attribution 2026-07-09 16:15:59 +08:00
bincxzandCursor 04810ae15e fix: default Connected picker port from live session, not vault
When session.port is undefined, use SSH default 22 instead of a vault
host.port that may have been edited after the terminal connected.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-09 16:12:20 +08:00
陈大猫 729958ea90 Merge pull request #2056 from binaricat/codex/fix-2051-group-search
Fix group host list search scoping
2026-07-09 16:10:52 +08:00
陈大猫 c89e3d9574 Merge pull request #2057 from binaricat/codex/2054-quick-switch-powershell-setting
Fix quick switcher local shell setting
2026-07-09 16:10:28 +08:00
bincxzandCursor fa445a8466 fix: avoid double-issuing External MCP token on host-ready
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>
2026-07-09 16:09:26 +08:00
bincxz b2d4883006 fix: respect local shell setting in quick switcher 2026-07-09 16:05:11 +08:00
bincxzandCursor 9848107592 fix: make SFTP live reuse probe fail closed with reuseOnly
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>
2026-07-09 16:02:20 +08:00
bincxzandCursor 9a45005406 fix: keep External discovery on dedicated token after host-ready
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>
2026-07-09 16:02:20 +08:00
陈大猫 e06b47625f Merge pull request #2050 from binaricat/feature/http-proxy-settings
Add app-level HTTP(S) proxy for cloud sync and AI
2026-07-09 16:00:21 +08:00
bincxzandCursor 609c664eed fix: reuse live SFTP sessions without vault credentials
Try endpoint-only openSftp with sourceSessionId before getHostCredentials
so Connected picker rows work when saved password/key is missing or
undecryptable on this device.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-09 15:55:06 +08:00
bincxz 37a136aeb5 Fix group host list search scoping 2026-07-09 15:54:07 +08:00
bincxzandCursor 1ce4797bdb fix: use dedicated External MCP auth token and stop reseeding cleared scope
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>
2026-07-09 15:52:07 +08:00
bincxzandCursor d8aacbe4e9 Harden HTTP proxy cancel, TLS, and env isolation.
Register stream cancel before proxy lookup, keep abort as AbortError end-to-end, avoid weakening proxy-hop TLS, strip scheme-less credentials, and restore launch-time proxy env for terminals and SSH ProxyCommand.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-09 15:42:31 +08:00
bincxzandCursor 9c66e7f309 fix: allow Settings External MCP approvals and move session sync to application state
Accept approval responses from Settings, clear sibling approval cards on resolve, register Always Allow grant persisters outside Catty, and keep session sync behind the application/state lint boundary.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-09 15:39:17 +08:00
bincxzandCursor 8020d45808 fix: gate External MCP scope writes and surface approvals in Settings
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>
2026-07-09 15:31:38 +08:00
bincxzandCursor 48157f56a8 fix: keep edited saved hosts visible next to Connected rows
Only hide a vault host when its endpoint matches the live Connected
entry, so post-connect host edits still offer the new saved target.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-09 15:16:03 +08:00
bincxzandCursor dbe3e693e7 fix: harden External MCP session sync and approval bridge lifetime
Skip peer/settings windows, listen for cross-window enable, only mark payloads sent after success, and mount the MCP approval IPC bridge at app startup before TerminalLayer lazy-loads.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-09 15:13:37 +08:00
bincxzandCursor fc6a686ad9 fix: exclude SFTP sudo hosts from Connected picker
Sudo SFTP never reuses a terminal shell connection; advertising those
hosts as Live would fall back to a fresh auth while hiding the normal row.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-09 15:05:58 +08:00
bincxzandCursor da1e9547ec fix: use live session endpoint for SFTP Connected picker rows
Vault host edits after connect must not break sourceSessionId reuse;
overlay hostname/username/port from the terminal session onto the picker host.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-09 15:00:00 +08:00
bincxzandCursor f615fc4b89 fix: make External MCP usable without Catty panel and harden enable races
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>
2026-07-09 14:49:40 +08:00
bincxzandCursor 5c0e5f5538 Fix proxy settings equality and proxied insecure TLS.
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>
2026-07-09 14:28:59 +08:00
bincxzandCursor c0d90178ab fix: merge External MCP session scope and refresh permission mode live
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>
2026-07-09 14:27:51 +08:00
bincxzandCursor f291ba5ebf fix: decide SFTP Connected reuse from session transport
Drop the vault-host mosh/et filter so plain SSH terminals opened against
a mosh/et-default host (e.g. ssh:// deep links) still appear as reusable.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-09 14:18:34 +08:00
bincxzandCursor 5e16c72c03 fix: seed External MCP scope from renderer/Catty metadata
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>
2026-07-09 14:16:23 +08:00
bincxzandCursor c02848bb08 Add app-level HTTP(S) proxy for cloud sync and AI.
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>
2026-07-09 14:12:08 +08:00
bincxzandCursor f67a29ecd7 fix: keep External MCP scope when live session map is empty
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>
2026-07-09 14:09:31 +08:00
bincxzandCursor 793f86129c fix: preserve External MCP session metadata and Claude env parsing
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>
2026-07-09 14:05:32 +08:00
bincxzandCursor 9811e1ad24 fix: keep Grok extra-arg launcher entries as conflict
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>
2026-07-09 13:59:14 +08:00
bincxzandCursor 1840fa53f8 fix: remove disabled Codex/Grok External MCP entries before re-add
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>
2026-07-09 13:58:59 +08:00
bincxzandCursor 416ea21424 fix: revoke External MCP approvals and parse Claude scope text
Clear pending reserved-scope approvals on disable, recognize Claude's
"User/Local config (...)" scope lines, and ignore disabled Grok entries.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-09 13:49:53 +08:00
bincxzandCursor 82af11f26e fix: only list reusable SSH sessions in SFTP Connected picker
Exclude connecting and Mosh/ET sessions so Connected rows always map
to a live ssh2 shell that SFTP can reuse without a fresh login.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-09 13:49:00 +08:00
bincxzandCursor b04e8f58bf fix: clear Claude local-scope External MCP entries on upgrade
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>
2026-07-09 13:39:58 +08:00
bincxzandCursor 54e4d8dfbb fix: prefer latest same-host session for SFTP reuse
When multiple live terminals share a hostId, pick the later same-status
session so Connected picker reuse targets the newest endpoint match.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-09 13:36:07 +08:00
bincxzandCursor 45d7046b16 fix: require discovery env for External MCP client configured state
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>
2026-07-09 13:34:23 +08:00
陈大猫 ae8babcf5a Merge pull request #2048 from keyleaf/fix-buffer-early-ai-stream-events
fix(ai): buffer early bridge stream events
2026-07-09 13:32:14 +08:00
bincxzandCursor 9b2b8be2b8 fix: surface External MCP approvals and harden discovery resolve
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>
2026-07-09 13:30:43 +08:00
bincxzandCursor b6dec0dba3 fix: correct Claude get scope and External MCP enable gate
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>
2026-07-09 13:22:39 +08:00
bincxzandCursor 5ba34b647e fix: tighten External MCP revoke, Claude user scope, and polling
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>
2026-07-09 13:12:03 +08:00
keyleaf 73bc62948f fix(ai): buffer early bridge stream events 2026-07-09 13:06:47 +08:00