Skip to content

Commit 8830d2a

Browse files
fix(session): safeguard message conversion against invalid prompts (anomalyco#8862)
1 parent f197b8a commit 8830d2a

1 file changed

Lines changed: 11 additions & 8 deletions

File tree

‎packages/opencode/src/session/message-v2.ts‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -517,8 +517,11 @@ export namespace MessageV2 {
517517
input: part.state.input,
518518
output: part.state.time.compacted
519519
? "[Old tool result content cleared]"
520-
: { output: part.state.output, attachments: part.state.attachments },
521-
callProviderMetadata: part.metadata,
520+
: {
521+
output: part.state.output,
522+
attachments: part.state.attachments?.filter((x) => x) ?? [],
523+
},
524+
callProviderMetadata: part.metadata ?? {},
522525
})
523526
}
524527
if (part.state.status === "error")
@@ -556,12 +559,12 @@ export namespace MessageV2 {
556559
}
557560
}
558561

559-
return convertToModelMessages(
560-
result.filter((msg) => msg.parts.some((part) => part.type !== "step-start")),
561-
{
562-
tools: options?.tools,
563-
},
564-
)
562+
const filtered = result
563+
.filter((msg) => msg.parts.length > 0)
564+
.filter((msg) => msg.parts.some((part) => part.type !== "step-start"))
565+
return convertToModelMessages(filtered, {
566+
tools: options?.tools,
567+
})
565568
}
566569

567570
export const stream = fn(Identifier.schema("session"), async function* (sessionID) {

0 commit comments

Comments
 (0)