Merge pull request #8 from copilot-community-sdk/merge-upstream-20260203

Merge upstream 20260203

Author: brunoborges

.lastmerge

@@ -1 +1 @@
-e6e4decda7bdc74cb669cb1da6fdf45be7151034
+73c14315ede2a2f9329fe2a442cd220a80f14191

README.md

@@ -15,7 +15,7 @@ Java SDK for programmatic control of GitHub Copilot CLI, enabling you to build A
 ### Requirements
 
 - Java 17 or later
-- GitHub Copilot CLI 0.0.400 or later installed and in PATH (or provide custom `cliPath`)
+- GitHub Copilot CLI 0.0.401 or later installed and in PATH (or provide custom `cliPath`)
 
 ### Maven
 

pom.xml

@@ -106,28 +106,39 @@
                         </goals>
                         <configuration>
                             <target xmlns:if="ant:if" xmlns:unless="ant:unless">
+                                <!-- Load the target commit from .lastmerge file -->
+                                <loadfile property="copilot.sdk.commit" srcFile="${project.basedir}/.lastmerge">
+                                    <filterchain>
+                                        <striplinebreaks/>
+                                        <trim/>
+                                    </filterchain>
+                                </loadfile>
+
                                 <!-- Check if .git directory exists -->
                                 <condition property="repo.exists">
                                     <available file="${copilot.sdk.clone.dir}/.git" type="dir" />
                                 </condition>
 
-                                <!-- If repo exists, fetch and reset -->
+                                <!-- If repo exists, fetch and reset to the target commit -->
                                 <sequential if:set="repo.exists">
-                                    <echo message="Updating existing copilot-sdk repository..." />
+                                    <echo message="Updating existing copilot-sdk repository to commit ${copilot.sdk.commit}..." />
                                     <exec executable="git" dir="${copilot.sdk.clone.dir}" failonerror="true">
                                         <arg value="fetch" />
+                                        <arg value="--depth" />
+                                        <arg value="1" />
                                         <arg value="origin" />
+                                        <arg value="${copilot.sdk.commit}" />
                                     </exec>
                                     <exec executable="git" dir="${copilot.sdk.clone.dir}" failonerror="true">
                                         <arg value="reset" />
                                         <arg value="--hard" />
-                                        <arg value="origin/main" />
+                                        <arg value="FETCH_HEAD" />
                                     </exec>
                                 </sequential>
 
-                                <!-- If repo doesn't exist, clone it -->
+                                <!-- If repo doesn't exist, clone it at the specific commit -->
                                 <sequential unless:set="repo.exists">
-                                    <echo message="Cloning copilot-sdk repository..." />
+                                    <echo message="Cloning copilot-sdk repository at commit ${copilot.sdk.commit}..." />
                                     <delete dir="${copilot.sdk.clone.dir}" quiet="true" />
                                     <exec executable="git" failonerror="true">
                                         <arg value="clone" />
@@ -136,6 +147,18 @@
                                         <arg value="https://github.com/github/copilot-sdk.git" />
                                         <arg value="${copilot.sdk.clone.dir}" />
                                     </exec>
+                                    <exec executable="git" dir="${copilot.sdk.clone.dir}" failonerror="true">
+                                        <arg value="fetch" />
+                                        <arg value="--depth" />
+                                        <arg value="1" />
+                                        <arg value="origin" />
+                                        <arg value="${copilot.sdk.commit}" />
+                                    </exec>
+                                    <exec executable="git" dir="${copilot.sdk.clone.dir}" failonerror="true">
+                                        <arg value="reset" />
+                                        <arg value="--hard" />
+                                        <arg value="FETCH_HEAD" />
+                                    </exec>
                                 </sequential>
                             </target>
                         </configuration>

src/site/markdown/index.md

@@ -9,7 +9,7 @@ Welcome to the documentation for the **Copilot SDK for Java** — a Java SDK for
 ### Requirements
 
 - Java 17 or later
-- GitHub Copilot CLI 0.0.400 or later installed and in PATH (or provide custom `cliPath`)
+- GitHub Copilot CLI 0.0.401 or later installed and in PATH (or provide custom `cliPath`)
 
 ### Installation
 

