diff --git a/.lastmerge b/.lastmerge
index caffac28b..eea41e5b5 100644
--- a/.lastmerge
+++ b/.lastmerge
@@ -1 +1 @@
-dd2dcbc439256acfb9feb2cff07c0b9c820091b8
+c63feb2794786342d57936c13d28c250e723c676
diff --git a/src/main/java/com/github/copilot/sdk/CopilotClient.java b/src/main/java/com/github/copilot/sdk/CopilotClient.java
index 4b3bb0904..ebe995bd7 100644
--- a/src/main/java/com/github/copilot/sdk/CopilotClient.java
+++ b/src/main/java/com/github/copilot/sdk/CopilotClient.java
@@ -744,18 +744,15 @@ public CompletableFuture<String> getForegroundSessionId() {
      *             if the operation fails
      */
     public CompletableFuture<Void> setForegroundSessionId(String sessionId) {
-        return ensureConnected()
-                .thenCompose(
-                        connection -> connection.rpc
-                                .invoke("session.setForeground", Map.of("sessionId", sessionId),
-                                        com.github.copilot.sdk.json.SetForegroundSessionResponse.class)
-                                .thenAccept(response -> {
-                                    if (!response.success()) {
-                                        throw new RuntimeException(response.error() != null
-                                                ? response.error()
-                                                : "Failed to set foreground session");
-                                    }
-                                }));
+        return ensureConnected().thenCompose(connection -> connection.rpc
+                .invoke("session.setForeground", new com.github.copilot.sdk.json.SetForegroundSessionRequest(sessionId),
+                        com.github.copilot.sdk.json.SetForegroundSessionResponse.class)
+                .thenAccept(response -> {
+                    if (!response.success()) {
+                        throw new RuntimeException(
+                                response.error() != null ? response.error() : "Failed to set foreground session");
+                    }
+                }));
     }
 
     /**
diff --git a/src/main/java/com/github/copilot/sdk/json/SetForegroundSessionRequest.java b/src/main/java/com/github/copilot/sdk/json/SetForegroundSessionRequest.java
new file mode 100644
index 000000000..30470a5c9
--- /dev/null
+++ b/src/main/java/com/github/copilot/sdk/json/SetForegroundSessionRequest.java
@@ -0,0 +1,18 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.sdk.json;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Internal request object for setting the foreground session.
+ *
+ * @param sessionId
+ *            the ID of the session to set as the foreground session
+ * @see com.github.copilot.sdk.CopilotClient#setForegroundSessionId(String)
+ * @since 1.0.0
+ */
+public record SetForegroundSessionRequest(@JsonProperty("sessionId") String sessionId) {
+}