Add tests for copilotHome, tcpConnectionToken, and instructionDirectories

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

Author: Copilot

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

@@ -36,6 +36,9 @@ void copilotClientOptionsCloneBasic() {
         original.setPort(9000);
         original.setGitHubToken("ghp_test");
         original.setUseLoggedInUser(false);
+        original.setCopilotHome("/custom/copilot/home");
+        original.setUseStdio(false);
+        original.setTcpConnectionToken("my-token-123");
 
         CopilotClientOptions cloned = original.clone();
 
@@ -44,6 +47,8 @@ void copilotClientOptionsCloneBasic() {
         assertEquals(original.getPort(), cloned.getPort());
         assertEquals(original.getGitHubToken(), cloned.getGitHubToken());
         assertEquals(original.getUseLoggedInUser(), cloned.getUseLoggedInUser());
+        assertEquals(original.getCopilotHome(), cloned.getCopilotHome());
+        assertEquals(original.getTcpConnectionToken(), cloned.getTcpConnectionToken());
     }
 
     @Test
@@ -120,6 +125,7 @@ void sessionConfigListIndependence() {
         toolList.add("grep");
         toolList.add("bash");
         original.setAvailableTools(toolList);
+        original.setInstructionDirectories(new ArrayList<>(List.of("/path/a", "/path/b")));
 
         SessionConfig cloned = original.clone();
 
@@ -129,6 +135,7 @@ void sessionConfigListIndependence() {
         // The cloned config should be unaffected by mutations to the original list
         assertEquals(2, cloned.getAvailableTools().size());
         assertEquals(3, original.getAvailableTools().size());
+        assertEquals(List.of("/path/a", "/path/b"), cloned.getInstructionDirectories());
     }
 
     @Test

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

@@ -199,6 +199,30 @@ void testSessionIdleTimeoutSecondsOptionAccepted() {
         assertEquals(600, options.getSessionIdleTimeoutSeconds());
     }
 
+    @Test
+    void testTcpConnectionTokenWithUseStdioThrows() {
+        var options = new CopilotClientOptions().setUseStdio(true).setTcpConnectionToken("my-token");
+
+        assertThrows(IllegalArgumentException.class, () -> new CopilotClient(options));
+    }
+
+    @Test
+    void testTcpConnectionTokenAcceptedInTcpMode() {
+        var options = new CopilotClientOptions().setUseStdio(false).setTcpConnectionToken("my-token");
+
+        // Should not throw
+        try (var client = new CopilotClient(options)) {
+            assertNotNull(client);
+        }
+    }
+
+    @Test
+    void testCopilotHomeOptionSetOnOptions() {
+        var options = new CopilotClientOptions().setCopilotHome("/custom/home");
+
+        assertEquals("/custom/home", options.getCopilotHome());
+    }
+
     // ===== onLifecycle tests =====
 
     /**

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

@@ -0,0 +1,127 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.sdk;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import com.github.copilot.sdk.json.MessageOptions;
+import com.github.copilot.sdk.json.PermissionHandler;
+import com.github.copilot.sdk.json.ResumeSessionConfig;
+import com.github.copilot.sdk.json.SessionConfig;
+
+/**
+ * E2E tests for session configuration features.
+ */
+public class SessionConfigE2ETest {
+
+    private static E2ETestContext ctx;
+
+    @BeforeAll
+    static void setup() throws Exception {
+        ctx = E2ETestContext.create();
+    }
+
+    @AfterAll
+    static void teardown() throws Exception {
+        if (ctx != null) {
+            ctx.close();
+        }
+    }
+
+    @Disabled("Requires test harness update with instructionDirectories snapshots - see reference impl PR #1190")
+    @Test
+    void testShouldApplyInstructionDirectoriesOnCreate() throws Exception {
+        ctx.configureForTest("session_config", "should_apply_instructiondirectories_on_create");
+
+        // Set up instruction directory with a custom instruction file
+        Path projectDir = ctx.getWorkDir().resolve("instruction-create-project");
+        Path instructionDir = ctx.getWorkDir().resolve("extra-create-instructions");
+        Path instructionFilesDir = instructionDir.resolve(".github").resolve("instructions");
+        String sentinel = "JAVA_CREATE_INSTRUCTION_DIRECTORIES_SENTINEL";
+        Files.createDirectories(projectDir);
+        Files.createDirectories(instructionFilesDir);
+        Files.writeString(instructionFilesDir.resolve("extra.instructions.md"), "Always include " + sentinel + ".");
+
+        try (CopilotClient client = ctx.createClient()) {
+            CopilotSession session = client.createSession(new SessionConfig().setWorkingDirectory(projectDir.toString())
+                    .setInstructionDirectories(List.of(instructionDir.toString()))
+                    .setOnPermissionRequest(PermissionHandler.APPROVE_ALL)).get();
+
+            session.sendAndWait(new MessageOptions().setPrompt("What is 1+1?")).get(60, TimeUnit.SECONDS);
+
+            List<Map<String, Object>> exchanges = ctx.getExchanges();
+            assertFalse(exchanges.isEmpty(), "Should have at least one exchange");
+            String systemMessage = getSystemMessage(exchanges.get(0));
+            assertNotNull(systemMessage, "System message should not be null");
+            assertTrue(systemMessage.contains(sentinel),
+                    "System message should contain the instruction sentinel: " + sentinel);
+        }
+    }
+
+    @Disabled("Requires test harness update with instructionDirectories snapshots - see reference impl PR #1190")
+    @Test
+    void testShouldApplyInstructionDirectoriesOnResume() throws Exception {
+        ctx.configureForTest("session_config", "should_apply_instructiondirectories_on_resume");
+
+        // Set up instruction directory with a custom instruction file
+        Path projectDir = ctx.getWorkDir().resolve("instruction-resume-project");
+        Path instructionDir = ctx.getWorkDir().resolve("extra-resume-instructions");
+        Path instructionFilesDir = instructionDir.resolve(".github").resolve("instructions");
+        String sentinel = "JAVA_RESUME_INSTRUCTION_DIRECTORIES_SENTINEL";
+        Files.createDirectories(projectDir);
+        Files.createDirectories(instructionFilesDir);
+        Files.writeString(instructionFilesDir.resolve("extra.instructions.md"), "Always include " + sentinel + ".");
+
+        try (CopilotClient client = ctx.createClient()) {
+            // Create a session first
+            CopilotSession session1 = client.createSession(new SessionConfig()
+                    .setWorkingDirectory(projectDir.toString()).setOnPermissionRequest(PermissionHandler.APPROVE_ALL))
+                    .get();
+
+            // Resume with instructionDirectories
+            CopilotSession session2 = client.resumeSession(session1.getSessionId(),
+                    new ResumeSessionConfig().setWorkingDirectory(projectDir.toString())
+                            .setInstructionDirectories(List.of(instructionDir.toString()))
+                            .setOnPermissionRequest(PermissionHandler.APPROVE_ALL))
+                    .get();
+
+            session2.sendAndWait(new MessageOptions().setPrompt("What is 1+1?")).get(60, TimeUnit.SECONDS);
+
+            List<Map<String, Object>> exchanges = ctx.getExchanges();
+            assertFalse(exchanges.isEmpty(), "Should have at least one exchange");
+            String systemMessage = getSystemMessage(exchanges.get(0));
+            assertNotNull(systemMessage, "System message should not be null");
+            assertTrue(systemMessage.contains(sentinel),
+                    "System message should contain the instruction sentinel: " + sentinel);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private static String getSystemMessage(Map<String, Object> exchange) {
+        Object messagesObj = exchange.get("messages");
+        if (messagesObj instanceof List<?> messages) {
+            for (Object msg : messages) {
+                if (msg instanceof Map<?, ?> msgMap) {
+                    if ("system".equals(msgMap.get("role"))) {
+                        Object content = msgMap.get("content");
+                        return content != null ? content.toString() : null;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+}