test(java): add dedicated rpc server e2e coverage

Add a dedicated Java RpcServerE2ETest that exercises server-scoped RPC wrappers in parity with the other SDKs.

Update Java RPC codegen so server-scoped session methods keep their required sessionId params while session-scoped wrappers continue to inject sessionId automatically.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Author: stephentoub

java/scripts/codegen/java.ts

@@ -1651,15 +1651,16 @@ function addWrapperResultImports(resultType: string, allImports: Set<string>, pa
 }
 
 /**
- * Return the params class name if the method has a params schema with properties
- * other than sessionId (i.e. there are user-supplied parameters).
+ * Return the params class name if the method has a params schema with user-supplied properties.
+ * Session-scoped wrappers inject sessionId automatically, but server-scoped wrappers must let
+ * callers supply it explicitly.
  */
-function wrapperParamsClassName(method: RpcMethodNode): string | null {
+function wrapperParamsClassName(method: RpcMethodNode, isSession: boolean): string | null {
     let params = method.params;
     if (params?.$ref) params = resolveRef(params) as JSONSchema7;
     if (!params || typeof params !== "object") return null;
     const props = params.properties ?? {};
-    const userProps = Object.keys(props).filter((k) => k !== "sessionId");
+    const userProps = Object.keys(props).filter((k) => !isSession || k !== "sessionId");
     if (userProps.length === 0) return null;
     return rpcMethodToClassName(method.rpcMethod) + "Params";
 }
@@ -1682,7 +1683,7 @@ function generateApiMethod(
     sessionIdExpr: string
 ): { lines: string[]; needsMapper: boolean; needsExperimentalImport: boolean } {
     const resultClass = wrapperResultClassName(method);
-    const paramsClass = wrapperParamsClassName(method);
+    const paramsClass = wrapperParamsClassName(method, isSession);
     const hasSessionId = methodHasSessionId(method);
     const hasExtraParams = paramsClass !== null;
     let needsMapper = false;
@@ -1790,7 +1791,7 @@ async function generateNamespaceApiFile(
     const methodLines: string[] = [];
     for (const [key, method] of tree.methods) {
         const resultClass = wrapperResultClassName(method);
-        const paramsClass = wrapperParamsClassName(method);
+        const paramsClass = wrapperParamsClassName(method, isSession);
         addWrapperResultImports(resultClass, allImports, packageName);
         if (paramsClass) allImports.add(`${packageName}.${paramsClass}`);
 
@@ -1910,7 +1911,7 @@ async function generateRpcRootFile(
     const methodLines: string[] = [];
     for (const [key, method] of tree.methods) {
         const resultClass = wrapperResultClassName(method);
-        const paramsClass = wrapperParamsClassName(method);
+        const paramsClass = wrapperParamsClassName(method, isSession);
         addWrapperResultImports(resultClass, allImports, packageName);
         if (paramsClass) allImports.add(`${packageName}.${paramsClass}`);
 

java/src/generated/java/com/github/copilot/generated/rpc/ServerSessionsApi.java

@@ -55,8 +55,8 @@ public CompletableFuture<SessionsForkResult> fork(SessionsForkParams params) {
      * @since 1.0.0
      */
     @CopilotExperimental
-    public CompletableFuture<SessionsConnectResult> connect() {
-        return caller.invoke("sessions.connect", java.util.Map.of(), SessionsConnectResult.class);
+    public CompletableFuture<SessionsConnectResult> connect(SessionsConnectParams params) {
+        return caller.invoke("sessions.connect", params, SessionsConnectResult.class);
     }
 
     /**
@@ -110,8 +110,8 @@ public CompletableFuture<SessionsGetLastForContextResult> getLastForContext(Sess
      * @since 1.0.0
      */
     @CopilotExperimental
-    public CompletableFuture<SessionsGetEventFilePathResult> getEventFilePath() {
-        return caller.invoke("sessions.getEventFilePath", java.util.Map.of(), SessionsGetEventFilePathResult.class);
+    public CompletableFuture<SessionsGetEventFilePathResult> getEventFilePath(SessionsGetEventFilePathParams params) {
+        return caller.invoke("sessions.getEventFilePath", params, SessionsGetEventFilePathResult.class);
     }
 
     /**
@@ -143,8 +143,8 @@ public CompletableFuture<SessionsCheckInUseResult> checkInUse(SessionsCheckInUse
      * @since 1.0.0
      */
     @CopilotExperimental
-    public CompletableFuture<SessionsGetPersistedRemoteSteerableResult> getPersistedRemoteSteerable() {
-        return caller.invoke("sessions.getPersistedRemoteSteerable", java.util.Map.of(), SessionsGetPersistedRemoteSteerableResult.class);
+    public CompletableFuture<SessionsGetPersistedRemoteSteerableResult> getPersistedRemoteSteerable(SessionsGetPersistedRemoteSteerableParams params) {
+        return caller.invoke("sessions.getPersistedRemoteSteerable", params, SessionsGetPersistedRemoteSteerableResult.class);
     }
 
     /**
@@ -154,8 +154,8 @@ public CompletableFuture<SessionsGetPersistedRemoteSteerableResult> getPersisted
      * @since 1.0.0
      */
     @CopilotExperimental
-    public CompletableFuture<Void> close() {
-        return caller.invoke("sessions.close", java.util.Map.of(), Void.class);
+    public CompletableFuture<Void> close(SessionsCloseParams params) {
+        return caller.invoke("sessions.close", params, Void.class);
     }
 
     /**
@@ -187,8 +187,8 @@ public CompletableFuture<SessionsPruneOldResult> pruneOld(SessionsPruneOldParams
      * @since 1.0.0
      */
     @CopilotExperimental
-    public CompletableFuture<Void> save() {
-        return caller.invoke("sessions.save", java.util.Map.of(), Void.class);
+    public CompletableFuture<Void> save(SessionsSaveParams params) {
+        return caller.invoke("sessions.save", params, Void.class);
     }
 
     /**
@@ -198,8 +198,8 @@ public CompletableFuture<Void> save() {
      * @since 1.0.0
      */
     @CopilotExperimental
-    public CompletableFuture<Void> releaseLock() {
-        return caller.invoke("sessions.releaseLock", java.util.Map.of(), Void.class);
+    public CompletableFuture<Void> releaseLock(SessionsReleaseLockParams params) {
+        return caller.invoke("sessions.releaseLock", params, Void.class);
     }
 
     /**
@@ -231,8 +231,8 @@ public CompletableFuture<Void> reloadPluginHooks(SessionsReloadPluginHooksParams
      * @since 1.0.0
      */
     @CopilotExperimental
-    public CompletableFuture<SessionsLoadDeferredRepoHooksResult> loadDeferredRepoHooks() {
-        return caller.invoke("sessions.loadDeferredRepoHooks", java.util.Map.of(), SessionsLoadDeferredRepoHooksResult.class);
+    public CompletableFuture<SessionsLoadDeferredRepoHooksResult> loadDeferredRepoHooks(SessionsLoadDeferredRepoHooksParams params) {
+        return caller.invoke("sessions.loadDeferredRepoHooks", params, SessionsLoadDeferredRepoHooksResult.class);
     }
 
     /**
@@ -253,8 +253,8 @@ public CompletableFuture<Void> setAdditionalPlugins(SessionsSetAdditionalPlugins
      * @since 1.0.0
      */
     @CopilotExperimental
-    public CompletableFuture<SessionsGetBoardEntryCountResult> getBoardEntryCount() {
-        return caller.invoke("sessions.getBoardEntryCount", java.util.Map.of(), SessionsGetBoardEntryCountResult.class);
+    public CompletableFuture<SessionsGetBoardEntryCountResult> getBoardEntryCount(SessionsGetBoardEntryCountParams params) {
+        return caller.invoke("sessions.getBoardEntryCount", params, SessionsGetBoardEntryCountResult.class);
     }
 
     /**

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

@@ -381,6 +381,24 @@ public void setCopilotUserByToken(String token, String login, String copilotPlan
         proxy.setCopilotUserByToken(token, login, copilotPlan, apiUrl, telemetryUrl, analyticsTrackingId);
     }
 
+    /**
+     * Configures the proxy to return a raw Copilot user response for a given token.
+     *
+     * @param token
+     *            the GitHub token
+     * @param response
+     *            the raw response object to return for the token
+     * @throws IOException
+     *             if the request fails
+     * @throws InterruptedException
+     *             if the request is interrupted
+     */
+    public void setCopilotUserByToken(String token, Map<String, Object> response)
+            throws IOException, InterruptedException {
+        ensureProxyAlive();
+        proxy.setCopilotUserByToken(token, response);
+    }
+
     /**
      * Initializes the proxy state without loading a snapshot.
      * <p>