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

Fix cmux ssh shell integration niceties and prove with docker e2e

Browse source
This commit is contained in:
Lawrence Chen 2026-02-21 02:00:24 -08:00
parent 3295c45199
commit e0a7c32f62
6 changed files with 332 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

26
CLI/cmux.swift
View file

@ -1939,14 +1939,24 @@ struct CMUXCLI {
private func buildSSHStartupCommand(sshCommand: String, shellFeatures: String) -> String {
let trimmedFeatures = shellFeatures.trimmingCharacters(in: .whitespacesAndNewlines)
let sshCommandWithScopedFeatures: String
if trimmedFeatures.isEmpty {
sshCommandWithScopedFeatures = sshCommand
} else {
sshCommandWithScopedFeatures = "GHOSTTY_SHELL_FEATURES=\(shellQuote(trimmedFeatures)) " + sshCommand
}
let script = sshCommandWithScopedFeatures + "; exec ${SHELL:-/bin/zsh} -l"
return "/bin/sh -lc \(shellQuote(script))"
let shellFeaturesBootstrap: String = trimmedFeatures.isEmpty
? ""
: "export GHOSTTY_SHELL_FEATURES=\(shellQuote(trimmedFeatures))"
// Run through an interactive zsh so Ghostty's ssh-env/ssh-terminfo wrappers are actually loaded.
let sourceGhosttyZshIntegration = """
if [[ -n "${GHOSTTY_RESOURCES_DIR:-}" ]]; then
_cmux_ghostty_integration="${GHOSTTY_RESOURCES_DIR}/shell-integration/zsh/ghostty-integration"
if [[ -r "$_cmux_ghostty_integration" ]]; then
builtin source -- "$_cmux_ghostty_integration"
(( $+functions[_ghostty_deferred_init] )) && _ghostty_deferred_init
fi
builtin unset _cmux_ghostty_integration
fi
"""
let script = [shellFeaturesBootstrap, sourceGhosttyZshIntegration, "\(sshCommand); exec ${SHELL:-/bin/zsh} -l"]
.filter { !$0.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty }
.joined(separator: "\n")
return "/bin/zsh -ilc \(shellQuote(script))"
}
private func hasSSHOptionKey(_ options: [String], key: String) -> Bool {