sapient/oh-my-openagent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: defensive SDK response handling & parts-reader normalization

Browse Source 
- Replace all response.data ?? [] with (response.data ?? response)
  pattern across 14 files to handle SDK array-shaped responses
- Normalize SDK parts in parts-reader.ts by injecting sessionID/
  messageID before validation (P1: SDK parts lack these fields)
- Treat unknown part types as having content in
  recover-empty-content-message-sdk.ts to prevent false placeholder
  injection on image/file parts
- Replace local isRecord with shared import in parts-reader.ts
This commit is contained in:
YeonGyu-Kim
2026-02-16 15:45:14 +09:00
parent 8edf6ed96f
commit 5a6a9e9800
15 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/features/background-agent/manager.ts
View File

@@ -875,7 +875,7 @@ export class BackgroundManager {
path: { id: sessionID },
})
const messages = response.data ?? []
const messages = ((response.data ?? response) as unknown as Array<{ info?: { role?: string } }>) ?? []
// Check for at least one assistant or tool message
const hasAssistantOrToolMessage = messages.some(

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

@@ -64,7 +64,7 @@ async function findEmptyMessageIdsFromSDK(
const response = (await client.session.messages({
path: { id: sessionID },
})) as { data?: SDKMessage[] }
const messages = response.data ?? []
const messages = ((response.data ?? response) as unknown as SDKMessage[]) ?? []
const emptyIds: string[] = []
for (const message of messages) {

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

@@ -17,7 +17,7 @@ export async function getMessageIdsFromSDK(
): Promise<string[]> {
try {
const response = await client.session.messages({ path: { id: sessionID } })
const messages = (response.data ?? []) as SDKMessage[]
const messages = ((response.data ?? response) as unknown as SDKMessage[]) ?? []
return messages.map(msg => msg.info.id)
} catch {
return []

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

@@ -72,7 +72,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 ?? []) as Array<{ parts?: ToolPart[] }>
const rawMessages = ((response.data ?? response) as unknown as Array<{ parts?: ToolPart[] }>) ?? []
return rawMessages.filter((m) => m.parts) as MessagePart[]
} catch {
return []

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

@@ -108,7 +108,7 @@ async function truncateToolOutputsByCallIdFromSDK(
): Promise<{ truncatedCount: number }> {
try {
const response = await client.session.messages({ path: { id: sessionID } })
const messages = (response.data ?? []) as SDKMessage[]
const messages = ((response.data ?? response) as unknown as SDKMessage[]) ?? []
let truncatedCount = 0
for (const msg of messages) {

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

@@ -66,7 +66,7 @@ export async function truncateUntilTargetTokens(
const response = (await client.session.messages({
path: { id: sessionID },
})) as { data?: SDKMessage[] }
const messages = response.data ?? []
const messages = (response.data ?? response) as SDKMessage[]
toolPartsByKey = new Map<string, SDKToolPart>()
for (const message of messages) {

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

@@ -32,7 +32,7 @@ export async function findToolResultsBySizeFromSDK(
): Promise<ToolResultInfo[]> {
try {
const response = await client.session.messages({ path: { id: sessionID } })
const messages = (response.data ?? []) as SDKMessage[]
const messages = ((response.data ?? response) as unknown as SDKMessage[]) ?? []
const results: ToolResultInfo[] = []
for (const msg of messages) {
@@ -98,7 +98,7 @@ export async function countTruncatedResultsFromSDK(
): Promise<number> {
try {
const response = await client.session.messages({ path: { id: sessionID } })
const messages = (response.data ?? []) as SDKMessage[]
const messages = ((response.data ?? response) as unknown as SDKMessage[]) ?? []
let count = 0
for (const msg of messages) {

4
src/hooks/session-recovery/recover-empty-content-message-sdk.ts
View File

@@ -126,7 +126,7 @@ function sdkPartHasContent(part: SdkPart): boolean {
return true
}
return false
return true
}
function sdkMessageHasContent(message: MessageData): boolean {
@@ -136,7 +136,7 @@ function sdkMessageHasContent(message: MessageData): boolean {
async function readMessagesFromSDK(client: Client, sessionID: string): Promise<MessageData[]> {
try {
const response = await client.session.messages({ path: { id: sessionID } })
return (response.data ?? []) as MessageData[]
return ((response.data ?? response) as unknown as MessageData[]) ?? []
} catch {
return []
}

4
src/hooks/session-recovery/recover-thinking-block-order.ts
View File

@@ -77,7 +77,7 @@ async function findMessagesWithOrphanThinkingFromSDK(
let messages: MessageData[]
try {
const response = await client.session.messages({ path: { id: sessionID } })
messages = (response.data ?? []) as MessageData[]
messages = ((response.data ?? response) as unknown as MessageData[]) ?? []
} catch {
return []
}
@@ -111,7 +111,7 @@ async function findMessageByIndexNeedingThinkingFromSDK(
let messages: MessageData[]
try {
const response = await client.session.messages({ path: { id: sessionID } })
messages = (response.data ?? []) as MessageData[]
messages = ((response.data ?? response) as unknown as MessageData[]) ?? []
} catch {
return null
}

2
src/hooks/session-recovery/recover-thinking-disabled-violation.ts
View File

@@ -38,7 +38,7 @@ async function recoverThinkingDisabledViolationFromSDK(
): Promise<boolean> {
try {
const response = await client.session.messages({ path: { id: sessionID } })
const messages = (response.data ?? []) as MessageData[]
const messages = ((response.data ?? response) as unknown as MessageData[]) ?? []
const messageIDsWithThinking: string[] = []
for (const msg of messages) {

2
src/hooks/session-recovery/recover-tool-result-missing.ts
View File

@@ -28,7 +28,7 @@ async function readPartsFromSDKFallback(
): Promise<MessagePart[]> {
try {
const response = await client.session.messages({ path: { id: sessionID } })
const messages = (response.data ?? []) as MessageData[]
const messages = ((response.data ?? response) as unknown as MessageData[]) ?? []
const target = messages.find((m) => m.info?.id === messageID)
if (!target?.parts) return []

4
src/hooks/session-recovery/storage/empty-text.ts
View File

@@ -51,7 +51,7 @@ export async function replaceEmptyTextPartsAsync(
): Promise<boolean> {
try {
const response = await client.session.messages({ path: { id: sessionID } })
const messages = (response.data ?? []) as MessageData[]
const messages = ((response.data ?? response) as unknown as MessageData[]) ?? []
const targetMsg = messages.find((m) => m.info?.id === messageID)
if (!targetMsg?.parts) return false
@@ -101,7 +101,7 @@ export async function findMessagesWithEmptyTextPartsFromSDK(
): Promise<string[]> {
try {
const response = await client.session.messages({ path: { id: sessionID } })
const messages = (response.data ?? []) as MessageData[]
const messages = ((response.data ?? response) as unknown as MessageData[]) ?? []
const result: string[] = []
for (const msg of messages) {

12
src/hooks/session-recovery/storage/parts-reader.ts
View File

@@ -4,13 +4,10 @@ import type { PluginInput } from "@opencode-ai/plugin"
import { PART_STORAGE } from "../constants"
import type { StoredPart } from "../types"
import { isSqliteBackend } from "../../../shared"
import { isRecord } from "../../../shared/record-type-guard"
type OpencodeClient = PluginInput["client"]
function isRecord(value: unknown): value is Record<string, unknown> {
return typeof value === "object" && value !== null
}
function isStoredPart(value: unknown): value is StoredPart {
if (!isRecord(value)) return false
return (
@@ -57,7 +54,12 @@ export async function readPartsFromSDK(
const rawParts = data.parts
if (!Array.isArray(rawParts)) return []
return rawParts.filter(isStoredPart)
return rawParts
.map((part: unknown) => {
if (!isRecord(part) || typeof part.id !== "string" || typeof part.type !== "string") return null
return { ...part, sessionID, messageID } as StoredPart
})
.filter((part): part is StoredPart => part !== null)
} catch {
return []
}

2
src/hooks/session-recovery/storage/thinking-prepend.ts
View File

@@ -74,7 +74,7 @@ async function findLastThinkingContentFromSDK(
): Promise<string> {
try {
const response = await client.session.messages({ path: { id: sessionID } })
const messages = (response.data ?? []) as MessageData[]
const messages = ((response.data ?? response) as unknown as MessageData[]) ?? []
const currentIndex = messages.findIndex((m) => m.info?.id === beforeMessageID)
if (currentIndex === -1) return ""

2
src/hooks/session-recovery/storage/thinking-strip.ts
View File

@@ -42,7 +42,7 @@ export async function stripThinkingPartsAsync(
): Promise<boolean> {
try {
const response = await client.session.messages({ path: { id: sessionID } })
const messages = (response.data ?? []) as Array<{ parts?: Array<{ type: string; id: string }> }>
const messages = ((response.data ?? response) as unknown as Array<{ parts?: Array<{ type: string; id: string }> }>) ?? []
const targetMsg = messages.find((m) => {
const info = (m as Record<string, unknown>)["info"] as Record<string, unknown> | undefined