diff --git a/apps/shared/OpenClawKit/Sources/OpenClawChatUI/ChatGatewayRequest.swift b/apps/shared/OpenClawKit/Sources/OpenClawChatUI/ChatGatewayRequest.swift
index 45d9a3592fd7..dfa89a6a6585 100644
--- a/apps/shared/OpenClawKit/Sources/OpenClawChatUI/ChatGatewayRequest.swift
+++ b/apps/shared/OpenClawKit/Sources/OpenClawChatUI/ChatGatewayRequest.swift
@@ -149,17 +149,6 @@ public enum OpenClawChatGatewayRequests {
             timeoutMs: Double(requestTimeoutMs))
     }
 
-    public static func patchSessionModel(
-        sessionKey: String,
-        agentID: String?,
-        model: String?) -> OpenClawChatGatewayRequest
-    {
-        self.patchSessionSettings(
-            sessionKey: sessionKey,
-            agentID: agentID,
-            model: .some(model))
-    }
-
     public static func patchSessionPreferences(
         sessionKey: String,
         agentID: String?,
diff --git a/apps/shared/OpenClawKit/Sources/OpenClawChatUI/ChatSessions.swift b/apps/shared/OpenClawKit/Sources/OpenClawChatUI/ChatSessions.swift
index b288dff9ce10..f0c4002463e9 100644
--- a/apps/shared/OpenClawKit/Sources/OpenClawChatUI/ChatSessions.swift
+++ b/apps/shared/OpenClawKit/Sources/OpenClawChatUI/ChatSessions.swift
@@ -70,7 +70,6 @@ public struct OpenClawChatModelPatchResult: Decodable, Sendable, Equatable {
     public let thinkingLevel: String?
     public let thinkingLevels: [OpenClawChatThinkingLevelOption]?
 
-    // periphery:ignore - package tests construct patch responses; app consumers decode them.
     public init(
         key: String? = nil,
         modelProvider: String?,
diff --git a/apps/shared/OpenClawKit/Sources/OpenClawKit/GatewayNodeSession.swift b/apps/shared/OpenClawKit/Sources/OpenClawKit/GatewayNodeSession.swift
index 5d3033f8bd7a..8d77fe23bb5b 100644
--- a/apps/shared/OpenClawKit/Sources/OpenClawKit/GatewayNodeSession.swift
+++ b/apps/shared/OpenClawKit/Sources/OpenClawKit/GatewayNodeSession.swift
@@ -685,13 +685,6 @@ public actor GatewayNodeSession {
         return serverMethods.contains(method)
     }
 
-    public func currentMainSessionKey(
-        ifCurrentRoute expectedRoute: GatewayNodeSessionRoute) -> String?
-    {
-        guard self.isCurrentRoute(expectedRoute), self.channel != nil else { return nil }
-        return self.mainSessionKey
-    }
-
     public func waitForCurrentMainSessionKey(
         ifCurrentRoute expectedRoute: GatewayNodeSessionRoute) async -> String?
     {
diff --git a/apps/shared/OpenClawKit/Tests/OpenClawKitTests/ChatGatewayRequestTests.swift b/apps/shared/OpenClawKit/Tests/OpenClawKitTests/ChatGatewayRequestTests.swift
index 5abe1bcfafa5..ee1a5f1d0250 100644
--- a/apps/shared/OpenClawKit/Tests/OpenClawKitTests/ChatGatewayRequestTests.swift
+++ b/apps/shared/OpenClawKit/Tests/OpenClawKitTests/ChatGatewayRequestTests.swift
@@ -68,11 +68,11 @@ struct ChatGatewayRequestTests {
         #expect(request.params["archived"] == nil)
     }
 
-    @Test func `model patch request encodes default model as null`() {
-        let request = OpenClawChatGatewayRequests.patchSessionModel(
+    @Test func `settings patch request encodes default model as null`() {
+        let request = OpenClawChatGatewayRequests.patchSessionSettings(
             sessionKey: "agent:main:main",
             agentID: nil,
-            model: nil)
+            model: .some(nil))
 
         #expect(request.params["model"]?.value is NSNull)
         #expect(request.params["agentId"] == nil)
diff --git a/apps/shared/OpenClawKit/Tests/OpenClawKitTests/GatewayNodeSessionTests.swift b/apps/shared/OpenClawKit/Tests/OpenClawKitTests/GatewayNodeSessionTests.swift
index fe4af271b171..a8ad343b87a3 100644
--- a/apps/shared/OpenClawKit/Tests/OpenClawKitTests/GatewayNodeSessionTests.swift
+++ b/apps/shared/OpenClawKit/Tests/OpenClawKitTests/GatewayNodeSessionTests.swift
@@ -3167,10 +3167,10 @@ struct GatewayNodeSessionTests {
 
         let route = try #require(await gateway.currentRoute())
         #expect(await capturedMainSessionKey.get() == "agent:main:main")
-        #expect(await gateway.currentMainSessionKey(ifCurrentRoute: route) == "agent:main:main")
+        #expect(await gateway.waitForCurrentMainSessionKey(ifCurrentRoute: route) == "agent:main:main")
 
         await gateway.disconnect()
-        #expect(await gateway.currentMainSessionKey(ifCurrentRoute: route) == nil)
+        #expect(await gateway.waitForCurrentMainSessionKey(ifCurrentRoute: route) == nil)
     }
 
     @Test