Skip to content

Commit 0c4ffec

Browse files
committed
chore: rename toModelMessage -> toModelMessages
1 parent 5c3e9cf commit 0c4ffec

4 files changed

Lines changed: 16 additions & 16 deletions

File tree

packages/opencode/src/session/compaction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ export namespace SessionCompaction {
149149
tools: {},
150150
system: [],
151151
messages: [
152-
...MessageV2.toModelMessage(input.messages),
152+
...MessageV2.toModelMessages(input.messages),
153153
{
154154
role: "user",
155155
content: [

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ export namespace MessageV2 {
432432
})
433433
export type WithParts = z.infer<typeof WithParts>
434434

435-
export function toModelMessage(input: WithParts[]): ModelMessage[] {
435+
export function toModelMessages(input: WithParts[]): ModelMessage[] {
436436
const result: UIMessage[] = []
437437

438438
for (const msg of input) {

packages/opencode/src/session/prompt.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ export namespace SessionPrompt {
598598
sessionID,
599599
system: [...(await SystemPrompt.environment()), ...(await SystemPrompt.custom())],
600600
messages: [
601-
...MessageV2.toModelMessage(sessionMessages),
601+
...MessageV2.toModelMessages(sessionMessages),
602602
...(isLastStep
603603
? [
604604
{
@@ -1800,7 +1800,7 @@ NOTE: At any point in time through this workflow you should feel free to ask the
18001800
},
18011801
...(hasOnlySubtaskParts
18021802
? [{ role: "user" as const, content: subtaskParts.map((p) => p.prompt).join("\n") }]
1803-
: MessageV2.toModelMessage(contextMessages)),
1803+
: MessageV2.toModelMessages(contextMessages)),
18041804
],
18051805
})
18061806
const text = await result.text.catch((err) => log.error("failed to generate title", { error: err }))

packages/opencode/test/session/message-v2.test.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ describe("session.message-v2.toModelMessage", () => {
6666
},
6767
]
6868

69-
expect(MessageV2.toModelMessage(input)).toStrictEqual([
69+
expect(MessageV2.toModelMessages(input)).toStrictEqual([
7070
{
7171
role: "user",
7272
content: [{ type: "text", text: "hello" }],
@@ -91,7 +91,7 @@ describe("session.message-v2.toModelMessage", () => {
9191
},
9292
]
9393

94-
expect(MessageV2.toModelMessage(input)).toStrictEqual([])
94+
expect(MessageV2.toModelMessages(input)).toStrictEqual([])
9595
})
9696

9797
test("includes synthetic text parts", () => {
@@ -122,7 +122,7 @@ describe("session.message-v2.toModelMessage", () => {
122122
},
123123
]
124124

125-
expect(MessageV2.toModelMessage(input)).toStrictEqual([
125+
expect(MessageV2.toModelMessages(input)).toStrictEqual([
126126
{
127127
role: "user",
128128
content: [{ type: "text", text: "hello" }],
@@ -189,7 +189,7 @@ describe("session.message-v2.toModelMessage", () => {
189189
},
190190
]
191191

192-
expect(MessageV2.toModelMessage(input)).toStrictEqual([
192+
expect(MessageV2.toModelMessages(input)).toStrictEqual([
193193
{
194194
role: "user",
195195
content: [
@@ -259,7 +259,7 @@ describe("session.message-v2.toModelMessage", () => {
259259
},
260260
]
261261

262-
expect(MessageV2.toModelMessage(input)).toStrictEqual([
262+
expect(MessageV2.toModelMessages(input)).toStrictEqual([
263263
{
264264
role: "user",
265265
content: [{ type: "text", text: "run tool" }],
@@ -341,7 +341,7 @@ describe("session.message-v2.toModelMessage", () => {
341341
},
342342
]
343343

344-
expect(MessageV2.toModelMessage(input)).toStrictEqual([
344+
expect(MessageV2.toModelMessages(input)).toStrictEqual([
345345
{
346346
role: "user",
347347
content: [{ type: "text", text: "run tool" }],
@@ -408,7 +408,7 @@ describe("session.message-v2.toModelMessage", () => {
408408
},
409409
]
410410

411-
expect(MessageV2.toModelMessage(input)).toStrictEqual([
411+
expect(MessageV2.toModelMessages(input)).toStrictEqual([
412412
{
413413
role: "user",
414414
content: [{ type: "text", text: "run tool" }],
@@ -461,7 +461,7 @@ describe("session.message-v2.toModelMessage", () => {
461461
},
462462
]
463463

464-
expect(MessageV2.toModelMessage(input)).toStrictEqual([])
464+
expect(MessageV2.toModelMessages(input)).toStrictEqual([])
465465
})
466466

467467
test("includes aborted assistant messages only when they have non-step-start/reasoning content", () => {
@@ -504,7 +504,7 @@ describe("session.message-v2.toModelMessage", () => {
504504
},
505505
]
506506

507-
expect(MessageV2.toModelMessage(input)).toStrictEqual([
507+
expect(MessageV2.toModelMessages(input)).toStrictEqual([
508508
{
509509
role: "assistant",
510510
content: [
@@ -540,7 +540,7 @@ describe("session.message-v2.toModelMessage", () => {
540540
},
541541
]
542542

543-
expect(MessageV2.toModelMessage(input)).toStrictEqual([
543+
expect(MessageV2.toModelMessages(input)).toStrictEqual([
544544
{
545545
role: "assistant",
546546
content: [{ type: "text", text: "first" }],
@@ -567,7 +567,7 @@ describe("session.message-v2.toModelMessage", () => {
567567
},
568568
]
569569

570-
expect(MessageV2.toModelMessage(input)).toStrictEqual([])
570+
expect(MessageV2.toModelMessages(input)).toStrictEqual([])
571571
})
572572

573573
test("converts pending/running tool calls to error results to prevent dangling tool_use", () => {
@@ -614,7 +614,7 @@ describe("session.message-v2.toModelMessage", () => {
614614
},
615615
]
616616

617-
const result = MessageV2.toModelMessage(input)
617+
const result = MessageV2.toModelMessages(input)
618618

619619
expect(result).toStrictEqual([
620620
{

0 commit comments

Comments
 (0)