Python/Go better representation of internal in codegen output

Author: SteveSandersonMS

go/client.go

@@ -120,6 +120,10 @@ type Client struct {
 	// RPC provides typed server-scoped RPC methods.
 	// This field is nil until the client is connected via Start().
 	RPC *rpc.ServerRpc
+
+	// internalRPC provides SDK-internal RPC methods (handshake helpers etc.).
+	// Lowercase = not exported; external callers cannot reach it.
+	internalRPC *rpc.InternalServerRpc
 }
 
 // NewClient creates a new Copilot CLI client with the given options.
@@ -441,6 +445,7 @@ func (c *Client) Stop() error {
 	}
 
 	c.RPC = nil
+	c.internalRPC = nil
 	return errors.Join(errs...)
 }
 
@@ -512,6 +517,7 @@ func (c *Client) ForceStop() {
 	}
 
 	c.RPC = nil
+	c.internalRPC = nil
 }
 
 func (c *Client) ensureConnected(ctx context.Context) error {
@@ -1355,7 +1361,7 @@ func (c *Client) verifyProtocolVersion(ctx context.Context) error {
 		t := c.effectiveConnectionToken
 		tokenPtr = &t
 	}
-	connectResult, err := c.RPC.Connect(ctx, &rpc.ConnectRequest{Token: tokenPtr})
+	connectResult, err := c.internalRPC.Connect(ctx, &rpc.ConnectRequest{Token: tokenPtr})
 	if err != nil {
 		var rpcErr *jsonrpc2.Error
 		if errors.As(err, &rpcErr) && rpcErr.Code == jsonrpc2.ErrMethodNotFound.Code {
@@ -1514,6 +1520,7 @@ func (c *Client) startCLIServer(ctx context.Context) error {
 			}()
 		})
 		c.RPC = rpc.NewServerRpc(c.client)
+		c.internalRPC = rpc.NewInternalServerRpc(c.client)
 		c.setupNotificationHandler()
 		c.client.Start()
 
@@ -1639,6 +1646,7 @@ func (c *Client) connectViaTcp(ctx context.Context) error {
 		}()
 	})
 	c.RPC = rpc.NewServerRpc(c.client)
+	c.internalRPC = rpc.NewInternalServerRpc(c.client)
 	c.setupNotificationHandler()
 	c.client.Start()
 

python/copilot/client.py

@@ -36,6 +36,7 @@
     ClientSessionApiHandlers,
     ConnectRequest,
     ServerRpc,
+    _InternalServerRpc,
     register_client_session_api_handlers,
 )
 from .generated.session_events import (
@@ -2181,7 +2182,7 @@ async def _verify_protocol_version(self) -> None:
 
         server_version: int | None
         try:
-            connect_result = await ServerRpc(self._client).connect(
+            connect_result = await _InternalServerRpc(self._client).connect(
                 ConnectRequest(token=self._effective_connection_token)
             )
             server_version = connect_result.protocol_version

python/copilot/generated/rpc.py

@@ -1836,13 +1836,13 @@ def _patch_model_capabilities(data: dict) -> dict:
         const publicNode = filterNodeByVisibility(schema.server, "public");
         if (publicNode) emitRpcWrapper(lines, publicNode, false, resolveType, "");
         const internalNode = filterNodeByVisibility(schema.server, "internal");
-        if (internalNode) emitRpcWrapper(lines, internalNode, false, resolveType, "Internal");
+        if (internalNode) emitRpcWrapper(lines, internalNode, false, resolveType, "_Internal");
     }
     if (schema.session) {
         const publicNode = filterNodeByVisibility(schema.session, "public");
         if (publicNode) emitRpcWrapper(lines, publicNode, true, resolveType, "");
         const internalNode = filterNodeByVisibility(schema.session, "internal");
-        if (internalNode) emitRpcWrapper(lines, internalNode, true, resolveType, "Internal");
+        if (internalNode) emitRpcWrapper(lines, internalNode, true, resolveType, "_Internal");
     }
     if (schema.clientSession) {
         emitClientSessionApiRegistration(lines, schema.clientSession, resolveType);
@@ -1937,7 +1937,7 @@ function emitRpcWrapper(lines: string[], node: Record<string, unknown>, isSessio
     // Emit wrapper class
     if (isSession) {
         lines.push(`class ${wrapperName}:`);
-        lines.push(classPrefix === "Internal"
+        lines.push(classPrefix === "_Internal"
             ? `    """Internal SDK session-scoped RPC methods. Not part of the public API."""`
             : `    """Typed session-scoped RPC methods."""`);
         lines.push(`    def __init__(self, client: "JsonRpcClient", session_id: str):`);
@@ -1949,7 +1949,7 @@ function emitRpcWrapper(lines: string[], node: Record<string, unknown>, isSessio
         }
     } else {
         lines.push(`class ${wrapperName}:`);
-        lines.push(classPrefix === "Internal"
+        lines.push(classPrefix === "_Internal"
             ? `    """Internal SDK server-scoped RPC methods (handshake helpers etc.). Not part of the public API."""`
             : `    """Typed server-scoped RPC methods."""`);
         lines.push(`    def __init__(self, client: "JsonRpcClient"):`);