Fix codegen and Rust SQLite params

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

Author: Copilot

go/rpc/zrpc.go

@@ -19,7 +19,7 @@
     MCPConfigUpdateRequest,
     MCPServerConfig,
     MCPServerConfigHTTPOauthGrantType,
-    MCPServerConfigType,
+    MCPServerConfigHTTPType,
 )
 
 from .testharness import E2ETestContext
@@ -71,7 +71,7 @@ async def test_should_round_trip_http_mcp_oauth_config_rpc(self, ctx: E2ETestCon
 
         server_name = f"sdk-http-oauth-{uuid.uuid4().hex}"
         config = MCPServerConfig(
-            type=MCPServerConfigType.HTTP,
+            type=MCPServerConfigHTTPType.HTTP,
             url="https://example.com/mcp",
             headers={"Authorization": "Bearer token"},
             oauth_client_id="client-id",
@@ -81,7 +81,7 @@ async def test_should_round_trip_http_mcp_oauth_config_rpc(self, ctx: E2ETestCon
             timeout=3000,
         )
         updated_config = MCPServerConfig(
-            type=MCPServerConfigType.HTTP,
+            type=MCPServerConfigHTTPType.HTTP,
             url="https://example.com/updated-mcp",
             oauth_client_id="updated-client-id",
             oauth_public_client=True,
@@ -96,7 +96,7 @@ async def test_should_round_trip_http_mcp_oauth_config_rpc(self, ctx: E2ETestCon
             )
             after_add = await ctx.client.rpc.mcp.config.list()
             added = _server_config(after_add.servers, server_name)
-            assert added.type == MCPServerConfigType.HTTP
+            assert added.type == MCPServerConfigHTTPType.HTTP
             assert added.url == "https://example.com/mcp"
             assert added.headers is not None
             assert added.headers["Authorization"] == "Bearer token"

python/e2e/test_rpc_mcp_config_e2e.py

@@ -9,7 +9,6 @@ use serde::{Deserialize, Serialize};
 use super::session_events::{
     McpServerSource, McpServerStatus, ReasoningSummary, SessionMode, SkillSource,
 };
-
 use crate::types::{RequestId, SessionId};
 
 /// JSON-RPC method name constants.
@@ -969,7 +968,7 @@ pub struct McpServer {
 pub struct McpServerConfigHttpAuth {
     /// Fixed port for the OAuth redirect callback server.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub redirect_port: Option<i64>,
+    pub redirect_port: Option<i32>,
 }
 
 /// Remote MCP server configuration accessed over HTTP or SSE.

rust/src/generated/api_types.rs

@@ -48,7 +48,6 @@ use crate::generated::api_types::{
     SessionFsError, SessionFsErrorCode, SessionFsReaddirWithTypesEntry,
     SessionFsReaddirWithTypesEntryType, SessionFsSetProviderConventions, SessionFsStatResult,
 };
-
 pub use crate::generated::api_types::{SessionFsSqliteQueryResult, SessionFsSqliteQueryType};
 
 /// Configuration for a custom session filesystem provider.
@@ -354,7 +353,7 @@ pub trait SessionFsProvider: Send + Sync + 'static {
         session_id: &str,
         query: &str,
         query_type: SessionFsSqliteQueryType,
-        params: &HashMap<String, serde_json::Value>,
+        params: Option<&HashMap<String, serde_json::Value>>,
     ) -> Result<SessionFsSqliteQueryResult, FsError> {
         let _ = (session_id, query, query_type, params);
         Err(FsError::Other("sqlite_query not supported".to_string()))

rust/src/session_fs.rs

@@ -316,12 +316,13 @@ pub(crate) async fn sqlite_query(
         }
     };
     let id = request.id;
+    let sqlite_params = (!params.params.is_empty()).then_some(&params.params);
     let result = match provider
         .sqlite_query(
             params.session_id.as_ref(),
             &params.query,
             params.query_type,
-            &params.params,
+            sqlite_params,
         )
         .await
     {

rust/src/session_fs_dispatch.rs

@@ -206,12 +206,14 @@ async fn should_map_all_sessionfs_handler_operations() {
         provider.stat("/workspace/nested/missing.txt").await,
         Err(FsError::NotFound(_))
     ));
+    let sqlite_params =
+        std::collections::HashMap::from([("answer".to_string(), serde_json::Value::from(42))]);
     let sqlite_result = provider
         .sqlite_query(
             "handler-session",
             "select :answer as answer",
             SessionFsSqliteQueryType::Query,
-            &std::collections::HashMap::from([("answer".to_string(), serde_json::Value::from(42))]),
+            Some(&sqlite_params),
         )
         .await
         .expect("sqlite query");
@@ -626,7 +628,7 @@ impl SessionFsProvider for TestSessionFsProvider {
         session_id: &str,
         query: &str,
         query_type: SessionFsSqliteQueryType,
-        params: &std::collections::HashMap<String, serde_json::Value>,
+        params: Option<&std::collections::HashMap<String, serde_json::Value>>,
     ) -> Result<SessionFsSqliteQueryResult, FsError> {
         let mut row = std::collections::HashMap::new();
         row.insert("sessionId".to_string(), session_id.to_string().into());
@@ -644,7 +646,7 @@ impl SessionFsProvider for TestSessionFsProvider {
         row.insert(
             "answer".to_string(),
             params
-                .get("answer")
+                .and_then(|params| params.get("answer"))
                 .cloned()
                 .unwrap_or(serde_json::Value::Null),
         );

rust/tests/e2e/session_fs.rs

@@ -2990,7 +2990,7 @@ impl SessionFsProvider for RecordingFsProvider {
         session_id: &str,
         query: &str,
         query_type: SessionFsSqliteQueryType,
-        params: &std::collections::HashMap<String, serde_json::Value>,
+        params: Option<&std::collections::HashMap<String, serde_json::Value>>,
     ) -> Result<SessionFsSqliteQueryResult, FsError> {
         let mut row = std::collections::HashMap::new();
         row.insert(
@@ -3016,7 +3016,7 @@ impl SessionFsProvider for RecordingFsProvider {
         row.insert(
             "answer".to_string(),
             params
-                .get("answer")
+                .and_then(|params| params.get("answer"))
                 .cloned()
                 .unwrap_or(serde_json::Value::Null),
         );
@@ -3221,7 +3221,7 @@ async fn session_fs_maps_sqlite_errors_to_results() {
             _session_id: &str,
             _query: &str,
             _query_type: SessionFsSqliteQueryType,
-            _params: &std::collections::HashMap<String, serde_json::Value>,
+            _params: Option<&std::collections::HashMap<String, serde_json::Value>>,
         ) -> Result<SessionFsSqliteQueryResult, FsError> {
             Err(FsError::Other("sqlite unavailable".to_string()))
         }

rust/tests/session_test.rs

@@ -66,6 +66,16 @@ const goInitialisms = new Set(["id", "ui", "uri", "url", "api", "http", "https",
 const goCommentTextWrapLength = 90;
 const wrapGoCommentText = wordwrap(goCommentTextWrapLength);
 
+function goIntegerType(schema: JSONSchema7): "int32" | "int64" {
+    const { minimum, maximum } = schema;
+    return Number.isInteger(minimum) &&
+        Number.isInteger(maximum) &&
+        minimum >= -2147483648 &&
+        maximum <= 2147483647
+        ? "int32"
+        : "int64";
+}
+
 function toPascalCase(s: string): string {
     return s
         .split(/[^A-Za-z0-9]+/)
@@ -852,7 +862,10 @@ function resolveGoPropertyType(
         return isRequired ? "string" : "*string";
     }
     if (type === "number") return isRequired ? "float64" : "*float64";
-    if (type === "integer") return isRequired ? "int64" : "*int64";
+    if (type === "integer") {
+        const integerType = goIntegerType(propSchema);
+        return isRequired ? integerType : `*${integerType}`;
+    }
     if (type === "boolean") return isRequired ? "bool" : "*bool";
 
     // Array type
@@ -2294,7 +2307,7 @@ function goPrimitiveSchemaGoType(schema: JSONSchema7, ctx: GoCodegenCtx): string
     const resolved = resolveSchema(schema, ctx.definitions) ?? schema;
     switch (resolved.type) {
         case "boolean": return "bool";
-        case "integer": return "int64";
+        case "integer": return goIntegerType(resolved);
         case "number": return "float64";
         case "string": return "string";
         default: return undefined;

scripts/codegen/go.ts

@@ -74,6 +74,16 @@ const STRING_NEWTYPE_OVERRIDES: Record<string, string> = {
 	requestId: "RequestId",
 };
 
+function rustIntegerType(schema: JSONSchema7): "i32" | "i64" {
+	const { minimum, maximum } = schema;
+	return Number.isInteger(minimum) &&
+		Number.isInteger(maximum) &&
+		minimum >= -2147483648 &&
+		maximum <= 2147483647
+		? "i32"
+		: "i64";
+}
+
 // ── Naming helpers ──────────────────────────────────────────────────────────
 
 function toPascalCase(s: string): string {
@@ -663,7 +673,7 @@ function resolveRustType(
 		return wrapOption("String", isRequired);
 	}
 	if (schemaType === "number") return wrapOption("f64", isRequired);
-	if (schemaType === "integer") return wrapOption("i64", isRequired);
+	if (schemaType === "integer") return wrapOption(rustIntegerType(propSchema), isRequired);
 	if (schemaType === "boolean") return wrapOption("bool", isRequired);
 
 	// Array