diff --git a/packages/speech-core/src/tts.test.ts b/packages/speech-core/src/tts.test.ts
index e3e0f6d6818..f4026cd941d 100644
--- a/packages/speech-core/src/tts.test.ts
+++ b/packages/speech-core/src/tts.test.ts
@@ -485,14 +485,16 @@ describe("speech-core native voice-note routing", () => {
   });
 
   it("caps oversized voice model TTS timeouts before synthesis", async () => {
-    installSpeechProviders([createMockSpeechProvider("mock", { autoSelectOrder: 1 })]);
+    installSpeechProviders([
+      createMockSpeechProvider("mock", { autoSelectOrder: 1, models: ["mock-tts"] }),
+    ]);
 
     const result = await synthesizeSpeech({
       text: "Use capped explicit timeout.",
       cfg: {
         agents: {
           defaults: {
-            voiceModel: { primary: "mock", timeoutMs: Number.MAX_SAFE_INTEGER },
+            voiceModel: { primary: "mock/mock-tts", timeoutMs: Number.MAX_SAFE_INTEGER },
           },
         },
         messages: {
diff --git a/scripts/protocol-gen-swift.ts b/scripts/protocol-gen-swift.ts
index 15a0c979267..9bce73f9ae4 100644
--- a/scripts/protocol-gen-swift.ts
+++ b/scripts/protocol-gen-swift.ts
@@ -41,18 +41,6 @@ const STRICT_LITERAL_STRUCTS = new Set([
 ]);
 
 const DEFAULTED_OPTIONAL_INIT_PARAMS: Record<string, Set<string>> = {
-  SessionOperationEvent: new Set(["agentId"]),
-  SessionsCompactionBranchParams: new Set(["agentId"]),
-  SessionsCompactionGetParams: new Set(["agentId"]),
-  SessionsCompactionListParams: new Set(["agentId"]),
-  SessionsCompactionRestoreParams: new Set(["agentId"]),
-  SessionsCompactParams: new Set(["agentId"]),
-  SessionsDeleteParams: new Set(["agentId"]),
-  SessionsMessagesSubscribeParams: new Set(["agentId"]),
-  SessionsMessagesUnsubscribeParams: new Set(["agentId"]),
-  SessionsPatchParams: new Set(["agentId"]),
-  SessionsResetParams: new Set(["agentId"]),
-  SessionsSendParams: new Set(["agentId"]),
   SessionsAbortParams: new Set(["agentId"]),
   SessionOperationEvent: new Set(["agentId"]),
   SessionsUsageParams: new Set(["agentId", "agentScope"]),