Port enableConfigDiscovery, ModelCapabilitiesOverride, McpServerConfig types, and setModel overload

Agent-Logs-Url: https://github.com/github/copilot-sdk-java/sessions/6440ac65-a609-41e9-8afc-718bccbef08a

Co-authored-by: edburns <75821+edburns@users.noreply.github.com>

Author: Copilot

README.md

@@ -25,7 +25,7 @@ Java SDK for programmatic control of GitHub Copilot CLI, enabling you to build A
 ### Requirements
 
 - Java 17 or later. **JDK 25 recommended**. Selecting JDK 25 enables the use of virtual threads, as shown in the [Quick Start](#quick-start).
-- GitHub Copilot CLI 1.0.17 or later installed and in `PATH` (or provide custom `cliPath`)
+- GitHub Copilot CLI 1.0.22 or later installed and in `PATH` (or provide custom `cliPath`)
 
 ### Maven
 

src/main/java/com/github/copilot/sdk/CopilotSession.java

@@ -53,6 +53,7 @@
 import com.github.copilot.sdk.json.HookInvocation;
 import com.github.copilot.sdk.json.InputOptions;
 import com.github.copilot.sdk.json.MessageOptions;
+import com.github.copilot.sdk.json.ModelCapabilitiesOverride;
 import com.github.copilot.sdk.json.PermissionHandler;
 import com.github.copilot.sdk.json.PermissionInvocation;
 import com.github.copilot.sdk.json.PermissionRequest;
@@ -1496,13 +1497,46 @@ public CompletableFuture<Void> abort() {
      * @since 1.2.0
      */
     public CompletableFuture<Void> setModel(String model, String reasoningEffort) {
+        return setModel(model, reasoningEffort, null);
+    }
+
+    /**
+     * Changes the model for this session with optional reasoning effort level and
+     * model capabilities overrides.
+     * <p>
+     * The new model takes effect for the next message. Conversation history is
+     * preserved.
+     *
+     * <pre>{@code
+     * session.setModel("claude-sonnet-4.5", null,
+     * 		new ModelCapabilitiesOverride().setSupports(new ModelCapabilitiesOverrideSupports().setVision(true))).get();
+     * }</pre>
+     *
+     * @param model
+     *            the model ID to switch to (e.g., {@code "gpt-4.1"})
+     * @param reasoningEffort
+     *            reasoning effort level (e.g., {@code "low"}, {@code "medium"},
+     *            {@code "high"}, {@code "xhigh"}); {@code null} to use default
+     * @param modelCapabilities
+     *            per-property overrides for model capabilities, deep-merged over
+     *            runtime defaults; {@code null} to use runtime defaults
+     * @return a future that completes when the model switch is acknowledged
+     * @throws IllegalStateException
+     *             if this session has been terminated
+     * @since 1.4.0
+     */
+    public CompletableFuture<Void> setModel(String model, String reasoningEffort,
+            ModelCapabilitiesOverride modelCapabilities) {
         ensureNotTerminated();
         var params = new java.util.HashMap<String, Object>();
         params.put("sessionId", sessionId);
         params.put("modelId", model);
         if (reasoningEffort != null) {
             params.put("reasoningEffort", reasoningEffort);
         }
+        if (modelCapabilities != null) {
+            params.put("modelCapabilities", modelCapabilities);
+        }
         return rpc.invoke("session.model.switchTo", params, Void.class);
     }
 
@@ -1524,7 +1558,7 @@ public CompletableFuture<Void> setModel(String model, String reasoningEffort) {
      * @since 1.0.11
      */
     public CompletableFuture<Void> setModel(String model) {
-        return setModel(model, null);
+        return setModel(model, null, null);
     }
 
     /**

src/main/java/com/github/copilot/sdk/SessionRequestBuilder.java

@@ -122,6 +122,8 @@ static CreateSessionRequest buildCreateRequest(SessionConfig config, String sess
         request.setSkillDirectories(config.getSkillDirectories());
         request.setDisabledSkills(config.getDisabledSkills());
         request.setConfigDir(config.getConfigDir());
+        request.setEnableConfigDiscovery(config.getEnableConfigDiscovery());
+        request.setModelCapabilities(config.getModelCapabilities());
 
         if (config.getCommands() != null && !config.getCommands().isEmpty()) {
             var wireCommands = config.getCommands().stream()
@@ -193,6 +195,8 @@ static ResumeSessionRequest buildResumeRequest(String sessionId, ResumeSessionCo
         request.setSkillDirectories(config.getSkillDirectories());
         request.setDisabledSkills(config.getDisabledSkills());
         request.setInfiniteSessions(config.getInfiniteSessions());
+        request.setEnableConfigDiscovery(config.getEnableConfigDiscovery());
+        request.setModelCapabilities(config.getModelCapabilities());
 
         if (config.getCommands() != null && !config.getCommands().isEmpty()) {
             var wireCommands = config.getCommands().stream()

src/main/java/com/github/copilot/sdk/json/CreateSessionRequest.java

@@ -68,7 +68,7 @@ public final class CreateSessionRequest {
     private Boolean streaming;
 
     @JsonProperty("mcpServers")
-    private Map<String, Object> mcpServers;
+    private Map<String, McpServerConfig> mcpServers;
 
     @JsonProperty("envValueMode")
     private String envValueMode;
@@ -91,6 +91,12 @@ public final class CreateSessionRequest {
     @JsonProperty("configDir")
     private String configDir;
 
+    @JsonProperty("enableConfigDiscovery")
+    private Boolean enableConfigDiscovery;
+
+    @JsonProperty("modelCapabilities")
+    private ModelCapabilitiesOverride modelCapabilities;
+
     @JsonProperty("commands")
     private List<CommandWireDefinition> commands;
 
@@ -240,12 +246,12 @@ public void setStreaming(Boolean streaming) {
     }
 
     /** Gets MCP servers. @return the servers map */
-    public Map<String, Object> getMcpServers() {
+    public Map<String, McpServerConfig> getMcpServers() {
         return mcpServers == null ? null : Collections.unmodifiableMap(mcpServers);
     }
 
     /** Sets MCP servers. @param mcpServers the servers map */
-    public void setMcpServers(Map<String, Object> mcpServers) {
+    public void setMcpServers(Map<String, McpServerConfig> mcpServers) {
         this.mcpServers = mcpServers;
     }
 
@@ -319,6 +325,30 @@ public void setConfigDir(String configDir) {
         this.configDir = configDir;
     }
 
+    /** Gets the enableConfigDiscovery flag. @return the flag */
+    public Boolean getEnableConfigDiscovery() {
+        return enableConfigDiscovery;
+    }
+
+    /**
+     * Sets the enableConfigDiscovery flag. @param enableConfigDiscovery the flag
+     */
+    public void setEnableConfigDiscovery(Boolean enableConfigDiscovery) {
+        this.enableConfigDiscovery = enableConfigDiscovery;
+    }
+
+    /** Gets the model capabilities override. @return the override */
+    public ModelCapabilitiesOverride getModelCapabilities() {
+        return modelCapabilities;
+    }
+
+    /**
+     * Sets the model capabilities override. @param modelCapabilities the override
+     */
+    public void setModelCapabilities(ModelCapabilitiesOverride modelCapabilities) {
+        this.modelCapabilities = modelCapabilities;
+    }
+
     /** Gets the commands wire definitions. @return the commands */
     public List<CommandWireDefinition> getCommands() {
         return commands == null ? null : Collections.unmodifiableList(commands);

src/main/java/com/github/copilot/sdk/json/CustomAgentConfig.java

@@ -50,7 +50,7 @@ public class CustomAgentConfig {
     private String prompt;
 
     @JsonProperty("mcpServers")
-    private Map<String, Object> mcpServers;
+    private Map<String, McpServerConfig> mcpServers;
 
     @JsonProperty("infer")
     private Boolean infer;
@@ -175,7 +175,7 @@ public CustomAgentConfig setPrompt(String prompt) {
      *
      * @return the MCP servers map
      */
-    public Map<String, Object> getMcpServers() {
+    public Map<String, McpServerConfig> getMcpServers() {
         return mcpServers == null ? null : Collections.unmodifiableMap(mcpServers);
     }
 
@@ -186,7 +186,7 @@ public Map<String, Object> getMcpServers() {
      *            the MCP server configurations
      * @return this config for method chaining
      */
-    public CustomAgentConfig setMcpServers(Map<String, Object> mcpServers) {
+    public CustomAgentConfig setMcpServers(Map<String, McpServerConfig> mcpServers) {
         this.mcpServers = mcpServers;
         return this;
     }

src/main/java/com/github/copilot/sdk/json/McpHttpServerConfig.java

@@ -0,0 +1,82 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.sdk.json;
+
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Configuration for a remote HTTP/SSE MCP server.
+ * <p>
+ * Use this class to configure an MCP server accessed via HTTP or Server-Sent
+ * Events.
+ *
+ * <h2>Example</h2>
+ *
+ * <pre>{@code
+ * var server = new McpHttpServerConfig().setUrl("https://example.com/mcp")
+ * 		.setHeaders(Map.of("Authorization", "Bearer token")).setTools(List.of("*"));
+ * }</pre>
+ *
+ * @see McpServerConfig
+ * @since 1.4.0
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public final class McpHttpServerConfig extends McpServerConfig {
+
+    @JsonProperty("url")
+    private String url;
+
+    @JsonProperty("headers")
+    private Map<String, String> headers;
+
+    /** Returns the URL of the remote server. */
+    public String getUrl() {
+        return url;
+    }
+
+    /**
+     * Sets the URL of the remote server.
+     *
+     * @param url
+     *            the server URL
+     * @return this instance for method chaining
+     */
+    public McpHttpServerConfig setUrl(String url) {
+        this.url = url;
+        return this;
+    }
+
+    /** Returns the optional HTTP headers to include in requests. */
+    public Map<String, String> getHeaders() {
+        return headers;
+    }
+
+    /**
+     * Sets optional HTTP headers to include in requests.
+     *
+     * @param headers
+     *            HTTP header map
+     * @return this instance for method chaining
+     */
+    public McpHttpServerConfig setHeaders(Map<String, String> headers) {
+        this.headers = headers;
+        return this;
+    }
+
+    @Override
+    public McpHttpServerConfig setTools(java.util.List<String> tools) {
+        super.setTools(tools);
+        return this;
+    }
+
+    @Override
+    public McpHttpServerConfig setTimeout(Integer timeout) {
+        super.setTimeout(timeout);
+        return this;
+    }
+}

src/main/java/com/github/copilot/sdk/json/McpServerConfig.java

@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.sdk.json;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+
+/**
+ * Abstract base class for MCP server configurations.
+ * <p>
+ * Use {@link McpStdioServerConfig} for local/stdio MCP servers or
+ * {@link McpHttpServerConfig} for remote HTTP/SSE MCP servers.
+ *
+ * <h2>Example: Local server</h2>
+ *
+ * <pre>{@code
+ * var servers = Map.of("my-server",
+ * 		new McpStdioServerConfig().setCommand("node").setArgs(List.of("mcp-server.js")).setTools(List.of("*")));
+ * var session = client.createSession(new SessionConfig().setMcpServers(servers)).get();
+ * }</pre>
+ *
+ * <h2>Example: Remote server</h2>
+ *
+ * <pre>{@code
+ * var servers = Map.of("remote-server",
+ * 		new McpHttpServerConfig().setUrl("https://example.com/mcp").setTools(List.of("*")));
+ * var session = client.createSession(new SessionConfig().setMcpServers(servers)).get();
+ * }</pre>
+ *
+ * @see McpStdioServerConfig
+ * @see McpHttpServerConfig
+ * @see SessionConfig#setMcpServers(java.util.Map)
+ * @since 1.4.0
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type", defaultImpl = McpStdioServerConfig.class)
+@JsonSubTypes({@JsonSubTypes.Type(value = McpStdioServerConfig.class, name = "stdio"),
+        @JsonSubTypes.Type(value = McpHttpServerConfig.class, name = "http")})
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public abstract class McpServerConfig {
+
+    @JsonProperty("tools")
+    private List<String> tools;
+
+    @JsonProperty("timeout")
+    private Integer timeout;
+
+    /**
+     * Private constructor to prevent direct subclassing outside this package.
+     */
+    McpServerConfig() {
+    }
+
+    /**
+     * Returns the list of tools to include from this server. An empty list means
+     * none; use {@code "*"} for all.
+     */
+    public List<String> getTools() {
+        return tools;
+    }
+
+    /**
+     * Sets the list of tools to include from this server. Use {@code "*"} to
+     * include all tools.
+     *
+     * @param tools
+     *            tool names, or {@code List.of("*")} for all
+     * @return this instance for method chaining
+     */
+    public McpServerConfig setTools(List<String> tools) {
+        this.tools = tools;
+        return this;
+    }
+
+    /**
+     * Returns the optional timeout in milliseconds for tool calls to this server.
+     */
+    public Integer getTimeout() {
+        return timeout;
+    }
+
+    /**
+     * Sets the optional timeout in milliseconds for tool calls to this server.
+     *
+     * @param timeout
+     *            timeout in milliseconds, or {@code null} for no override
+     * @return this instance for method chaining
+     */
+    public McpServerConfig setTimeout(Integer timeout) {
+        this.timeout = timeout;
+        return this;
+    }
+}