@cognipeer/agent-sdk 0.4.8 → 0.4.9

package/dist/index.mjs

@@ -3147,7 +3147,23 @@ function createAgent(opts) {
         state = { ...state, ...await finalizeNode(state) };
         continue;
       }
-      if (toolCalls.length === 0) break;
+      if (toolCalls.length === 0) {
+        if (opts.outputSchema && !state.ctx?.__finalizedDueToStructuredOutput && !state.ctx?.__structuredOutputForceFinalize) {
+          const forceMsg = {
+            role: "system",
+            content: [
+              "A structured output schema is active.",
+              "You MUST now call tool `response` with the final JSON object that matches the schema.",
+              "Do not write the JSON in the assistant message.",
+              "Call `response` exactly once, then stop."
+            ].join("\n")
+          };
+          const ctx = { ...state.ctx || {}, __structuredOutputForceFinalize: true };
+          state = { ...state, messages: [...state.messages, forceMsg], ctx };
+          continue;
+        }
+        break;
+      }
       onProgress?.({ stage: "tools", message: "Running tools" });
       if (cancelIfRequested("before_tools")) break;
       state = { ...state, ...await toolsNode(state) };
@@ -3160,31 +3176,31 @@ function createAgent(opts) {
       const last = state.messages[state.messages.length - 1];
       const lastHasToolCalls = Array.isArray(last?.tool_calls) && last.tool_calls.length > 0;
       if (!lastHasToolCalls) {
-        const forceMsg = {
-          role: "system",
-          content: [
-            "A structured output schema is active.",
-            "You MUST now call tool `response` with the final JSON object that matches the schema.",
-            "Do not write the JSON in the assistant message.",
-            "Call `response` exactly once, then stop."
-          ].join("\n")
-        };
         const alreadyForced = Boolean(state.ctx?.__structuredOutputForceFinalize);
-        if (!alreadyForced) {
-          const ctx = { ...state.ctx || {}, __structuredOutputForceFinalize: true };
-          state = { ...state, messages: [...state.messages, forceMsg], ctx };
-          try {
-            state = { ...state, ...await agentCore(state) };
-            const lastAfter = state.messages[state.messages.length - 1];
-            const toolCallsAfter = Array.isArray(lastAfter?.tool_calls) ? lastAfter.tool_calls : [];
-            if (toolCallsAfter.length > 0) {
-              state = { ...state, ...await toolsNode(state) };
-            }
-          } catch (err) {
-            const errMsg = err instanceof Error ? err.message : String(err);
-            emit?.({ type: "metadata", error: `Structured output force-finalize failed: ${errMsg}` });
-            throw err;
+        if (alreadyForced) {
+          const finalNudge = {
+            role: "system",
+            content: [
+              "A structured output schema is active.",
+              "You MUST now call tool `response` with the final JSON object that matches the schema.",
+              "Do not write the JSON in the assistant message.",
+              "Call `response` exactly once, then stop.",
+              "Do NOT call any other tools. Produce the response NOW based on whatever information you have gathered so far."
+            ].join("\n")
+          };
+          state = { ...state, messages: [...state.messages, finalNudge] };
+        }
+        try {
+          state = { ...state, ...await agentCore(state) };
+          const lastAfter = state.messages[state.messages.length - 1];
+          const toolCallsAfter = Array.isArray(lastAfter?.tool_calls) ? lastAfter.tool_calls : [];
+          if (toolCallsAfter.length > 0) {
+            state = { ...state, ...await toolsNode(state) };
           }
+        } catch (err) {
+          const errMsg = err instanceof Error ? err.message : String(err);
+          emit?.({ type: "metadata", error: `Structured output force-finalize failed: ${errMsg}` });
+          throw err;
         }
       }
     }