diff --git a/src/agents/pi-embedded-runner.sanitize-session-history.test.ts b/src/agents/pi-embedded-runner.sanitize-session-history.test.ts
index d1d5c5105c4..7d73d809e12 100644
--- a/src/agents/pi-embedded-runner.sanitize-session-history.test.ts
+++ b/src/agents/pi-embedded-runner.sanitize-session-history.test.ts
@@ -1243,8 +1243,7 @@ describe("sanitizeSessionHistory", () => {
           message &&
           typeof message === "object" &&
           message.role === "assistant" &&
-          extractToolCallsFromAssistant(message as Extract<AgentMessage, { role: "assistant" }>)
-            .length > 0,
+          extractToolCallsFromAssistant(message).length > 0,
       ),
     ).toHaveLength(1);
     expect(
@@ -1258,8 +1257,7 @@ describe("sanitizeSessionHistory", () => {
           message &&
           typeof message === "object" &&
           message.role === "assistant" &&
-          extractToolCallsFromAssistant(message as Extract<AgentMessage, { role: "assistant" }>)
-            .length > 0,
+          extractToolCallsFromAssistant(message).length > 0,
       ),
     ).toHaveLength(1);
     expect(
diff --git a/src/agents/pi-embedded-runner/run/attempt.tool-call-normalization.ts b/src/agents/pi-embedded-runner/run/attempt.tool-call-normalization.ts
index 128f3c8c516..7caa8d69463 100644
--- a/src/agents/pi-embedded-runner/run/attempt.tool-call-normalization.ts
+++ b/src/agents/pi-embedded-runner/run/attempt.tool-call-normalization.ts
@@ -354,9 +354,7 @@ function sanitizeReplayToolCallInputs(
       message.content.some((block) => isThinkingLikeReplayBlock(block)) &&
       message.content.some((block) => isReplayToolCallBlock(block))
     ) {
-      const replaySafeToolCalls = extractToolCallsFromAssistant(
-        message as Extract<AgentMessage, { role: "assistant" }>,
-      );
+      const replaySafeToolCalls = extractToolCallsFromAssistant(message);
       if (
         isReplaySafeThinkingTurn(message.content, allowedToolNames) &&
         replaySafeToolCalls.every((toolCall) => !claimedReplaySafeToolCallIds.has(toolCall.id))
@@ -720,8 +718,7 @@ export function wrapStreamFnSanitizeMalformedToolCalls(
       : sanitized.messages;
     if (transcriptPolicy?.validateAnthropicTurns) {
       nextMessages = sanitizeAnthropicReplayToolResults(nextMessages, {
-        disallowEmbeddedUserToolResultsForSignedThinkingReplay:
-          allowProviderOwnedThinkingReplay,
+        disallowEmbeddedUserToolResultsForSignedThinkingReplay: allowProviderOwnedThinkingReplay,
       });
     }
     if (nextMessages === messages) {
diff --git a/src/agents/session-transcript-repair.ts b/src/agents/session-transcript-repair.ts
index c69a4da4531..75952ee3f38 100644
--- a/src/agents/session-transcript-repair.ts
+++ b/src/agents/session-transcript-repair.ts
@@ -142,7 +142,7 @@ export function isRedactedSessionsSpawnAttachment(item: unknown): boolean {
     if (!(SESSIONS_SPAWN_ATTACHMENT_METADATA_KEYS as readonly string[]).includes(key)) {
       return false;
     }
-    if (typeof attachment[key] !== "string" || (attachment[key] as string).trim().length === 0) {
+    if (typeof attachment[key] !== "string" || attachment[key].trim().length === 0) {
       return false;
     }
   }