Add missing options to ResumeSessionConfig for parity with SessionConfig

brunoborges · brunoborges · commit 25ad83ac1082 · 2026-02-05T23:56:08.000-08:00
Port upstream PR #376: Add model, systemMessage, availableTools,
excludedTools, configDir, and infiniteSessions to ResumeSessionConfig
and ResumeSessionRequest.
diff --git a/src/main/java/com/github/copilot/sdk/CopilotClient.java b/src/main/java/com/github/copilot/sdk/CopilotClient.java
@@ -630,23 +630,29 @@ public CompletableFuture<CopilotSession> resumeSession(String sessionId, ResumeS
             var request = new ResumeSessionRequest();
             request.setSessionId(sessionId);
             if (config != null) {
+                request.setModel(config.getModel());
                 request.setReasoningEffort(config.getReasoningEffort());
                 request.setTools(config.getTools() != null
                         ? config.getTools().stream()
                                 .map(t -> new ToolDef(t.getName(), t.getDescription(), t.getParameters()))
                                 .collect(Collectors.toList())
                         : null);
+                request.setSystemMessage(config.getSystemMessage());
+                request.setAvailableTools(config.getAvailableTools());
+                request.setExcludedTools(config.getExcludedTools());
                 request.setProvider(config.getProvider());
                 request.setRequestPermission(config.getOnPermissionRequest() != null ? true : null);
                 request.setRequestUserInput(config.getOnUserInputRequest() != null ? true : null);
                 request.setHooks(config.getHooks() != null && config.getHooks().hasHooks() ? true : null);
                 request.setWorkingDirectory(config.getWorkingDirectory());
+                request.setConfigDir(config.getConfigDir());
                 request.setDisableResume(config.isDisableResume() ? true : null);
                 request.setStreaming(config.isStreaming() ? true : null);
                 request.setMcpServers(config.getMcpServers());
                 request.setCustomAgents(config.getCustomAgents());
                 request.setSkillDirectories(config.getSkillDirectories());
                 request.setDisabledSkills(config.getDisabledSkills());
+                request.setInfiniteSessions(config.getInfiniteSessions());
             }
 
             return connection.rpc.invoke("session.resume", request, ResumeSessionResponse.class).thenApply(response -> {
diff --git a/src/main/java/com/github/copilot/sdk/json/ResumeSessionConfig.java b/src/main/java/com/github/copilot/sdk/json/ResumeSessionConfig.java
@@ -32,19 +32,48 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class ResumeSessionConfig {
 
+    private String model;
     private List<ToolDefinition> tools;
+    private SystemMessageConfig systemMessage;
+    private List<String> availableTools;
+    private List<String> excludedTools;
     private ProviderConfig provider;
     private String reasoningEffort;
     private PermissionHandler onPermissionRequest;
     private UserInputHandler onUserInputRequest;
     private SessionHooks hooks;
     private String workingDirectory;
+    private String configDir;
     private boolean disableResume;
     private boolean streaming;
     private Map<String, Object> mcpServers;
     private List<CustomAgentConfig> customAgents;
     private List<String> skillDirectories;
     private List<String> disabledSkills;
+    private InfiniteSessionConfig infiniteSessions;
+
+    /**
+     * Gets the AI model to use.
+     *
+     * @return the model name
+     */
+    public String getModel() {
+        return model;
+    }
+
+    /**
+     * Sets the AI model to use for the resumed session.
+     * <p>
+     * Can change the model when resuming an existing session.
+     *
+     * @param model
+     *            the model name
+     * @return this config for method chaining
+     */
+    public ResumeSessionConfig setModel(String model) {
+        this.model = model;
+        return this;
+    }
 
     /**
      * Gets the custom tools for this session.
@@ -68,6 +97,78 @@ public ResumeSessionConfig setTools(List<ToolDefinition> tools) {
         return this;
     }
 
+    /**
+     * Gets the system message configuration.
+     *
+     * @return the system message config
+     */
+    public SystemMessageConfig getSystemMessage() {
+        return systemMessage;
+    }
+
+    /**
+     * Sets the system message configuration.
+     * <p>
+     * The system message controls the behavior and personality of the assistant.
+     *
+     * @param systemMessage
+     *            the system message configuration
+     * @return this config for method chaining
+     * @see SystemMessageConfig
+     */
+    public ResumeSessionConfig setSystemMessage(SystemMessageConfig systemMessage) {
+        this.systemMessage = systemMessage;
+        return this;
+    }
+
+    /**
+     * Gets the list of allowed tool names.
+     *
+     * @return the list of available tool names
+     */
+    public List<String> getAvailableTools() {
+        return availableTools == null ? null : Collections.unmodifiableList(availableTools);
+    }
+
+    /**
+     * Sets the list of tool names that are allowed in this session.
+     * <p>
+     * When specified, only tools in this list will be available to the assistant.
+     * Takes precedence over excluded tools.
+     *
+     * @param availableTools
+     *            the list of allowed tool names
+     * @return this config for method chaining
+     */
+    public ResumeSessionConfig setAvailableTools(List<String> availableTools) {
+        this.availableTools = availableTools;
+        return this;
+    }
+
+    /**
+     * Gets the list of excluded tool names.
+     *
+     * @return the list of excluded tool names
+     */
+    public List<String> getExcludedTools() {
+        return excludedTools == null ? null : Collections.unmodifiableList(excludedTools);
+    }
+
+    /**
+     * Sets the list of tool names to exclude from this session.
+     * <p>
+     * Tools in this list will not be available to the assistant. Ignored if
+     * available tools is specified.
+     *
+     * @param excludedTools
+     *            the list of tool names to exclude
+     * @return this config for method chaining
+     */
+    public ResumeSessionConfig setExcludedTools(List<String> excludedTools) {
+        this.excludedTools = excludedTools;
+        return this;
+    }
+
     /**
      * Gets the custom API provider configuration.
      *
@@ -200,6 +301,29 @@ public ResumeSessionConfig setWorkingDirectory(String workingDirectory) {
         return this;
     }
 
+    /**
+     * Gets the configuration directory path.
+     *
+     * @return the configuration directory path
+     */
+    public String getConfigDir() {
+        return configDir;
+    }
+
+    /**
+     * Sets the configuration directory path.
+     * <p>
+     * Override the default configuration directory location.
+     *
+     * @param configDir
+     *            the configuration directory path
+     * @return this config for method chaining
+     */
+    public ResumeSessionConfig setConfigDir(String configDir) {
+        this.configDir = configDir;
+        return this;
+    }
+
     /**
      * Returns whether the resume event is disabled.
      *
@@ -328,4 +452,27 @@ public ResumeSessionConfig setDisabledSkills(List<String> disabledSkills) {
         this.disabledSkills = disabledSkills;
         return this;
     }
+
+    /**
+     * Gets the infinite session configuration.
+     *
+     * @return the infinite session config
+     */
+    public InfiniteSessionConfig getInfiniteSessions() {
+        return infiniteSessions;
+    }
+
+    /**
+     * Sets the infinite session configuration for persistent workspaces and
+     * automatic compaction.
+     *
+     * @param infiniteSessions
+     *            the infinite session configuration
+     * @return this config for method chaining
+     * @see InfiniteSessionConfig
+     */
+    public ResumeSessionConfig setInfiniteSessions(InfiniteSessionConfig infiniteSessions) {
+        this.infiniteSessions = infiniteSessions;
+        return this;
+    }
 }
diff --git a/src/main/java/com/github/copilot/sdk/json/ResumeSessionRequest.java b/src/main/java/com/github/copilot/sdk/json/ResumeSessionRequest.java
@@ -29,12 +29,24 @@ public final class ResumeSessionRequest {
     @JsonProperty("sessionId")
     private String sessionId;
 
+    @JsonProperty("model")
+    private String model;
+
     @JsonProperty("reasoningEffort")
     private String reasoningEffort;
 
     @JsonProperty("tools")
     private List<ToolDef> tools;
 
+    @JsonProperty("systemMessage")
+    private SystemMessageConfig systemMessage;
+
+    @JsonProperty("availableTools")
+    private List<String> availableTools;
+
+    @JsonProperty("excludedTools")
+    private List<String> excludedTools;
+
     @JsonProperty("provider")
     private ProviderConfig provider;
 
@@ -50,6 +62,9 @@ public final class ResumeSessionRequest {
     @JsonProperty("workingDirectory")
     private String workingDirectory;
 
+    @JsonProperty("configDir")
+    private String configDir;
+
     @JsonProperty("disableResume")
     private Boolean disableResume;
 
@@ -68,6 +83,9 @@ public final class ResumeSessionRequest {
     @JsonProperty("disabledSkills")
     private List<String> disabledSkills;
 
+    @JsonProperty("infiniteSessions")
+    private InfiniteSessionConfig infiniteSessions;
+
     /** Gets the session ID. @return the session ID */
     public String getSessionId() {
         return sessionId;
@@ -78,6 +96,16 @@ public void setSessionId(String sessionId) {
         this.sessionId = sessionId;
     }
 
+    /** Gets the model name. @return the model */
+    public String getModel() {
+        return model;
+    }
+
+    /** Sets the model name. @param model the model */
+    public void setModel(String model) {
+        this.model = model;
+    }
+
     /** Gets the reasoning effort. @return the reasoning effort level */
     public String getReasoningEffort() {
         return reasoningEffort;
@@ -100,6 +128,39 @@ public void setTools(List<ToolDef> tools) {
         this.tools = tools;
     }
 
+    /** Gets the system message config. @return the system message config */
+    public SystemMessageConfig getSystemMessage() {
+        return systemMessage;
+    }
+
+    /**
+     * Sets the system message config. @param systemMessage the system message
+     * config
+     */
+    public void setSystemMessage(SystemMessageConfig systemMessage) {
+        this.systemMessage = systemMessage;
+    }
+
+    /** Gets available tools. @return the available tool names */
+    public List<String> getAvailableTools() {
+        return availableTools == null ? null : Collections.unmodifiableList(availableTools);
+    }
+
+    /** Sets available tools. @param availableTools the available tool names */
+    public void setAvailableTools(List<String> availableTools) {
+        this.availableTools = availableTools;
+    }
+
+    /** Gets excluded tools. @return the excluded tool names */
+    public List<String> getExcludedTools() {
+        return excludedTools == null ? null : Collections.unmodifiableList(excludedTools);
+    }
+
+    /** Sets excluded tools. @param excludedTools the excluded tool names */
+    public void setExcludedTools(List<String> excludedTools) {
+        this.excludedTools = excludedTools;
+    }
+
     /** Gets the provider config. @return the provider */
     public ProviderConfig getProvider() {
         return provider;
@@ -150,6 +211,16 @@ public void setWorkingDirectory(String workingDirectory) {
         this.workingDirectory = workingDirectory;
     }
 
+    /** Gets config directory. @return the config directory */
+    public String getConfigDir() {
+        return configDir;
+    }
+
+    /** Sets config directory. @param configDir the config directory */
+    public void setConfigDir(String configDir) {
+        this.configDir = configDir;
+    }
+
     /** Gets disable resume flag. @return the flag */
     public Boolean getDisableResume() {
         return disableResume;
@@ -209,4 +280,17 @@ public List<String> getDisabledSkills() {
     public void setDisabledSkills(List<String> disabledSkills) {
         this.disabledSkills = disabledSkills;
     }
+
+    /** Gets infinite sessions config. @return the infinite sessions config */
+    public InfiniteSessionConfig getInfiniteSessions() {
+        return infiniteSessions;
+    }
+
+    /**
+     * Sets infinite sessions config. @param infiniteSessions the infinite sessions
+     * config
+     */
+    public void setInfiniteSessions(InfiniteSessionConfig infiniteSessions) {
+        this.infiniteSessions = infiniteSessions;
+    }
 }
