Fix CR feedback

Author: SteveSandersonMS

dotnet/src/Client.cs

@@ -72,8 +72,11 @@ public partial class CopilotClient : IDisposable, IAsyncDisposable
     /// <remarks>
     /// The client must be started before accessing this property. Use <see cref="StartAsync"/> or set <see cref="CopilotClientOptions.AutoStart"/> to true.
     /// </remarks>
+    /// <exception cref="ObjectDisposedException">Thrown if the client has been disposed.</exception>
     /// <exception cref="InvalidOperationException">Thrown if the client is not started.</exception>
-    public ServerRpc Rpc => _rpc ?? throw new InvalidOperationException("Client is not started. Call StartAsync first.");
+    public ServerRpc Rpc => _disposed
+        ? throw new ObjectDisposedException(nameof(CopilotClient))
+        : _rpc ?? throw new InvalidOperationException("Client is not started. Call StartAsync first.");
 
     /// <summary>
     /// Creates a new instance of <see cref="CopilotClient"/>.
@@ -300,7 +303,8 @@ private async Task CleanupConnectionAsync(List<Exception>? errors)
         try { ctx.Rpc.Dispose(); }
         catch (Exception ex) { errors?.Add(ex); }
 
-        // Clear models cache
+        // Clear RPC and models cache
+        _rpc = null;
         _modelsCache = null;
 
         if (ctx.NetworkStream is not null)

dotnet/src/Generated/Rpc.cs

@@ -5,7 +5,6 @@
 // AUTO-GENERATED FILE - DO NOT EDIT
 // Generated from: api.schema.json
 
-using System.Diagnostics.CodeAnalysis;
 using System.Text.Json.Serialization;
 using StreamJsonRpc;
 

dotnet/src/Session.cs

@@ -4,7 +4,6 @@
 
 using Microsoft.Extensions.AI;
 using StreamJsonRpc;
-using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;

go/client.go

@@ -86,9 +86,9 @@ type Client struct {
 	typedLifecycleHandlers map[SessionLifecycleEventType][]SessionLifecycleHandler
 	lifecycleHandlersMux   sync.Mutex
 
-	// Rpc provides typed server-scoped RPC methods.
+	// RPC provides typed server-scoped RPC methods.
 	// This field is nil until the client is connected via Start().
-	Rpc *rpc.ServerRpc
+	RPC *rpc.ServerRpc
 }
 
 // NewClient creates a new Copilot CLI client with the given options.
@@ -342,6 +342,7 @@ func (c *Client) Stop() error {
 		c.actualPort = 0
 	}
 
+	c.RPC = nil
 	return errors.Join(errs...)
 }
 
@@ -400,6 +401,8 @@ func (c *Client) ForceStop() {
 	if !c.isExternalServer {
 		c.actualPort = 0
 	}
+
+	c.RPC = nil
 }
 
 func (c *Client) ensureConnected() error {
@@ -1086,7 +1089,7 @@ func (c *Client) startCLIServer(ctx context.Context) error {
 
 		// Create JSON-RPC client immediately
 		c.client = jsonrpc2.NewClient(stdin, stdout)
-		c.Rpc = rpc.NewServerRpc(c.client)
+		c.RPC = rpc.NewServerRpc(c.client)
 		c.setupNotificationHandler()
 		c.client.Start()
 
@@ -1159,7 +1162,7 @@ func (c *Client) connectViaTcp(ctx context.Context) error {
 
 	// Create JSON-RPC client with the connection
 	c.client = jsonrpc2.NewClient(conn, conn)
-	c.Rpc = rpc.NewServerRpc(c.client)
+	c.RPC = rpc.NewServerRpc(c.client)
 	c.setupNotificationHandler()
 	c.client.Start()
 

go/session.go

@@ -65,8 +65,8 @@ type Session struct {
 	hooks             *SessionHooks
 	hooksMux          sync.RWMutex
 
-	// Rpc provides typed session-scoped RPC methods.
-	Rpc *rpc.SessionRpc
+	// RPC provides typed session-scoped RPC methods.
+	RPC *rpc.SessionRpc
 }
 
 // WorkspacePath returns the path to the session workspace directory when infinite
@@ -84,7 +84,7 @@ func newSession(sessionID string, client *jsonrpc2.Client, workspacePath string)
 		client:        client,
 		handlers:      make([]sessionHandler, 0),
 		toolHandlers:  make(map[string]ToolHandler),
-		Rpc:           rpc.NewSessionRpc(client, sessionID),
+		RPC:           rpc.NewSessionRpc(client, sessionID),
 	}
 }
 

nodejs/src/client.ts

@@ -358,6 +358,7 @@ export class CopilotClient {
                 );
             }
             this.connection = null;
