Fix agent resume when saved cwd is deleted

CLI/CMUXCLI+TmuxCompatSupport.swift

@@ -47,7 +47,8 @@ extension CMUXCLI {
 
         var pieces: [String] = []
         if let trimmedCwd, !trimmedCwd.isEmpty {
-            pieces.append("cd -- \(tmuxShellQuote(resolvePath(trimmedCwd)))")
+            let quotedCwd = tmuxShellQuote(resolvePath(trimmedCwd))
+            pieces.append("cd -- \(quotedCwd)")
         }
         if !commandText.isEmpty {
             pieces.append(commandText)
@@ -202,7 +203,8 @@ extension CMUXCLI {
             "rm -f -- \"$0\" 2>/dev/null || true"
         ]
         if let cwd = cwd?.trimmingCharacters(in: .whitespacesAndNewlines), !cwd.isEmpty {
-            lines.append("cd -- \(tmuxShellQuote(resolvePath(cwd))) || exit $?")
+            let quotedCwd = tmuxShellQuote(resolvePath(cwd))
+            lines.append("cd -- \(quotedCwd) || exit $?")
         }
         lines.append("exec \"${SHELL:-/bin/sh}\" -lc \(tmuxShellQuote(commandText))")
         do {

CLI/cmux.swift

@@ -17228,7 +17228,8 @@ struct CMUXCLI {
             "rm -f -- \"$0\" 2>/dev/null || true"
         ]
         if let cwd = cwd?.trimmingCharacters(in: .whitespacesAndNewlines), !cwd.isEmpty {
-            lines.append("cd -- \(codexTeamsShellQuote(cwd)) || exit $?")
+            let quotedCwd = codexTeamsShellQuote(cwd)
+            lines.append("{ cd -- \(quotedCwd) 2>/dev/null || [ ! -d \(quotedCwd) ]; } || exit $?")
         }
         lines.append("exec \"${SHELL:-/bin/sh}\" -lc \(codexTeamsShellQuote(commandText))")
         do {
@@ -23572,9 +23573,15 @@ struct CMUXCLI {
         var commandParts: [String] = []
         commandParts.append(contentsOf: argv)
 
-        var command = commandParts.map(cliShellQuote).joined(separator: " ")
-        if let cwd = normalizedHookValue(workingDirectory) {
-            command = "cd \(cliShellQuote(cwd)) && \(command)"
+        let cwd = normalizedHookValue(workingDirectory)
+        let sanitizedCommandParts = AgentLaunchSanitizer.removingSavedWorkingDirectoryOptions(
+            from: commandParts,
+            workingDirectory: cwd
+        )
+        let command = sanitizedCommandParts.map(cliShellQuote).joined(separator: " ")
+        if let cwd {
+            let quotedCwd = cliShellQuote(cwd)
+            return "{ cd -- \(quotedCwd) 2>/dev/null || [ ! -d \(quotedCwd) ]; } && \(command)"
         }
         return command
     }

Packages/CMUXAgentLaunch/Sources/CMUXAgentLaunch/AgentLaunchSanitizer.swift

@@ -151,6 +151,43 @@ public enum AgentLaunchSanitizer {
         return preserveOptions(tail, policy: codexPolicy)
     }
 
+    public static func removingSavedWorkingDirectoryOptions(
+        from args: [String],
+        workingDirectory: String?
+    ) -> [String] {
+        guard let workingDirectory = normalizedWorkingDirectory(workingDirectory) else {
+            return args
+        }
+
+        let valueOptions: Set<String> = ["--cd", "-C", "--cwd", "--workspace", "-w"]
+        let optionPrefixes = valueOptions.map { "\($0)=" }
+        var result: [String] = []
+        var index = 0
+        while index < args.count {
+            let arg = args[index]
+            if arg == "--" {
+                result.append(contentsOf: args[index...])
+                break
+            }
+            if valueOptions.contains(arg),
+               index + 1 < args.count,
+               workingDirectoryValue(args[index + 1], matches: workingDirectory) {
+                index += 2
+                continue
+            }
+            if let prefix = optionPrefixes.first(where: { arg.hasPrefix($0) }) {
+                let value = String(arg.dropFirst(prefix.count))
+                if workingDirectoryValue(value, matches: workingDirectory) {
+                    index += 1
+                    continue
+                }
+            }
+            result.append(arg)
+            index += 1
+        }
+        return result
+    }
+
     private static func preservedCodexLaunchArguments(args: [String]) -> [String]? {
         if codexForkCommand(in: args) != nil {
             return preservedCodexForkArguments(args: args)
@@ -350,6 +387,21 @@ public enum AgentLaunchSanitizer {
         return droppedOptions.contains(String(arg[..<equals]))
     }
 
+    private static func normalizedWorkingDirectory(_ value: String?) -> String? {
+        guard let trimmed = value?.trimmingCharacters(in: .whitespacesAndNewlines),
+              !trimmed.isEmpty else {
+            return nil
+        }
+        return trimmed
+    }
+
+    private static func workingDirectoryValue(_ value: String, matches workingDirectory: String) -> Bool {
+        guard value == workingDirectory else {
+            return (value as NSString).expandingTildeInPath == (workingDirectory as NSString).expandingTildeInPath
+        }
+        return true
+    }
+
     private static func runtimeOnlyOptionWidth(_ arg: String) -> Int? {
         if let width = runtimeOnlyOptionWidths[arg] {
             return width

Packages/CMUXAgentLaunch/Tests/CMUXAgentLaunchTests/AgentLaunchSanitizerTests.swift

@@ -650,4 +650,32 @@ struct AgentLaunchSanitizerTests {
             ) == ["amp", "--mode", "geppetto"]
         )
     }
+
+    @Test("Removes cwd options that duplicate the saved working directory")
+    func removesSavedWorkingDirectoryOptions() {
+        #expect(
+            AgentLaunchSanitizer.removingSavedWorkingDirectoryOptions(
+                from: ["codex", "resume", "session", "--cd", "/tmp/project", "--model", "gpt-5.4"],
+                workingDirectory: "/tmp/project"
+            ) == ["codex", "resume", "session", "--model", "gpt-5.4"]
+        )
+        #expect(
+            AgentLaunchSanitizer.removingSavedWorkingDirectoryOptions(
+                from: ["grok", "-r", "session", "--cwd=/tmp/project", "--model", "grok-4"],
+                workingDirectory: "/tmp/project"
+            ) == ["grok", "-r", "session", "--model", "grok-4"]
+        )
+        #expect(
+            AgentLaunchSanitizer.removingSavedWorkingDirectoryOptions(
+                from: ["qoder", "--workspace", "/tmp/other", "--cwd", "/tmp/project"],
+                workingDirectory: "/tmp/project"
+            ) == ["qoder", "--workspace", "/tmp/other"]
+        )
+        #expect(
+            AgentLaunchSanitizer.removingSavedWorkingDirectoryOptions(
+                from: ["qoder", "-w", "/tmp/project", "--model", "best"],
+                workingDirectory: "/tmp/project"
+            ) == ["qoder", "--model", "best"]
+        )
+    }
 }