marketing-shibata50/cmux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge origin/main into issue-151-ssh-remote-port-proxying

Browse source
This commit is contained in:
Lawrence Chen 2026-03-12 05:09:03 -07:00
commit b12f70b26c
46 changed files with 2655 additions and 246 deletions
Download patch file Download diff file Expand all files Collapse all files

31
CLI/cmux.swift
View file

@ -8925,6 +8925,7 @@ struct CMUXCLI {
\(bold)Shortcuts\(reset)
\(bold)\u{2318}N\(reset)\(subdued) New workspace\(reset)
\(bold)\u{2318}T\(reset)\(subdued) New tab\(reset)
\(bold)\u{2318}P\(reset)\(subdued) Go to workspace\(reset)
\(bold)\u{2318}D\(reset)\(subdued) Split right\(reset)
\(bold)\u{2318}\u{21E7}D\(reset)\(subdued) Split down\(reset)
@ -9023,7 +9024,7 @@ struct CMUXCLI {
}
let fileManager = FileManager.default
var current = executableURL.deletingLastPathComponent()
var current = executableURL.deletingLastPathComponent().standardizedFileURL
while true {
let projectFile = current.appendingPathComponent("GhosttyTabs.xcodeproj/project.pbxproj")
@ -9044,8 +9045,7 @@ struct CMUXCLI {
}
}
let parent = current.deletingLastPathComponent()
if parent.path == current.path {
guard let parent = parentSearchURL(for: current) else {
break
}
current = parent
@ -9114,6 +9114,22 @@ struct CMUXCLI {
return String(normalized.prefix(12))
}
// Foundation can walk past "/" into "/.." when repeatedly deleting path
// components, so stop once the canonical root is reached.
private func parentSearchURL(for url: URL) -> URL? {
let standardized = url.standardizedFileURL
let path = standardized.path
guard !path.isEmpty, path != "/" else {
return nil
}
let parent = standardized.deletingLastPathComponent().standardizedFileURL
guard parent.path != path else {
return nil
}
return parent
}
private func candidateInfoPlistURLs() -> [URL] {
guard let executableURL = resolvedExecutableURL() else {
return []
@ -9131,7 +9147,7 @@ struct CMUXCLI {
candidates.append(url)
}
var current = executableURL.deletingLastPathComponent()
var current = executableURL.deletingLastPathComponent().standardizedFileURL
while true {
if current.pathExtension == "app" {
appendIfExisting(current.appendingPathComponent("Contents/Info.plist"))
@ -9148,8 +9164,7 @@ struct CMUXCLI {
break
}
let parent = current.deletingLastPathComponent()
if parent.path == current.path {
guard let parent = parentSearchURL(for: current) else {
break
}
current = parent
@ -9162,8 +9177,8 @@ struct CMUXCLI {
}
let searchRoots = [
executableURL.deletingLastPathComponent(),
executableURL.deletingLastPathComponent().deletingLastPathComponent()
executableURL.deletingLastPathComponent().standardizedFileURL,
executableURL.deletingLastPathComponent().deletingLastPathComponent().standardizedFileURL
]
for root in searchRoots {
guard let entries = fileManager.enumerator(