github
diff --git a/‎.github/copilot-instructions.md‎
Lines changed: 3 additions & 3 deletions b/‎.github/copilot-instructions.md‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎.github/prompts/agentic-merge-reference-impl.prompt.md‎
Lines changed: 1 addition & 1 deletion b/‎.github/prompts/agentic-merge-reference-impl.prompt.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎CHANGELOG.md‎
Lines changed: 1 addition & 1 deletion b/‎CHANGELOG.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎README.md‎
Lines changed: 7 additions & 7 deletions b/‎README.md‎
Lines changed: 7 additions & 7 deletions
diff --git a/‎config/spotbugs/spotbugs-exclude.xml‎
Lines changed: 2 additions & 2 deletions b/‎config/spotbugs/spotbugs-exclude.xml‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎jbang-example.java‎
Lines changed: 6 additions & 6 deletions b/‎jbang-example.java‎
Lines changed: 6 additions & 6 deletions
diff --git a/‎pom.xml‎
Lines changed: 3 additions & 3 deletions b/‎pom.xml‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎scripts/codegen/java.ts‎
Lines changed: 3 additions & 3 deletions b/‎scripts/codegen/java.ts‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎…ub/copilot/sdk/generated/AbortEvent.java‎ ‎…github/copilot/generated/AbortEvent.java‎src/generated/java/com/github/copilot/sdk/generated/AbortEvent.java renamed to src/generated/java/com/github/copilot/generated/AbortEvent.java
Lines changed: 1 addition & 1 deletion b/‎…ub/copilot/sdk/generated/AbortEvent.java‎ ‎…github/copilot/generated/AbortEvent.java‎src/generated/java/com/github/copilot/sdk/generated/AbortEvent.java renamed to src/generated/java/com/github/copilot/generated/AbortEvent.java
Lines changed: 1 addition & 1 deletion
diff --git a/‎…b/copilot/sdk/generated/AbortReason.java‎ ‎…ithub/copilot/generated/AbortReason.java‎src/generated/java/com/github/copilot/sdk/generated/AbortReason.java renamed to src/generated/java/com/github/copilot/generated/AbortReason.java
Lines changed: 1 addition & 1 deletion b/‎…b/copilot/sdk/generated/AbortReason.java‎ ‎…ithub/copilot/generated/AbortReason.java‎src/generated/java/com/github/copilot/sdk/generated/AbortReason.java renamed to src/generated/java/com/github/copilot/generated/AbortReason.java
Lines changed: 1 addition & 1 deletion
@@ -75,9 +75,9 @@ mvn test -Dtest=CopilotClientTest
 
 ### Package Structure
 
-- `com.github.copilot.sdk` - Core classes (CopilotClient, CopilotSession, JsonRpcClient)
-- `com.github.copilot.sdk.json` - DTOs, request/response types, handler interfaces (SessionConfig, MessageOptions, ToolDefinition, etc.)
-- `com.github.copilot.sdk.generated` - Generated event types for session streaming (SessionEvent, AssistantMessageEvent, SessionIdleEvent, ToolExecutionStartEvent, etc.)
+- `com.github.copilot` - Core classes (CopilotClient, CopilotSession, JsonRpcClient)
+- `com.github.copilot.rpc` - DTOs, request/response types, handler interfaces (SessionConfig, MessageOptions, ToolDefinition, etc.)
+- `com.github.copilot.generated` - Generated event types for session streaming (SessionEvent, AssistantMessageEvent, SessionIdleEvent, ToolExecutionStartEvent, etc.)
 
 ### Test Infrastructure
 
 
@@ -209,7 +209,7 @@ This creates a clear history of changes that can be reviewed in the Pull Request
 Follow the existing Java SDK patterns:
 - Use Jackson for JSON serialization (`ObjectMapper`)
 - Use Java records for DTOs where appropriate
-- Follow the existing package structure under `com.github.copilot.sdk`
+- Follow the existing package structure under `com.github.copilot`
 - Maintain backward compatibility when possible
 - **Match the style of surrounding code** - Consistency with existing code is more important than reference implementation patterns
 - **Prefer existing abstractions** - If the Java SDK already solves a problem differently than .NET, keep the Java approach
 
@@ -405,7 +405,7 @@ New types: `GetForegroundSessionResponse`, `SetForegroundSessionResponse`
 
 - Advanced usage documentation with comprehensive examples
 - Getting started guide with Maven and JBang instructions
-- Package-info.java files for `com.github.copilot.sdk`, `events`, and `json` packages
+- Package-info.java files for `com.github.copilot`, `events`, and `json` packages
 - `@since` annotations on all public classes
 - Versioned documentation with version selector on GitHub Pages
 - Maven resources plugin for site markdown filtering
 
