Enhance SFTP and terminal flows, stabilize desktop sync - #1377
Open
elhak wants to merge 5 commits into
Open
Conversation
…onflicts # Conflicts: # src/ui/AppShell.tsx # src/ui/auth/Auth.tsx # src/ui/dashboard/cards/NetworkGraphCard.tsx # src/ui/features/docker/components/LogViewer.tsx # src/ui/features/host-metrics/cards/managers/LogViewerCard.tsx # src/ui/features/terminal/Terminal.tsx # src/ui/shell/MobileBottomBar.tsx # src/ui/shell/tabUtils.tsx # src/ui/sidebar/AppRail.tsx # src/ui/sidebar/HostCredentialList.tsx # src/ui/sidebar/HostEditor.tsx # src/ui/sidebar/UserProfilePanel.tsx
Merge upstream parent `main` into fork branch and resolve UI conflicts
ZacharyZcR
requested changes
Sep 1, 2026
ZacharyZcR
left a comment
Member
There was a problem hiding this comment.
Thanks for the contribution. This cannot be safely reviewed or merged in its current form.
Blocking changes required:
- Retarget/rebase the work onto
dev-2.8.0; feature and bug-fix work for the upcoming release must not targetmain. - Split this into focused PRs by concern. The current PR changes 74 files (+8.7k/-3.6k) across SFTP, terminal AI, remote sync, tunnels, authentication, host editing, navigation, localization, and documentation. That scope prevents reliable review and rollback.
- Remove the merge-conflict resolution commit and rebuild each focused change from the current development branch. It resolved conflicts across core UI/session files, making it impossible to distinguish intended behavior from stale-branch conflict choices.
- Give each replacement PR focused tests and a clear issue/behavior statement. Please do not include unrelated formatting, generated translations, or repository guidance with product changes.
The small WebAuthn iframe fix has already been isolated in #1378, so please omit that change from any replacement PR. Once the remaining concerns are split and based on dev-2.8.0, they can be reviewed independently.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This pull request introduces several improvements and new features across the codebase, focusing on enhanced documentation, expanded Electron API surface, improved remote sync logic, and better tunnel configuration handling. The changes also include updates to support more robust host reference resolution and improved file management capabilities.
Key changes include:
Documentation and Guidelines
AGENTS.mdfile outlining repository structure, coding conventions, build/test commands, commit/PR guidelines, and security considerations, providing clear onboarding and contribution guidance.Electron API Enhancements
electron/preload.jsto include methods for AI settings management, terminal agent sessions, and a suite of local file system operations (listing, reading, writing, renaming, permissions, etc.), as well as improved tunnel start/test methods to accept anauthToken. [1] [2]Remote Sync Improvements
electron/remote-sync.cjsto correctly synchronize entities that reference other entities (e.g., hosts referencing credentials), ensuring referential integrity between local and remote data. This includes new utility functions and integration into the sync process. [1] [2] [3] [4] [5] [6]electron/remote-sync-entities.cjsto keep user preferences local-only, improving compatibility with different backend versions.Tunnel and Host Reference Handling
src/backend/hosts/tunnel/c2s-relay.tsto support resolving hosts bysyncId(not justid), normalize address fields, and consistently useremoteAddressandlocalAddressfor tunnel endpoints. This improves cross-device tunneling and sync scenarios. [1] [2] [3] [4] [5] [6]host-resolution-repository.tsto look up a host by itssyncIdand user, supporting the above tunnel changes.Authentication and Logout Handling
src/main.tsxto import and use new authentication helpers for marking and clearing manual desktop logouts, and to clear manual logout state on login. [1] [2]LogoutOptionstype to support future extensibility in logout handling.