Restore Codex sessions through user-owned roots

CLI/CMUXCLI+AgentHookRestoreEvidence.swift

@@ -4,6 +4,43 @@ import CMUXAgentLaunch
 extension CMUXCLI {
     private static let codexPermissionEvidenceChunkBytes = 64 * 1024
 
+    func agentHookProviderOwnsResumeTarget(
+        kind: String,
+        sessionId: String,
+        transcriptPath: String?,
+        launchCommand: AgentHookLaunchCommandRecord?
+    ) -> Bool {
+        guard let sessionId = normalizedHookValue(sessionId) else { return false }
+        return agentHookCanonicalResumeSessionId(
+            kind: kind,
+            sessionId: sessionId,
+            transcriptPath: transcriptPath,
+            launchCommand: launchCommand
+        ) == sessionId
+    }
+
+    func agentHookCanonicalResumeSessionId(
+        kind: String,
+        sessionId: String,
+        transcriptPath: String?,
+        launchCommand: AgentHookLaunchCommandRecord?
+    ) -> String? {
+        guard let sessionId = normalizedHookValue(sessionId) else { return nil }
+        guard kind == "codex" else { return sessionId }
+        let environment = ProcessInfo.processInfo.environment
+        let codexHome = normalizedHookValue(launchCommand?.environment?["CODEX_HOME"])
+            ?? normalizedHookValue(environment["CODEX_HOME"])
+            ?? URL(
+                fileURLWithPath: normalizedHookValue(environment["HOME"]) ?? NSHomeDirectory(),
+                isDirectory: true
+            ).appendingPathComponent(".codex", isDirectory: true).path
+        return CodexSessionResumeVerifier().evidence(
+            sessionId: sessionId,
+            transcriptPath: transcriptPath,
+            codexHome: codexHome
+        )?.sessionId
+    }
+
     private func codexLaunchHasExplicitPermissions(_ launchCommand: AgentHookLaunchCommandRecord?) -> Bool {
         guard let launchCommand,
               AgentLaunchCaptureTrust.launcherDescribesKind(launchCommand.launcher, kind: "codex") else {
@@ -223,6 +260,14 @@ extension CMUXCLI {
         guard !permissionArguments.isEmpty else {
             return launchCommand
         }
+        // Environment-only captures intentionally have no argv. Establish the
+        // logical executable before appending repaired flags, or the first flag
+        // becomes argv[0] and the saved command tries to execute `--yolo`.
+        if launchCommand.arguments.isEmpty {
+            launchCommand.arguments = [
+                normalizedHookValue(launchCommand.executablePath) ?? "codex"
+            ]
+        }
         launchCommand.arguments.append(contentsOf: permissionArguments)
         return launchCommand
     }

CLI/CMUXCLI+SessionsList.swift

@@ -242,6 +242,11 @@ extension CMUXCLI {
                 let launchBacked = record.launchCommand != nil && agentHookSessionHasDurableResumeEvidence(
                     kind: spec.name,
                     launchCommand: record.launchCommand
+                ) && agentHookProviderOwnsResumeTarget(
+                    kind: spec.name,
+                    sessionId: record.sessionId,
+                    transcriptPath: record.transcriptPath,
+                    launchCommand: record.launchCommand
                 )
                 payload["launch_backed"] = launchBacked
 

CLI/cmux.swift

@@ -27689,9 +27689,19 @@ struct CMUXCLI {
         sessionId: String,
         cwd: String?,
         launchCommand: AgentHookLaunchCommandRecord?,
+        transcriptPath: String? = nil,
         observedPermissionMode: String? = nil
     ) {
-        if !agentHookSessionHasDurableResumeEvidence(kind: kind, launchCommand: launchCommand) {
+        guard agentHookSessionHasDurableResumeEvidence(
+            kind: kind,
+            launchCommand: launchCommand
+        ),
+              let resumeSessionId = agentHookCanonicalResumeSessionId(
+                kind: kind,
+                sessionId: sessionId,
+                transcriptPath: transcriptPath,
+                launchCommand: launchCommand
+              ) else {
             clearAgentSurfaceResumeBinding(client: client, workspaceId: workspaceId, surfaceId: surfaceId, sessionId: sessionId)
             return
         }
@@ -27704,7 +27714,7 @@ struct CMUXCLI {
         )
         guard let command = agentSurfaceResumeCommand(
             kind: kind,
-            sessionId: sessionId,
+            sessionId: resumeSessionId,
             launchCommand: launchCommand,
             workingDirectory: resumeWorkingDirectory,
             environment: resumeEnvironment,
@@ -27723,7 +27733,7 @@ struct CMUXCLI {
             "surface_id": surfaceId,
             "name": displayName,
             "kind": kind,
-            "checkpoint_id": sessionId,
+            "checkpoint_id": resumeSessionId,
             "source": "agent-hook",
             "command": command,
             "auto_resume": true
@@ -30150,7 +30160,14 @@ export default CMUXSessionRestore;
         // Workspace/surface resolution: prefer --workspace/--surface flags,
         // then env, then the caller process. Grok strips CMUX_* from hook
         // subprocesses, so PID attribution is the only reliable live binding.
-        let inferredPID = agentPIDFromHookEnvironment(agentName: def.name, env: env) ?? inferredAgentPID()
+        let hookEnvironmentPID = agentPIDFromHookEnvironment(agentName: def.name, env: env)
+        let inferredPID = hookEnvironmentPID ?? inferredAgentPID()
+        func resolvedAgentPID(mapped: ClaudeHookSessionRecord?) -> Int? {
+            // The wrapper exports the current agent process generation. It
+            // must supersede the durable record, whose PID belongs to the
+            // process that ran before a session resume.
+            hookEnvironmentPID ?? mapped?.pid ?? inferredPID
+        }
         let hookWsFlag = optionValue(hookArgs, name: "--workspace")
         let directWorkspaceArg = hookWsFlag ?? normalizedHookValue(env["CMUX_WORKSPACE_ID"])
         let explicitSurfaceFlag = optionValue(hookArgs, name: "--surface")
@@ -30253,7 +30270,10 @@ export default CMUXSessionRestore;
         func performAgentSessionTeardown() {
             guard let mapped = sessionId.isEmpty ? nil : (try? store.lookup(sessionId: sessionId)) else { return }
             sendAgentFeedTelemetry(workspaceId: mapped.workspaceId)
-            let suppressVisibleMutations = shouldSuppressNestedAgentVisibleMutations(currentAgentPID: mapped.pid, env: env)
+            let suppressVisibleMutations = shouldSuppressNestedAgentVisibleMutations(
+                currentAgentPID: resolvedAgentPID(mapped: mapped),
+                env: env
+            )
             if suppressVisibleMutations {
                 telemetry.breadcrumb("\(def.name)-hook.session-end.nested-suppressed")
             } else if let consumed = try? store.consume(sessionId: sessionId, workspaceId: nil, surfaceId: nil) {
@@ -30609,7 +30629,8 @@ export default CMUXSessionRestore;
                         displayName: def.displayName,
                         sessionId: sessionId,
                         cwd: preferredAgentHookResumeWorkingDirectory(kind: def.name, current: launchCommand, currentCwd: hookCwd, mapped: mapped),
-                        launchCommand: resumeLaunchCommand
+                        launchCommand: resumeLaunchCommand,
+                        transcriptPath: input.transcriptPath ?? mapped?.transcriptPath
                     )
                 }
             }
@@ -30642,7 +30663,7 @@ export default CMUXSessionRestore;
             }
             let workspaceId = target.workspaceId
             let surfaceId = target.surfaceId
-            let pid = mapped?.pid ?? inferredPID
+            let pid = resolvedAgentPID(mapped: mapped)
             let launchCommand = agentLaunchCommandFromEnvironment(env, fallbackPID: pid, fallbackKind: def.name, cwd: hookCwd ?? mapped?.cwd)
             let transcriptPathForStore = input.transcriptPath ?? mapped?.transcriptPath
             let resumeLaunchCommand = preferredAgentHookResumeLaunchCommand(
@@ -30675,7 +30696,8 @@ export default CMUXSessionRestore;
                     displayName: def.displayName,
                     sessionId: sessionId,
                     cwd: latest.cwd,
-                    launchCommand: latest.launchCommand
+                    launchCommand: latest.launchCommand,
+                    transcriptPath: latest.transcriptPath
                 )
                 if let lifecycle = latest.agentLifecycle {
                     setAgentLifecycle(
@@ -30875,7 +30897,8 @@ export default CMUXSessionRestore;
                     displayName: def.displayName,
                     sessionId: sessionId,
                     cwd: preferredAgentHookResumeWorkingDirectory(kind: def.name, current: launchCommand, currentCwd: hookCwd, mapped: mapped),
-                    launchCommand: resumeLaunchCommand
+                    launchCommand: resumeLaunchCommand,
+                    transcriptPath: transcriptPathForStore
                 )
                 if codexPromptTurnWentTerminal() {
                     stopStaleCodexPromptSubmit(restoreVisibleState: true)
@@ -30982,7 +31005,7 @@ export default CMUXSessionRestore;
             let workspaceId = target.workspaceId
             let surfaceId = target.surfaceId
             sendAgentFeedTelemetry(workspaceId: workspaceId, surfaceId: surfaceId)
-            let pid = mapped?.pid ?? inferredPID
+            let pid = resolvedAgentPID(mapped: mapped)
             let codexFailure: CodexHookFailureSummary?
             let codexSubagentSignals: CodexTranscriptSubagentSignals
             if def.name == "codex" {
@@ -31149,7 +31172,8 @@ export default CMUXSessionRestore;
                     displayName: def.displayName,
                     sessionId: sessionId,
                     cwd: cwd,
-                    launchCommand: resumeLaunchCommand
+                    launchCommand: resumeLaunchCommand,
+                    transcriptPath: input.transcriptPath ?? mapped?.transcriptPath
                 )
             }
             if let pid, !suppressVisibleMutations {
@@ -31321,7 +31345,7 @@ export default CMUXSessionRestore;
             let workspaceId = target.workspaceId
             let surfaceId = target.surfaceId
             sendAgentFeedTelemetryUnlessSuppressed(workspaceId: workspaceId, surfaceId: surfaceId)
-            let pid = mapped?.pid ?? inferredPID
+            let pid = resolvedAgentPID(mapped: mapped)
             let launchCommand = agentLaunchCommandFromEnvironment(
                 env,
                 fallbackPID: pid,
@@ -31353,7 +31377,8 @@ export default CMUXSessionRestore;
                     displayName: def.displayName,
                     sessionId: sessionId,
                     cwd: preferredAgentHookResumeWorkingDirectory(kind: def.name, current: launchCommand, currentCwd: hookCwd, mapped: mapped),
-                    launchCommand: resumeLaunchCommand
+                    launchCommand: resumeLaunchCommand,
+                    transcriptPath: input.transcriptPath ?? mapped?.transcriptPath
                 )
             }
             if let pid, !suppressVisibleMutations {
@@ -31517,7 +31542,7 @@ export default CMUXSessionRestore;
             }
 
             if !sessionId.isEmpty {
-                let pid = mapped?.pid ?? inferredPID
+                let pid = resolvedAgentPID(mapped: mapped)
                 let launchCommand = agentLaunchCommandFromEnvironment(
                     env,
                     fallbackPID: pid,
@@ -31695,7 +31720,7 @@ export default CMUXSessionRestore;
                         surfaceId: mapped.surfaceId,
                         cwd: hookCwd ?? mapped.cwd,
                         transcriptPath: input.transcriptPath ?? mapped.transcriptPath,
-                        pid: mapped.pid,
+                        pid: resolvedAgentPID(mapped: mapped),
                         launchCommand: mapped.launchCommand,
                         lastSubtitle: nil,
                         lastBody: nil,