clone/opencode
1
0
Fork 0
mirror of https://github.com/anomalyco/opencode.git synced 2026-04-24 06:45:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: update message-v2.ts and message-v2.test.ts to v6

Browse Source
This commit is contained in:
Aiden Cline
2026-03-20 11:42:12 -05:00
parent be972907a3
commit 44a251a406
2 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -510,19 +510,19 @@ export namespace MessageV2 {
}
const info = (row: typeof MessageTable.$inferSelect) =>
(({
...row.data,
id: row.id,
sessionID: row.session_id
}) as MessageV2.Info)
const part = (row: typeof PartTable.$inferSelect) =>
(({
({
...row.data,
id: row.id,
sessionID: row.session_id,
messageID: row.message_id
}) as MessageV2.Part)
}) as MessageV2.Info
const part = (row: typeof PartTable.$inferSelect) =>
({
...row.data,
id: row.id,
sessionID: row.session_id,
messageID: row.message_id,
}) as MessageV2.Part
const older = (row: Cursor) =>
or(
@@ -556,11 +556,11 @@ export namespace MessageV2 {
}))
}
export function toModelMessages(
export async function toModelMessages(
input: WithParts[],
model: Provider.Model,
options?: { stripMedia?: boolean },
): ModelMessage[] {
): Promise<ModelMessage[]> {
const result: UIMessage[] = []
const toolNames = new Set<string>()
// Track media from tool results that need to be injected as user messages
@@ -788,7 +788,7 @@ export namespace MessageV2 {
//@ts-expect-error (convertToModelMessages expects a ToolSet but only actually needs tools[name]?.toModelOutput)
tools,
},
);
)
}
export const page = fn(
@@ -854,13 +854,14 @@ export namespace MessageV2 {
db.select().from(PartTable).where(eq(PartTable.message_id, message_id)).orderBy(PartTable.id).all(),
)
return rows.map(
(row) => (({
...row.data,
id: row.id,
sessionID: row.session_id,
messageID: row.message_id
}) as MessageV2.Part),
);
(row) =>
({
...row.data,
id: row.id,
sessionID: row.session_id,
messageID: row.message_id,
}) as MessageV2.Part,
)
})
export const get = fn(

52
packages/opencode/test/session/message-v2.test.ts
View File

@@ -108,7 +108,7 @@ function basePart(messageID: string, id: string) {
}
describe("session.message-v2.toModelMessage", () => {
test("filters out messages with no parts", () => {
test("filters out messages with no parts", async () => {
const input: MessageV2.WithParts[] = [
{
info: userInfo("m-empty"),
@@ -126,7 +126,7 @@ describe("session.message-v2.toModelMessage", () => {
},
]
expect(MessageV2.toModelMessages(input, model)).toStrictEqual([
expect(await Promise.all(await MessageV2.toModelMessages(input, model))).toStrictEqual([
{
role: "user",
content: [{ type: "text", text: "hello" }],
@@ -134,7 +134,7 @@ describe("session.message-v2.toModelMessage", () => {
])
})
test("filters out messages with only ignored parts", () => {
test("filters out messages with only ignored parts", async () => {
const messageID = "m-user"
const input: MessageV2.WithParts[] = [
@@ -151,10 +151,10 @@ describe("session.message-v2.toModelMessage", () => {
},
]
expect(MessageV2.toModelMessages(input, model)).toStrictEqual([])
expect(await Promise.all(await MessageV2.toModelMessages(input, model))).toStrictEqual([])
})
test("includes synthetic text parts", () => {
test("includes synthetic text parts", async () => {
const messageID = "m-user"
const input: MessageV2.WithParts[] = [
@@ -182,7 +182,7 @@ describe("session.message-v2.toModelMessage", () => {
},
]
expect(MessageV2.toModelMessages(input, model)).toStrictEqual([
expect(await Promise.all(await MessageV2.toModelMessages(input, model))).toStrictEqual([
{
role: "user",
content: [{ type: "text", text: "hello" }],
@@ -194,7 +194,7 @@ describe("session.message-v2.toModelMessage", () => {
])
})
test("converts user text/file parts and injects compaction/subtask prompts", () => {
test("converts user text/file parts and injects compaction/subtask prompts", async () => {
const messageID = "m-user"
const input: MessageV2.WithParts[] = [
@@ -249,7 +249,7 @@ describe("session.message-v2.toModelMessage", () => {
},
]
expect(MessageV2.toModelMessages(input, model)).toStrictEqual([
expect(await Promise.all(await MessageV2.toModelMessages(input, model))).toStrictEqual([
{
role: "user",
content: [
@@ -267,7 +267,7 @@ describe("session.message-v2.toModelMessage", () => {
])
})
test("converts assistant tool completion into tool-call + tool-result messages with attachments", () => {
test("converts assistant tool completion into tool-call + tool-result messages with attachments", async () => {
const userID = "m-user"
const assistantID = "m-assistant"
@@ -319,7 +319,7 @@ describe("session.message-v2.toModelMessage", () => {
},
]
expect(MessageV2.toModelMessages(input, model)).toStrictEqual([
expect(await Promise.all(await MessageV2.toModelMessages(input, model))).toStrictEqual([
{
role: "user",
content: [{ type: "text", text: "run tool" }],
@@ -359,7 +359,7 @@ describe("session.message-v2.toModelMessage", () => {
])
})
test("omits provider metadata when assistant model differs", () => {
test("omits provider metadata when assistant model differs", async () => {
const userID = "m-user"
const assistantID = "m-assistant"
@@ -402,7 +402,7 @@ describe("session.message-v2.toModelMessage", () => {
},
]
expect(MessageV2.toModelMessages(input, model)).toStrictEqual([
expect(await Promise.all(await MessageV2.toModelMessages(input, model))).toStrictEqual([
{
role: "user",
content: [{ type: "text", text: "run tool" }],
@@ -434,7 +434,7 @@ describe("session.message-v2.toModelMessage", () => {
])
})
test("replaces compacted tool output with placeholder", () => {
test("replaces compacted tool output with placeholder", async () => {
const userID = "m-user"
const assistantID = "m-assistant"
@@ -470,7 +470,7 @@ describe("session.message-v2.toModelMessage", () => {
},
]
expect(MessageV2.toModelMessages(input, model)).toStrictEqual([
expect(await Promise.all(await MessageV2.toModelMessages(input, model))).toStrictEqual([
{
role: "user",
content: [{ type: "text", text: "run tool" }],
@@ -501,7 +501,7 @@ describe("session.message-v2.toModelMessage", () => {
])
})
test("converts assistant tool error into error-text tool result", () => {
test("converts assistant tool error into error-text tool result", async () => {
const userID = "m-user"
const assistantID = "m-assistant"
@@ -537,7 +537,7 @@ describe("session.message-v2.toModelMessage", () => {
},
]
expect(MessageV2.toModelMessages(input, model)).toStrictEqual([
expect(await Promise.all(await MessageV2.toModelMessages(input, model))).toStrictEqual([
{
role: "user",
content: [{ type: "text", text: "run tool" }],
@@ -570,7 +570,7 @@ describe("session.message-v2.toModelMessage", () => {
])
})
test("filters assistant messages with non-abort errors", () => {
test("filters assistant messages with non-abort errors", async () => {
const assistantID = "m-assistant"
const input: MessageV2.WithParts[] = [
@@ -590,10 +590,10 @@ describe("session.message-v2.toModelMessage", () => {
},
]
expect(MessageV2.toModelMessages(input, model)).toStrictEqual([])
expect(await Promise.all(await MessageV2.toModelMessages(input, model))).toStrictEqual([])
})
test("includes aborted assistant messages only when they have non-step-start/reasoning content", () => {
test("includes aborted assistant messages only when they have non-step-start/reasoning content", async () => {
const assistantID1 = "m-assistant-1"
const assistantID2 = "m-assistant-2"
@@ -633,7 +633,7 @@ describe("session.message-v2.toModelMessage", () => {
},
]
expect(MessageV2.toModelMessages(input, model)).toStrictEqual([
expect(await Promise.all(await MessageV2.toModelMessages(input, model))).toStrictEqual([
{
role: "assistant",
content: [
@@ -644,7 +644,7 @@ describe("session.message-v2.toModelMessage", () => {
])
})
test("splits assistant messages on step-start boundaries", () => {
test("splits assistant messages on step-start boundaries", async () => {
const assistantID = "m-assistant"
const input: MessageV2.WithParts[] = [
@@ -669,7 +669,7 @@ describe("session.message-v2.toModelMessage", () => {
},
]
expect(MessageV2.toModelMessages(input, model)).toStrictEqual([
expect(await Promise.all(await MessageV2.toModelMessages(input, model))).toStrictEqual([
{
role: "assistant",
content: [{ type: "text", text: "first" }],
@@ -681,7 +681,7 @@ describe("session.message-v2.toModelMessage", () => {
])
})
test("drops messages that only contain step-start parts", () => {
test("drops messages that only contain step-start parts", async () => {
const assistantID = "m-assistant"
const input: MessageV2.WithParts[] = [
@@ -696,10 +696,10 @@ describe("session.message-v2.toModelMessage", () => {
},
]
expect(MessageV2.toModelMessages(input, model)).toStrictEqual([])
expect(await Promise.all(await MessageV2.toModelMessages(input, model))).toStrictEqual([])
})
test("converts pending/running tool calls to error results to prevent dangling tool_use", () => {
test("converts pending/running tool calls to error results to prevent dangling tool_use", async () => {
const userID = "m-user"
const assistantID = "m-assistant"
@@ -743,7 +743,7 @@ describe("session.message-v2.toModelMessage", () => {
},
]
const result = MessageV2.toModelMessages(input, model)
const result = await Promise.all(await MessageV2.toModelMessages(input, model))
expect(result).toStrictEqual([
{