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

Sidebar metadata + tagged reload isolation (#16)

Browse source 
* Sidebar primitives + tagged dev isolation

* Allow wider sidebar resize

* Fix tagged socket selection + panel id errors

* Fix progress label quoting + bundle suffix sanitize

* Skip ctrl-enter keybind test when keystrokes blocked

* Fix shell nc hang + prune stale per-surface sidebar metadata
This commit is contained in:
Lawrence Chen 2026-02-06 18:09:56 -08:00 • committed by GitHub
parent b3c2a8c7c3
commit 7e69751e1b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
22 changed files with 2538 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Sources/GhosttyTerminalView.swift
View file

@ -886,6 +886,28 @@ final class TerminalSurface: Identifiable, ObservableObject {
}
}
// Shell integration: inject ZDOTDIR wrapper for zsh
let shellIntegrationEnabled = UserDefaults.standard.object(forKey: "sidebarShellIntegration") as? Bool ?? true
if shellIntegrationEnabled,
let integrationDir = Bundle.main.resourceURL?
.appendingPathComponent("shell-integration").path {
env["CMUX_SHELL_INTEGRATION"] = "1"
env["CMUX_SHELL_INTEGRATION_DIR"] = integrationDir
// Prefer the per-surface environment (from Ghostty config/env vars),
// falling back to the app's environment. This avoids regressions when
// users override SHELL/ZDOTDIR at the surface level.
let shell = (env["SHELL"]?.isEmpty == false ? env["SHELL"] : nil)
?? ProcessInfo.processInfo.environment["SHELL"]
?? "/bin/zsh"
let shellName = URL(fileURLWithPath: shell).lastPathComponent
if shellName == "zsh" {
let originalZdotdir = env["ZDOTDIR"] ?? ProcessInfo.processInfo.environment["ZDOTDIR"] ?? ""
env["CMUX_ORIGINAL_ZDOTDIR"] = originalZdotdir
env["ZDOTDIR"] = integrationDir
}
}
if !env.isEmpty {
envVars.reserveCapacity(env.count)
envStorage.reserveCapacity(env.count)