fix: defensive SDK response handling & parts-reader normalization
- 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:
@@ -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) {
|
||||
|
||||
@@ -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 []
|
||||
|
||||
@@ -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 []
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user