Repository navigation
File explorer sort options - #6986
Closed
austinywang wants to merge 28 commits into
Closed
austinywang wants to merge 28 commits into
austinywang wants to merge 28 commits into
Conversation
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
📝 WalkthroughWalkthroughThis PR adds configurable file explorer sorting by name, date created, and date modified, with ascending/descending order, persisted settings, UI controls, schema support, and localized strings. It also updates local and SSH directory listing data to carry timestamps for sorting. ChangesFile Explorer Sorting Feature
Estimated code review effort: 4 (Complex) | ~60 minutes Sequence Diagram(s)sequenceDiagram
participant User
participant FileExplorerHeaderView
participant FileExplorerView
participant FileExplorerStore
participant FileExplorerSortSettings
participant FileExplorerNodeSorter
User->>FileExplorerHeaderView: select sort key/order
FileExplorerHeaderView->>FileExplorerView: onSelectSortKey/onSelectSortOrder
FileExplorerView->>FileExplorerStore: setSortKey/setSortOrder
FileExplorerStore->>FileExplorerSortSettings: setOptions(sortOptions)
FileExplorerSortSettings-->>FileExplorerStore: didChangeNotification
FileExplorerStore->>FileExplorerNodeSorter: sorted(rootNodes, loadedChildren)
FileExplorerView->>FileExplorerView: reloadIfNeeded()
Related Issues: Suggested labels: area: file-explorer, area: localization, platform: macOS Suggested reviewers: maintainers familiar with FileExplorerStore and FileExplorerView Important Pre-merge checks failedPlease resolve all errors before merging. Addressing warnings is optional. ❌ Failed checks (4 errors, 2 warnings)
✅ Passed checks (19 passed)
✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
…rer-add-sort-options-date-created-m # Conflicts: # .github/swift-file-length-budget.tsv
Contributor
Greptile SummaryAdds sortable file explorer (name, date created, date modified with ascending/descending) persisted via
Confidence Score: 5/5Safe to merge; the sort, persistence, and SSH listing changes are well-structured with no correctness regressions found. The most consequential new paths — applySortOptions/resortLoadedNodes, SSH find+stat batching, and the coordinator's debounced reload — are all implemented correctly. The objectWillChange + 50ms debounce pattern ensures sortRevision is always read after mutations commit. The SSH bootstrap safely handles non-POSIX login shells and birth-time zero sentinels. The only findings are a maintenance mismatch in the JSON-path allowlist (hardcoded strings vs. constants) and a notifyDidChange visibility nit — neither affects runtime behaviour. No files require special attention; the hardcoded key strings in CmuxSettingsJSONPathSupport.swift are worth cleaning up before a future key rename. Important Files Changed
Sequence Diagram%%{init: {'theme': 'neutral'}}%%
sequenceDiagram
participant Header as FileExplorerHeaderView
participant Store as FileExplorerStore
participant Settings as FileExplorerSortSettings
participant UD as UserDefaults
participant NC as NotificationCenter
participant Coord as Coordinator (debounced 50ms)
Header->>Store: setSortKey(key)
Store->>Store: applySortOptions(options, persist:true)
Store->>Store: objectWillChange.send()
Store->>Store: "sortOptions = options"
Store->>Store: resortLoadedNodes()
Store->>Store: "sortRevision &+= 1"
Store->>Settings: setOptions(options)
Settings->>UD: set sortKeyKey / sortOrderKey
Settings->>NC: post(didChangeNotification)
NC-->>Store: observer fires (queue:.main, next runloop)
Store->>Store: "applySortOptionsFromDefaults() guard sortOptions != options return early"
NC-->>Coord: objectWillChange debounced 50ms
Coord->>Store: read sortRevision (now updated)
Coord->>Coord: outlineView.reloadData() + restoreExpansionState
%%{init: {'theme': 'base', 'themeVariables': {"darkMode": true, "background": "#0d1117", "primaryColor": "#21262d", "primaryTextColor": "#e6edf3", "primaryBorderColor": "#8b949e", "lineColor": "#8b949e", "textColor": "#e6edf3", "edgeLabelBackground": "#161b22", "actorBkg": "#21262d", "actorBorder": "#8b949e", "actorTextColor": "#e6edf3", "actorLineColor": "#8b949e", "signalColor": "#8b949e", "signalTextColor": "#e6edf3", "noteBkgColor": "#373320", "noteBorderColor": "#d4a72c", "noteTextColor": "#f0e6c0", "labelBoxBkgColor": "#21262d", "labelBoxBorderColor": "#8b949e", "labelTextColor": "#e6edf3", "loopTextColor": "#e6edf3", "activationBkgColor": "#30363d", "activationBorderColor": "#8b949e"}}}%%
sequenceDiagram
participant Header as FileExplorerHeaderView
participant Store as FileExplorerStore
participant Settings as FileExplorerSortSettings
participant UD as UserDefaults
participant NC as NotificationCenter
participant Coord as Coordinator (debounced 50ms)
Header->>Store: setSortKey(key)
Store->>Store: applySortOptions(options, persist:true)
Store->>Store: objectWillChange.send()
Store->>Store: "sortOptions = options"
Store->>Store: resortLoadedNodes()
Store->>Store: "sortRevision &+= 1"
Store->>Settings: setOptions(options)
Settings->>UD: set sortKeyKey / sortOrderKey
Settings->>NC: post(didChangeNotification)
NC-->>Store: observer fires (queue:.main, next runloop)
Store->>Store: "applySortOptionsFromDefaults() guard sortOptions != options return early"
NC-->>Coord: objectWillChange debounced 50ms
Coord->>Store: read sortRevision (now updated)
Coord->>Coord: outlineView.reloadData() + restoreExpansionState
Reviews (23): Last reviewed commit: "Merge remote-tracking branch 'origin/mai..." | Re-trigger Greptile |
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
added 4 commits
June 28, 2026 20:21
…rer-add-sort-options-date-created-m # Conflicts: # .github/swift-file-length-budget.tsv # Resources/Localizable.xcstrings
…rer-add-sort-options-date-created-m # Conflicts: # .github/swift-file-length-budget.tsv
The date-sort rewrite replaced the simple `ls` listing with a multi-line POSIX script sent as the SSH command, which OpenSSH runs through the account's login shell. fish/csh/tcsh cannot parse `for`/`if`/`case`, so the remote file explorer could fail entirely for those users. The script also ran two-plus `stat` processes per entry to gather timestamps, even for the default name sort that needs none, turning one `ls` into O(entries) remote process spawns and making large remote directories appear to hang. - Run the listing under `/bin/sh` regardless of login shell by base64-encoding the script and bootstrapping via `/bin/sh -c` (only a base64 payload with no shell metacharacters reaches the login shell), mirroring the existing DockSplitStore remote-script pattern. - Detect GNU vs BSD `stat` once, then run a single batched `stat` over all entries (O(1) remote processes). Timestamps are always collected so switching the sort key re-sorts the cached listing without a re-fetch. - Decompose into testable `remoteListingScript`/`posixShellBootstrap`/ `parseRemoteListing` helpers and add regression coverage for the POSIX-shell wrapping, batched stat, hidden/`.`/`..` filtering, and the birth-time threshold. Verified the generated command empirically against BSD `stat` and across /bin/sh, zsh, and bash. Surfaced by autoreview on PR #6986. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
autoreview flagged that the batched SSH listing's `cd ... || exit 0` plus the unconditional trailing `exit 0` reported permission/command failures as empty directories, losing the pre-rewrite ability to distinguish an inaccessible directory from an empty one. Exit non-zero (so `runSSHCommand` raises `sshCommandFailed`) when `cd` fails, when the directory is not readable (`[ -r . ]`), or when no usable `stat` is found. A readable-but-empty directory still reaches `exit 0` and lists as empty even though its unmatched glob makes `stat` exit non-zero. Verified on macOS that normal/empty dirs succeed while nonexistent and unreadable (x-only) dirs exit 1; added regression coverage. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
autoreview flagged that the batched listing used `stat -L`, which follows
symlinks. On GNU, a following stat of a dangling symlink emits no record and
exits non-zero for that operand, so with stderr suppressed the broken
symlink was silently dropped — users could no longer see, delete, rename, or
fix it. The pre-rewrite `ls -F` still listed dangling symlinks.
Drop `-L` so the listing uses lstat: every entry, including dangling and
directory symlinks, is reported with its own type ("symbolic link"),
matching the previous `ls -F` behavior (symlinks shown, non-expandable).
Added regression coverage that symlink rows stay listed and non-directory.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
autoreview flagged two more remote-listing regressions:
- The glob `* .[!.]* ..?*` expands in the remote shell before `stat`, so a
large directory could exceed ARG_MAX; `stat` then fails to exec and, with
stderr suppressed and the trailing `exit 0`, the directory looked empty.
Replace the glob with `find . -mindepth 1 -maxdepth 1 ... -exec stat {} +`,
which enumerates the directory and batches `stat` within ARG_MAX (still a
small bounded number of processes, never per-entry).
- The bootstrap ran `eval "$(...base64...)"` without checking the decode, so a
host lacking a compatible `base64` silently listed every directory as empty.
Capture the decoded script and `exit 1` when it is empty.
`find .` reports entries as `./name`, so the parser now keeps only the final
path component. Dotfiles are excluded with `! -name '.*'` unless hidden entries
are requested. Verified on macOS across normal/empty/missing/unreadable dirs,
dangling symlinks, and a simulated missing-base64 host; extended the tests.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
autoreview flagged that the remote-listing tests mostly asserted substrings of the generated shell script, which the repo's test-quality rule disallows and which can pass even when the command is invalid under /bin/sh or behaves differently at runtime. Replace the implementation-text assertions with executable behavioral tests: build the exact command the SSH transport sends and run it locally through a real shell against temp-directory fixtures, then assert the parsed result and exit status. Coverage now includes directory contents, hidden-file filtering, dangling/directory symlink visibility, empty-directory success, missing and unreadable directories surfacing as non-zero exits, single-quoted paths, identical results across /bin/sh and /bin/zsh, and a missing-base64 host (via an emptied PATH) erroring instead of listing empty. The synthetic parser unit tests are kept to cover GNU stat output that the macOS test host cannot produce. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
…rer-add-sort-options-date-created-m # Conflicts: # .github/swift-file-length-budget.tsv
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 4
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
Sources/KeyboardShortcutSettingsFileStore.swift (1)
1588-1601: 🚀 Performance & Scalability | 🔵 Trivial | 💤 Low valueBatch the sort-settings notification instead of posting inline per key.
Unlike the sibling flags in this same loop (
agentSessionAutoResumeDidChange,agentHibernationDidChange,rendererRealizationDidChange), which set a boolean and notify once after the loop, the new sort-settings check postsFileExplorerSortSettings.didChangeNotificationdirectly inside the loop. If bothsortByandsortOrderchange in the same settings reload (a common case — the user changes sort key and direction together, orcmux.jsonsets both keys at once), the notification fires twice, causingFileExplorerStore's observer to reapply sort options and re-sort the loaded nodes twice.♻️ Proposed fix: batch like the other flags
var agentSessionAutoResumeDidChange = false var agentHibernationDidChange = false var rendererRealizationDidChange = false + var fileExplorerSortSettingsDidChange = false for change in changes { if change.defaultsKey == TerminalScrollBarSettings.showScrollBarKey { TerminalScrollBarSettings.notifyDidChange(notificationCenter: notificationCenter) } if change.defaultsKey == TerminalCopyOnSelectSettings.copyOnSelectKey { TerminalCopyOnSelectSettings.notifyDidChange(notificationCenter: notificationCenter) } if change.defaultsKey == FileExplorerSortSettings.sortKeyKey || change.defaultsKey == FileExplorerSortSettings.sortOrderKey { - notificationCenter.post(name: FileExplorerSortSettings.didChangeNotification, object: nil) + fileExplorerSortSettingsDidChange = true } ... } + if fileExplorerSortSettingsDidChange { + notificationCenter.post(name: FileExplorerSortSettings.didChangeNotification, object: nil) + }🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@Sources/KeyboardShortcutSettingsFileStore.swift` around lines 1588 - 1601, The FileExplorer sort-settings change handling is posting FileExplorerSortSettings.didChangeNotification inside the changes loop, which can fire twice when both sortKeyKey and sortOrderKey change together. Update KeyboardShortcutSettingsFileStore’s settings reload logic to match the other batched flags by setting a local boolean when either FileExplorerSortSettings.sortKeyKey or sortOrderKey changes, then post the notification once after the loop.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@cmuxTests/KeyboardShortcutSettingsFileStoreStartupTests.swift`:
- Around line 537-587: The current test only covers valid fileExplorer sort
values, so it does not verify the settings-file parsing path rejects bad enum
raw values safely. Add a regression test alongside
testSettingsFileParsesFileExplorerSortOptions that writes an invalid
sortBy/sortOrder into cmux.json, then initializes
KeyboardShortcutSettingsFileStore and asserts FileExplorerSortSettings still
resolves to FileExplorerSortOptions.defaultValue without blocking the rest of
the file from being processed. Use the existing FileExplorerSortSettings,
KeyboardShortcutSettingsFileStore, and resolvedOptions() symbols to keep the
test aligned with the current parsing flow.
In `@Sources/FileExplorerHeaderView.swift`:
- Around line 104-114: The sort tooltip in FileExplorerHeaderView’s sort button
setup is building a localized format string with String(format:), which can
ignore locale-specific argument ordering. Update the tooltip construction in the
sortButton configuration to use String.localizedStringWithFormat with the
localized key/defaultValue string and the sortOptions.key.localizedTitle and
sortOptions.order.localizedTitle arguments, keeping the rest of the sortButton
accessibility setup unchanged.
In `@Sources/FileExplorerStore.swift`:
- Around line 213-381: The new sort-related types and comparator logic in
FileExplorerStore.swift add another large responsibility to an already oversized
mixed-purpose file. Move the self-contained sorting model and persistence pieces
out of FileExplorerStore.swift by extracting FileExplorerSortKey,
FileExplorerSortOrder, FileExplorerSortOptions, FileExplorerSortSettings, and
FileExplorerNodeSorter into a separate file so the store keeps only wiring and
usage. Keep the new file independent of AppKit/store concerns and update
FileExplorerStore and any callers to reference the extracted symbols.
- Around line 480-499: The local directory listing in FileExplorerStore is doing
a redundant filesystem stat for every entry via fileExists(atPath:isDirectory:)
after contentsOfDirectory already fetched metadata. Update the listing logic to
request .isDirectoryKey in contentsOfDirectory and read the directory flag from
resourceValues instead of probing each URL again, keeping the filtering and
FileExplorerEntry construction in the same flow.
---
Outside diff comments:
In `@Sources/KeyboardShortcutSettingsFileStore.swift`:
- Around line 1588-1601: The FileExplorer sort-settings change handling is
posting FileExplorerSortSettings.didChangeNotification inside the changes loop,
which can fire twice when both sortKeyKey and sortOrderKey change together.
Update KeyboardShortcutSettingsFileStore’s settings reload logic to match the
other batched flags by setting a local boolean when either
FileExplorerSortSettings.sortKeyKey or sortOrderKey changes, then post the
notification once after the loop.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: ASSERTIVE
Plan: Pro
Run ID: 6f55b732-f4a1-472b-918b-6523316a4890
⛔ Files ignored due to path filters (1)
.github/swift-file-length-budget.tsvis excluded by!**/*.tsv
📒 Files selected for processing (31)
Resources/Localizable.xcstringsSources/CmuxSettingsJSONPathSupport.swiftSources/FileExplorerHeaderView.swiftSources/FileExplorerStore.swiftSources/FileExplorerView.swiftSources/KeyboardShortcutSettingsFileStore+Template.swiftSources/KeyboardShortcutSettingsFileStore.swiftcmuxTests/FileExplorerDoubleClickActionTests.swiftcmuxTests/FileExplorerStoreTests.swiftcmuxTests/KeyboardShortcutSettingsFileStoreStartupTests.swiftweb/data/cmux.schema.jsonweb/messages/ar.jsonweb/messages/bs.jsonweb/messages/da.jsonweb/messages/de.jsonweb/messages/en.jsonweb/messages/es.jsonweb/messages/fr.jsonweb/messages/it.jsonweb/messages/ja.jsonweb/messages/km.jsonweb/messages/ko.jsonweb/messages/no.jsonweb/messages/pl.jsonweb/messages/pt-BR.jsonweb/messages/ru.jsonweb/messages/th.jsonweb/messages/tr.jsonweb/messages/uk.jsonweb/messages/zh-CN.jsonweb/messages/zh-TW.json
The remote listing script runs `find ... -exec stat ...` then reaches the trailing `exit 0` unconditionally, so a wholesale `find`/`stat` failure (e.g. a remote `find` lacking `-mindepth`/`-maxdepth`) is swallowed and the directory appears empty instead of raising `sshCommandFailed`. This behavioral test shadows `find` with a stub that exits non-zero and asserts the generated command exits non-zero. It fails against the current script (which masks the failure as exit 0); the fix follows in the next commit. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
![cubic-dev-ai[bot]](https://avatars.githubusercontent.com/in/1082092?s=60&v=4){kind=small}
There was a problem hiding this comment.
2 issues found across 32 files
Prompt for AI agents (unresolved issues)
Check if these issues are valid — if so, understand the root cause of each and fix them. If appropriate, use sub-agents to investigate and fix each issue separately.
<file name="cmuxTests/FileExplorerStoreTests.swift">
<violation number="1" location="cmuxTests/FileExplorerStoreTests.swift:1281">
P2: The new ProcessSSHFileExplorerListingTests suite creates Process objects with pipes to run shell commands and verify output/exit codes. Per team convention, tests that rely on a process/socket harness should use XCTest (XCTestCase) rather than Swift Testing, keeping pure unit tests in Swift Testing.</violation>
</file>
Tip: cubic can generate docs of your entire codebase and keep them up to date. Try it here.
Re-trigger cubic
The listing script ran `find ... -exec stat ...` and then reached the trailing `exit 0` unconditionally, with the `find` stderr suppressed. Any wholesale failure of the listing command — a remote `find` that lacks `-mindepth`/`-maxdepth`, a `stat` format the probe did not exercise, or a per-entry error — was swallowed and reported as an empty directory, regressing the pre-existing behavior where a failed `ls` raised `sshCommandFailed`. Propagate the failure with `|| exit 1` on both `find` branches so a failed listing exits non-zero. A genuinely empty directory still makes `find` exit zero with no output and reaches the trailing `exit 0`, so empty listings are unchanged. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@cmuxTests/FileExplorerStoreTests.swift`:
- Line 1459: The stdout emptiness check in the FileExplorerStore test is
decoding `Data` to a string unnecessarily; update the assertion to use
`data.isEmpty` directly instead of `String(decoding:as:)`. Locate the test
around the `FileExplorerStoreTests` assertion and keep the check focused on the
`data` value itself.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: ASSERTIVE
Plan: Pro
Run ID: 40d37e12-972b-4e0e-88f9-e2d948cc0d3b
⛔ Files ignored due to path filters (1)
.github/swift-file-length-budget.tsvis excluded by!**/*.tsv
📒 Files selected for processing (2)
Sources/FileExplorerStore.swiftcmuxTests/FileExplorerStoreTests.swift
… stat - Move FileExplorerSortKey/Order/Options/Settings/NodeSorter out of FileExplorerStore.swift into a dedicated Sources/FileExplorerSortOptions.swift (CodeRabbit Major + file-organization findings). Wire the new file into the Xcode project (UUID FE59960A) and refresh the file-length budget. - Use String.localizedStringWithFormat for the sort tooltip so locales that reorder positional arguments render correctly (CodeRabbit). - Prefetch .isDirectoryKey and read isDirectory from the cached resource values in the local listDirectory, dropping the redundant per-entry fileExists stat (CodeRabbit). Local dangling symlinks now stay visible, matching the remote listing behavior. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Avoids the redundant Data->String decode (SwiftLint optional_data_string_conversion) while asserting the same masked-empty-output regression. (CodeRabbit) Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
…-created-m Resolve conflicts: - Sources/FileExplorerStore.swift: keep the sorted(using:) Array extension (used at the local listing call site); drop the inline GitFileStatus / GitStatusProvider types, which origin/main extracted into their own files (Sources/GitFileStatus.swift, Sources/GitStatusProvider.swift). - .github/swift-file-length-budget.tsv: regenerated via scripts/swift_file_length_budget.py --write-budget. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
The origin/main merge left two all-default initializers on FileExplorerStore: the branch's sort-settings init(sortDefaults:notificationCenter:) and main's init(gitStatusProvider:). Each left the other's stored properties uninitialized, and FileExplorerStore() was ambiguous between them, so the target could not compile. Merge them into a single designated initializer that initializes notificationCenter, gitStatusProvider, sortSettings, sortOptions, and sortSettingsObserver, exposing a superset of parameters (all with defaults) so every existing call site keeps working. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
…rer-add-sort-options-date-created-m # Conflicts: # .github/swift-file-length-budget.tsv
…rer-add-sort-options-date-created-m # Conflicts: # .github/swift-file-length-budget.tsv
…rer-add-sort-options-date-created-m # Conflicts: # .github/swift-file-length-budget.tsv
…rer-add-sort-options-date-created-m
…rer-add-sort-options-date-created-m Resolve .github/swift-file-length-budget.tsv via scripts/swift_file_length_budget.py --write-budget on the merged tree. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
1 task done
namil-k
added a commit
to namil-k/cmux
that referenced
this pull request
Sep 22, 2026
The right-sidebar file explorer always sorted folders first, then case-insensitive by name. This adds a sort menu to the explorer header (name, date created, date modified; ascending or descending), persists the choice through fileExplorer.sortBy / fileExplorer.sortOrder in cmux.json and UserDefaults, and reads file dates for local and SSH listings. Rebased from manaflow-ai#6986 onto current main. Changes beyond the original PR: - settings parsing moved to KeyboardShortcutSettingsFileStore+SectionParsers and the key registry to CmuxSettingsFileStore+SupportedPaths, following the upstream split - sort-settings change notification is batched like the sibling flags - the header sort button uses RenderableSystemSymbol.configuredAppKitImage instead of NSImage(systemSymbolName:).withSymbolConfiguration - CmuxConfigSchema.generated.swift regenerated so the CLI validator accepts the new keys - configuration docs example lists the new keys Fixes manaflow-ai#5737 Supersedes manaflow-ai#6986 Co-authored-by: Austin Wang <austinwang115@gmail.com>
lawrencecchen
added
the
stale-revisit
namil-k
added a commit
to namil-k/cmux
that referenced
this pull request
Sep 25, 2026
The right-sidebar file explorer always sorted folders first, then case-insensitive by name. This adds a sort menu to the explorer header (name, date created, date modified; ascending or descending), persists the choice through fileExplorer.sortBy / fileExplorer.sortOrder in cmux.json and UserDefaults, and reads file dates for local and SSH listings. Rebased from manaflow-ai#6986 onto current main. Changes beyond the original PR: - settings parsing moved to KeyboardShortcutSettingsFileStore+SectionParsers and the key registry to CmuxSettingsFileStore+SupportedPaths, following the upstream split - sort-settings change notification is batched like the sibling flags - the header sort button uses RenderableSystemSymbol.configuredAppKitImage instead of NSImage(systemSymbolName:).withSymbolConfiguration - CmuxConfigSchema.generated.swift regenerated so the CLI validator accepts the new keys - configuration docs example lists the new keys Fixes manaflow-ai#5737 Supersedes manaflow-ai#6986 Co-authored-by: Austin Wang <austinwang115@gmail.com>
namil-k
added a commit
to namil-k/cmux
that referenced
this pull request
Sep 29, 2026
The right-sidebar file explorer always sorted folders first, then case-insensitive by name. This adds a sort menu to the explorer header (name, date created, date modified; ascending or descending), persists the choice through fileExplorer.sortBy / fileExplorer.sortOrder in cmux.json and UserDefaults, and reads file dates for local and SSH listings. Rebased from manaflow-ai#6986 onto current main. Changes beyond the original PR: - settings parsing moved to KeyboardShortcutSettingsFileStore+SectionParsers and the key registry to CmuxSettingsFileStore+SupportedPaths, following the upstream split - sort-settings change notification is batched like the sibling flags - the header sort button uses RenderableSystemSymbol.configuredAppKitImage instead of NSImage(systemSymbolName:).withSymbolConfiguration - CmuxConfigSchema.generated.swift regenerated so the CLI validator accepts the new keys - configuration docs example lists the new keys Fixes manaflow-ai#5737 Supersedes manaflow-ai#6986 Co-authored-by: Austin Wang <austinwang115@gmail.com>
This branch was successfully deployed
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
3 participants
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.
Fixes #5737
Summary
fileExplorer.sortBy,fileExplorer.sortOrder) and UserDefaults.Validation
No dev build or xcodebuild run per task instruction.
Summary by cubic
Adds sortable file explorer (name, date created, date modified) with ascending/descending and saved preferences. Also makes remote SSH listings shell‑agnostic and faster, preserves expanded folders on re‑sort/reload, and unifies
FileExplorerStoreinit.New Features
fileExplorer.sortByandfileExplorer.sortOrder; schema/messages updated; template defaults; live re‑sort.Bug Fixes
/bin/shbootstrap; single batchedstatviafind … -exec … +(ARG_MAX‑safe); caches timestamps; stable mode format..isDirectoryKey, dropping redundant per‑entrystat(local dangling symlinks stay visible).Written for commit 721d8ae. Summary will update on new commits.
Summary by CodeRabbit