@@ -741,6 +741,85 @@ describe("agent loop", () => {
741741 expect(dbLast.stopReason).toBe("aborted");
742742 });
743743
744+ test("interrupt during tool execution ends the turn without re-entering the model loop", async () => {
745+ faux.setResponses([
746+ fauxAssistantMessage([fauxToolCall("shell", { command: "sleep 10" })], {
747+ stopReason: "toolUse",
748+ }),
749+ ]);
750+
751+ const controller = new AbortController();
752+ const events: AgentEvent[] = [];
753+ const toolHandlers = new Map<string, ToolHandler>([
754+ [
755+ "shell",
756+ async () => {
757+ controller.abort();
758+ return {
759+ content: [
760+ {
761+ type: "text",
762+ text: "Shell error: This operation was aborted",
763+ },
764+ ],
765+ isError: true,
766+ };
767+ },
768+ ],
769+ ]);
770+
771+ const session = createSession(db, { cwd: tmp });
772+ const userMsg = makeUser("run and interrupt");
773+ const turn = appendMessage(db, session.id, userMsg);
774+
775+ const result = await runAgentLoop({
776+ db,
777+ sessionId: session.id,
778+ turn,
779+ model: faux.getModel(),
780+ systemPrompt: "Test",
781+ tools: builtinToolDefs(),
782+ toolHandlers,
783+ messages: [userMsg],
784+ cwd: tmp,
785+ signal: controller.signal,
786+ onEvent: (event) => events.push(event),
787+ });
788+
789+ expect(result.stopReason).toBe("aborted");
790+ expect(result.messages).toHaveLength(3);
791+ expect(result.messages.map((message) => message.role)).toEqual([
792+ "user",
793+ "assistant",
794+ "toolResult",
795+ ]);
796+
797+ const toolResult = result.messages[2];
798+ expect(toolResult?.role).toBe("toolResult");
799+ if (!toolResult || toolResult.role !== "toolResult") {
800+ throw new Error("Expected tool result message");
801+ }
802+ expect(toolResult.isError).toBe(true);
803+ expect(toolResult.content).toEqual([
804+ { type: "text", text: "Shell error: This operation was aborted" },
805+ ]);
806+
807+ expect(events.some((event) => event.type === "aborted")).toBe(false);
808+ expect(
809+ events.filter((event) => event.type === "assistant_message"),
810+ ).toHaveLength(1);
811+ expect(events.filter((event) => event.type === "tool_result")).toHaveLength(
812+ 1,
813+ );
814+
815+ const dbMessages = loadMessages(db, session.id);
816+ expect(dbMessages.map((message) => message.role)).toEqual([
817+ "user",
818+ "assistant",
819+ "toolResult",
820+ ]);
821+ });
822+
744823 test("preserves thinking content on assistant messages", async () => {
745824 faux.setResponses([
746825 fauxAssistantMessage([
@@ -837,6 +916,87 @@ describe("agent loop", () => {
837916 }
838917 });
839918
919+ test("converts thrown tool handler errors into error tool results", async () => {
920+ faux.setResponses([
921+ fauxAssistantMessage([fauxToolCall("shell", { command: "explode" })], {
922+ stopReason: "toolUse",
923+ }),
924+ fauxAssistantMessage("Recovered after tool failure."),
925+ ]);
926+
927+ const events: AgentEvent[] = [];
928+ const toolHandlers = new Map<string, ToolHandler>([
929+ [
930+ "shell",
931+ () => {
932+ throw new Error("kaboom");
933+ },
934+ ],
935+ ]);
936+
937+ const session = createSession(db, { cwd: tmp });
938+ const userMsg = makeUser("run the failing tool");
939+ const turn = appendMessage(db, session.id, userMsg);
940+
941+ const result = await runAgentLoop({
942+ db,
943+ sessionId: session.id,
944+ turn,
945+ model: faux.getModel(),
946+ systemPrompt: "Test",
947+ tools: builtinToolDefs(),
948+ toolHandlers,
949+ messages: [userMsg],
950+ cwd: tmp,
951+ onEvent: (event) => events.push(event),
952+ });
953+
954+ expect(result.stopReason).toBe("stop");
955+ expect(result.messages).toHaveLength(4);
956+
957+ const toolResult = result.messages.find(
958+ (message) => message.role === "toolResult",
959+ );
960+ expect(toolResult).toBeDefined();
961+ if (!toolResult || toolResult.role !== "toolResult") {
962+ throw new Error("Expected tool result message");
963+ }
964+ expect(toolResult.isError).toBe(true);
965+ expect(toolResult.content).toEqual([
966+ { type: "text", text: "Tool shell failed: kaboom" },
967+ ]);
968+
969+ const toolStart = events.find((event) => event.type === "tool_start");
970+ const toolEnd = events.find((event) => event.type === "tool_end");
971+ const toolResultEvent = events.find(
972+ (event) => event.type === "tool_result",
973+ );
974+
975+ expect(toolStart).toBeDefined();
976+ expect(toolEnd).toBeDefined();
977+ expect(toolResultEvent).toBeDefined();
978+
979+ if (
980+ !toolStart ||
981+ toolStart.type !== "tool_start" ||
982+ !toolEnd ||
983+ toolEnd.type !== "tool_end" ||
984+ !toolResultEvent ||
985+ toolResultEvent.type !== "tool_result"
986+ ) {
987+ throw new Error("Expected tool start/end/result events");
988+ }
989+
990+ expect(toolEnd.result.isError).toBe(true);
991+ expect(toolEnd.result.content).toEqual([
992+ { type: "text", text: "Tool shell failed: kaboom" },
993+ ]);
994+ expect(events.indexOf(toolStart)).toBeLessThan(events.indexOf(toolEnd));
995+ expect(events.indexOf(toolEnd)).toBeLessThan(
996+ events.indexOf(toolResultEvent),
997+ );
998+ });
999+
8401000 test("stopReason 'length' returns without looping", async () => {
8411001 faux.setResponses([
8421002 fauxAssistantMessage("Partial response that hit the token limit", {