fix: use dedicated tmux socket to preserve TCC permissions across restarts (#42)

gi11es · claude · web-flow · commit 10cc1eb29bcf · 2026-03-28T21:37:51.000+01:00
* fix: use dedicated tmux socket and kill server on quit to preserve TCC permissions

The tmux server survived Deckard restarts but retained stale TCC
permissions from the old Deckard process. macOS revokes TCC access
when the responsible app exits, causing "Operation not permitted"
errors in shells for protected directories like ~/Documents.

Fix: use a dedicated `-L deckard` socket (isolating from user tmux)
and kill the server on quit + launch so a fresh server with valid
TCC permissions is created each time.

Co-Authored-By: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;

* fix: keep tmux sessions alive across restarts, only isolate socket

The original fix killed the tmux server on quit, which lost all
terminal content — defeating the purpose of tmux persistence.
The TCC issue was likely a transient fluke (sleep/wake corruption),
not a systemic problem.

Keep the dedicated `-L deckard` socket for isolation from user tmux,
but restore session persistence: detach() on quit, orphan cleanup
on launch, and reconnect via -A on restore.

Co-Authored-By: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;

---------

Co-authored-by: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/Sources/Terminal/TerminalSurface.swift b/Sources/Terminal/TerminalSurface.swift
@@ -66,6 +66,10 @@ class TerminalSurface: NSObject, LocalProcessTerminalViewDelegate {
     /// The tmux session name, if this terminal is wrapped in tmux.
     var tmuxSessionName: String?
 
+    /// Dedicated tmux socket so Deckard's server is isolated from the user's.
+    /// A fresh server (with valid TCC permissions) is created on each launch.
+    static let tmuxSocket = "deckard"
+
     private let terminalView: DeckardTerminalView
     private var processExited = false
     private var pendingInitialInput: String?
@@ -125,7 +129,7 @@ class TerminalSurface: NSObject, LocalProcessTerminalViewDelegate {
         DispatchQueue.global(qos: .userInteractive).async {
             let task = Process()
             task.executableURL = URL(fileURLWithPath: path)
-            task.arguments = ["send-keys", "-t", name, "-X", "cancel"]
+            task.arguments = ["-L", Self.tmuxSocket, "send-keys", "-t", name, "-X", "cancel"]
             task.standardOutput = FileHandle.nullDevice
             task.standardError = FileHandle.nullDevice
             try? task.run()
@@ -170,7 +174,7 @@ class TerminalSurface: NSObject, LocalProcessTerminalViewDelegate {
             // tmux new-session -A: attach if exists, create if not
             // -s: session name, -c: starting directory (only for new sessions)
             // -u: force UTF-8 mode for proper emoji/wide character handling
-            var args = ["-u", "new-session", "-A", "-s", sessionName]
+            var args = ["-L", Self.tmuxSocket, "-u", "new-session", "-A", "-s", sessionName]
             if let cwd = workingDirectory { args += ["-c", cwd] }
 
             terminalView.startProcess(
@@ -239,7 +243,6 @@ class TerminalSurface: NSObject, LocalProcessTerminalViewDelegate {
         guard !processExited else { return }
         processExited = true
         terminalView.process?.terminate()
-        // Kill the tmux session when tab is explicitly closed
         killTmuxSession()
     }
 
@@ -271,7 +274,7 @@ class TerminalSurface: NSObject, LocalProcessTerminalViewDelegate {
         guard let name = tmuxSessionName, let path = Self.tmuxPath else { return }
         let task = Process()
         task.executableURL = URL(fileURLWithPath: path)
-        task.arguments = ["kill-session", "-t", name]
+        task.arguments = ["-L", Self.tmuxSocket, "kill-session", "-t", name]
         task.standardOutput = FileHandle.nullDevice
         task.standardError = FileHandle.nullDevice
         try? task.run()
@@ -313,7 +316,7 @@ class TerminalSurface: NSObject, LocalProcessTerminalViewDelegate {
             }
             let task = Process()
             task.executableURL = URL(fileURLWithPath: tmuxPath)
-            task.arguments = args
+            task.arguments = ["-L", tmuxSocket] + args
             task.standardOutput = FileHandle.nullDevice
             task.standardError = FileHandle.nullDevice
             try? task.run()
@@ -326,7 +329,7 @@ class TerminalSurface: NSObject, LocalProcessTerminalViewDelegate {
         guard let path = tmuxPath else { return nil }
         let task = Process()
         task.executableURL = URL(fileURLWithPath: path)
-        task.arguments = ["list-panes", "-t", sessionName, "-F", "#{pane_pid}"]
+        task.arguments = ["-L", tmuxSocket, "list-panes", "-t", sessionName, "-F", "#{pane_pid}"]
         let pipe = Pipe()
         task.standardOutput = pipe
         task.standardError = FileHandle.nullDevice
@@ -344,7 +347,7 @@ class TerminalSurface: NSObject, LocalProcessTerminalViewDelegate {
         guard let path = tmuxPath else { return }
         let task = Process()
         task.executableURL = URL(fileURLWithPath: path)
-        task.arguments = ["list-sessions", "-F", "#{session_name}"]
+        task.arguments = ["-L", tmuxSocket, "list-sessions", "-F", "#{session_name}"]
         let pipe = Pipe()
         task.standardOutput = pipe
         task.standardError = FileHandle.nullDevice
@@ -357,7 +360,7 @@ class TerminalSurface: NSObject, LocalProcessTerminalViewDelegate {
             if name.hasPrefix("deckard-") && !activeSessions.contains(name) {
                 let kill = Process()
                 kill.executableURL = URL(fileURLWithPath: path)
-                kill.arguments = ["kill-session", "-t", name]
+                kill.arguments = ["-L", tmuxSocket, "kill-session", "-t", name]
                 kill.standardOutput = FileHandle.nullDevice
                 kill.standardError = FileHandle.nullDevice
                 try? kill.run()
