Commit Graph
3794 Commits
Author SHA1 Message Date
bincxz 3962a87a23 docs(sftp): translate transfer research to English 2026-07-25 12:31:03 +08:00
bincxz 35e0122b7d test(sftp): stabilize concurrent failure ordering 2026-07-25 12:18:22 +08:00
bincxz 35ee1d4fdf fix(sftp): cancel stalled transfer preflights 2026-07-25 12:09:24 +08:00
bincxz a07f928ec4 fix(sftp): close late upload cancellation windows 2026-07-25 11:44:18 +08:00
bincxz 81b290c20b fix(sftp): preserve symlink transfer safety 2026-07-25 02:19:41 +08:00
bincxz 474aec6511 fix(sftp): stage SCP downloads safely 2026-07-25 01:35:08 +08:00
bincxz 616191fcf5 test(sftp): close final transfer review gaps 2026-07-25 01:13:38 +08:00
bincxz a4c1c3a39b fix(sftp): finish SCP cancellation checks 2026-07-25 01:09:32 +08:00
bincxz 2b74585dfb Merge remote-tracking branch 'origin/codex/sftp-transfer-hardening-followup' into codex/sftp-transfer-hardening-followup
# Conflicts:
#	electron/bridges/sftpBridge.cjs
#	electron/bridges/transferBridge.cjs
#	electron/bridges/transferBridge.test.cjs
2026-07-25 01:06:28 +08:00
bincxz 3f9634a9ca fix(sftp): close unified transfer safety gaps 2026-07-25 01:04:21 +08:00
netcatty-bot fd5ed5da7c fix: address Codex review on PR #2468 2026-07-24 16:56:49 +00:00
bincxz 2de1f901bb refactor(sftp): unify transfer transactions 2026-07-25 00:32:26 +08:00
bincxz b2545438ff Merge remote-tracking branch 'origin/main' into codex/sftp-transfer-hardening-followup 2026-07-25 00:06:02 +08:00
bincxz 2a4baab5a2 fix(sftp): keep isolated cancel deadline fixed 2026-07-24 23:36:43 +08:00
bincxz 7f6ccace2a fix(sftp): bound isolated download cancellation 2026-07-24 23:33:45 +08:00
bincxz f16cc36d1d fix(sftp): drain shared upload writes on cancel 2026-07-24 23:30:38 +08:00
bincxz f72c78fa51 test(sftp): hold final upload write through cancel 2026-07-24 23:18:07 +08:00
bincxz 3a37784c6a test(sftp): wait for full upload window on cancel 2026-07-24 23:15:57 +08:00
bincxz 9df1e8c1b9 test(sftp): prove upload cancellation drains writes 2026-07-24 23:13:24 +08:00
bincxz e4345446ff test(sftp): cover non-resumable upload cleanup 2026-07-24 23:09:54 +08:00
bincxz d4af2fb358 fix(sftp): verify non-resumable upload ranges 2026-07-24 22:58:46 +08:00
陈大猫 87b828c254 fix(terminal): complete Windows ConPTY clear handling (#2465)
* fix(terminal): enable ConPTY clear for Mosh and ET

* test(terminal): exercise Windows ConPTY spawn options

* fix(terminal): align ConPTY clear ABI

* fix(terminal): restore patched ConPTY runtime files

* fix(terminal): preserve patched ConPTY in packages

* test(ui): keep lazy-load comments ASCII-only

* fix(terminal): limit patched node-pty rebuild

* test(terminal): avoid platform-specific executable stubs
2026-07-24 22:58:38 +08:00
bincxz 5d5444a357 fix(sftp): retain source checks for range uploads 2026-07-24 22:48:31 +08:00
bincxz a5a1edb9ed docs(sftp): clarify split transfer guarantees 2026-07-24 22:31:19 +08:00
bincxz 43009240bd docs(sftp): compare transfer architectures 2026-07-24 22:27:48 +08:00
bincxz 8d644c4f4f test(sftp): verify digest cleanup before teardown 2026-07-24 22:15:26 +08:00
bincxz 1dba583a3a fix(sftp): recheck upload targets before promotion 2026-07-24 22:15:26 +08:00
bincxz 0063da6861 fix(sftp): close resumable upload edge cases 2026-07-24 22:15:26 +08:00
bincxz 9c42e54455 fix(sftp): verify resumable source ranges 2026-07-24 22:15:26 +08:00
bincxz 4857d76ac6 fix(sftp): snapshot resumable upload sources 2026-07-24 22:15:26 +08:00
bincxz 65dc53469c fix(sftp): guard upload promotion races 2026-07-24 22:15:26 +08:00
陈大猫andnetcatty-bot b04b2f2425 fix(sftp): raise upload WRITE fanout for higher throughput (#2452)
* fix(sftp): raise upload WRITE fanout for higher throughput

Increase UPLOAD_TRANSFER_CONCURRENCY from 8 to 32 so resumable and
fastPut uploads keep ~1MB in flight (32 × 32KB). Keeps the safe 32KB
packet size from #2022 while closing most of the gap with ssh2/Electerm
defaults on multi-ms RTT paths (#2449).

* fix(sftp): never fall straight into serial WriteStream uploads

Serial ssh2 WriteStream/put is RTT-bound (one 32KB WRITE at a time) and
is the usual cause of sub-MB/s speeds, not the fanout setting alone.

- Prefer concurrent WRITE ranges on an isolated channel, then fastPut,
  then concurrent ranges on the shared browse channel; serial stream is
  last resort only.
- Do not swallow post-upload size/content verification into fallback.
- uploadLocal and memory-buffer progress uploads use fastPut with the
  configured fanout instead of serial put.
- Add a regression test that sudo/shared sessions stay pipelined.

* fix(sftp): fail closed instead of serial WriteStream fallback

Align with OpenSSH/Electerm/WinSCP: default SFTP uploads stay on
pipelined WRITE strategies only. When concurrent isolated, fastPut,
and concurrent-shared all fail, throw the last error — do not crawl via
serial createWriteStream/put (RTT-bound, #2449).

uploadLocal and writeSftpBinaryWithProgress require fastPut; no silent
serial put path. Tests assert createWriteStream is never invoked on
forced concurrent failure.

* fix(sftp): restore pipelined upload on session-backed clients

Session-backed SFTP clients (openForSession / terminal reuse) are not
ssh2-sftp-client instances and lacked client.fastPut after serial put
was removed. Expose fastPut via the raw channel and route uploadLocal /
writeSftpBinaryWithProgress through pipelinedUploadLocalFile so
session-backed paths keep concurrency fanout.

* fix(sftp): make pipelined fastPut abortable and throttle progress

Address codex review on the upload fanout PR:
- Prefer a disposable SFTP channel for cancelable uploads so
  cancelSftpUpload / AbortSignal can end the transfer immediately.
- Honor abort signals for session-backed fastPut instead of ignoring
  them after the call starts.
- Restore 100ms / 1MB progress throttling for binary-with-progress
  fastPut step callbacks.

* fix(sftp): wait for shared-channel fastPut to settle on abort

When abort uses a non-disposable browse/sudo SFTP channel, do not reject
until fastPut's callback fires so temp/staged cleanup cannot race
in-flight WRITEs. Disposable channels still end immediately.

* fix(sftp): harden fastPut abort, channel errors, and pause ads

Codex re-review fixes:
- Attach SFTP channel error listeners during fastPut to avoid unhandled
  EventEmitter crashes on disposable channels.
- Wait for fastPut callback (with short force timeout) after disposable
  channel abort so temp files are not unlinked while still open.
- Mark pause unsupported during transferBridge fastPut fallback; restore
  pause ads for concurrent-shared.
- Create AbortController before staging ArrayBuffer to disk and pass
  signal to writeFile.

* fix(sftp): settle fastPut after errors and verify fastPut content

Codex P2 follow-ups:
- Channel errors during fastPut wait for the callback or a short force
  timeout before settling (same pattern as cancel) so temp files are not
  unlinked while still open.
- transferBridge uploadViaFastPut uses the same settle discipline so
  fallback strategies do not overlap a still-running isolated fastPut.
- Resumable fastPut fallback captures and rechecks a local content
  fingerprint before promoting success.

* fix(sftp): reset fastPut checkpoint and verify staged size

Codex re-review:
- After isolated fastPut fails, reset checkpointBytes so concurrent-shared
  does not resume past non-contiguous progress holes.
- Rethrow noTransferFallback/sourceChanged after fastPut fingerprint check.
- uploadLocal verifies staged remote size against local before rename.

* fix(sftp): avoid hang on cancelled close and unsafe fastPut checkpoints

- Skip/timeout remote CLOSE after disposable channel abort/failure so
  concurrent upload finally does not hang waiting on a dead channel.
- fastPut progress updates UI without advancing durable checkpointBytes
  (non-contiguous chunk progress is not crash-safe resume state).

* fix(sftp): address remaining remote Codex review notes

- Fall back to the shared browse SFTP channel when opening a disposable
  upload channel fails (MaxSessions / subsystem refused), unless aborted.
- Force-settle concurrent range uploads after cancel if in-flight WRITEs
  stall on a non-disposable shared channel (2s grace).

* fix(sftp): bound shared-channel fastPut cancel with force-settle

Shared browse/sudo channels cannot call sftp.end() on abort without
killing the session, but a stalled fastPut callback must still settle.
Schedule the same 2s force-finish used for disposable channels, and
cover it with a stall test that asserts the shared channel is not ended.

* fix(sftp): force-settle shared-channel fastPut on channel error

Shared browse/sudo channels cannot be ended on error, but a stalled
fastPut callback after an error event still must not hang forever.
Schedule the same 2s force-finish for shared-channel errors without
calling sftp.end(), and cover it with a stall regression test.

* fix(sftp): stage binary uploads and cleanup shared-channel cancel

writeSftpBinaryWithProgress now uploads to a remote .part path and
renames into place, so a stalled shared-channel fastPut cannot keep
mutating the final destination after cancel returns. Shared-channel
force-settle also best-effort unlinks the in-progress remote target
without ending the browse/sudo session.

* fix(sftp): harden staged upload replace semantics

Default to stage+rename for cancel-safe finals, but:
- write symlinks in-place so the link node is not replaced
- restore previous mode bits after rename overwrite
- fall back to in-place when creating a .part is permission-denied

Covers mode restore, symlink, and parent-dir permission regressions.

* fix(sftp): encode after staging names; never unlink finals

- Build stage/backup names from the logical path, then encode (GB18030-safe)
- Existing files/symlinks write in-place to preserve inode/metadata
- Shared-channel force-settle only unlinks .netcatty-upload-*.part paths

* fix(sftp): keep AbortSignal aborted in dispose cancel handler

When cancel replaces transferControl.abort for a disposable channel,
also abort the AbortController so staged rename/promotion cannot
complete after the UI has already cancelled the upload.

* fix(sftp): stage regular overwrites; throttle fastPut progress

Regular files always stage+rename (cancel cannot mutate finals on shared
channels) and restore mode after promotion. Symlinks stay in-place.
Clip stage/backup basenames to NAME_MAX and stop forcing every fastPut
step progress event through IPC.

* fix(sftp): tighten staging plan and permission fallback

- Without native lstat, existing paths write in-place to avoid clobbering links
- Permission fallback uses SFTP/error codes only (not message substrings)
- Cover size-mismatch paths whose names contain words like "access"

* fix: address Codex review on PR #2452

* fix(sftp): write SCP uploads through existing symlinks in-place

SCP stage+rename was replacing the symlink node itself. Detect symlink
destinations first and upload through them so the link target is updated.

* fix(sftp): drain shared writes before cleanup

* fix(sftp): track generated upload stages explicitly

* fix(sftp): preserve upload recovery paths

---------

Co-authored-by: netcatty-bot <308658023+netcatty-bot@users.noreply.github.com>
2026-07-24 21:28:31 +08:00
5b3ba2833b fix(#2453): [Bug] 为什么会出现这种突然出现一大段卡屏的现象 (#2454)
* fix(#2453): automated Cursor CLI fix

* fix(terminal): guard ConPTY clear behind viewport clear

* fix(terminal): enable effective ConPTY buffer clear

---------

Co-authored-by: netcatty-bot <308658023+netcatty-bot@users.noreply.github.com>
Co-authored-by: bincxz <16399091+binaricat@users.noreply.github.com>
2026-07-24 21:12:47 +08:00
9bd33a76b1 fix(#2456): [Bug] Codex CLI 提问时流意外断开:error decoding response body (#2457)
* fix(#2456): automated Cursor CLI fix

* fix: address Codex review on PR #2457

* fix: require retry signal for Codex stream warnings

* test: cover conflicting Codex retry signals

---------

Co-authored-by: netcatty-bot <308658023+netcatty-bot@users.noreply.github.com>
Co-authored-by: bincxz <16399091+binaricat@users.noreply.github.com>
2026-07-24 21:05:37 +08:00
jinmoandbincxz 871373ac4e 修复了 Netcatty 终端中 Docker 日志显示 OSC 颜色序列乱码的问题 (#2460)
* 修复了 Netcatty 终端中 Docker 日志显示 OSC 颜色序列乱码的问题

  1. 新增 OSC 10/11/12 处理程序(第 1861-1874 行)—— 注册对前景色、背景色、光标色的 OSC 序列处理,直接消费(返回
  true)阻止内容泄漏到屏幕。
  2. 在 dispose() 中添加清理代码(第 2053 行)—— 确保终端销毁时正确释放这些处理程序。

  修改后的效果

  - Docker 容器内 shell 主题发出的 OSC 颜色序列会被终端静默消费
  - 不再有任何 11;rgb:... 或 10;rgb:... 的可见文本泄漏
  - 与现有 OSC 7/52/133 处理程序的架构完全一致
  - 不影响用户设置的终端主题颜色

* fix(terminal): preserve native OSC color handling

---------

Co-authored-by: bincxz <16399091+binaricat@users.noreply.github.com>
2026-07-24 20:59:16 +08:00
陈大猫 48b2cd1f67 fix(ci): close Cursor automation handoffs and label state machine (#2461)
- Format recovery dispatches triage before clearing invalid-format
- Shared CJK-friendly title rules; codex label terminal state machine
- Research steps in classify; agent TITLE + PR body for bot PRs
- Single @codex review via CODEX_REQUEST_GITHUB_TOKEN (binaricat)
2026-07-24 20:10:28 +08:00
Netcatty-Bot 5b1af6ce16 Merge pull request #2459 from binaricat/cursor/issue-2458-30086360992
fix(#2458): [Bug] 新增的文件传输列表功能的暂停和全部暂定功能不生效
2026-07-24 19:11:42 +08:00
netcatty-bot 24e20b1b2e fix: address Codex review on PR #2459 2026-07-24 10:53:47 +00:00
netcatty-bot e7282d3be7 fix(#2458): automated Cursor CLI fix 2026-07-24 10:41:19 +00:00
陈大猫 e2f331ebda fix(ci): stop Codex loop failing on draft conversion (#2448)
Use TRIAGE_GITHUB_TOKEN for Codex review loop jobs. Treat convert-to-draft
and mark-ready permission errors, and closed PRs, as warnings so @codex
still runs instead of failing the whole automation job.
2026-07-24 15:18:13 +08:00
陈大猫 3ff16920fd fix(ci): make triage replies plain and drop Cursor disclaimer (#2447)
Public issue comments no longer show a generated-by line. Grounding stays
in code_findings/reasoning only so reply can use UI language without file
paths, symbols, or dense parentheses. Classify prompt and rewrite templates
match that tone.
2026-07-24 15:08:47 +08:00
陈大猫andnetcatty-cursor-bot 3e6f49204b fix(#2436): [Bug] 终端闪现-Terminal Flash / Screen Flicker (#2440)
* fix(#2436): automated Cursor CLI fix

* fix: address Codex review on PR #2440

---------

Co-authored-by: netcatty-cursor-bot <41898282+github-actions[bot]@users.noreply.github.com>
2026-07-24 15:02:30 +08:00
陈大猫 fa5af2a573 fix(ci): attribute Cursor automation commits to netcatty-bot (#2445)
Use netcatty-bot name and noreply email for implement and Codex-fix
git commits so authorship matches the bot account that pushes PRs.
2026-07-24 14:59:01 +08:00
陈大猫 4175bcace9 fix(ci): post Cursor triage as netcatty-bot via TRIAGE_GITHUB_TOKEN (#2444)
Use the bot PAT for classify prepare/apply and implement needs-human
comments so issue activity shows netcatty-bot instead of github-actions.
Treat netcatty-bot as an own actor for automation PR loops.
2026-07-24 14:53:49 +08:00
陈大猫 0e46755faa fix(ci): prefer already_available for primary how-to asks (#2441)
Stop over-interpreting multi-session / right-sidebar requests as larger
unshipped features when the literal ask already has a UI entry path.
2026-07-24 14:16:22 +08:00
陈大猫 27a42e3a76 fix(ci): Cursor triage crash + already_available how-to close (#2439)
* fix(ci): stop Cursor issue triage crashing on Search pagination

Octokit normalizes Search API pages so response.data is already the items
array. Mapping response.data.items returned undefined and then crashed on
candidate.user during daily-limit admission — so every valid new issue
failed before Cursor classify could run.

* fix(ci): classify already-available issues with how-to and auto-close

Add an already_available triage category for requests the product already
ships: after code-grounded inspection, reply with the concrete UI entry
path, then close as completed. Low confidence falls back to other instead
of closing. Keeps the Search pagination fix so new issues can classify.
2026-07-24 14:01:11 +08:00
陈大猫andnetcatty-cursor-bot 874b17893b Fix SFTP transfer throughput regression (#2429)
* fix SFTP transfer throughput regression

* fix: address Codex review on PR #2429

* fix resumable transfer review findings

* fix remaining resumable transfer review findings

* fix: address Codex review on PR #2429

* fix(sftp): harden resumable range fallback and channel cleanup

Truncate staged sparse tails to the contiguous checkpoint before stream
fallback or pause, always release isolated download channels on cancel and
failed fast paths, and stabilize concurrency unit tests.

* fix(sftp): abort range transfers on isolated channel errors

Attach a temporary SFTP error listener during concurrent range copies so
channel resets reject cleanly instead of crashing main, and force-publish
the contiguous checkpoint when pausing.

* fix(sftp): never truncate S2S temp source on upload fallback

stagedLocalPath during SFTP→SFTP upload is the fully-downloaded temp
source, not a partial target. Only truncate partial download/local
targets and remote .part staging files.

* fix(sftp): truncate direct-download sparse tails on range fallback

Direct SFTP→local resumable transfers keep resumeStage "direct" and never
copied targetType onto the transfer object, so prepareStreamFallback skipped
truncating the staged .part after out-of-order range failure. A later stream
pause could then stat the oversized sparse file and advance past holes.

Treat any staged local path outside the S2S upload phase as a partial target,
persist target metadata on the transfer, and fix the sparse-tail test to assert
against the real staged path.

* fix(sftp): always end isolated upload channel on open failures

uploadFileResumableFast assumed callers only saw throws after the isolated
channel was already ended, but a failed local fs.open left the channel open
while the catch path cleared fastSftp without disposing it. End the channel
in a single finally covering local open, remote open, and range transfer.

* test(sftp): stabilize local-open channel cleanup regression

Make the missing-source upload case delete the file only after the isolated
channel opens, and keep stream-fallback errors handled so the suite asserts
channel disposal without unhandled stream ENOENTs.

* fix resumable transfer fallback safety

* fix(sftp): allow cancel while resumable OPEN is in flight

Install transfer.abort before awaiting local/remote handles so cancel ends
the isolated channel if the server stalls SFTP OPEN. Covers upload and
download fast paths, with a regression test for stalled upload OPEN.

* fix(sftp): detect same-size source rewrites via content samples

Metadata-only checks can miss in-place rewrites when mtime/ctime do not
advance. Sample SHA-256 digests through the open local handle before range
upload and re-check after, and do the same path-level check for stream
fallback. Harden the regression test by freezing utimes after rewrite.

---------

Co-authored-by: netcatty-cursor-bot <41898282+github-actions[bot]@users.noreply.github.com>
v1.1.72
2026-07-24 13:16:57 +08:00
陈大猫 2681465f14 Merge pull request #2437 from binaricat/codex/fix-terminal-execute-no-newline
fix(ai): handle terminal output without trailing newline
2026-07-24 12:11:21 +08:00
bincxz e949f4f0b3 fix(ai): handle terminal output without trailing newline 2026-07-24 12:01:49 +08:00
陈大猫 b742832ee7 Merge pull request #2435 from binaricat/fix/keychain-new-key-secondary-style
fix(ui): match keychain New Key button to sibling actions
2026-07-24 11:40:33 +08:00