@@ -67,13 +67,13 @@ implementation 'com.github:copilot-sdk-java:1.0.0-beta-java.4'
 ## Quick Start
 
 ```java
-import com.github.copilot.sdk.CopilotClient;
-import com.github.copilot.sdk.generated.AssistantMessageEvent;
-import com.github.copilot.sdk.generated.SessionUsageInfoEvent;
-import com.github.copilot.sdk.json.CopilotClientOptions;
-import com.github.copilot.sdk.json.MessageOptions;
-import com.github.copilot.sdk.json.PermissionHandler;
-import com.github.copilot.sdk.json.SessionConfig;
+import com.github.copilot.CopilotClient;
+import com.github.copilot.generated.AssistantMessageEvent;
+import com.github.copilot.generated.SessionUsageInfoEvent;
+import com.github.copilot.rpc.CopilotClientOptions;
+import com.github.copilot.rpc.MessageOptions;
+import com.github.copilot.rpc.PermissionHandler;
+import com.github.copilot.rpc.SessionConfig;
 
 import java.util.concurrent.Executors;
 
 
@@ -10,11 +10,11 @@
 -->
 <FindBugsFilter>
     <Match>
-        <Package name="com.github.copilot.sdk.generated"/>
+        <Package name="com.github.copilot.generated"/>
         <Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2"/>
     </Match>
     <Match>
-        <Package name="com.github.copilot.sdk.json"/>
+        <Package name="com.github.copilot.rpc"/>
         <Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2"/>
     </Match>
 </FindBugsFilter>
@@ -1,11 +1,11 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 //DEPS com.github:copilot-sdk-java:1.0.0-beta-java.4
-import com.github.copilot.sdk.CopilotClient;
-import com.github.copilot.sdk.generated.AssistantMessageEvent;
-import com.github.copilot.sdk.generated.SessionUsageInfoEvent;
-import com.github.copilot.sdk.json.MessageOptions;
-import com.github.copilot.sdk.json.PermissionHandler;
-import com.github.copilot.sdk.json.SessionConfig;
+import com.github.copilot.CopilotClient;
+import com.github.copilot.generated.AssistantMessageEvent;
+import com.github.copilot.generated.SessionUsageInfoEvent;
+import com.github.copilot.rpc.MessageOptions;
+import com.github.copilot.rpc.PermissionHandler;
+import com.github.copilot.rpc.SessionConfig;
 
 import static java.lang.System.out;
 
 
@@ -429,11 +429,11 @@
                             <propertyName>testExecutionAgentArgs</propertyName>
                             <!-- Focus on SDK package, exclude test harness utilities -->
                             <includes>
-                                <include>com/github/copilot/sdk/**</include>
+                                <include>com/github/copilot/**</include>
                             </includes>
                             <excludes>
-                                <exclude>com/github/copilot/sdk/E2ETestContext*</exclude>
-                                <exclude>com/github/copilot/sdk/CapiProxy*</exclude>
+                                <exclude>com/github/copilot/E2ETestContext*</exclude>
+                                <exclude>com/github/copilot/CapiProxy*</exclude>
                             </excludes>
                         </configuration>
                     </execution>
 
@@ -358,7 +358,7 @@ async function generateSessionEvents(schemaPath: string): Promise<void> {
     pendingStandaloneTypes.clear();
 
     const variants = extractEventVariants(schema);
-    const packageName = "com.github.copilot.sdk.generated";
+    const packageName = "com.github.copilot.generated";
     const packageDir = `src/generated/java/com/github/copilot/sdk/generated`;
 
     // Generate base SessionEvent class
@@ -940,7 +940,7 @@ async function generateRpcTypes(schemaPath: string): Promise<void> {
         console.warn(`[codegen] Could not load session-events schema for cross-ref resolution: ${e}`);
     }
 
-    const packageName = "com.github.copilot.sdk.generated.rpc";
+    const packageName = "com.github.copilot.generated.rpc";
     const packageDir = `src/generated/java/com/github/copilot/sdk/generated/rpc`;
 
     // Collect all RPC methods from all sections
@@ -1562,7 +1562,7 @@ async function generateRpcWrappers(schemaPath: string): Promise<void> {
     // Set module-level definitions for $ref resolution in wrapper helpers
     currentDefinitions = (schema.definitions ?? {}) as Record<string, JSONSchema7>;
 
-    const packageName = "com.github.copilot.sdk.generated.rpc";
+    const packageName = "com.github.copilot.generated.rpc";
     const packageDir = `src/generated/java/com/github/copilot/sdk/generated/rpc`;
 
     // RpcCaller interface and shared ObjectMapper holder