ToothFairyAI_Public/tf_code
1
0
Fork 0
mirror of https://gitea.toothfairyai.com/ToothFairyAI/tf_code.git synced 2026-04-04 08:03:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: rm user message when dealing w/ image attachments, use proper tool attachment instead

Browse Source
This commit is contained in:
Aiden Cline
2026-01-16 00:04:56 -06:00
parent 0233dd1b39
commit de2de099b4
2 changed files with 41 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
packages/opencode/src/session/prompt.ts
View File

@@ -597,7 +597,7 @@ export namespace SessionPrompt {
sessionID,
system: [...(await SystemPrompt.environment()), ...(await SystemPrompt.custom())],
messages: [
...MessageV2.toModelMessage(sessionMessages),
...MessageV2.toModelMessage(sessionMessages, { tools }),
...(isLastStep
? [
{
@@ -716,10 +716,18 @@ export namespace SessionPrompt {
)
return result
},
toModelOutput(result) {
toModelOutput(result: { output: string; attachments?: MessageV2.FilePart[] }) {
if (!result.attachments?.length) return { type: "text", value: result.output }
return {
type: "text",
value: result.output,
type: "content",
value: [
{ type: "text", text: result.output },
...result.attachments.map((a) => ({
type: "media" as const,
data: a.url.slice(a.url.indexOf(",") + 1),
mediaType: a.mime,
})),
],
}
},
})
@@ -806,10 +814,18 @@ export namespace SessionPrompt {
content: result.content, // directly return content to preserve ordering when outputting to model
}
}
item.toModelOutput = (result) => {
item.toModelOutput = (result: { output: string; attachments?: MessageV2.FilePart[] }) => {
if (!result.attachments?.length) return { type: "text", value: result.output }
return {
type: "text",
value: result.output,
type: "content",
value: [
{ type: "text", text: result.output },
...result.attachments.map((a) => ({
type: "media" as const,
data: a.url.slice(a.url.indexOf(",") + 1),
mediaType: a.mime,
})),
],
}
}
tools[key] = item