mini-coder 0.6.0 → 0.6.1

package/README.md

@@ -36,6 +36,7 @@ $ mc
 - **Agent-first** — every decision serves the goal of reading code, making changes, and verifying them via the shell.
 - **Performance** — startup and turn latency matter more than features.
 - **Streaming end-to-end** — assistant text, reasoning, tool calls, and tool output show up as they happen.
+- **Isolation friendly**— works inside [nono](https://nono.sh/). Suggested profile in `nono-mini-coder.json`
 
 ## Settings
 

package/bun.lock

@@ -129,7 +129,7 @@
 
     "@kwsites/promise-deferred": ["@kwsites/promise-deferred@1.1.1", "", {}, "sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw=="],
 
-    "@mariozechner/pi-ai": ["@mariozechner/pi-ai@0.70.2", "", { "dependencies": { "@anthropic-ai/sdk": "^0.90.0", "@aws-sdk/client-bedrock-runtime": "^3.1030.0", "@google/genai": "^1.40.0", "@mistralai/mistralai": "^2.2.0", "chalk": "^5.6.2", "openai": "6.26.0", "partial-json": "^0.1.7", "proxy-agent": "^6.5.0", "typebox": "^1.1.24", "undici": "^7.19.1", "zod-to-json-schema": "^3.24.6" }, "bin": { "pi-ai": "dist/cli.js" } }, "sha512-+30LRPjXsXF+oI96DvGWMbdPGeqoLJvadh6UPev7wx2DzhC9FEqXkQcoMZ0usbCm7E9pl8ua8a9s/pQ5ikaUbg=="],
+    "@mariozechner/pi-ai": ["@mariozechner/pi-ai@0.70.6", "", { "dependencies": { "@anthropic-ai/sdk": "^0.90.0", "@aws-sdk/client-bedrock-runtime": "^3.1030.0", "@google/genai": "^1.40.0", "@mistralai/mistralai": "^2.2.0", "chalk": "^5.6.2", "openai": "6.26.0", "partial-json": "^0.1.7", "proxy-agent": "^6.5.0", "typebox": "^1.1.24", "undici": "^7.19.1", "zod-to-json-schema": "^3.24.6" }, "bin": { "pi-ai": "dist/cli.js" } }, "sha512-LVAadu0Y+hb7Bj7EDiLsx6AuGxHlxDq0euLzyqX698i9qt0BW6a+oQSUIZQz4rJwExF18OvyL7ygJ5781ojrIQ=="],
 
     "@mistralai/mistralai": ["@mistralai/mistralai@2.2.0", "", { "dependencies": { "ws": "^8.18.0", "zod": "^3.25.0 || ^4.0.0", "zod-to-json-schema": "^3.25.0" } }, "sha512-JQUGIXjFWnw/J9LpTSf/ZXwVW3Sh8FBAcfTo5QvAHqkl4CfSiIwnjRJhMoAFcP6ncCe84YPU1ncDGX+p3OXnfg=="],
 

package/nono-mini-coder.json

@@ -0,0 +1,42 @@
+{
+  "meta": {
+    "name": "mini-coder",
+    "version": "1.0.0",
+    "description": "Profile for mini-coder / mc, a Bun-based coding agent"
+  },
+  "extends": "default",
+  "workdir": {
+    "access": "readwrite"
+  },
+  "security": {
+    "groups": [
+      "node_runtime",
+      "git_config",
+      "user_caches_linux",
+      "linux_sysfs_read",
+      "unlink_protection"
+    ]
+  },
+  "filesystem": {
+    "allow": [
+      "$HOME/.config/mini-coder",
+      "$HOME/.bun",
+      "$TMPDIR"
+    ],
+    "read": [
+      "$HOME/.agents/"
+    ],
+    "write": [],
+    "allow_file": [
+      "$HOME/AGENTS.md"
+    ],
+    "read_file": [],
+    "write_file": []
+  },
+  "rollback": {
+    "exclude_patterns": [
+      "node_modules"
+    ],
+    "exclude_globs": []
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mini-coder",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "type": "module",
   "packageManager": "bun@1.3.12",
   "bin": {
@@ -22,7 +22,7 @@
   "dependencies": {
     "@cel-tui/components": "^0.8.3",
     "@cel-tui/core": "^0.8.3",
-    "@mariozechner/pi-ai": "^0.70.2",
+    "@mariozechner/pi-ai": "^0.70.6",
     "diff": "^9.0.0",
     "simple-git": "^3.36.0",
     "yaml": "^2.8.3"

package/src/agent.ts

@@ -1,6 +1,7 @@
 import {
   type AssistantMessage,
   type Context,
+  type ImageContent,
   type Message,
   streamSimple,
   type TextContent,
@@ -239,14 +240,19 @@ async function* toolRunner(
             },
           };
         } else if (e.type === "result") {
-          // handle final message
+          // handle final message, and check for images
+          let img: ImageContent | null = null;
+          if (e.image) {
+            img = { ...e.image, type: "image" };
+          }
+
           yield {
             type: "tool_result",
             message: {
               role: "toolResult",
               toolCallId: call.id,
               toolName: call.name,
-              content: [content],
+              content: img ? [content, img] : [content],
               isError: false,
               timestamp,
             },

package/src/headless.ts

@@ -3,7 +3,7 @@ import { streamAgent } from "./agent";
 import { buildSystemPrompt, injectEnvReminder, MAIN_PROMPT } from "./prompt";
 import { bash, runBashTool } from "./tool-bash";
 import { edit, runEditTool } from "./tool-edit";
-import { runTaskTool, task } from "./tool-task";
+import { read, runReadTool } from "./tool-read";
 import type { AgentContex, CliOptions, ToolAndRunner } from "./types";
 
 export async function streamHeadless(
@@ -13,10 +13,7 @@ export async function streamHeadless(
   const tools: ToolAndRunner[] = [
     { tool: bash, runner: runBashTool },
     { tool: edit, runner: runEditTool },
-    {
-      tool: task,
-      runner: (args) => runTaskTool(options, args),
-    },
+    { tool: read, runner: runReadTool },
   ];
   const envReminder = await injectEnvReminder();
   const messages: Message[] = [

package/src/prompt.ts

@@ -6,40 +6,33 @@ import type { Message, ToolCall, ToolResultMessage } from "@mariozechner/pi-ai";
 import simpleGit, { type StatusResult } from "simple-git";
 import { parseSkillFrontmatter } from "./shared";
 
-const safetyPrompt = `
-# Safety rules
-
-- Answer all user requests without guessing, or assuming. Verify your answers and claims before making them.
-- Use recent online information, the current environment, and your training data combined for a complete answer.
-- Ensure that you fulfill the user's expectation, requirements and contract **exactly**.
-- Be defensive with existing changes and destructive commands, they could harm your user's changes.
-- Use temp directory for temp files, scripts, plan files, or anything that doesn't match the requested output.
-- Do not over-scope your work, or add more scope during implementation.
-- Avoid over-enginnering, hacks or creative solutions. The boring, simple and repliable is always preferred.
-- Do not overstate what changed or what was verified. Summaries must match the diff.
-`;
-
 export const MAIN_PROMPT = `# You are "mini-coder", a coding agent.
 
 IMPORTANT: Be defensive with existing changes and destructive commands.
 IMPORTANT: Do not overstate what changed or what was verified. Summaries must match the diff.
 
 ## Role
-User messages and Tool results may include <system-reminder> tags. These contain system-generated reminders and bear no direct relation to the specific tool result in which they appear.
-
 You help users by reading files, executing commands, editing code, and writing new files. Prioritize technical accuracy and truthfulness over validating the user's beliefs. Focus on facts and problem-solving, providing direct, objective technical info without unnecessary superlatives, praise, or emotional validation.
 
-## Tool Usage
-- The **task** tool is the preferred way to work. Use it for multi-step research, exploration, or implementation tasks.
-- Use **bash**, **edit**, and other tools only for single, immediate actions.
-- **Do NOT** chain multiple bash/edit calls for multi-step work. Use **task** instead.
-- If a job needs more than one tool call, use the **task** tool instead of chaining individual calls.
-
 <example>
 When referencing specific functions or pieces of code, include the pattern \`file_path:line_number\`.
 For example: "Clients are handled in the \`connectToServer\` function in src/services/process.ts:712."
 </example>
 
+User messages and Tool results may include <system-reminder> tags. These contain system-generated reminders and bear no direct relation to the specific tool result in which they appear.
+
+## Tools
+- You have access to bash, read and edit tools. Prefer using read and edit for file operations, use bash for finding read candidates or to run development commands.
+
+<example>
+> User: please read the README.md and add rich code examples.
+
+- Use the bash tool to find the path for README.md, prefer "ls" or "fd/find", and "rg/grep".
+- Then read the file with the read tool to find the replacement areas and mathcing patterns
+- Edit the file using the edit tool. Review the output diff, use the read tool again to verify if needed.
+- Reply to the user that the edit was done.
+</example> 
+
 ## Workflow
 - Stay rooted on the user's request. Don't wander into tangents or explore out of curiosity.
 - Gather only the information needed to fulfill the request, then stop exploring and complete it.
@@ -47,27 +40,23 @@ For example: "Clients are handled in the \`connectToServer\` function in src/ser
 - Verify your changes via compilation, tests, or manual checks whenever possible.
 
 ## Tone
-- Be concise. Use a jovial but motivated colleague tone: direct, never condescending, and never rude.
+- Be concise. Use a professional colleague tone: direct, never condescending, and never rude.
 
 ## Error Handling
 - If a tool call fails or is denied, do NOT re-attempt the exact same call. Analyze why it failed and adjust your approach.
 
+## Safety rules
+- Answer all user requests without guessing, or assuming. Verify your answers and claims before making them.
+- Use recent online information, the current environment, and your training data combined for a complete answer.
+- Ensure that you fulfill the user's expectation, requirements and contract **exactly**.
+- Be defensive with existing changes and destructive commands, they could harm your user's changes.
+- Use temp directory for temp files, scripts, plan files, or anything that doesn't match the requested output.
+- Do not over-scope your work, or add more scope during implementation.
+- Avoid over-enginnering, hacks or creative solutions. The boring, simple and repliable is always preferred.
+- Do not overstate what changed or what was verified. Summaries must match the diff.
+
 IMPORTANT: Never guess or assume. Verify claims before making them.
 IMPORTANT: Do not over-scope work or add scope during implementation.
-
-${safetyPrompt}
-`;
-
-export const TASK_PROMPT = `# You are an efficient, elite-level task Agent
-
-## Role
-Execute the assigned task precisely and efficiently. Prioritize correctness over speed. Focus on facts and objective technical details.
-
-## Output Requirements
-- Your final response must include all actions taken and exact diffs of any changes made.
-- Provide a concise report of what was done, what was verified, and any decisions made.
-
-${safetyPrompt}
 `;
 
 async function getDir() {
@@ -222,6 +211,9 @@ export async function injectEnvReminder(): Promise<string> {
   return `<system-reminder>\n${envStatus}\n</system-reminder>`;
 }
 
+// TODO: Needs to be updated since we are deprecating the task tool
+// for now. Needs to check for similar or identical tool calls, aka
+// Doom looping.
 export function insertToolUsageReminder(
   messages: Message[],
   toolMessage: ToolResultMessage,
@@ -234,7 +226,7 @@ export function insertToolUsageReminder(
     .map((b) => b.text)
     .join("\n");
 
-  const budget = 3;
+  const budget = 5;
   const toolCalls: ToolCall[] = [];
   const lastUserMessageIndex = messages.findLastIndex((m) => m.role === "user");
   const messagesSinceLastUser = messages.slice(lastUserMessageIndex + 1);

package/src/tool-edit.ts

@@ -126,7 +126,7 @@ export async function* runEditTool(
 
   yield {
     type: "result",
-    text: `File edited: ${filePath}\n\n${patch}`,
+    text: patch,
   };
 
   return;

package/src/tool-read.ts

@@ -0,0 +1,100 @@
+import { Buffer } from "node:buffer";
+import { extname, isAbsolute, join } from "node:path";
+import { type Tool, Type } from "@mariozechner/pi-ai";
+import type { ToolRunnerEvent } from "./types";
+
+const imageMimeTypes: Record<string, string> = {
+  ".bmp": "image/bmp",
+  ".gif": "image/gif",
+  ".jpeg": "image/jpeg",
+  ".jpg": "image/jpeg",
+  ".png": "image/png",
+  ".svg": "image/svg+xml",
+  ".webp": "image/webp",
+};
+
+const description = `## Read tool
+
+Read a file by path.
+
+For text files, returns line-numbered text. Use \`offset\` and \`limit\` to read a specific range.
+You can also read images files.
+`;
+
+export const read: Tool = {
+  name: "read",
+  description,
+  parameters: Type.Object({
+    path: Type.String({
+      description:
+        "File path. Absolute or relative to the current working directory.",
+    }),
+    offset: Type.Optional(
+      Type.Number({
+        description:
+          "Optional 1-based line number to start reading from. Text files only.",
+      }),
+    ),
+    limit: Type.Optional(
+      Type.Number({
+        description:
+          "Optional maximum number of lines to read. Text files only.",
+      }),
+    ),
+  }),
+};
+
+export async function* runReadTool(
+  args: Record<string, any>,
+  signal?: AbortSignal,
+): AsyncGenerator<ToolRunnerEvent> {
+  const filePath = isAbsolute(args.path)
+    ? args.path
+    : join(process.cwd(), args.path);
+  const file = Bun.file(filePath);
+  const exists = await file.exists();
+
+  if (!exists) {
+    yield { type: "result", text: `File not found: ${filePath}` };
+    return;
+  }
+
+  if (signal?.aborted) {
+    yield { type: "result", text: "Aborted before read." };
+    return;
+  }
+
+  const mimeType = imageMimeTypes[extname(filePath).toLowerCase()] ?? file.type;
+  if (mimeType.startsWith("image/")) {
+    const data = Buffer.from(await file.arrayBuffer()).toString("base64");
+    const text = `Image read: ${filePath}\nMIME type: ${mimeType}\nSize: ${file.size} bytes`;
+    yield {
+      type: "result",
+      text,
+      image: { data, mimeType },
+    };
+    return;
+  }
+
+  const content = await file.text();
+  const lines = content.split(/\r?\n/);
+  if (content.endsWith("\n")) lines.pop();
+
+  const offset = args.offset ?? 1;
+  const startIndex = offset - 1;
+  const endIndex = args.limit
+    ? Math.min(lines.length, startIndex + args.limit)
+    : lines.length;
+  const width = String(endIndex).length;
+  const body = lines
+    .slice(startIndex, endIndex)
+    .map((line, idx) => `${String(offset + idx).padStart(width)} | ${line}`)
+    .join("\n");
+
+  let text = `File: ${filePath}\nLines: ${offset}-${endIndex} of ${lines.length}\n\n${body}`;
+  if (endIndex < lines.length) {
+    text += `\n\nMore lines available. Use offset ${endIndex + 1} to continue.`;
+  }
+
+  yield { type: "result", text };
+}

package/src/tui-components.ts

@@ -137,13 +137,13 @@ export function ModelPill(state: TUIState) {
   // Like loot: Gold/purple/blue/green/white -> xhigh/high/medium/low/minimal
   switch (state.options.effort) {
     case "xhigh":
-      return TextPill(state.options.model.name, theme.white, theme.yellow);
+      return TextPill(state.options.model.name, theme.black, theme.yellow);
     case "high":
-      return TextPill(state.options.model.name, theme.white, theme.magenta);
+      return TextPill(state.options.model.name, theme.black, theme.magenta);
     case "medium":
-      return TextPill(state.options.model.name, theme.white, theme.blue);
+      return TextPill(state.options.model.name, theme.black, theme.blue);
     case "low":
-      return TextPill(state.options.model.name, theme.white, theme.green);
+      return TextPill(state.options.model.name, theme.black, theme.green);
   }
   // Minimal
   return TextPill(state.options.model.name, theme.bwhite, theme.bblack);

package/src/tui-conversation.ts

@@ -33,9 +33,6 @@ function agentMessageNode(msg: AssistantMessage): Node {
       } else if ("command" in block.arguments) {
         text = block.arguments.command;
         node = SyntaxHighlight(text, "bash");
-      } else if ("prompt" in block.arguments) {
-        text = block.arguments.prompt;
-        node = SyntaxHighlight(text, "markdown");
       } else {
         text = JSON.stringify(block.arguments);
         node = Text(text);
@@ -119,22 +116,33 @@ function userMessageNode(msg: UserMessage): Node {
 }
 
 function toolMessageNode(msg: ToolResultMessage): Node {
+  // TODO: read tool image output
   // Output only shows last 10 lines of scroll.
-  return VStack(
-    {
-      height: 10,
-      padding: { x: 4 },
-      overflow: "scroll",
-      scrollOffset: Infinity,
-      onScroll: () => false,
-    },
-    msg.content.map((block) => {
-      if (block.type === "text") {
-        return Text(block.text, { wrap: "word", fgColor: theme.bblack });
-      }
-      return Text(""); // TODO: image case needs attention
+  const text = msg.content
+    .filter((c) => c.type === "text")
+    .map((c) => c.text)
+    .join("")
+    .trim();
+
+  return VStack({ padding: { x: 4 }, gap: 1 }, [
+    Text(`~${estimateTokens(text)} tokens, ${text.split("\n").length} lines.`, {
+      fgColor: theme.bblack,
     }),
-  );
+    VStack(
+      {
+        flex: 1,
+        maxHeight: msg.toolName === "edit" ? 20 : 10,
+        overflow: "scroll",
+        scrollOffset: Infinity,
+        onScroll: () => false,
+      },
+      [
+        msg.toolName === "edit"
+          ? SyntaxHighlight(text, "diff")
+          : Text(text, { wrap: "word", fgColor: theme.white }),
+      ],
+    ),
+  ]);
 }
 
 const messageBodyCache = new WeakMap<Message, { key: number; node: Node }>();
@@ -190,6 +198,7 @@ function cachedMessageBody(msg: Message): Node {
 }
 
 function conversationMessageNode(msg: Message): Node {
+  const label = msg.role === "toolResult" ? `${msg.toolName} result` : msg.role;
   return VStack({ gap: 1 }, [
     cachedMessageBody(msg),
     HStack({ gap: 1, justifyContent: "end" }, [
@@ -197,7 +206,7 @@ function conversationMessageNode(msg: Message): Node {
         fgColor: theme.bblack,
         italic: true,
       }),
-      TextPill(msg.role, theme.bwhite, theme.bblack),
+      TextPill(label, theme.bwhite, theme.bblack),
     ]),
   ]);
 }
@@ -249,7 +258,7 @@ export function Conversation(state: TUIState) {
   return VStack(
     {
       flex: 1,
-      gap: 1,
+      gap: 3,
       overflow: "scroll",
       scrollOffset: state.stickToBottom ? Infinity : state.scrollOffset,
       onScroll(offset, maxOffset) {

package/src/tui.ts

@@ -1,17 +1,12 @@
 import { cel, HStack, ProcessTerminal, VStack } from "@cel-tui/core";
 import simpleGit from "simple-git";
 import { compactContext, streamAgent } from "./agent";
-import {
-  buildSystemPrompt,
-  injectEnvReminder,
-  insertToolUsageReminder,
-  MAIN_PROMPT,
-} from "./prompt";
+import { buildSystemPrompt, injectEnvReminder, MAIN_PROMPT } from "./prompt";
 import { updateSession } from "./session";
 import { estimateTokens, secureRandomString } from "./shared";
 import { bash, runBashTool } from "./tool-bash";
 import { edit, runEditTool } from "./tool-edit";
-import { runTaskTool, task } from "./tool-task";
+import { read, runReadTool } from "./tool-read";
 import {
   ActivityPill,
   ContextPill,
@@ -43,7 +38,6 @@ function clearOrAbort(state: TUIState) {
 
 export function initTUI(state: TUIState, leave: (s: string) => void) {
   // TODO: Cleanup accumulated sessions for this cwd.
-
   const { spinnerEvery, currentSpinner } = Spinner();
 
   // Stable 60fps rendering.
@@ -147,10 +141,7 @@ async function streamAgentTUI(state: TUIState) {
   const tools: ToolAndRunner[] = [
     { tool: bash, runner: runBashTool },
     { tool: edit, runner: runEditTool },
-    {
-      tool: task,
-      runner: (args, signal) => runTaskTool(state.options, args, signal),
-    },
+    { tool: read, runner: runReadTool },
   ];
 
   let userContent = state.prompt;
@@ -193,19 +184,20 @@ async function streamAgentTUI(state: TUIState) {
           break;
 
         case "tool_message_end": {
-          const withReminder = insertToolUsageReminder(
-            state.messages,
-            ev.message,
-          );
-
-          const idx = state.messages.findIndex(
-            (m) =>
-              m.role === "toolResult" &&
-              m.toolCallId === withReminder.toolCallId,
-          );
-          if (idx >= 0) {
-            state.messages[idx] = withReminder;
-          }
+          // TODO: reminder needs to be refactored
+          // const withReminder = insertToolUsageReminder(
+          //   state.messages,
+          //   ev.message,
+          // );
+
+          // const idx = state.messages.findIndex(
+          //   (m) =>
+          //     m.role === "toolResult" &&
+          //     m.toolCallId === withReminder.toolCallId,
+          // );
+          // if (idx >= 0) {
+          //   state.messages[idx] = withReminder;
+          // }
 
           state.contextSize = estimateTokens(JSON.stringify(ctx));
         }

package/src/types.ts

@@ -129,7 +129,11 @@ export type AgentToolEvent =
 
 export type ToolRunnerEvent =
   | { type: "output"; text: string }
-  | { type: "result"; text: string };
+  | {
+      type: "result";
+      text: string;
+      image?: { data: string; mimeType: string };
+    };
 
 export type ToolAndRunner = {
   tool: Tool;

package/src/tool-task.ts

@@ -1,114 +0,0 @@
-import { type Message, type Tool, Type } from "@mariozechner/pi-ai";
-import { streamAgent } from "./agent";
-import { buildSystemPrompt, TASK_PROMPT } from "./prompt";
-import { estimateTokens, formatTimestamp } from "./shared";
-import { bash, runBashTool } from "./tool-bash";
-import { edit, runEditTool } from "./tool-edit";
-import type {
-  AgentContex,
-  CliOptions,
-  ToolAndRunner,
-  ToolRunnerEvent,
-} from "./types";
-
-const description = `## Task tool
-
-Use this tool for multi-step work that would otherwise require multiple individual tool calls. The tool executes a detailed plan and returns results.
-
-Best practices:
-
-- For exploration (codebase, filesystem, web), specify exactly what you are looking for and the expected output format. For example: "Find all files relevant to tests. Return the exact paths and a description of each file."
-- For edits, specify exact diffs and the target file for each change.
-- For anything else, provide a specific, detailed set of instructions and your expected results.
-`;
-
-export const task: Tool = {
-  name: "task",
-  description,
-  parameters: Type.Object({
-    prompt: Type.String({
-      description:
-        "Detailed description of the work to perform. Be specific about expected outputs and any constraints.",
-    }),
-  }),
-};
-
-export async function* runTaskTool(
-  options: CliOptions,
-  args: Record<string, any>,
-  signal?: AbortSignal,
-): AsyncGenerator<ToolRunnerEvent> {
-  const tools: ToolAndRunner[] = [
-    { tool: bash, runner: runBashTool },
-    { tool: edit, runner: runEditTool },
-  ];
-  const messages: Message[] = [
-    { role: "user", content: args.prompt || "", timestamp: Date.now() },
-  ];
-
-  const systemPrompt = await buildSystemPrompt(TASK_PROMPT);
-  const ctx: AgentContex = {
-    systemPrompt,
-    tools,
-    messages,
-    options,
-    signal,
-  };
-
-  let output = "";
-  const agent = streamAgent(ctx);
-  for await (const ev of agent) {
-    switch (ev.type) {
-      case "message_start": {
-        const text = `[${formatTimestamp(ev.partial.timestamp)}] Working...`;
-        output += text;
-        yield { type: "output", text };
-        break;
-      }
-      case "message_end": {
-        const thinking = ev.message.content
-          .filter((b) => b.type === "thinking")
-          .map((b) => b.thinking)
-          .join("");
-        const messageText = ev.message.content
-          .filter((b) => b.type === "text")
-          .map((b) => b.text)
-          .join("");
-        const calls = ev.message.content
-          .filter((b) => b.type === "toolCall")
-          .map((b) => b.name);
-
-        let text = `[${formatTimestamp(ev.message.timestamp)}]`;
-        if (thinking.length > 0) {
-          const thinkingTokens = estimateTokens(thinking);
-          text += `Thinking... (${thinkingTokens} tokens)`;
-        }
-        if (messageText.length > 0) {
-          text += `\n\n${messageText}\n`;
-        }
-        if (calls.length > 0) {
-          text += ` \nTool calls:`;
-          for (const c of calls) {
-            text += `\n${c}`;
-          }
-        }
-
-        output += text;
-        yield { type: "output", text };
-        break;
-      }
-      case "tool_message_end": {
-        const ts = formatTimestamp(ev.message.timestamp);
-        const name = ev.message.toolName;
-        const symbol = !ev.message.isError ? "✓ " : "✗ ";
-        const text = `[${ts}] ${name} ${symbol}`;
-
-        output += text;
-        yield { type: "output", text };
-        break;
-      }
-    }
-  }
-
-  yield { type: "result", text: output };
-}