@@ -8,7 +8,7 @@ import {
88 MAIN_PROMPT,
99 } from "./prompt";
1010 import { updateSession } from "./session";
11-import { estimateTokens, secureRandomString } from "./shared";
11+import { estimateTokens, formatTimestamp, secureRandomString } from "./shared";
1212 import { bash, runBashTool } from "./tool-bash";
1313 import { edit, runEditTool } from "./tool-edit";
1414 import { read, runReadTool } from "./tool-read";
@@ -24,7 +24,8 @@ import {
2424 import { Conversation, emptyState } from "./tui-conversation";
2525 import { Editor } from "./tui-editor";
2626 import { mainMenu } from "./tui-overlay";
27-import type { AgentContex, ToolAndRunner, TUIState } from "./types";
27+import type { AgentContex, ToolAndRunner, TUIMessage, TUIState } from "./types";
28+import { AssistantMessage, ToolResultMessage } from "@earendil-works/pi-ai";
2829
2930 function clearOrAbort(state: TUIState) {
3031 // Are we mid stream? Abort it.
@@ -156,6 +157,11 @@ async function streamAgentTUI(state: TUIState) {
156157 content: userContent,
157158 timestamp: Date.now(),
158159 });
160+ state.tuiMessages.push({
161+ timestamp: formatTimestamp(Date.now()),
162+ role: "user",
163+ text: state.prompt,
164+ });
159165 state.prompt = "";
160166
161167 const systemPrompt = await buildSystemPrompt(MAIN_PROMPT);
@@ -167,15 +173,70 @@ async function streamAgentTUI(state: TUIState) {
167173 signal: state.abortController?.signal,
168174 };
169175
170- // We send a reference to state.messages, so things just render.
171- // We just need to react to some updates.
176+ const toTUIMessage = (partial: AssistantMessage) => {
177+ const text = partial.content
178+ .filter((c) => c.type === "text")
179+ .map((c) => c.text)
180+ .join("")
181+ .trim();
182+ const thinking = partial.content
183+ .filter((c) => c.type === "thinking")
184+ .map((c) => c.thinking)
185+ .join("")
186+ .trim();
187+ const toolCalls = partial.content
188+ .filter((c) => c.type === "toolCall")
189+ .map((c) => {
190+ return {
191+ id: c.id,
192+ tool: c.name,
193+ args: c.arguments,
194+ output: "",
195+ };
196+ });
197+
198+ return {
199+ timestamp: formatTimestamp(partial.timestamp),
200+ role: "assistant" as const,
201+ text,
202+ thinking,
203+ toolCalls,
204+ };
205+ };
206+
207+ const updateToolCall = (
208+ partial: ToolResultMessage,
209+ tuiMessages: TUIMessage[],
210+ ) => {
211+ tuiMessages.forEach((c) => {
212+ const parentCall =
213+ c.toolCalls && c.toolCalls.find((t) => t.id === partial.toolCallId);
214+ if (parentCall) {
215+ parentCall.output = partial.content
216+ .filter((c) => c.type === "text")
217+ .map((c) => c.text)
218+ .join("")
219+ .trim();
220+ }
221+ });
222+ };
223+
172224 const agent = streamAgent(ctx);
173225 try {
174226 for await (const ev of agent) {
175227 switch (ev.type) {
176228 case "message_start":
229+ state.tuiMessages.push(toTUIMessage(ev.partial));
230+ break;
177231 case "message_update":
232+ state.tuiMessages[state.tuiMessages.length - 1] = toTUIMessage(
233+ ev.partial,
234+ );
235+ break;
178236 case "message_end": {
237+ state.tuiMessages[state.tuiMessages.length - 1] = toTUIMessage(
238+ ev.message,
239+ );
179240 const { systemPrompt, tools, messages } = ctx;
180241 state.contextSize = estimateTokens(
181242 JSON.stringify({ systemPrompt, tools, messages }),
@@ -184,10 +245,13 @@ async function streamAgentTUI(state: TUIState) {
184245 }
185246
186247 case "tool_message_start":
248+ updateToolCall(ev.partial, state.tuiMessages);
249+ break;
187250 case "tool_message_update":
251+ updateToolCall(ev.partial, state.tuiMessages);
188252 break;
189-
190253 case "tool_message_end": {
254+ updateToolCall(ev.message, state.tuiMessages);
191255 const withReminder = insertToolUsageReminder(
192256 state.messages,
193257 ev.message,