fix: paired Mac Codex sessions finish loading (#104299)

steipete · web-flow · commit 20fe3f46dbbe · 2026-07-11T01:14:36.000-07:00
* fix(codex): allow cold Mac session catalogs

* chore: keep release notes in PR body
diff --git a/apps/macos/Sources/OpenClaw/NodeMode/MacNodeCodexThreadCatalog.swift b/apps/macos/Sources/OpenClaw/NodeMode/MacNodeCodexThreadCatalog.swift
@@ -131,6 +131,7 @@ enum MacNodeCodexThreadCatalog {
     static let defaultUserMacOSBetaAppExecutable = FileManager.default.homeDirectoryForCurrentUser
         .appendingPathComponent("Applications/Codex Beta.app/Contents/Resources/codex")
         .path
+    static let defaultTimeoutSeconds: Double = 24
     private static let maxSessionIdLength = 256
     private static let maxSessionNameLength = 500
     private static let maxCwdLength = 4096
@@ -208,7 +209,7 @@ enum MacNodeCodexThreadCatalog {
         arguments: [String]? = nil,
         cwd: URL? = nil,
         clearEnv: [String] = [],
-        timeoutSeconds: Double = 12,
+        timeoutSeconds: Double = MacNodeCodexThreadCatalog.defaultTimeoutSeconds,
         maxLineBytes: Int = 5 * 1024 * 1024) async throws -> String
     {
         let params = try self.decodeParams(paramsJSON)
@@ -226,7 +227,7 @@ enum MacNodeCodexThreadCatalog {
     private static func list(
         params: ListParams,
         invocation: ResolvedInvocation,
-        timeoutSeconds: Double = 12,
+        timeoutSeconds: Double = MacNodeCodexThreadCatalog.defaultTimeoutSeconds,
         maxLineBytes: Int = 5 * 1024 * 1024) async throws -> String
     {
         guard params.searchTerm != nil else {
diff --git a/apps/macos/Tests/OpenClawIPCTests/MacNodeCodexThreadCatalogTests.swift b/apps/macos/Tests/OpenClawIPCTests/MacNodeCodexThreadCatalogTests.swift
@@ -940,6 +940,10 @@ struct MacNodeCodexThreadCatalogTests {
         #expect((decoded["sessions"] as? [Any])?.count == 50)
     }
 
+    @Test func `default deadline allows cold large catalog scans`() {
+        #expect(MacNodeCodexThreadCatalog.defaultTimeoutSeconds == 24)
+    }
+
     @Test func `rejects unknown and out of range params before launch`() async {
         let cases = [
             (#"{"extra":true}"#, "unknown Codex session catalog parameter: extra"),
diff --git a/extensions/codex/src/session-catalog.test.ts b/extensions/codex/src/session-catalog.test.ts
@@ -752,6 +752,7 @@ describe("Codex supervision catalog", () => {
         nodeId: "devbox",
         command: CODEX_APP_SERVER_THREADS_LIST_COMMAND,
         params: expect.not.objectContaining({ archived: expect.anything() }),
+        timeoutMs: 28_000,
       }),
     );
     expect(JSON.stringify(result)).not.toContain("private");
diff --git a/extensions/codex/src/session-catalog.ts b/extensions/codex/src/session-catalog.ts
@@ -74,7 +74,10 @@ export const CODEX_SESSION_ARCHIVE_METHOD = "codex.sessions.archive";
 const CODEX_APP_SERVER_THREADS_CAPABILITY = "codex-app-server-threads";
 const DEFAULT_PAGE_LIMIT = 50;
 export const CODEX_SESSION_CATALOG_MAX_PAGE_LIMIT = 100;
-const NODE_INVOKE_TIMEOUT_MS = 20_000;
+// A node may need a cold Codex state scan before returning a large catalog page.
+// Keep this above the Mac node's native 24-second deadline so its result wins,
+// while remaining below the shared CLI client's 30-second outer deadline.
+const NODE_INVOKE_TIMEOUT_MS = 28_000;
 const MAX_SEARCH_LENGTH = 500;
 const MAX_CURSOR_LENGTH = 4096;
 const MAX_CURSOR_COUNT = 100;
