xonecas.io
64875
Mc

mini-coder / commit 6238d03

feat: work in progress for better agent api

xonecas2026-04-27 6238d03598d4f5e0210e7abfdbbcd59f33b23fd1 parent 7c08232

4 files changed

src/agent.ts+126−4
@@ -2,6 +2,7 @@ import { readdir } from "node:fs/promises";
22 import { homedir, platform } from "node:os";
33 import { join } from "node:path";
44 import {
5+ type AssistantMessage,
56 type Context,
67 type Message,
78 streamSimple,
@@ -9,8 +10,14 @@ import {
910 type ToolResultMessage,
1011 } from "@mariozechner/pi-ai";
1112 import { type StatusResult, simpleGit } from "simple-git";
13+import { getApiKey } from "./oauth";
1214 import { parseSkillFrontmatter } from "./shared";
13-import type { AgentStreamEvent, CliOptions, ToolAndRunner } from "./types";
15+import type {
16+ AgentStreamEvent,
17+ CliOptions,
18+ ToolAndRunner,
19+ ToolRunnerEvent,
20+} from "./types";
1421
1522 const IDENTITY_PROMPT = `# You are "mini-coder", an efficient, elite coding agent.
1623
@@ -267,9 +274,7 @@ export async function* streamAgent(
267274
268275 // Check if the agent is done, or an error/abort happened before moving
269276 // on towards tool calling.
270- if (
271- ["stop", "error", "aborted", "length"].includes(finalMessage.stopReason)
272- ) {
277+ if (finalMessage.stopReason !== "toolUse") {
273278 // Agent is done, send the final message, and current context.
274279 yield { type: "complete", message: finalMessage, context };
275280 break;
@@ -347,3 +352,120 @@ export async function* streamAgent(
347352 }
348353 }
349354 }
355+
356+// CONTINUE: exploring a cleaner api for the core. It's a mess of bugs between this and the consumers: task, tui and headless, they all do things slighty different :/ my bad. this will bring some consistency.
357+type AgentContex = {
358+ systemPrompt: string;
359+ tools: ToolAndRunner[];
360+ messages: Message[];
361+ options: CliOptions;
362+ signal: AbortSignal | undefined;
363+};
364+
365+type AgentEvent =
366+ | {
367+ type: "message_start" | "message_update";
368+ partial: AssistantMessage;
369+ }
370+ | {
371+ type: "message_end";
372+ message: AssistantMessage;
373+ }
374+ | {
375+ type: "tool_message_start" | "tool_message_update";
376+ partial: ToolResultMessage;
377+ }
378+ | {
379+ type: "tool_message_end";
380+ message: ToolResultMessage;
381+ };
382+
383+export async function* _streamAgent(
384+ agentCtx: AgentContex,
385+): AsyncGenerator<AgentEvent> {
386+ const llmCtx: Context = {
387+ systemPrompt: agentCtx.systemPrompt,
388+ tools: agentCtx.tools.map((t) => t.tool),
389+ messages: agentCtx.messages,
390+ };
391+
392+ // Important for refreshing tokens.
393+ const apiKey = await getApiKey(agentCtx.options);
394+
395+ // Main agent loop, continues until llm sends a response other than toolCall or has no tool calls.
396+ while (true) {
397+ const s = streamSimple(agentCtx.options.model, llmCtx, {
398+ signal: agentCtx.signal,
399+ apiKey,
400+ });
401+
402+ let partial: AssistantMessage | null = null;
403+ let added = false;
404+
405+ for await (const e of s) {
406+ switch (e.type) {
407+ case "start":
408+ partial = e.partial;
409+ llmCtx.messages.push(e.partial);
410+ added = true;
411+ yield { type: "message_start", partial };
412+ break;
413+
414+ case "text_start":
415+ case "text_delta":
416+ case "text_end":
417+ case "thinking_start":
418+ case "thinking_delta":
419+ case "thinking_end":
420+ case "toolcall_start":
421+ case "toolcall_delta":
422+ case "toolcall_end":
423+ if (partial) {
424+ partial = e.partial;
425+ llmCtx.messages[llmCtx.messages.length - 1] = partial;
426+ yield { type: "message_update", partial };
427+ }
428+ break;
429+
430+ case "done":
431+ case "error": {
432+ const finalMessage = await s.result();
433+ if (added) {
434+ llmCtx.messages[llmCtx.messages.length - 1] = finalMessage;
435+ } else {
436+ llmCtx.messages.push(finalMessage);
437+ yield { type: "message_start", partial: { ...finalMessage } };
438+ }
439+
440+ yield { type: "message_end", message: finalMessage };
441+ return;
442+ }
443+ }
444+ }
445+
446+ const message = await s.result();
447+ if (added) {
448+ llmCtx.messages[llmCtx.messages.length - 1] = message;
449+ } else {
450+ llmCtx.messages.push(message);
451+ yield { type: "message_start", partial: { ...message } };
452+ }
453+
454+ const toolCalls = message.content.filter((c) => c.type === "toolCall");
455+
456+ // Stop on errors or no tools to call.
457+ if (message.stopReason !== "toolUse" || toolCalls.length === 0) {
458+ yield { type: "message_end", message };
459+ break;
460+ }
461+
462+ if (toolCalls.length > 0) {
463+ // Append toolResultMessges
464+ }
465+ }
466+}
467+
468+async function* toolRunner(
469+ toolCall: ToolCall[],
470+ tools: ToolAndRunner[],
471+): AsyncGenerator<ToolResultMessage> {}
src/tool-task.ts+7−0
@@ -84,6 +84,13 @@ export async function* runTaskTool(
8484 yield { type: "output", text: ev.event.content };
8585 }
8686
87+ if (ev.type === "assistant" && ev.event.type === "error") {
88+ yield {
89+ type: "output",
90+ text: `\n\nStopped: ${ev.event.error.errorMessage ?? "Unknown error."}`,
91+ };
92+ }
93+
8794 if (ev.type === "tool_result") {
8895 const estimate = estimateTokens(JSON.stringify(ev.message.content));
8996 const elapsed = elapsedTime(Date.now() - ev.message.timestamp);
src/tui-conversation.ts+12−0
@@ -48,6 +48,18 @@ function agentMessageNode(msg: AssistantMessage): Node {
4848 ]);
4949 });
5050
51+ const error =
52+ ((msg.stopReason === "error" || msg.stopReason === "aborted") &&
53+ msg.errorMessage) ??
54+ "Unknown error.";
55+ if (error) {
56+ textBlocks.push(
57+ VStack({ padding: { x: 4 }, gap: 1 }, [
58+ TextPill(msg.stopReason, theme.white, theme.bblack),
59+ Text(error),
60+ ]),
61+ );
62+ }
5163 return VStack({ gap: 1 }, textBlocks);
5264 }
5365
src/tui.ts+5−4
@@ -243,7 +243,6 @@ export async function streamTUI(state: TUIState) {
243243 onStream(ev.event, ev.context);
244244 break;
245245 case "tool_output":
246- // TODO:
247246 onToolOutput(ev.message, ev.context);
248247 break;
249248 case "tool_result":
@@ -256,8 +255,10 @@ export async function streamTUI(state: TUIState) {
256255 }
257256 } finally {
258257 state.streaming = false;
259- const gitStatus = (await git.status()).isClean() ? "" : "*";
260- const gitBranch = (await git.branch()).current;
261- state.gitBranch = `${gitBranch}${gitStatus}`;
258+ try {
259+ const gitStatus = (await git.status()).isClean() ? "" : "*";
260+ const gitBranch = (await git.branch()).current;
261+ state.gitBranch = `${gitBranch}${gitStatus}`;
262+ } catch (_) {}
262263 }
263264 }