refactor: create normalizeSDKResponse helper and replace scattered patterns across 37 files

src/hooks/anthropic-context-window-limit-recovery/message-builder.ts

@@ -1,5 +1,6 @@
 import { log } from "../../shared/logger"
 import type { PluginInput } from "@opencode-ai/plugin"
+import { normalizeSDKResponse } from "../../shared"
 import { isSqliteBackend } from "../../shared/opencode-storage-detection"
 import {
   findEmptyMessages,
@@ -64,7 +65,7 @@ async function findEmptyMessageIdsFromSDK(
     const response = (await client.session.messages({
       path: { id: sessionID },
     })) as { data?: SDKMessage[] }
-    const messages = ((response.data ?? response) as unknown as SDKMessage[]) ?? []
+    const messages = normalizeSDKResponse(response, [] as SDKMessage[], { preferResponseOnMissingData: true })
 
     const emptyIds: string[] = []
     for (const message of messages) {

src/hooks/anthropic-context-window-limit-recovery/message-storage-directory.ts

@@ -1,6 +1,7 @@
 import { existsSync, readdirSync } from "node:fs"
 import type { PluginInput } from "@opencode-ai/plugin"
 import { getMessageDir } from "../../shared/opencode-message-dir"
+import { normalizeSDKResponse } from "../../shared"
 
 export { getMessageDir }
 
@@ -17,7 +18,7 @@ export async function getMessageIdsFromSDK(
 ): Promise<string[]> {
   try {
     const response = await client.session.messages({ path: { id: sessionID } })
-    const messages = ((response.data ?? response) as unknown as SDKMessage[]) ?? []
+    const messages = normalizeSDKResponse(response, [] as SDKMessage[], { preferResponseOnMissingData: true })
     return messages.map(msg => msg.info.id)
   } catch {
     return []

src/hooks/anthropic-context-window-limit-recovery/pruning-deduplication.ts

@@ -6,6 +6,7 @@ import { estimateTokens } from "./pruning-types"
 import { log } from "../../shared/logger"
 import { getMessageDir } from "../../shared/opencode-message-dir"
 import { isSqliteBackend } from "../../shared/opencode-storage-detection"
+import { normalizeSDKResponse } from "../../shared"
 
 type OpencodeClient = PluginInput["client"]
 
@@ -72,7 +73,7 @@ function readMessages(sessionID: string): MessagePart[] {
 async function readMessagesFromSDK(client: OpencodeClient, sessionID: string): Promise<MessagePart[]> {
   try {
     const response = await client.session.messages({ path: { id: sessionID } })
-    const rawMessages = ((response.data ?? response) as unknown as Array<{ parts?: ToolPart[] }>) ?? []
+    const rawMessages = normalizeSDKResponse(response, [] as Array<{ parts?: ToolPart[] }>, { preferResponseOnMissingData: true })
     return rawMessages.filter((m) => m.parts) as MessagePart[]
   } catch {
     return []

src/hooks/anthropic-context-window-limit-recovery/pruning-tool-output-truncation.ts

@@ -7,6 +7,7 @@ import { truncateToolResultAsync } from "./tool-result-storage-sdk"
 import { log } from "../../shared/logger"
 import { getMessageDir } from "../../shared/opencode-message-dir"
 import { isSqliteBackend } from "../../shared/opencode-storage-detection"
+import { normalizeSDKResponse } from "../../shared"
 
 type OpencodeClient = PluginInput["client"]
 
@@ -108,7 +109,7 @@ async function truncateToolOutputsByCallIdFromSDK(
 ): Promise<{ truncatedCount: number }> {
   try {
     const response = await client.session.messages({ path: { id: sessionID } })
-    const messages = ((response.data ?? response) as unknown as SDKMessage[]) ?? []
+    const messages = normalizeSDKResponse(response, [] as SDKMessage[], { preferResponseOnMissingData: true })
     let truncatedCount = 0
 
     for (const msg of messages) {

src/hooks/anthropic-context-window-limit-recovery/target-token-truncation.ts

@@ -3,6 +3,7 @@ import type { AggressiveTruncateResult } from "./tool-part-types"
 import { findToolResultsBySize, truncateToolResult } from "./tool-result-storage"
 import { truncateToolResultAsync } from "./tool-result-storage-sdk"
 import { isSqliteBackend } from "../../shared/opencode-storage-detection"
+import { normalizeSDKResponse } from "../../shared"
 
 type OpencodeClient = PluginInput["client"]
 
@@ -66,7 +67,7 @@ export async function truncateUntilTargetTokens(
 			const response = (await client.session.messages({
 				path: { id: sessionID },
 			})) as { data?: SDKMessage[] }
-			const messages = (response.data ?? response) as SDKMessage[]
+			const messages = normalizeSDKResponse(response, [] as SDKMessage[], { preferResponseOnMissingData: true })
 			toolPartsByKey = new Map<string, SDKToolPart>()
 
 			for (const message of messages) {

src/hooks/anthropic-context-window-limit-recovery/tool-result-storage-sdk.ts

@@ -4,6 +4,7 @@ import { TRUNCATION_MESSAGE } from "./storage-paths"
 import type { ToolResultInfo } from "./tool-part-types"
 import { patchPart } from "../../shared/opencode-http-api"
 import { log } from "../../shared/logger"
+import { normalizeSDKResponse } from "../../shared"
 
 type OpencodeClient = PluginInput["client"]
 
@@ -32,7 +33,7 @@ export async function findToolResultsBySizeFromSDK(
 ): Promise<ToolResultInfo[]> {
   try {
     const response = await client.session.messages({ path: { id: sessionID } })
-    const messages = ((response.data ?? response) as unknown as SDKMessage[]) ?? []
+    const messages = normalizeSDKResponse(response, [] as SDKMessage[], { preferResponseOnMissingData: true })
     const results: ToolResultInfo[] = []
 
     for (const msg of messages) {
@@ -98,7 +99,7 @@ export async function countTruncatedResultsFromSDK(
 ): Promise<number> {
   try {
     const response = await client.session.messages({ path: { id: sessionID } })
-    const messages = ((response.data ?? response) as unknown as SDKMessage[]) ?? []
+    const messages = normalizeSDKResponse(response, [] as SDKMessage[], { preferResponseOnMissingData: true })
     let count = 0
 
     for (const msg of messages) {