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:
parent
8edf6ed96f
commit
5a6a9e9800
@ -875,7 +875,7 @@ export class BackgroundManager {
|
|||||||
path: { id: sessionID },
|
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
|
// Check for at least one assistant or tool message
|
||||||
const hasAssistantOrToolMessage = messages.some(
|
const hasAssistantOrToolMessage = messages.some(
|
||||||
|
|||||||
@ -64,7 +64,7 @@ async function findEmptyMessageIdsFromSDK(
|
|||||||
const response = (await client.session.messages({
|
const response = (await client.session.messages({
|
||||||
path: { id: sessionID },
|
path: { id: sessionID },
|
||||||
})) as { data?: SDKMessage[] }
|
})) as { data?: SDKMessage[] }
|
||||||
const messages = response.data ?? []
|
const messages = ((response.data ?? response) as unknown as SDKMessage[]) ?? []
|
||||||
|
|
||||||
const emptyIds: string[] = []
|
const emptyIds: string[] = []
|
||||||
for (const message of messages) {
|
for (const message of messages) {
|
||||||
|
|||||||
@ -17,7 +17,7 @@ export async function getMessageIdsFromSDK(
|
|||||||
): Promise<string[]> {
|
): Promise<string[]> {
|
||||||
try {
|
try {
|
||||||
const response = await client.session.messages({ path: { id: sessionID } })
|
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)
|
return messages.map(msg => msg.info.id)
|
||||||
} catch {
|
} catch {
|
||||||
return []
|
return []
|
||||||
|
|||||||
@ -72,7 +72,7 @@ function readMessages(sessionID: string): MessagePart[] {
|
|||||||
async function readMessagesFromSDK(client: OpencodeClient, sessionID: string): Promise<MessagePart[]> {
|
async function readMessagesFromSDK(client: OpencodeClient, sessionID: string): Promise<MessagePart[]> {
|
||||||
try {
|
try {
|
||||||
const response = await client.session.messages({ path: { id: sessionID } })
|
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[]
|
return rawMessages.filter((m) => m.parts) as MessagePart[]
|
||||||
} catch {
|
} catch {
|
||||||
return []
|
return []
|
||||||
|
|||||||
@ -108,7 +108,7 @@ async function truncateToolOutputsByCallIdFromSDK(
|
|||||||
): Promise<{ truncatedCount: number }> {
|
): Promise<{ truncatedCount: number }> {
|
||||||
try {
|
try {
|
||||||
const response = await client.session.messages({ path: { id: sessionID } })
|
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
|
let truncatedCount = 0
|
||||||
|
|
||||||
for (const msg of messages) {
|
for (const msg of messages) {
|
||||||
|
|||||||
@ -66,7 +66,7 @@ export async function truncateUntilTargetTokens(
|
|||||||
const response = (await client.session.messages({
|
const response = (await client.session.messages({
|
||||||
path: { id: sessionID },
|
path: { id: sessionID },
|
||||||
})) as { data?: SDKMessage[] }
|
})) as { data?: SDKMessage[] }
|
||||||
const messages = response.data ?? []
|
const messages = (response.data ?? response) as SDKMessage[]
|
||||||
toolPartsByKey = new Map<string, SDKToolPart>()
|
toolPartsByKey = new Map<string, SDKToolPart>()
|
||||||
|
|
||||||
for (const message of messages) {
|
for (const message of messages) {
|
||||||
|
|||||||
@ -32,7 +32,7 @@ export async function findToolResultsBySizeFromSDK(
|
|||||||
): Promise<ToolResultInfo[]> {
|
): Promise<ToolResultInfo[]> {
|
||||||
try {
|
try {
|
||||||
const response = await client.session.messages({ path: { id: sessionID } })
|
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[] = []
|
const results: ToolResultInfo[] = []
|
||||||
|
|
||||||
for (const msg of messages) {
|
for (const msg of messages) {
|
||||||
@ -98,7 +98,7 @@ export async function countTruncatedResultsFromSDK(
|
|||||||
): Promise<number> {
|
): Promise<number> {
|
||||||
try {
|
try {
|
||||||
const response = await client.session.messages({ path: { id: sessionID } })
|
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
|
let count = 0
|
||||||
|
|
||||||
for (const msg of messages) {
|
for (const msg of messages) {
|
||||||
|
|||||||
@ -126,7 +126,7 @@ function sdkPartHasContent(part: SdkPart): boolean {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
return false
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
function sdkMessageHasContent(message: MessageData): boolean {
|
function sdkMessageHasContent(message: MessageData): boolean {
|
||||||
@ -136,7 +136,7 @@ function sdkMessageHasContent(message: MessageData): boolean {
|
|||||||
async function readMessagesFromSDK(client: Client, sessionID: string): Promise<MessageData[]> {
|
async function readMessagesFromSDK(client: Client, sessionID: string): Promise<MessageData[]> {
|
||||||
try {
|
try {
|
||||||
const response = await client.session.messages({ path: { id: sessionID } })
|
const response = await client.session.messages({ path: { id: sessionID } })
|
||||||
return (response.data ?? []) as MessageData[]
|
return ((response.data ?? response) as unknown as MessageData[]) ?? []
|
||||||
} catch {
|
} catch {
|
||||||
return []
|
return []
|
||||||
}
|
}
|
||||||
|
|||||||
@ -77,7 +77,7 @@ async function findMessagesWithOrphanThinkingFromSDK(
|
|||||||
let messages: MessageData[]
|
let messages: MessageData[]
|
||||||
try {
|
try {
|
||||||
const response = await client.session.messages({ path: { id: sessionID } })
|
const response = await client.session.messages({ path: { id: sessionID } })
|
||||||
messages = (response.data ?? []) as MessageData[]
|
messages = ((response.data ?? response) as unknown as MessageData[]) ?? []
|
||||||
} catch {
|
} catch {
|
||||||
return []
|
return []
|
||||||
}
|
}
|
||||||
@ -111,7 +111,7 @@ async function findMessageByIndexNeedingThinkingFromSDK(
|
|||||||
let messages: MessageData[]
|
let messages: MessageData[]
|
||||||
try {
|
try {
|
||||||
const response = await client.session.messages({ path: { id: sessionID } })
|
const response = await client.session.messages({ path: { id: sessionID } })
|
||||||
messages = (response.data ?? []) as MessageData[]
|
messages = ((response.data ?? response) as unknown as MessageData[]) ?? []
|
||||||
} catch {
|
} catch {
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -38,7 +38,7 @@ async function recoverThinkingDisabledViolationFromSDK(
|
|||||||
): Promise<boolean> {
|
): Promise<boolean> {
|
||||||
try {
|
try {
|
||||||
const response = await client.session.messages({ path: { id: sessionID } })
|
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[] = []
|
const messageIDsWithThinking: string[] = []
|
||||||
for (const msg of messages) {
|
for (const msg of messages) {
|
||||||
|
|||||||
@ -28,7 +28,7 @@ async function readPartsFromSDKFallback(
|
|||||||
): Promise<MessagePart[]> {
|
): Promise<MessagePart[]> {
|
||||||
try {
|
try {
|
||||||
const response = await client.session.messages({ path: { id: sessionID } })
|
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)
|
const target = messages.find((m) => m.info?.id === messageID)
|
||||||
if (!target?.parts) return []
|
if (!target?.parts) return []
|
||||||
|
|
||||||
|
|||||||
@ -51,7 +51,7 @@ export async function replaceEmptyTextPartsAsync(
|
|||||||
): Promise<boolean> {
|
): Promise<boolean> {
|
||||||
try {
|
try {
|
||||||
const response = await client.session.messages({ path: { id: sessionID } })
|
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)
|
const targetMsg = messages.find((m) => m.info?.id === messageID)
|
||||||
if (!targetMsg?.parts) return false
|
if (!targetMsg?.parts) return false
|
||||||
@ -101,7 +101,7 @@ export async function findMessagesWithEmptyTextPartsFromSDK(
|
|||||||
): Promise<string[]> {
|
): Promise<string[]> {
|
||||||
try {
|
try {
|
||||||
const response = await client.session.messages({ path: { id: sessionID } })
|
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[] = []
|
const result: string[] = []
|
||||||
|
|
||||||
for (const msg of messages) {
|
for (const msg of messages) {
|
||||||
|
|||||||
@ -4,13 +4,10 @@ import type { PluginInput } from "@opencode-ai/plugin"
|
|||||||
import { PART_STORAGE } from "../constants"
|
import { PART_STORAGE } from "../constants"
|
||||||
import type { StoredPart } from "../types"
|
import type { StoredPart } from "../types"
|
||||||
import { isSqliteBackend } from "../../../shared"
|
import { isSqliteBackend } from "../../../shared"
|
||||||
|
import { isRecord } from "../../../shared/record-type-guard"
|
||||||
|
|
||||||
type OpencodeClient = PluginInput["client"]
|
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 {
|
function isStoredPart(value: unknown): value is StoredPart {
|
||||||
if (!isRecord(value)) return false
|
if (!isRecord(value)) return false
|
||||||
return (
|
return (
|
||||||
@ -57,7 +54,12 @@ export async function readPartsFromSDK(
|
|||||||
const rawParts = data.parts
|
const rawParts = data.parts
|
||||||
if (!Array.isArray(rawParts)) return []
|
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 {
|
} catch {
|
||||||
return []
|
return []
|
||||||
}
|
}
|
||||||
|
|||||||
@ -74,7 +74,7 @@ async function findLastThinkingContentFromSDK(
|
|||||||
): Promise<string> {
|
): Promise<string> {
|
||||||
try {
|
try {
|
||||||
const response = await client.session.messages({ path: { id: sessionID } })
|
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)
|
const currentIndex = messages.findIndex((m) => m.info?.id === beforeMessageID)
|
||||||
if (currentIndex === -1) return ""
|
if (currentIndex === -1) return ""
|
||||||
|
|||||||
@ -42,7 +42,7 @@ export async function stripThinkingPartsAsync(
|
|||||||
): Promise<boolean> {
|
): Promise<boolean> {
|
||||||
try {
|
try {
|
||||||
const response = await client.session.messages({ path: { id: sessionID } })
|
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 targetMsg = messages.find((m) => {
|
||||||
const info = (m as Record<string, unknown>)["info"] as Record<string, unknown> | undefined
|
const info = (m as Record<string, unknown>)["info"] as Record<string, unknown> | undefined
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user