@@ -18,6 +18,7 @@ import type {
1818 Tool,
1919 ToolCall,
2020 ToolResultMessage,
21+ UserMessage,
2122 } from "@mariozechner/pi-ai";
2223 import { streamSimple } from "@mariozechner/pi-ai";
2324 import { appendMessage } from "./session.ts";
@@ -79,6 +80,7 @@ export type AgentEvent =
7980 args: Record<string, unknown>;
8081 content: AssistantMessage["content"];
8182 }
83+ | { type: "user_message"; message: UserMessage }
8284 | { type: "assistant_message"; message: AssistantMessage }
8385 | {
8486 type: "tool_start";
@@ -131,6 +133,8 @@ interface RunAgentOpts {
131133 signal?: AbortSignal;
132134 /** Callback for UI events. */
133135 onEvent?: (event: AgentEvent) => void;
136+ /** Dequeue the next queued steering message, if one is waiting. */
137+ takeQueuedUserMessage?: () => UserMessage | null;
134138 }
135139
136140 /** Result of the agent loop. */
@@ -462,6 +466,19 @@ async function streamAssistantMessage(
462466 return mergeAssistantMessage(partialAssistantMessage, finalAssistantMessage);
463467 }
464468
469+function appendUserMessage(
470+ db: Database,
471+ sessionId: string,
472+ messages: Message[],
473+ userMessage: UserMessage,
474+ onEvent: RunAgentOpts["onEvent"],
475+): number {
476+ messages.push(userMessage);
477+ const turn = appendMessage(db, sessionId, userMessage);
478+ onEvent?.({ type: "user_message", message: userMessage });
479+ return turn;
480+}
481+
465482 function appendAssistantMessage(
466483 db: Database,
467484 sessionId: string,
@@ -490,15 +507,22 @@ function resolveLoopStopReason(
490507 return { messages, stopReason: assistantMessage.stopReason };
491508 }
492509
493- if (
494- assistantMessage.stopReason === "stop" ||
495- assistantMessage.stopReason === "length"
496- ) {
497- onEvent?.({ type: "done", message: assistantMessage });
498- return { messages, stopReason: assistantMessage.stopReason };
510+ return null;
511+}
512+
513+function consumeQueuedUserMessage(
514+ db: Database,
515+ sessionId: string,
516+ messages: Message[],
517+ takeQueuedUserMessage: RunAgentOpts["takeQueuedUserMessage"],
518+ onEvent: RunAgentOpts["onEvent"],
519+): number | null {
520+ const queuedUserMessage = takeQueuedUserMessage?.();
521+ if (!queuedUserMessage) {
522+ return null;
499523 }
500524
501- return null;
525+ return appendUserMessage(db, sessionId, messages, queuedUserMessage, onEvent);
502526 }
503527
504528 function getAssistantToolCalls(message: AssistantMessage): ToolCall[] {
@@ -581,6 +605,72 @@ function appendToolResultMessage(
581605 onEvent?.({ type: "tool_result", message: toolResultMessage });
582606 }
583607
608+function finalizeStoppedAssistantMessage(
609+ db: Database,
610+ sessionId: string,
611+ messages: Message[],
612+ assistantMessage: AssistantMessage,
613+ stopReason: "stop" | "length",
614+ takeQueuedUserMessage: RunAgentOpts["takeQueuedUserMessage"],
615+ onEvent: RunAgentOpts["onEvent"],
616+): AgentLoopResult | number {
617+ const queuedTurn = consumeQueuedUserMessage(
618+ db,
619+ sessionId,
620+ messages,
621+ takeQueuedUserMessage,
622+ onEvent,
623+ );
624+ if (queuedTurn !== null) {
625+ return queuedTurn;
626+ }
627+
628+ onEvent?.({ type: "done", message: assistantMessage });
629+ return { messages, stopReason };
630+}
631+
632+async function executeAssistantToolCalls(
633+ assistantMessage: AssistantMessage,
634+ opts: Pick<
635+ RunAgentOpts,
636+ | "db"
637+ | "sessionId"
638+ | "messages"
639+ | "toolHandlers"
640+ | "cwd"
641+ | "signal"
642+ | "onEvent"
643+ | "model"
644+ >,
645+ turn: number,
646+): Promise<AgentLoopResult | null> {
647+ for (const toolCall of getAssistantToolCalls(assistantMessage)) {
648+ const result = await executeToolCall(toolCall, opts);
649+ appendToolResultMessage(
650+ opts.db,
651+ opts.sessionId,
652+ opts.messages,
653+ toolCall,
654+ result,
655+ turn,
656+ opts.onEvent,
657+ );
658+
659+ if (opts.signal?.aborted) {
660+ opts.onEvent?.({
661+ type: "aborted",
662+ message: buildIncompleteAssistantMessage(
663+ { model: opts.model, signal: opts.signal },
664+ assistantMessage,
665+ ),
666+ });
667+ return { messages: opts.messages, stopReason: "aborted" };
668+ }
669+ }
670+
671+ return null;
672+}
673+
584674 // ---------------------------------------------------------------------------
585675 // Agent loop
586676 // ---------------------------------------------------------------------------
@@ -609,7 +699,9 @@ export async function runAgentLoop(
609699 onEvent,
610700 toolHandlers,
611701 cwd,
702+ takeQueuedUserMessage,
612703 } = opts;
704+ let currentTurn = turn;
613705
614706 while (true) {
615707 const assistantMessage = await streamAssistantMessage(opts);
@@ -618,7 +710,7 @@ export async function runAgentLoop(
618710 sessionId,
619711 messages,
620712 assistantMessage,
621- turn,
713+ currentTurn,
622714 onEvent,
623715 );
624716
@@ -631,33 +723,53 @@ export async function runAgentLoop(
631723 return stopResult;
632724 }
633725
634- for (const toolCall of getAssistantToolCalls(assistantMessage)) {
635- const result = await executeToolCall(toolCall, {
636- toolHandlers,
637- cwd,
638- signal,
639- onEvent,
640- });
641- appendToolResultMessage(
726+ if (
727+ assistantMessage.stopReason === "stop" ||
728+ assistantMessage.stopReason === "length"
729+ ) {
730+ const finalResult = finalizeStoppedAssistantMessage(
642731 db,
643732 sessionId,
644733 messages,
645- toolCall,
646- result,
647- turn,
734+ assistantMessage,
735+ assistantMessage.stopReason,
736+ takeQueuedUserMessage,
648737 onEvent,
649738 );
650-
651- if (signal?.aborted) {
652- onEvent?.({
653- type: "aborted",
654- message: buildIncompleteAssistantMessage(
655- { model, signal },
656- assistantMessage,
657- ),
658- });
659- return { messages, stopReason: "aborted" };
739+ if (typeof finalResult === "number") {
740+ currentTurn = finalResult;
741+ continue;
660742 }
743+ return finalResult;
744+ }
745+
746+ const toolStopResult = await executeAssistantToolCalls(
747+ assistantMessage,
748+ {
749+ db,
750+ sessionId,
751+ messages,
752+ toolHandlers,
753+ cwd,
754+ signal,
755+ onEvent,
756+ model,
757+ },
758+ currentTurn,
759+ );
760+ if (toolStopResult) {
761+ return toolStopResult;
762+ }
763+
764+ const queuedTurn = consumeQueuedUserMessage(
765+ db,
766+ sessionId,
767+ messages,
768+ takeQueuedUserMessage,
769+ onEvent,
770+ );
771+ if (queuedTurn !== null) {
772+ currentTurn = queuedTurn;
661773 }
662774 }
663775 }