@@ -991,6 +991,183 @@ describe("agent loop", () => {
991991 ]);
992992 });
993993
994+ test("uses an explicit stream end result when no terminal event was emitted", async () => {
995+ const api = "agent-stream-end-result-test";
996+ const sourceId = "agent-stream-end-result-test-source";
997+ const model: Model<string> = {
998+ id: "agent-stream-end-result-model",
999+ name: "Agent Stream End Result Model",
1000+ api,
1001+ provider: "test",
1002+ baseUrl: "http://localhost:0",
1003+ reasoning: false,
1004+ input: ["text"],
1005+ cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
1006+ contextWindow: 128000,
1007+ maxTokens: 4096,
1008+ };
1009+
1010+ const finalMessage: AssistantMessage = {
1011+ role: "assistant",
1012+ content: [{ type: "text", text: "done without terminal event" }],
1013+ api,
1014+ provider: model.provider,
1015+ model: model.id,
1016+ usage: ZERO_USAGE,
1017+ stopReason: "stop",
1018+ timestamp: Date.now(),
1019+ };
1020+
1021+ registerApiProvider(
1022+ {
1023+ api,
1024+ stream: () => {
1025+ const stream = createAssistantMessageEventStream();
1026+ queueMicrotask(() => {
1027+ stream.end(finalMessage);
1028+ });
1029+ return stream;
1030+ },
1031+ streamSimple: () => {
1032+ const stream = createAssistantMessageEventStream();
1033+ queueMicrotask(() => {
1034+ stream.end(finalMessage);
1035+ });
1036+ return stream;
1037+ },
1038+ },
1039+ sourceId,
1040+ );
1041+
1042+ const session = createSession(db, { cwd: tmp });
1043+ const userMsg = makeUser("hello");
1044+ const turn = appendMessage(db, session.id, userMsg);
1045+
1046+ try {
1047+ const result = await runAgentLoop({
1048+ db,
1049+ sessionId: session.id,
1050+ turn,
1051+ model,
1052+ systemPrompt: "Test",
1053+ tools: [],
1054+ toolHandlers: new Map(),
1055+ messages: [userMsg],
1056+ cwd: tmp,
1057+ });
1058+
1059+ expect(result.stopReason).toBe("stop");
1060+ const lastMessage = result.messages.at(-1);
1061+ expect(lastMessage?.role).toBe("assistant");
1062+ if (!lastMessage || lastMessage.role !== "assistant") {
1063+ throw new Error("Expected assistant message");
1064+ }
1065+ expect(lastMessage.stopReason).toBe("stop");
1066+ expect(lastMessage.content).toEqual(finalMessage.content);
1067+ } finally {
1068+ unregisterApiProviders(sourceId);
1069+ }
1070+ });
1071+
1072+ test("treats a stream that ends without a terminal event as an error instead of hanging", async () => {
1073+ const api = "agent-incomplete-stream-test";
1074+ const sourceId = "agent-incomplete-stream-test-source";
1075+ const model: Model<string> = {
1076+ id: "agent-incomplete-stream-model",
1077+ name: "Agent Incomplete Stream Model",
1078+ api,
1079+ provider: "test",
1080+ baseUrl: "http://localhost:0",
1081+ reasoning: false,
1082+ input: ["text"],
1083+ cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
1084+ contextWindow: 128000,
1085+ maxTokens: 4096,
1086+ };
1087+
1088+ const buildPartialMessage = (): AssistantMessage => ({
1089+ role: "assistant",
1090+ content: [{ type: "text", text: "partial" }],
1091+ api,
1092+ provider: model.provider,
1093+ model: model.id,
1094+ usage: ZERO_USAGE,
1095+ stopReason: "stop",
1096+ timestamp: Date.now(),
1097+ });
1098+
1099+ registerApiProvider(
1100+ {
1101+ api,
1102+ stream: () => {
1103+ const stream = createAssistantMessageEventStream();
1104+ queueMicrotask(() => {
1105+ stream.push({
1106+ type: "start",
1107+ partial: buildPartialMessage(),
1108+ });
1109+ stream.end();
1110+ });
1111+ return stream;
1112+ },
1113+ streamSimple: () => {
1114+ const stream = createAssistantMessageEventStream();
1115+ queueMicrotask(() => {
1116+ stream.push({
1117+ type: "start",
1118+ partial: buildPartialMessage(),
1119+ });
1120+ stream.end();
1121+ });
1122+ return stream;
1123+ },
1124+ },
1125+ sourceId,
1126+ );
1127+
1128+ const session = createSession(db, { cwd: tmp });
1129+ const userMsg = makeUser("hello");
1130+ const turn = appendMessage(db, session.id, userMsg);
1131+ const timeout = Symbol("timeout");
1132+
1133+ try {
1134+ const raced = await Promise.race([
1135+ runAgentLoop({
1136+ db,
1137+ sessionId: session.id,
1138+ turn,
1139+ model,
1140+ systemPrompt: "Test",
1141+ tools: [],
1142+ toolHandlers: new Map(),
1143+ messages: [userMsg],
1144+ cwd: tmp,
1145+ }),
1146+ new Promise<typeof timeout>((resolve) => {
1147+ setTimeout(() => resolve(timeout), 100);
1148+ }),
1149+ ]);
1150+
1151+ expect(raced).not.toBe(timeout);
1152+ if (raced === timeout) {
1153+ throw new Error("Expected runAgentLoop to settle");
1154+ }
1155+
1156+ expect(raced.stopReason).toBe("error");
1157+ const lastMessage = raced.messages.at(-1);
1158+ expect(lastMessage?.role).toBe("assistant");
1159+ if (!lastMessage || lastMessage.role !== "assistant") {
1160+ throw new Error("Expected assistant error message");
1161+ }
1162+ expect(lastMessage.stopReason).toBe("error");
1163+ expect(lastMessage.errorMessage).toContain(
1164+ "Stream ended without a final assistant message",
1165+ );
1166+ } finally {
1167+ unregisterApiProviders(sourceId);
1168+ }
1169+ });
1170+
9941171 test("preserves thinking content on assistant messages", async () => {
9951172 faux.setResponses([
9961173 fauxAssistantMessage([