@@ -15,7 +15,7 @@ import {
1515 writeln,
1616 } from "../cli/output.ts";
1717 import { resolveModel } from "../llm-api/providers.ts";
18-import { type CoreMessage, runTurn, userMessage } from "../llm-api/turn.ts";
18+import { type CoreMessage, runTurn } from "../llm-api/turn.ts";
1919 import type { Message, ToolDef } from "../llm-api/types.ts";
2020 import { connectMcpServer } from "../mcp/client.ts";
2121 import {
@@ -102,10 +102,10 @@ Guidelines:
102102 }
103103
104104 // ─── DB messages → raw ModelMessages (for session resume) ────────────────────
105-// On resume, the DB has only simple text messages (user prompts + assistant
106-// text replies). Tool-call/result parts are intentionally not reconstructed
107-// because the complex output/input shapes are opaque. The conversation context
108-// is still preserved for the model via the text content.
105+// On resume, the DB stores text-only messages. Tool-call/result parts are
106+// intentionally not reconstructed because the complex output/input shapes are
107+// opaque. Any tool-role entries are kept as plain text and treated as assistant
108+// messages for resume context.
109109 function isTextPart(part: unknown): part is { type: "text"; text: string } {
110110 return (
111111 typeof part === "object" &&
@@ -115,24 +115,30 @@ function isTextPart(part: unknown): part is { type: "text"; text: string } {
115115 );
116116 }
117117
118+function resumeRole(role: Message["role"]): "user" | "assistant" {
119+ // Tool-role entries are stored as plain text; treat them as assistant
120+ // messages when rebuilding context for the model.
121+ return role === "user" ? "user" : "assistant";
122+}
123+
118124 function dbMessagesToCore(messages: Message[]): CoreMessage[] {
119125 return messages.map((m): CoreMessage => {
126+ const role = resumeRole(m.role);
120127 if (typeof m.content === "string") {
121- // DB messages only have "user" or "assistant" roles; cast is safe.
122- return { role: m.role as "user" | "assistant", content: m.content };
128+ return { role, content: m.content };
123129 }
124130 if (Array.isArray(m.content)) {
125131 // Filter to text-only parts to avoid feeding malformed tool parts
126132 const textParts = m.content.filter(isTextPart);
127133 if (textParts.length > 0) {
128134 return {
129- role: m.role as "user" | "assistant",
135+ role,
130136 content: textParts,
131137 };
132138 }
133- return { role: m.role as "user" | "assistant", content: "" };
139+ return { role, content: "" };
134140 }
135- return { role: m.role as "user" | "assistant", content: String(m.content) };
141+ return { role, content: String(m.content) };
136142 });
137143 }