src/test/java/com/github/copilot/sdk/AskUserTest.java

@@ -25,7 +25,7 @@
  *
  * <p>
  * These tests use the shared CapiProxy infrastructure for deterministic API
- * response replay. Snapshots are stored in test/snapshots/ask-user/.
+ * response replay. Snapshots are stored in test/snapshots/ask_user/.
  * </p>
  */
 public class AskUserTest {
@@ -46,7 +46,7 @@ static void teardown() throws Exception {
 
     @Test
     void testUserInputHandlerInvokedWhenModelUsesAskUserTool() throws Exception {
-        ctx.configureForTest("ask-user", "should_invoke_user_input_handler_when_model_uses_ask_user_tool");
+        ctx.configureForTest("ask_user", "should_invoke_user_input_handler_when_model_uses_ask_user_tool");
 
         List<UserInputRequest> userInputRequests = new ArrayList<>();
         final String[] sessionIdHolder = new String[1];
@@ -84,7 +84,7 @@ void testUserInputHandlerInvokedWhenModelUsesAskUserTool() throws Exception {
 
     @Test
     void testUserInputRequestWithChoices() throws Exception {
-        ctx.configureForTest("ask-user", "should_receive_choices_in_user_input_request");
+        ctx.configureForTest("ask_user", "should_receive_choices_in_user_input_request");
 
         List<UserInputRequest> userInputRequests = new ArrayList<>();
 
@@ -120,7 +120,7 @@ void testUserInputRequestWithChoices() throws Exception {
      */
     @Test
     void testFreeformUserInputResponse() throws Exception {
-        ctx.configureForTest("ask-user", "should_handle_freeform_user_input_response");
+        ctx.configureForTest("ask_user", "should_handle_freeform_user_input_response");
 
         final List<UserInputRequest> userInputRequests = new ArrayList<>();
         String freeformAnswer = "This is my custom freeform answer that was not in the choices";

src/test/java/com/github/copilot/sdk/CapiProxy.java

@@ -288,6 +288,39 @@ public String getProxyUrl() {
         return proxyUrl;
     }
 
+    /**
+     * Checks if the proxy process is still alive.
+     *
+     * @return true if the proxy is running, false otherwise
+     */
+    public boolean isAlive() {
+        return process != null && process.isAlive();
+    }
+
+    /**
+     * Restarts the proxy server. This stops the current instance (if any) and
+     * starts a new one.
+     *
+     * @return the new proxy URL
+     * @throws IOException
+     *             if the server fails to start
+     * @throws InterruptedException
+     *             if the startup is interrupted
+     */
+    public String restart() throws IOException, InterruptedException {
+        try {
+            stop(true); // Skip writing cache on restart
+        } catch (Exception e) {
+            // Best effort - force cleanup
+            if (process != null) {
+                process.destroyForcibly();
+                process = null;
+            }
+            proxyUrl = null;
+        }
+        return start();
+    }
+
     @Override
     public void close() throws Exception {
         stop();

src/test/java/com/github/copilot/sdk/CopilotSessionTest.java

@@ -19,6 +19,7 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 
 import com.github.copilot.sdk.events.AbstractSessionEvent;
 import com.github.copilot.sdk.events.AbortEvent;
@@ -486,17 +487,22 @@ void testCreateSessionWithCustomConfigDir() throws Exception {
         }
     }
 
+    // Skip in CI - this test validates client-side timeout behavior, not LLM
+    // responses.
+    // The test intentionally times out before receiving a response, so there's no
+    // snapshot to replay.
     @Test
+    @DisabledIfEnvironmentVariable(named = "CI", matches = ".*")
     void testSendAndWaitThrowsOnTimeout() throws Exception {
-        ctx.configureForTest("session", "should_receive_session_events");
+        ctx.configureForTest("session", "sendandwait_throws_on_timeout");
 
         try (CopilotClient client = ctx.createClient()) {
             CopilotSession session = client.createSession().get();
 
             // Use a very short timeout that will definitely expire
             try {
                 // Note: We use a command that takes time so timeout triggers before completion
-                session.sendAndWait(new MessageOptions().setPrompt("Run 'sleep 10 && echo done'"), 100).get(5,
+                session.sendAndWait(new MessageOptions().setPrompt("Run 'sleep 2 && echo done'"), 100).get(5,
                         TimeUnit.SECONDS);
                 fail("Expected timeout exception");
             } catch (Exception e) {

src/test/java/com/github/copilot/sdk/E2ETestContext.java

@@ -55,7 +55,7 @@ public class E2ETestContext implements AutoCloseable {
     private final String cliPath;
     private final Path homeDir;
     private final Path workDir;
-    private final String proxyUrl;
+    private String proxyUrl;
     private final CapiProxy proxy;
     private final Path repoRoot;
 
@@ -133,6 +133,9 @@ public String getProxyUrl() {
      *             if configuration is interrupted
      */
     public void configureForTest(String testFile, String testName) throws IOException, InterruptedException {
+        // Restart the proxy if it has crashed
+        ensureProxyAlive();
+
         // Convert test method names to lowercase snake_case for snapshot filenames
         // to avoid case collisions on case-insensitive filesystems (macOS/Windows)
         String sanitizedName = SNAKE_CASE.matcher(testName).replaceAll("_").toLowerCase();
@@ -141,6 +144,20 @@ public void configureForTest(String testFile, String testName) throws IOExceptio
         proxy.configure(snapshotPath, workDir.toString());
     }
 
+    /**
+     * Ensures the proxy is alive, restarting it if necessary.
+     *
+     * @throws IOException
+     *             if the proxy cannot be restarted
+     * @throws InterruptedException
+     *             if interrupted during restart
+     */
+    public void ensureProxyAlive() throws IOException, InterruptedException {
+        if (!proxy.isAlive()) {
+            proxyUrl = proxy.restart();
+        }
+    }
+
     /**
      * Gets the captured HTTP exchanges from the proxy.
      *
@@ -173,8 +190,16 @@ public Map<String, String> getEnvironment() {
      * @return a new CopilotClient
      */
     public CopilotClient createClient() {
-        return new CopilotClient(new CopilotClientOptions().setCliPath(cliPath).setCwd(workDir.toString())
-                .setEnvironment(getEnvironment()));
+        CopilotClientOptions options = new CopilotClientOptions().setCliPath(cliPath).setCwd(workDir.toString())
+                .setEnvironment(getEnvironment());
+
+        // In CI, use a fake token to avoid auth issues
+        String ci = System.getenv("CI");
+        if (ci != null && !ci.isEmpty()) {
+            options.setGithubToken("fake-token-for-e2e-tests");
+        }
+
+        return new CopilotClient(options);
     }
 
     @Override

src/test/java/com/github/copilot/sdk/McpAndAgentsTest.java

@@ -26,7 +26,7 @@
  *
  * <p>
  * These tests use the shared CapiProxy infrastructure for deterministic API
- * response replay. Snapshots are stored in test/snapshots/mcp-and-agents/.
+ * response replay. Snapshots are stored in test/snapshots/mcp_and_agents/.
  * </p>
  */
 public class McpAndAgentsTest {
@@ -59,7 +59,7 @@ private Map<String, Object> createLocalMcpServer(String command, List<String> ar
 
     @Test
     void testAcceptMcpServerConfigurationOnSessionCreate() throws Exception {
-        ctx.configureForTest("mcp-and-agents", "should_accept_mcp_server_configuration_on_session_create");
+        ctx.configureForTest("mcp_and_agents", "should_accept_mcp_server_configuration_on_session_create");
 
         Map<String, Object> mcpServers = new HashMap<>();
         mcpServers.put("test-server", createLocalMcpServer("echo", List.of("hello")));
@@ -83,7 +83,7 @@ void testAcceptMcpServerConfigurationOnSessionCreate() throws Exception {
 
     @Test
     void testAcceptMcpServerConfigurationOnSessionResume() throws Exception {
-        ctx.configureForTest("mcp-and-agents", "should_accept_mcp_server_configuration_on_session_resume");
+        ctx.configureForTest("mcp_and_agents", "should_accept_mcp_server_configuration_on_session_resume");
 
         try (CopilotClient client = ctx.createClient()) {
             // Create a session first
@@ -115,7 +115,7 @@ void testAcceptMcpServerConfigurationOnSessionResume() throws Exception {
     void testHandleMultipleMcpServers() throws Exception {
         // Use same snapshot as single MCP server test since it doesn't depend on server
         // count
-        ctx.configureForTest("mcp-and-agents", "should_accept_mcp_server_configuration_on_session_create");
+        ctx.configureForTest("mcp_and_agents", "should_accept_mcp_server_configuration_on_session_create");
 
         Map<String, Object> mcpServers = new HashMap<>();
         mcpServers.put("server1", createLocalMcpServer("echo", List.of("server1")));
@@ -133,7 +133,7 @@ void testHandleMultipleMcpServers() throws Exception {
 
     @Test
     void testAcceptCustomAgentConfigurationOnSessionCreate() throws Exception {
-        ctx.configureForTest("mcp-and-agents", "should_accept_custom_agent_configuration_on_session_create");
+        ctx.configureForTest("mcp_and_agents", "should_accept_custom_agent_configuration_on_session_create");
 
         List<CustomAgentConfig> customAgents = List.of(new CustomAgentConfig().setName("test-agent")
                 .setDisplayName("Test Agent").setDescription("A test agent for SDK testing")
@@ -158,7 +158,7 @@ void testAcceptCustomAgentConfigurationOnSessionCreate() throws Exception {
 
     @Test
     void testAcceptCustomAgentConfigurationOnSessionResume() throws Exception {
-        ctx.configureForTest("mcp-and-agents", "should_accept_custom_agent_configuration_on_session_resume");
+        ctx.configureForTest("mcp_and_agents", "should_accept_custom_agent_configuration_on_session_resume");
 
         try (CopilotClient client = ctx.createClient()) {
             // Create a session first
@@ -191,7 +191,7 @@ void testAcceptCustomAgentConfigurationOnSessionResume() throws Exception {
     void testCustomAgentWithToolsConfiguration() throws Exception {
         // Use same snapshot as create test since this just verifies configuration
         // acceptance
-        ctx.configureForTest("mcp-and-agents", "should_accept_custom_agent_configuration_on_session_create");
+        ctx.configureForTest("mcp_and_agents", "should_accept_custom_agent_configuration_on_session_create");
 
         List<CustomAgentConfig> customAgents = List.of(new CustomAgentConfig().setName("tool-agent")
                 .setDisplayName("Tool Agent").setDescription("An agent with specific tools")
@@ -208,7 +208,7 @@ void testCustomAgentWithToolsConfiguration() throws Exception {
     @Test
     void testCustomAgentWithMcpServers() throws Exception {
         // Use combined snapshot since this uses both MCP servers and custom agents
-        ctx.configureForTest("mcp-and-agents", "should_accept_both_mcp_servers_and_custom_agents");
+        ctx.configureForTest("mcp_and_agents", "should_accept_both_mcp_servers_and_custom_agents");
 
         Map<String, Object> agentMcpServers = new HashMap<>();
         agentMcpServers.put("agent-server", createLocalMcpServer("echo", List.of("agent-mcp")));
@@ -228,7 +228,7 @@ void testCustomAgentWithMcpServers() throws Exception {
     @Test
     void testMultipleCustomAgents() throws Exception {
         // Use same snapshot as create test
-        ctx.configureForTest("mcp-and-agents", "should_accept_custom_agent_configuration_on_session_create");
+        ctx.configureForTest("mcp_and_agents", "should_accept_custom_agent_configuration_on_session_create");
 
         List<CustomAgentConfig> customAgents = List.of(
                 new CustomAgentConfig().setName("agent1").setDisplayName("Agent One").setDescription("First agent")
@@ -248,7 +248,7 @@ void testMultipleCustomAgents() throws Exception {
 
     @Test
     void testAcceptBothMcpServersAndCustomAgents() throws Exception {
-        ctx.configureForTest("mcp-and-agents", "should_accept_both_mcp_servers_and_custom_agents");
+        ctx.configureForTest("mcp_and_agents", "should_accept_both_mcp_servers_and_custom_agents");
 
         Map<String, Object> mcpServers = new HashMap<>();
         mcpServers.put("shared-server", createLocalMcpServer("echo", List.of("shared")));