ToothFairyAI_Public/tf_code
1
0
Fork 0
mirror of https://gitea.toothfairyai.com/ToothFairyAI/tf_code.git synced 2026-04-02 23:23:45 +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

40
packages/opencode/src/session/message-v2.ts
View File

@@ -1,7 +1,14 @@
import { BusEvent } from "@/bus/bus-event"
import z from "zod"
import { NamedError } from "@opencode-ai/util/error"
import { APICallError, convertToModelMessages, LoadAPIKeyError, type ModelMessage, type UIMessage } from "ai"
import {
APICallError,
convertToModelMessages,
LoadAPIKeyError,
type ModelMessage,
type UIMessage,
type ToolSet,
} from "ai"
import { Identifier } from "../id/id"
import { LSP } from "../lsp"
import { Snapshot } from "@/snapshot"
@@ -432,7 +439,7 @@ export namespace MessageV2 {
})
export type WithParts = z.infer<typeof WithParts>
export function toModelMessage(input: WithParts[]): ModelMessage[] {
export function toModelMessage(input: WithParts[], options?: { tools?: ToolSet }): ModelMessage[] {
const result: UIMessage[] = []
for (const msg of input) {
@@ -503,30 +510,14 @@ export namespace MessageV2 {
})
if (part.type === "tool") {
if (part.state.status === "completed") {
if (part.state.attachments?.length) {
result.push({
id: Identifier.ascending("message"),
role: "user",
parts: [
{
type: "text",
text: `Tool ${part.tool} returned an attachment:`,
},
...part.state.attachments.map((attachment) => ({
type: "file" as const,
url: attachment.url,
mediaType: attachment.mime,
filename: attachment.filename,
})),
],
})
}
assistantMessage.parts.push({
type: ("tool-" + part.tool) as `tool-${string}`,
state: "output-available",
toolCallId: part.callID,
input: part.state.input,
output: part.state.time.compacted ? "[Old tool result content cleared]" : part.state.output,
output: part.state.time.compacted
? "[Old tool result content cleared]"
: { output: part.state.output, attachments: part.state.attachments },
callProviderMetadata: part.metadata,
})
}
@@ -565,7 +556,12 @@ export namespace MessageV2 {
}
}
return convertToModelMessages(result.filter((msg) => msg.parts.some((part) => part.type !== "step-start")))
return convertToModelMessages(
result.filter((msg) => msg.parts.some((part) => part.type !== "step-start")),
{
tools: options?.tools,
},
)
}
export const stream = fn(Identifier.schema("session"), async function* (sessionID) {