Revert "Merge pull request #1314 from github/fix/java-cookbook-sdk-0.2.1"

This reverts commit d14dc51, reversing
changes made to 7c6c0be.

Author: brunoborges

cookbook/copilot-sdk/java/accessibility-report.md

@@ -67,12 +67,11 @@ public class AccessibilityReport {
             client.start().get();
 
             // Configure Playwright MCP server for browser automation
-            Map<String, Object> mcpConfig = Map.of(
-                "type", "local",
-                "command", "npx",
-                "args", List.of("@playwright/mcp@latest"),
-                "tools", List.of("*")
-            );
+            var mcpConfig = new McpServerConfig()
+                .setType("local")
+                .setCommand("npx")
+                .setArgs(List.of("@playwright/mcp@latest"))
+                .setTools(List.of("*"));
 
             var session = client.createSession(
                 new SessionConfig()
@@ -168,12 +167,11 @@ public class AccessibilityReport {
 The recipe configures a local MCP server that runs alongside the session:
 
 ```java
-Map<String, Object> mcpConfig = Map.of(
-    "type", "local",
-    "command", "npx",
-    "args", List.of("@playwright/mcp@latest"),
-    "tools", List.of("*")
-);
+var mcpConfig = new McpServerConfig()
+    .setType("local")
+    .setCommand("npx")
+    .setArgs(List.of("@playwright/mcp@latest"))
+    .setTools(List.of("*"));
 
 var session = client.createSession(
     new SessionConfig()

cookbook/copilot-sdk/java/error-handling.md

@@ -150,42 +150,27 @@ try (var client = new CopilotClient()) {
 
 ## Handling tool errors
 
-When defining tools, return an error string to signal a failure back to the model instead of throwing.
+When defining tools, return an error result to signal a failure back to the model instead of throwing.
 
 ```java
-import com.github.copilot.sdk.json.ToolDefinition;
-import java.util.concurrent.CompletableFuture;
-
-var readFileTool = ToolDefinition.create(
-    "read_file",
-    "Read a file from disk",
-    Map.of(
-        "type", "object",
-        "properties", Map.of(
-            "path", Map.of("type", "string", "description", "File path")
-        ),
-        "required", List.of("path")
-    ),
-    invocation -> {
+import com.github.copilot.sdk.json.ToolResultObject;
+
+session.addTool(
+    ToolDefinition.builder()
+        .name("read_file")
+        .description("Read a file from disk")
+        .parameter("path", "string", "File path", true)
+        .build(),
+    (args) -> {
         try {
-            var path = (String) invocation.getArguments().get("path");
             var content = java.nio.file.Files.readString(
-                java.nio.file.Path.of(path));
-            return CompletableFuture.completedFuture(content);
-        } catch (java.io.IOException ex) {
-            return CompletableFuture.completedFuture(
-                "Error: Failed to read file: " + ex.getMessage());
+                java.nio.file.Path.of(args.get("path").toString()));
+            return ToolResultObject.success(content);
+        } catch (IOException ex) {
+            return ToolResultObject.error("Failed to read file: " + ex.getMessage());
         }
     }
 );
-
-// Register tools when creating the session
-var session = client.createSession(
-    new SessionConfig()
-        .setOnPermissionRequest(PermissionHandler.APPROVE_ALL)
-        .setModel("gpt-5")
-        .setTools(List.of(readFileTool))
-).get();
 ```
 
 ## Best practices
@@ -194,5 +179,5 @@ var session = client.createSession(
 2. **Unwrap `ExecutionException`**: Call `getCause()` to inspect the real error — the outer `ExecutionException` is just a `CompletableFuture` wrapper.
 3. **Restore interrupt flag**: When catching `InterruptedException`, call `Thread.currentThread().interrupt()` to preserve the interrupted status.
 4. **Set timeouts**: Use `get(timeout, TimeUnit)` instead of bare `get()` for any call that could block indefinitely.
-5. **Return tool errors, don't throw**: Return an error string from the `CompletableFuture` so the model can recover gracefully.
+5. **Return tool errors, don't throw**: Use `ToolResultObject.error()` so the model can recover gracefully.
 6. **Log errors**: Capture error details for debugging — consider a logging framework like SLF4J for production applications.

cookbook/copilot-sdk/java/multiple-sessions.md

@@ -48,9 +48,9 @@ public class MultipleSessions {
             session3.sendAndWait(new MessageOptions().setPrompt("How do I initialize a module?")).get();
 
             // Clean up all sessions
-            session1.close();
-            session2.close();
-            session3.close();
+            session1.destroy().get();
+            session2.destroy().get();
+            session3.destroy().get();
         }
     }
 }
@@ -136,7 +136,7 @@ var session = client.createSession(new SessionConfig()
 
 session.sendAndWait(new MessageOptions().setPrompt("Hello!")).get();
 
-session.close();
+session.destroy().get();
 client.stop().get();
 executor.shutdown();
 ```

cookbook/copilot-sdk/java/recipe/AccessibilityReport.java

@@ -43,12 +43,11 @@ public static void main(String[] args) throws Exception {
             client.start().get();
 
             // Configure Playwright MCP server for browser automation
-            Map<String, Object> mcpConfig = Map.of(
-                "type", "local",
-                "command", "npx",
-                "args", List.of("@playwright/mcp@latest"),
-                "tools", List.of("*")
-            );
+            var mcpConfig = new McpServerConfig()
+                .setType("local")
+                .setCommand("npx")
+                .setArgs(List.of("@playwright/mcp@latest"))
+                .setTools(List.of("*"));
 
             var session = client.createSession(
                 new SessionConfig()

cookbook/copilot-sdk/java/recipe/MultipleSessions.java

@@ -30,7 +30,8 @@ public static void main(String[] args) throws Exception {
             System.out.println("S3: " + s3.sendAndWait(new MessageOptions().setPrompt("Explain pattern matching")).get().getData().content());
 
             // Clean up
-            s1.close(); s2.close(); s3.close();
+            s1.destroy().get(); s2.destroy().get(); s3.destroy().get();
+            client.stop().get();
         }
     }
 }