diff --git a/src/agents/session-tool-result-guard.ts b/src/agents/session-tool-result-guard.ts
index 86ae9b040..d7810e2ce 100644
--- a/src/agents/session-tool-result-guard.ts
+++ b/src/agents/session-tool-result-guard.ts
@@ -103,7 +103,7 @@ export function installSessionToolResultGuard(
       if (sanitized.length === 0) {
         return undefined;
       }
-      nextMessage = sanitized[0] as AgentMessage;
+      nextMessage = sanitized[0];
     }
     const nextRole = (nextMessage as { role?: unknown }).role;
 
diff --git a/src/agents/session-transcript-repair.ts b/src/agents/session-transcript-repair.ts
index 1a0339d20..56d043972 100644
--- a/src/agents/session-transcript-repair.ts
+++ b/src/agents/session-transcript-repair.ts
@@ -114,11 +114,10 @@ export function repairToolCallInputs(messages: AgentMessage[]): ToolCallInputRep
       continue;
     }
 
-    const assistant = msg as Extract<AgentMessage, { role: "assistant" }>;
     const nextContent = [];
     let droppedInMessage = 0;
 
-    for (const block of assistant.content) {
+    for (const block of msg.content) {
       if (isToolCallBlock(block) && !hasToolCallInput(block)) {
         droppedToolCalls += 1;
         droppedInMessage += 1;
@@ -134,7 +133,7 @@ export function repairToolCallInputs(messages: AgentMessage[]): ToolCallInputRep
         changed = true;
         continue;
       }
-      out.push({ ...assistant, content: nextContent });
+      out.push({ ...msg, content: nextContent });
       continue;
     }