fix: extend bridge send timeout

omarshahine · omarshahine · commit 4c85d165c31f · 2026-06-06T18:55:41.000-07:00
diff --git a/Sources/IMsgCore/IMsgBridgeClient.swift b/Sources/IMsgCore/IMsgBridgeClient.swift
@@ -41,15 +41,16 @@ public final class IMsgBridgeClient: @unchecked Sendable {
   public func invoke(
     action: BridgeAction,
     params: [String: Any] = [:],
-    timeout: TimeInterval = IMsgBridgeProtocol.defaultResponseTimeout
+    timeout: TimeInterval? = nil
   ) async throws -> [String: Any] {
+    let effectiveTimeout = timeout ?? IMsgBridgeProtocol.defaultResponseTimeout(for: action)
     if useLegacyIPC {
       try launcher.ensureRunning()
       return try await invokeLegacy(action: action, params: params)
     }
 
     try launcher.ensureLaunched()
-    return try await invokeV2(action: action, params: params, timeout: timeout)
+    return try await invokeV2(action: action, params: params, timeout: effectiveTimeout)
   }
 
   // MARK: - v2 path
diff --git a/Sources/IMsgCore/IMsgBridgeProtocol.swift b/Sources/IMsgCore/IMsgBridgeProtocol.swift
@@ -22,8 +22,21 @@ public enum IMsgBridgeProtocol {
   public static let rotatedEventsFileName: String = ".imsg-events.jsonl.1"
   public static let eventsRotationBytes: Int = 1 * 1024 * 1024
 
-  /// Default per-request timeout for synchronous RPC waits.
+  /// Default per-request timeout for synchronous non-send RPC waits.
   public static let defaultResponseTimeout: TimeInterval = 10.0
+
+  /// Default timeout for send-style bridge waits. macOS 26 private sends can
+  /// stall for well over the probe window before Messages.app returns.
+  public static let defaultSendResponseTimeout: TimeInterval = 150.0
+
+  public static func defaultResponseTimeout(for action: BridgeAction) -> TimeInterval {
+    switch action {
+    case .sendMessage, .sendMultipart, .sendAttachment, .sendPoll, .sendReaction:
+      return defaultSendResponseTimeout
+    default:
+      return defaultResponseTimeout
+    }
+  }
 }
 
 /// All action verbs exposed by the v2 bridge. Names match the BlueBubbles
diff --git a/Tests/IMsgCoreTests/IMsgBridgeProtocolTests.swift b/Tests/IMsgCoreTests/IMsgBridgeProtocolTests.swift
@@ -82,4 +82,41 @@ struct IMsgBridgeProtocolTests {
     #expect(response.success == false)
     #expect(response.error == "Chat not found")
   }
+
+  @Test
+  func bridgeProtocolUsesLongerDefaultForSendActions() {
+    #expect(IMsgBridgeProtocol.defaultResponseTimeout == 10.0)
+    #expect(IMsgBridgeProtocol.defaultSendResponseTimeout == 150.0)
+
+    for action in [
+      BridgeAction.sendMessage,
+      .sendMultipart,
+      .sendAttachment,
+      .sendPoll,
+      .sendReaction,
+    ] {
+      #expect(
+        IMsgBridgeProtocol.defaultResponseTimeout(for: action)
+          == IMsgBridgeProtocol.defaultSendResponseTimeout
+      )
+    }
+  }
+
+  @Test
+  func bridgeProtocolKeepsShortDefaultForNonSendActions() {
+    for action in [
+      BridgeAction.status,
+      .typing,
+      .read,
+      .editMessage,
+      .unsendMessage,
+      .deleteMessage,
+      .notifyAnyways,
+    ] {
+      #expect(
+        IMsgBridgeProtocol.defaultResponseTimeout(for: action)
+          == IMsgBridgeProtocol.defaultResponseTimeout
+      )
+    }
+  }
 }