+            this._rpc = null;
         }
 
         // Clear models cache
@@ -435,6 +436,7 @@ export class CopilotClient {
                 // Ignore errors during force stop
             }
             this.connection = null;
+            this._rpc = null;
         }
 
         // Clear models cache

python/copilot/client.py

@@ -334,6 +334,7 @@ async def stop(self) -> list["StopError"]:
         if self._client:
             await self._client.stop()
             self._client = None
+        self._rpc = None
 
         # Clear models cache
         async with self._models_cache_lock:
@@ -382,6 +383,7 @@ async def force_stop(self) -> None:
             except Exception:
                 pass  # Ignore errors during force stop
             self._client = None
+        self._rpc = None
 
         # Clear models cache
         async with self._models_cache_lock:

scripts/codegen/csharp.ts

@@ -712,7 +712,6 @@ function generateRpcCode(schema: ApiSchema): string {
 // AUTO-GENERATED FILE - DO NOT EDIT
 // Generated from: api.schema.json
 
-using System.Diagnostics.CodeAnalysis;
 using System.Text.Json.Serialization;
 using StreamJsonRpc;
 

scripts/codegen/go.ts

@@ -267,7 +267,7 @@ function emitMethod(lines: string[], receiver: string, name: string, method: Rpc
         }
         lines.push(`    raw, err := a.client.Request("${method.rpcMethod}", req)`);
     } else {
-        const arg = hasParams ? "params" : "nil";
+        const arg = hasParams ? "params" : "map[string]interface{}{}";
         lines.push(`    raw, err := a.client.Request("${method.rpcMethod}", ${arg})`);
     }
 

scripts/codegen/python.ts

@@ -251,30 +251,30 @@ function emitMethod(lines: string[], name: string, method: RpcMethod, isSession:
     const paramProps = method.params?.properties || {};
     const nonSessionParams = Object.keys(paramProps).filter((k) => k !== "sessionId");
     const hasParams = isSession ? nonSessionParams.length > 0 : Object.keys(paramProps).length > 0;
+    const paramsType = toPascalCase(method.rpcMethod) + "Params";
 
-    // Build signature
-    const sigParams = isSession ? nonSessionParams : Object.keys(paramProps);
-    const paramList = sigParams.map((p) => `${toSnakeCase(p)}`).join(", ");
+    // Build signature with typed params
     const sig = hasParams
-        ? `    async def ${methodName}(self, ${paramList}) -> ${resultType}:`
+        ? `    async def ${methodName}(self, params: ${paramsType}) -> ${resultType}:`
         : `    async def ${methodName}(self) -> ${resultType}:`;
 
     lines.push(sig);
 
-    // Build request body
+    // Build request body with proper serialization/deserialization
     if (isSession) {
         if (hasParams) {
-            const paramDict = nonSessionParams.map((p) => `"${p}": ${toSnakeCase(p)}`).join(", ");
-            lines.push(`        return await self._client.request("${method.rpcMethod}", {"sessionId": self._session_id, ${paramDict}})`);
+            lines.push(`        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}`);
+            lines.push(`        params_dict["sessionId"] = self._session_id`);
+            lines.push(`        return ${resultType}.from_dict(await self._client.request("${method.rpcMethod}", params_dict))`);
         } else {
-            lines.push(`        return await self._client.request("${method.rpcMethod}", {"sessionId": self._session_id})`);
+            lines.push(`        return ${resultType}.from_dict(await self._client.request("${method.rpcMethod}", {"sessionId": self._session_id}))`);
         }
     } else {
         if (hasParams) {
-            const paramDict = Object.keys(paramProps).map((p) => `"${p}": ${toSnakeCase(p)}`).join(", ");
-            lines.push(`        return await self._client.request("${method.rpcMethod}", {${paramDict}})`);
+            lines.push(`        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}`);
+            lines.push(`        return ${resultType}.from_dict(await self._client.request("${method.rpcMethod}", params_dict))`);
         } else {
-            lines.push(`        return await self._client.request("${method.rpcMethod}", {})`);
+            lines.push(`        return ${resultType}.from_dict(await self._client.request("${method.rpcMethod}", {}))`);
         }
     }
     lines.push(``);