Repository navigation
Add file tree sidebar with cmd-click path composition - #738
Open
AlexBoudreaux wants to merge 2 commits into
Open
AlexBoudreaux wants to merge 2 commits into
AlexBoudreaux wants to merge 2 commits into
Conversation
Port file tree sidebar concept from PR manaflow-ai#601 (credit @Shehryar) and add cmd-click to inject file paths into the active terminal pane. - File tree sidebar toggled with Cmd+E or titlebar folder button - Cmd-click any file/folder to insert shell-escaped path into terminal - Regular click to select files, expand/collapse folders - Right-click context menu (Copy Path, Reveal in Finder, Open in Default App) - FSEvents file watching for automatic tree refresh - Hidden files shown by default - Lazy directory loading with preserved expand state on refresh Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
|
@AlexBoudreaux is attempting to deploy a commit to the Manaflow Team on Vercel. A member of the Team first needs to authorize it. |
📝 WalkthroughWalkthroughAdds a new file-tree sidebar feature: model, node types, SwiftUI rows and sidebar view; integrates a toggle (titlebar, menu, shortcut), AppStorage state, path-send logic to terminals, and registers new Swift files in the Xcode project. Changes
Sequence Diagram(s)sequenceDiagram
participant User
participant Titlebar
participant Menu
participant ContentView
participant FileTreeModel
participant FSEvents
participant Terminal
User->>Titlebar: press toggle button
Titlebar->>ContentView: onToggleFileTree()
Menu->>ContentView: (alt) Toggle File Tree command
ContentView->>ContentView: flip sidebarContentMode (tabs ↔ fileTree)
ContentView->>ContentView: ensure sidebar visible when enabling fileTree
alt Enabled fileTree
ContentView->>FileTreeModel: loadDirectory(workspace.currentDirectory)
FileTreeModel->>FSEvents: start watching
FSEvents-->>FileTreeModel: notify changes
FileTreeModel-->>ContentView: publish rootNodes update
ContentView->>Terminal: send escaped path (on compose)
end
Estimated code review effort🎯 4 (Complex) | ⏱️ ~45 minutes Possibly related PRs
Poem
🚥 Pre-merge checks | ✅ 2 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
Author
|
Author
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 5
🧹 Nitpick comments (3)
Sources/AppDelegate.swift (1)
5210-5221: Refactor the file-tree toggle to avoid rawUserDefaultsliterals and duplicate writes.At Line 5211-Line 5216, using a typed mode transition (single write path) will reduce drift risk with other call sites and make behavior easier to maintain.
♻️ Suggested cleanup
- if matchShortcut(event: event, shortcut: KeyboardShortcutSettings.shortcut(for: .toggleFileTree)) { - let current = UserDefaults.standard.string(forKey: "sidebarContentMode") ?? SidebarContentMode.tabs.rawValue - if current == SidebarContentMode.fileTree.rawValue { - UserDefaults.standard.set(SidebarContentMode.tabs.rawValue, forKey: "sidebarContentMode") - } else { - UserDefaults.standard.set(SidebarContentMode.fileTree.rawValue, forKey: "sidebarContentMode") - if sidebarState?.isVisible == false { - sidebarState?.toggle() - } - } - return true - } + if matchShortcut(event: event, shortcut: KeyboardShortcutSettings.shortcut(for: .toggleFileTree)) { + let sidebarContentModeKey = "sidebarContentMode" + let currentMode = SidebarContentMode( + rawValue: UserDefaults.standard.string(forKey: sidebarContentModeKey) ?? "" + ) ?? .tabs + let nextMode: SidebarContentMode = (currentMode == .fileTree) ? .tabs : .fileTree + UserDefaults.standard.set(nextMode.rawValue, forKey: sidebarContentModeKey) + + if nextMode == .fileTree, sidebarState?.isVisible == false { + sidebarState?.toggle() + } + return true + }🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@Sources/AppDelegate.swift` around lines 5210 - 5221, The toggle logic writes the same UserDefaults key in two branches and uses a raw string; replace this with a typed enum transition: read current via SidebarContentMode(rawValue: ...), compute a single newMode (either .tabs or .fileTree) and call UserDefaults.standard.set(newMode.rawValue, forKey: "sidebarContentMode") exactly once, then if newMode == .fileTree and sidebarState?.isVisible == false call sidebarState?.toggle(); update the code paths around matchShortcut(...) / KeyboardShortcutSettings.shortcut(for:) to use SidebarContentMode explicitly rather than raw literals.Sources/cmuxApp.swift (1)
499-510: Extract file-tree mode toggling into a shared helper.Lines 500-507 duplicate the same
UserDefaultstoggle branch that now also exists inSources/Update/UpdateTitlebarAccessory.swift(Lines 736-744). This risks behavior drift over time (key name and sidebar-visibility rule).♻️ Suggested consolidation
- splitCommandButton(title: "Toggle File Tree", shortcut: toggleFileTreeMenuShortcut) { - let current = UserDefaults.standard.string(forKey: "sidebarContentMode") ?? SidebarContentMode.tabs.rawValue - if current == SidebarContentMode.fileTree.rawValue { - UserDefaults.standard.set(SidebarContentMode.tabs.rawValue, forKey: "sidebarContentMode") - } else { - UserDefaults.standard.set(SidebarContentMode.fileTree.rawValue, forKey: "sidebarContentMode") - if !sidebarState.isVisible { - sidebarState.toggle() - } - } - } + splitCommandButton(title: "Toggle File Tree", shortcut: toggleFileTreeMenuShortcut) { + SidebarContentModeToggler.toggle(defaults: .standard, sidebarState: sidebarState) + }enum SidebarContentModeToggler { static let defaultsKey = "sidebarContentMode" static func toggle(defaults: UserDefaults = .standard, sidebarState: SidebarState) { let current = defaults.string(forKey: defaultsKey) ?? SidebarContentMode.tabs.rawValue let next: SidebarContentMode = (current == SidebarContentMode.fileTree.rawValue) ? .tabs : .fileTree defaults.set(next.rawValue, forKey: defaultsKey) if next == .fileTree, !sidebarState.isVisible { sidebarState.toggle() } } }🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@Sources/cmuxApp.swift` around lines 499 - 510, The sidebar file-tree toggle logic is duplicated; extract it into a single helper (e.g., SidebarContentModeToggler) that exposes a static defaultsKey and a static toggle(defaults: UserDefaults = .standard, sidebarState: SidebarState) method which reads the current SidebarContentMode, computes the next (.tabs or .fileTree), writes next.rawValue to UserDefaults, and only calls sidebarState.toggle() when next == .fileTree and sidebarState.isVisible is false; then replace the inline branch in splitCommandButton (and the duplicate in UpdateTitlebarAccessory) with a call to SidebarContentModeToggler.toggle(...) to centralize behavior and the key name.Sources/ContentView.swift (1)
1922-1932: PrefersidebarContentModeas the single source of truth in toggle handler.This closure duplicates key strings and writes
UserDefaultsdirectly even though@AppStorageis already bound. Centralizing the toggle viasidebarContentModereduces drift risk.♻️ Refactor sketch
+ private func toggleSidebarContentMode() { + if sidebarContentMode == SidebarContentMode.fileTree.rawValue { + sidebarContentMode = SidebarContentMode.tabs.rawValue + return + } + sidebarContentMode = SidebarContentMode.fileTree.rawValue + if !sidebarState.isVisible { + sidebarState.toggle() + } + } + private var fullscreenControls: some View { TitlebarControlsView( @@ - onToggleFileTree: { - let current = UserDefaults.standard.string(forKey: "sidebarContentMode") ?? SidebarContentMode.tabs.rawValue - if current == SidebarContentMode.fileTree.rawValue { - UserDefaults.standard.set(SidebarContentMode.tabs.rawValue, forKey: "sidebarContentMode") - } else { - UserDefaults.standard.set(SidebarContentMode.fileTree.rawValue, forKey: "sidebarContentMode") - if !sidebarState.isVisible { - sidebarState.toggle() - } - } - }, + onToggleFileTree: { + toggleSidebarContentMode() + },🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@Sources/ContentView.swift` around lines 1922 - 1932, The onToggleFileTree closure should use the `@AppStorage-backed` sidebarContentMode as the single source of truth instead of reading/writing UserDefaults directly; update the closure to toggle sidebarContentMode between SidebarContentMode.tabs and SidebarContentMode.fileTree, and only call sidebarState.toggle() when you set sidebarContentMode to .fileTree and sidebarState.isVisible is false (so visibility is synchronized), eliminating direct UserDefaults.standard access and duplicated rawValue strings.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@Sources/ContentView.swift`:
- Around line 1826-1835: The shellEscapePath function currently only quotes
paths when certain characters are present, leaving glob metacharacters unquoted;
update shellEscapePath to always single-quote the input path (remove the
needsQuoting guard), escape any internal single quotes by replacing "'" with
"'\\''", and return the fully single-quoted string; reference the existing
shellEscapeCharacters constant in GhosttyTerminalView.swift for the full
character set if needed and ensure the function name shellEscapePath is the one
you change.
In `@Sources/FileTree/FileTreeModel.swift`:
- Around line 21-27: loadDirectory and refresh initiate uncancelled async scans
via Task that can finish out of order and overwrite newer results; fix by
version-gating scan results: add a monotonically-incremented scanVersion
property on the FileTreeModel and increment it before starting each Task (in
loadDirectory and refresh), capture the current version in a local variable
inside the Task, await scanDirectory(path), then only assign
self.rootNodes/self.rootPath if the captured version still equals the model's
current scanVersion; alternatively keep and cancel the previous Task by storing
it (e.g., lastScanTask) and calling cancel() before starting a new one, but the
primary fix is to check the scanVersion after await to prevent stale scan
results from replacing newer state.
- Around line 189-205: The restoreExpandedState implementation sets
nodes[i].children = children when lazily loading a directory but never
re-applies expandedIds to that newly loaded subtree, so nested expanded folders
collapse; in the Task after obtaining children from scanDirectory, update the
closure in findAndUpdate (or immediately after assigning n.children) to call
restoreExpandedState(in: &n.children, expandedIds: expandedIds) (or equivalent)
so the freshly loaded children have their isExpanded and descendant states
reapplied; reference restoreExpandedState(in:inout:expandedIds:),
scanDirectory(), findAndUpdate(in:id:update:), FileTreeNode, and rootNodes and
ensure this reapplication runs on the MainActor like the surrounding Task.
In `@Sources/FileTree/FileTreeSidebar.swift`:
- Around line 68-74: The onChange handler for workspace.currentDirectory needs
to handle transitions to an empty path to avoid leaving stale nodes/watches:
when the trimmed value is empty, call a new model.clearDirectory() (implement
clearDirectory to cancel refreshCoalesceTask, call stopWatching(), set rootPath
= "" and rootNodes = []), and still set selectedFilePath = nil; otherwise keep
the existing branch that calls model.loadDirectory(trimmed) and clears
selectedFilePath. Ensure the new clearDirectory API is added to the model type
so onChange can invoke it.
In `@Sources/KeyboardShortcutSettings.swift`:
- Around line 174-175: The default shortcut for toggleFileTree in
KeyboardShortcutSettings.swift currently returns StoredShortcut(key: "e", ...)
which conflicts with the existing ⌘E binding in cmuxApp.swift ("Use Selection
for Find"); change the default StoredShortcut returned by the case
.toggleFileTree to a non-conflicting key (for example "b" or "t") so the
toggleFileTree default won’t collide, and ensure the change is made inside the
KeyboardShortcutSettings.swift switch for the toggleFileTree case (updating
StoredShortcut initialization accordingly).
---
Nitpick comments:
In `@Sources/AppDelegate.swift`:
- Around line 5210-5221: The toggle logic writes the same UserDefaults key in
two branches and uses a raw string; replace this with a typed enum transition:
read current via SidebarContentMode(rawValue: ...), compute a single newMode
(either .tabs or .fileTree) and call UserDefaults.standard.set(newMode.rawValue,
forKey: "sidebarContentMode") exactly once, then if newMode == .fileTree and
sidebarState?.isVisible == false call sidebarState?.toggle(); update the code
paths around matchShortcut(...) / KeyboardShortcutSettings.shortcut(for:) to use
SidebarContentMode explicitly rather than raw literals.
In `@Sources/cmuxApp.swift`:
- Around line 499-510: The sidebar file-tree toggle logic is duplicated; extract
it into a single helper (e.g., SidebarContentModeToggler) that exposes a static
defaultsKey and a static toggle(defaults: UserDefaults = .standard,
sidebarState: SidebarState) method which reads the current SidebarContentMode,
computes the next (.tabs or .fileTree), writes next.rawValue to UserDefaults,
and only calls sidebarState.toggle() when next == .fileTree and
sidebarState.isVisible is false; then replace the inline branch in
splitCommandButton (and the duplicate in UpdateTitlebarAccessory) with a call to
SidebarContentModeToggler.toggle(...) to centralize behavior and the key name.
In `@Sources/ContentView.swift`:
- Around line 1922-1932: The onToggleFileTree closure should use the
`@AppStorage-backed` sidebarContentMode as the single source of truth instead of
reading/writing UserDefaults directly; update the closure to toggle
sidebarContentMode between SidebarContentMode.tabs and
SidebarContentMode.fileTree, and only call sidebarState.toggle() when you set
sidebarContentMode to .fileTree and sidebarState.isVisible is false (so
visibility is synchronized), eliminating direct UserDefaults.standard access and
duplicated rawValue strings.
ℹ️ Review info
Configuration used: defaults
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (11)
GhosttyTabs.xcodeproj/project.pbxprojSources/AppDelegate.swiftSources/ContentView.swiftSources/FileTree/FileTreeModel.swiftSources/FileTree/FileTreeNode.swiftSources/FileTree/FileTreeRow.swiftSources/FileTree/FileTreeSidebar.swiftSources/FileTree/SidebarContentMode.swiftSources/KeyboardShortcutSettings.swiftSources/Update/UpdateTitlebarAccessory.swiftSources/cmuxApp.swift
Contributor
Greptile SummaryThis PR adds a file tree sidebar that displays the workspace directory with a novel cmd-click interaction to inject shell-escaped paths into the terminal. The implementation shows solid architectural patterns including FSEvents file watching, lazy directory loading with preserved expand state, and proper memory management with Key changes:
Issues found:
Recommendations:
Confidence Score: 3/5
Important Files Changed
Sequence DiagramsequenceDiagram
participant User
participant FileTreeRow
participant FileTreeSidebar
participant ContentView
participant TerminalPanel
participant Ghostty
User->>FileTreeRow: Cmd+Click file/folder
FileTreeRow->>FileTreeRow: Detect NSApp.currentEvent modifierFlags
FileTreeRow->>FileTreeRow: Trigger flash animation
FileTreeRow->>FileTreeSidebar: onComposePath(node.path)
FileTreeSidebar->>ContentView: sendPathToFocusedTerminal(path)
ContentView->>ContentView: shellEscapePath(path)
Note over ContentView: ⚠️ Incomplete escaping<br/>Missing: *, ?, [], {}, ~, #, \, etc.
ContentView->>TerminalPanel: sendText(escapedPath)
TerminalPanel->>Ghostty: ghostty_surface_text()
Note over Ghostty: Path injected as typed text<br/>(not bracketed paste)
Ghostty-->>User: Path appears in terminal
User->>FileTreeRow: Right-click file/folder
FileTreeRow->>FileTreeRow: Show context menu
User->>FileTreeRow: Select "Insert Path to Terminal"
FileTreeRow->>FileTreeSidebar: onComposePath(node.path)
Note over FileTreeSidebar: Same flow as Cmd+Click
Last reviewed commit: 2124532 |
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
Comment on lines
+1803
to
+1811
| } | ||
| } | ||
|
|
||
| private var sidebarView: some View { | ||
| VStack(spacing: 0) { | ||
| if sidebarContentMode == SidebarContentMode.fileTree.rawValue { | ||
| fileTreeSidebarContent | ||
| } else { | ||
| tabsSidebarContent |
Contributor
There was a problem hiding this comment.
Incomplete shell escaping - missing glob chars (*, ?, [, ]), brace expansion ({, }), command substitution (`), tilde (~), hash (#), backslash (\), and control characters. A file named test*.txt or $(dangerous) would be sent unquoted and cause shell expansion/execution.
Safer approach: always wrap in single quotes:
Suggested change
| } | |
| } | |
| private var sidebarView: some View { | |
| VStack(spacing: 0) { | |
| if sidebarContentMode == SidebarContentMode.fileTree.rawValue { | |
| fileTreeSidebarContent | |
| } else { | |
| tabsSidebarContent | |
| private func shellEscapePath(_ path: String) -> String { | |
| // Always wrap in single quotes and escape internal single quotes | |
| let escaped = path.replacingOccurrences(of: "'", with: "'\\''") | |
| return "'\(escaped)'" | |
| } |
Comment on lines
+1826
to
1835
| private func shellEscapePath(_ path: String) -> String { | ||
| let needsQuoting = path.contains(" ") || path.contains("'") || path.contains("\"") | ||
| || path.contains("(") || path.contains(")") || path.contains("&") | ||
| || path.contains("|") || path.contains(";") || path.contains("$") | ||
| || path.contains("`") || path.contains("!") | ||
| guard needsQuoting else { return path } | ||
| // Use single quotes with escaped inner single quotes | ||
| let escaped = path.replacingOccurrences(of: "'", with: "'\\''") | ||
| return "'\(escaped)'" | ||
| } |
Contributor
There was a problem hiding this comment.
Inconsistent with existing shell escaping in GhosttyTerminalView.escapeDropForShell which uses backslash escaping for \\ ()[]{}<>\"'\!#$&;|*?\t`. File drop and file tree should use the same escaping strategy.
Extract escapeDropForShell to a shared utility or use the same character set and approach here.
- Always single-quote paths in shellEscapePath to prevent glob expansion - Add scanVersion to prevent stale async scans from overwriting newer results - Recursively restore expanded state on lazily loaded children - Add clearDirectory() to handle empty directory transitions - Change shortcut to Cmd+Shift+E to avoid conflict with Use Selection for Find Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
There was a problem hiding this comment.
Actionable comments posted: 1
🧹 Nitpick comments (1)
Sources/ContentView.swift (1)
1916-1926: Use@AppStoragestate directly instead of rawUserDefaultstoggling.This avoids dual state paths and keeps sidebar mode changes in one source of truth.
♻️ Suggested refactor
onToggleFileTree: { - let current = UserDefaults.standard.string(forKey: "sidebarContentMode") ?? SidebarContentMode.tabs.rawValue - if current == SidebarContentMode.fileTree.rawValue { - UserDefaults.standard.set(SidebarContentMode.tabs.rawValue, forKey: "sidebarContentMode") + if sidebarContentMode == SidebarContentMode.fileTree.rawValue { + sidebarContentMode = SidebarContentMode.tabs.rawValue } else { - UserDefaults.standard.set(SidebarContentMode.fileTree.rawValue, forKey: "sidebarContentMode") + sidebarContentMode = SidebarContentMode.fileTree.rawValue if !sidebarState.isVisible { sidebarState.toggle() } } },🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@Sources/ContentView.swift` around lines 1916 - 1926, The onToggleFileTree closure currently reads and writes UserDefaults directly (using keys like "sidebarContentMode") causing dual state paths; replace those raw UserDefaults accesses with the `@AppStorage-backed` property that represents the sidebar content mode (e.g., sidebarContentMode: SidebarContentMode.RawValue) so the view uses a single source of truth; update the onToggleFileTree logic to toggle the `@AppStorage-backed` sidebarContentMode between SidebarContentMode.fileTree.rawValue and SidebarContentMode.tabs.rawValue and keep the existing behavior of calling sidebarState.toggle() when switching to fileTree and the sidebar is not visible.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@Sources/ContentView.swift`:
- Around line 1818-1824: The sendPathToFocusedTerminal function currently sends
the escaped path without a trailing space, causing concatenated tokens when
cmd-clicking multiple paths; update the code in sendPathToFocusedTerminal so
that after calling shellEscapePath(path) you append a single space to the string
passed to terminalPanel.sendText (i.e., send escaped + " ") so each inserted
path is separated; reference sendPathToFocusedTerminal, shellEscapePath, and
terminalPanel.sendText when making the change.
---
Nitpick comments:
In `@Sources/ContentView.swift`:
- Around line 1916-1926: The onToggleFileTree closure currently reads and writes
UserDefaults directly (using keys like "sidebarContentMode") causing dual state
paths; replace those raw UserDefaults accesses with the `@AppStorage-backed`
property that represents the sidebar content mode (e.g., sidebarContentMode:
SidebarContentMode.RawValue) so the view uses a single source of truth; update
the onToggleFileTree logic to toggle the `@AppStorage-backed` sidebarContentMode
between SidebarContentMode.fileTree.rawValue and
SidebarContentMode.tabs.rawValue and keep the existing behavior of calling
sidebarState.toggle() when switching to fileTree and the sidebar is not visible.
ℹ️ Review info
Configuration used: defaults
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (4)
Sources/ContentView.swiftSources/FileTree/FileTreeModel.swiftSources/FileTree/FileTreeSidebar.swiftSources/KeyboardShortcutSettings.swift
🚧 Files skipped from review as they are similar to previous changes (1)
- Sources/FileTree/FileTreeModel.swift
Comment on lines
+1818
to
+1824
| private func sendPathToFocusedTerminal(_ path: String) { | ||
| guard let workspace = tabManager.selectedTab, | ||
| let terminalPanel = workspace.focusedTerminalPanel else { return } | ||
| // Shell-escape the path so spaces and special chars don't break commands | ||
| let escaped = shellEscapePath(path) | ||
| terminalPanel.sendText(escaped) | ||
| } |
There was a problem hiding this comment.
🧩 Analysis chain
🏁 Script executed:
#!/bin/bash
# Verify delimiter logic in onComposePath call sites and sendPathToFocusedTerminal usage
rg -n -C5 'onComposePath|sendPathToFocusedTerminal|shellEscapePath' Sources --type swift | head -200Repository: manaflow-ai/cmux
Length of output: 7141
🏁 Script executed:
#!/bin/bash
# Find terminalPanel.sendText implementation and other call sites
rg -n 'func sendText|\.sendText\(' Sources --type swift -A2 | head -100Repository: manaflow-ai/cmux
Length of output: 3789
🏁 Script executed:
#!/bin/bash
# Read the complete sendText implementation in GhosttyTerminalView
sed -n '2100,2120p' Sources/GhosttyTerminalView.swiftRepository: manaflow-ai/cmux
Length of output: 748
Add trailing space to sendPathToFocusedTerminal to support multiple cmd-click path insertion.
When users cmd-click multiple file paths sequentially, each call to sendText() concatenates without spacing, resulting in invalid shell syntax like '/path/one''/path/two'. Append a space after the escaped path to ensure proper token separation:
private func sendPathToFocusedTerminal(_ path: String) {
guard let workspace = tabManager.selectedTab,
let terminalPanel = workspace.focusedTerminalPanel else { return }
// Shell-escape the path so spaces and special chars don't break commands
let escaped = shellEscapePath(path)
terminalPanel.sendText(escaped + " ")
}🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@Sources/ContentView.swift` around lines 1818 - 1824, The
sendPathToFocusedTerminal function currently sends the escaped path without a
trailing space, causing concatenated tokens when cmd-clicking multiple paths;
update the code in sendPathToFocusedTerminal so that after calling
shellEscapePath(path) you append a single space to the string passed to
terminalPanel.sendText (i.e., send escaped + " ") so each inserted path is
separated; reference sendPathToFocusedTerminal, shellEscapePath, and
terminalPanel.sendText when making the change.
Collaborator
|
This remains live on current main: the sidebar has file preview support, but no dedicated file-tree sidebar or cmd-click path composition. Leaving it open for a fresh integration with the current sidebar architecture. :) |
teamleaderleo
added
the
area: sidebar
This branch has not been 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
2 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.
Summary
Adds a file tree sidebar that shows the workspace's current directory, with a novel interaction: cmd-click any file or folder to inject its shell-escaped path directly into the active terminal pane.
Ported the file tree concept from PR #601 by @Shehryar (stripped the code editor panel to keep scope focused on path composition). Built on top of current main with no conflicts.
Features
@AppStorage/UserDefaultsso it survives restarts and works reactively across all view hierarchies (SwiftUI ContentView + AppKit titlebar accessory)How it works
When you cmd-click a file in the tree, the path is shell-escaped (single-quote wrapped with internal quotes escaped) and sent to the focused terminal pane via
ghostty_surface_text. This means the path appears as typed text without triggering bracketed paste mode, so it works naturally with any shell or CLI tool waiting for input.Files changed
Sources/FileTree/FileTreeNode.swiftSources/FileTree/FileTreeModel.swiftSources/FileTree/FileTreeRow.swiftSources/FileTree/FileTreeSidebar.swiftSources/FileTree/SidebarContentMode.swiftSources/ContentView.swiftSources/AppDelegate.swiftSources/cmuxApp.swiftSources/KeyboardShortcutSettings.swift.toggleFileTreeshortcut definitionSources/Update/UpdateTitlebarAccessory.swiftGhosttyTabs.xcodeproj/project.pbxprojTest plan
Credits
File tree concept ported from PR #601 by @Shehryar. Thank you for the foundation!
🤖 Generated with Claude Code
Summary by CodeRabbit