fix(ios): preserve agent ownership for session mutations

steipete · steipete · commit c2262aa04cd1 · 2026-07-10T05:44:23.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,6 +30,7 @@ Docs: https://docs.openclaw.ai
 - **Chutes OAuth deadlines:** bound token exchange, profile lookup, and refresh requests, and keep issued tokens when optional userinfo enrichment stalls. (#102026) Thanks @Alix-007.
 - **Control UI workspace avatars:** inline validated agent avatar files in bootstrap and identity responses so Personal card images render without unauthenticated avatar-route requests, while preserving configured emoji precedence. (#102892, #97602) Thanks @LZY3538.
 - **Exec safe-bin flags:** auto-approve curated read-only boolean flags for default stdin-only filters while keeping unknown flags, tail follow/retry modes, file operands, and custom profiles fail-closed. (#88953) Thanks @yetval.
+- **iOS session mutations:** scope rename, archive, pin, delete, and fork requests to the selected agent, preserving the parent agent for forked sessions so multi-agent chat actions cannot mutate or create sessions under the wrong agent. (#103366, #103415) Thanks @lin-hongkuan and @harjothkhara.
 - **Model pin hot reload and fallback:** keep explicit `/model` selections authoritative across Telegram config reloads and model fallback, capture one live config snapshot per assembled turn, and leave fallback candidates turn-local instead of persisting them over the user's pin. (#103324, #103417) Thanks @obviyus.
 - **Swift protocol initializers:** default every schema-optional generated initializer parameter to `nil` so additive protocol fields no longer break SDK construction call sites.
 - **OpenCode Go MiMo catalog:** stop exposing the deprecated `mimo-v2-omni` and `mimo-v2-pro` aliases that reject agent requests, and keep release validation on the active MiMo V2.5 routes. (#103311, #103329) Thanks @krissding.
diff --git a/apps/ios/Sources/Chat/IOSGatewayChatTransport.swift b/apps/ios/Sources/Chat/IOSGatewayChatTransport.swift
@@ -461,7 +461,7 @@ struct IOSGatewayChatTransport: OpenClawChatTransport {
             label: label,
             parentSessionKey: parentTarget?.sessionKey,
             worktree: worktree)
-        let res = try await self.gateway.request(method: "sessions.create", paramsJSON: json, timeoutSeconds: 15)
+        let res = try await gateway.request(method: "sessions.create", paramsJSON: json, timeoutSeconds: 15)
         return try JSONDecoder().decode(OpenClawChatCreateSessionResponse.self, from: res)
     }
 
@@ -480,12 +480,12 @@ struct IOSGatewayChatTransport: OpenClawChatTransport {
         archived: Bool) async throws -> OpenClawChatSessionsListResponse
     {
         let json = try Self.makeListSessionsParamsJSON(limit: limit, search: search, archived: archived)
-        let res = try await self.gateway.request(method: "sessions.list", paramsJSON: json, timeoutSeconds: 15)
+        let res = try await gateway.request(method: "sessions.list", paramsJSON: json, timeoutSeconds: 15)
         return try JSONDecoder().decode(OpenClawChatSessionsListResponse.self, from: res)
     }
 
     func listModels() async throws -> [OpenClawChatModelChoice] {
-        let response = try await self.gateway.request(
+        let response = try await gateway.request(
             method: "models.list",
             paramsJSON: nil,
             timeoutSeconds: 15)
@@ -532,10 +532,11 @@ struct IOSGatewayChatTransport: OpenClawChatTransport {
 
     func forkSession(parentKey: String) async throws -> String {
         let target = self.sessionTarget(for: parentKey)
+        let childAgentID = target.agentID ?? Self.agentID(fromSessionKey: target.sessionKey)
         let json = try Self.makeForkSessionParamsJSON(
             parentKey: target.sessionKey,
-            agentId: target.agentID)
-        let response = try await self.requestSessionMutation(
+            agentId: childAgentID)
+        let response = try await requestSessionMutation(
             method: "sessions.create",
             paramsJSON: json,
             timeoutSeconds: 15)
diff --git a/apps/ios/Tests/IOSGatewayChatTransportTests.swift b/apps/ios/Tests/IOSGatewayChatTransportTests.swift
@@ -106,13 +106,13 @@ struct IOSGatewayChatTransportTests {
     }
 
     @Test func `list sessions params request archived sessions explicitly`() throws {
-        let params = try self.object(
+        let params = try object(
             from: IOSGatewayChatTransport.makeListSessionsParamsJSON(limit: 12, archived: true))
         #expect(params["archived"] as? Bool == true)
     }
 
     @Test func `patch session params preserve explicit null clearing`() throws {
-        let params = try self.object(
+        let params = try object(
             from: IOSGatewayChatTransport.makePatchSessionParamsJSON(
                 key: "session-1",
                 label: .some(nil),
@@ -128,7 +128,7 @@ struct IOSGatewayChatTransportTests {
     }
 
     @Test func `patch session params include selected global agent`() throws {
-        let params = try self.object(
+        let params = try object(
             from: IOSGatewayChatTransport.makePatchSessionParamsJSON(
                 key: "global",
                 agentId: "reviewer",
@@ -139,7 +139,7 @@ struct IOSGatewayChatTransportTests {
     }
 
     @Test func `fork session params preserve parent agent`() throws {
-        let params = try self.object(
+        let params = try object(
             from: IOSGatewayChatTransport.makeForkSessionParamsJSON(
                 parentKey: "agent:reviewer:telegram:group:1",
                 agentId: "reviewer"))
@@ -149,7 +149,7 @@ struct IOSGatewayChatTransportTests {
     }
 
     @Test func `session model patch params include model and selected agent`() throws {
-        let params = try self.object(
+        let params = try object(
             from: IOSGatewayChatTransport.makeSessionPatchModelParamsJSON(
                 sessionKey: "global",
                 agentId: "reviewer",
@@ -160,7 +160,7 @@ struct IOSGatewayChatTransportTests {
     }
 
     @Test func `session model patch params encode default model as null`() throws {
-        let params = try self.object(
+        let params = try object(
             from: IOSGatewayChatTransport.makeSessionPatchModelParamsJSON(
                 sessionKey: "agent:main:main",
                 model: nil))
@@ -304,27 +304,27 @@ struct IOSGatewayChatTransportTests {
         let requests = await recorder.all()
         #expect(requests.map(\.method) == Array(
             repeating: ["sessions.patch", "sessions.delete", "sessions.create"],
-            count: 3).flatMap { $0 })
+            count: 3).flatMap(\.self))
         #expect(requests.map(\.timeoutSeconds) == Array(repeating: 15, count: 9))
 
-        for (offset, expectedKey, expectedAgentID) in [
-            (0, "agent:reviewer:Matrix:Channel:Room", nil),
-            (3, "global", "reviewer"),
-            (6, "agent:ops:main", nil),
-        ] as [(Int, String, String?)] {
-            let patch = try self.object(from: requests[offset].paramsJSON)
+        for (offset, expectedKey, expectedMutationAgentID, expectedForkAgentID) in [
+            (0, "agent:reviewer:Matrix:Channel:Room", nil, "reviewer"),
+            (3, "global", "reviewer", "reviewer"),
+            (6, "agent:ops:main", nil, "ops"),
+        ] as [(Int, String, String?, String?)] {
+            let patch = try object(from: requests[offset].paramsJSON)
             #expect(patch["key"] as? String == expectedKey)
-            #expect(patch["agentId"] as? String == expectedAgentID)
+            #expect(patch["agentId"] as? String == expectedMutationAgentID)
             #expect(patch["pinned"] as? Bool == true)
 
-            let delete = try self.object(from: requests[offset + 1].paramsJSON)
+            let delete = try object(from: requests[offset + 1].paramsJSON)
             #expect(delete["key"] as? String == expectedKey)
-            #expect(delete["agentId"] as? String == expectedAgentID)
+            #expect(delete["agentId"] as? String == expectedMutationAgentID)
             #expect(delete["deleteTranscript"] as? Bool == true)
 
-            let fork = try self.object(from: requests[offset + 2].paramsJSON)
+            let fork = try object(from: requests[offset + 2].paramsJSON)
             #expect(fork["parentSessionKey"] as? String == expectedKey)
-            #expect(fork["agentId"] as? String == expectedAgentID)
+            #expect(fork["agentId"] as? String == expectedForkAgentID)
             #expect(fork["fork"] as? Bool == true)
         }
     }
