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

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

Browse Source 
This reverts commit de2de099b4.
This commit is contained in:
Aiden Cline
2026-01-16 09:33:54 -06:00
parent bd914a8c06
commit e0a854f035
2 changed files with 29 additions and 41 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, { tools }),
...MessageV2.toModelMessage(sessionMessages),
...(isLastStep
? [
{
@@ -716,18 +716,10 @@ export namespace SessionPrompt {
)
return result
},
toModelOutput(result: { output: string; attachments?: MessageV2.FilePart[] }) {
if (!result.attachments?.length) return { type: "text", value: result.output }
toModelOutput(result) {
return {
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,
})),
],
type: "text",
value: result.output,
}
},
})
@@ -814,18 +806,10 @@ export namespace SessionPrompt {
content: result.content, // directly return content to preserve ordering when outputting to model
}
}
item.toModelOutput = (result: { output: string; attachments?: MessageV2.FilePart[] }) => {
if (!result.attachments?.length) return { type: "text", value: result.output }
item.toModelOutput = (result) => {
return {
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,
})),
],
type: "text",
value: result.output,
}
}
tools[key] = item