Fix Rust import generation and Python test import ordering

- Rust generator: merge crate::types imports in api_types.rs so the source matches what rustfmt produces on Linux (joining adjacent use crate::types::... lines). This unbreaks the Codegen Check on CI.
- Python: sort the import block in test_event_forward_compatibility.py to satisfy ruff I001.

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

Author: stephentoub

python/test_event_forward_compatibility.py

@@ -13,6 +13,7 @@
 import pytest
 
 from copilot.generated.session_events import (
+    AttachmentGithubReferenceType,
     Data,
     ElicitationCompletedAction,
     ElicitationRequestedMode,
@@ -23,7 +24,6 @@
     SessionEventType,
     SessionTaskCompleteData,
     UserMessageAgentMode,
-    AttachmentGithubReferenceType,
     session_event_from_dict,
     session_event_to_dict,
 )

rust/src/generated/api_types.rs

@@ -11,8 +11,7 @@ use super::session_events::{
     PermissionRule, ReasoningSummary, SessionMode, ShutdownType, SkillSource,
     UserToolSessionApproval,
 };
-use crate::types::SessionEvent;
-use crate::types::{RequestId, SessionId};
+use crate::types::{RequestId, SessionEvent, SessionId};
 
 /// JSON-RPC method name constants.
 pub mod rpc_methods {

scripts/codegen/rust.ts

@@ -1561,12 +1561,22 @@ function generateApiTypesCode(
 			names.add(typeName);
 		}
 	}
+	// api_types.rs always needs RequestId/SessionId from crate::types. Merge them into
+	// the same import group as any other crate::types refs (e.g. SessionEvent) so the
+	// generator emits a single `use crate::types::{...};` line that matches what
+	// rustfmt would otherwise produce after merging adjacent imports.
+	let cratesTypesImports = externalImports.get("crate::types");
+	if (!cratesTypesImports) {
+		cratesTypesImports = new Set<string>();
+		externalImports.set("crate::types", cratesTypesImports);
+	}
+	cratesTypesImports.add("RequestId");
+	cratesTypesImports.add("SessionId");
 	for (const [module, typeNames] of [...externalImports].sort(([left], [right]) =>
 		left.localeCompare(right),
 	)) {
 		out.push(`use ${module}::{${[...typeNames].sort().join(", ")}};`);
 	}
-	out.push("use crate::types::{RequestId, SessionId};");
 	out.push("");
 
 	// Method constants