@dudousxd/nestjs-agent-core 0.45.1 → 0.45.2

package/dist/index.cjs

@@ -5966,7 +5966,7 @@ function traceToolExecution(runId, call, run) {
 }
 __name(traceToolExecution, "traceToolExecution");
 function toModelMessages(messages) {
-  return messages.map((message) => ({
+  return withoutBlankAssistantMessages(messages.map((message) => ({
     role: message.role,
     content: message.content,
     ...message.toolCalls !== void 0 ? {
@@ -5978,9 +5978,17 @@ function toModelMessages(messages) {
     ...message.attachments !== void 0 ? {
       attachments: message.attachments
     } : {}
-  }));
+  })));
 }
 __name(toModelMessages, "toModelMessages");
+function isBlankAssistantMessage(message) {
+  return message.role === "assistant" && message.content.trim().length === 0 && (message.toolCalls?.length ?? 0) === 0 && (message.toolResults?.length ?? 0) === 0;
+}
+__name(isBlankAssistantMessage, "isBlankAssistantMessage");
+function withoutBlankAssistantMessages(messages) {
+  return messages.some(isBlankAssistantMessage) ? messages.filter((message) => !isBlankAssistantMessage(message)) : messages;
+}
+__name(withoutBlankAssistantMessages, "withoutBlankAssistantMessages");
 function historyContext(input) {
   return {
     threadId: input.threadId,
@@ -6012,7 +6020,7 @@ async function loadSelectedHistory(deps, input, hooks) {
   });
   return {
     ...recorded,
-    messages: settleDanglingToolCalls(recorded.messages)
+    messages: settleDanglingToolCalls(withoutBlankAssistantMessages(recorded.messages))
   };
 }
 __name(loadSelectedHistory, "loadSelectedHistory");
@@ -7780,13 +7788,18 @@ ${block}`;
         runId: hooks.runId,
         step: i,
         count
-      }, () => generateFollowUps(deps.model, [
-        ...modelMessages,
-        {
-          role: "assistant",
-          content: turn.text
-        }
-      ], count), (result2) => ({
+      }, () => generateFollowUps(
+        deps.model,
+        // A blank answer is left off: an empty assistant message gets the call refused.
+        turn.text.trim().length > 0 ? [
+          ...modelMessages,
+          {
+            role: "assistant",
+            content: turn.text
+          }
+        ] : modelMessages,
+        count
+      ), (result2) => ({
         followUps: result2.followUps.length,
         inputTokens: result2.usage.inputTokens,
         outputTokens: result2.usage.outputTokens,
@@ -7854,7 +7867,8 @@ ${block}`;
       ...synthetic.map((entry) => entry.call)
     ];
     const syntheticResults = synthetic.map((entry) => entry.result);
-    const assistant = await hooks.step(`persist:assistant:${i}`, () => deps.store.appendMessage({
+    const blankStep = turn.text.trim().length === 0 && messageCalls.length === 0 && syntheticResults.length === 0 && (turn.ui === void 0 || turn.ui.length === 0) && turn.reasoning === void 0 && followUps === void 0;
+    const assistant = await hooks.step(`persist:assistant:${i}`, () => blankStep ? Promise.resolve(null) : deps.store.appendMessage({
       threadId: input.threadId,
       role: "assistant",
       content: turn.text,
@@ -7900,6 +7914,23 @@ ${block}`;
         toolResults: syntheticResults
       } : {}
     };
+    const finishFinalStep = /* @__PURE__ */ __name(() => hooks.step(`stream:step-finish:${i}`, async () => {
+      await writer.write(encodeStreamEvent({
+        kind: "step-finish",
+        usage: turn.usage,
+        costUsd,
+        ...turn.reasoningMs !== void 0 ? {
+          reasoningMs: turn.reasoningMs
+        } : {},
+        ...stepModel !== void 0 ? {
+          model: stepModel
+        } : {}
+      }));
+    }), "finishFinalStep");
+    if (assistant === null) {
+      await finishFinalStep();
+      break;
+    }
     modelMessages.push(assistantMessage);
     for (const entry of synthetic) {
       const { call, result: result2 } = entry;
@@ -7933,19 +7964,7 @@ ${block}`;
       });
     }
     if (isFinalTurn) {
-      await hooks.step(`stream:step-finish:${i}`, async () => {
-        await writer.write(encodeStreamEvent({
-          kind: "step-finish",
-          usage: turn.usage,
-          costUsd,
-          ...turn.reasoningMs !== void 0 ? {
-            reasoningMs: turn.reasoningMs
-          } : {},
-          ...stepModel !== void 0 ? {
-            model: stepModel
-          } : {}
-        }));
-      });
+      await finishFinalStep();
       break;
     }
     await haltIfCancelled(hooks, cancellable, `cancel:tools:${i}`);
@@ -8056,13 +8075,15 @@ ${toolText}`;
         return;
       }
       const agent = input.agentName ?? "default";
-      await deps.store.appendMessage({
-        threadId: delivery.threadId,
-        role: "assistant",
-        content: lastText,
-        agentName: agent,
-        runId: hooks.runId
-      });
+      if (lastText.trim().length > 0) {
+        await deps.store.appendMessage({
+          threadId: delivery.threadId,
+          role: "assistant",
+          content: lastText,
+          agentName: agent,
+          runId: hooks.runId
+        });
+      }
       await deps.store.updateToolCall({
         toolCallId: delivery.toolCallId,
         status: "executed",