@prompd/cli 0.4.10 → 0.4.11

package/dist/lib/workflowExecutor.js

@@ -1189,9 +1189,10 @@ async function executePromptNode(node, context, options, trace, state, workflowF
         },
     };
     await emitAgentCheckpoint(afterEvent, options, workflowFile);
-    // Apply guardrail validation if configured
-    if (data.guardrail) {
+    // Apply guardrail validation if configured and enabled
+    if (data.guardrail && data.guardrail.enabled !== false) {
         const guardrail = data.guardrail;
+        const originalLlmResult = result; // Preserve LLM response before guardrail may modify it
         let isRejected = false;
         // Evaluate rejection condition
         if (guardrail.rejectionExpression) {
@@ -1276,8 +1277,8 @@ async function executePromptNode(node, context, options, trace, state, workflowF
                 message: `Guardrail PASSED content, outputMode=${outputMode}`,
             }, options);
             if (outputMode === 'original') {
-                // Return the original input that was sent to the guardrail prompt
-                result = context.previous_output;
+                // Return the original LLM response (before guardrail evaluation)
+                result = originalLlmResult;
             }
             else if (outputMode === 'reject-message') {
                 // Return custom message even on pass (useful for custom routing)
@@ -4102,6 +4103,10 @@ async function executeAgentNode(node, context, options, trace, state, workflowFi
         const lastAssistantMessage = conversationHistory.filter(m => m.role === 'assistant').pop();
         finalResponse = lastAssistantMessage?.content || 'Agent reached maximum iterations without completing.';
     }
+    // Strip any unexecuted <tool_call> XML from final response so raw tags don't leak to output
+    if (finalResponse) {
+        finalResponse = finalResponse.replace(/<tool_call>[\s\S]*?<\/tool_call>/gi, '').trim();
+    }
     // Determine output based on outputMode
     let output;
     switch (data.outputMode) {
@@ -5112,6 +5117,10 @@ Analyze the input above. Return a JSON object:
         const lastAssistantMessage = conversationHistory.filter(m => m.role === 'assistant').pop();
         finalResponse = lastAssistantMessage?.content || 'Agent reached maximum iterations.';
     }
+    // Strip any unexecuted <tool_call> XML from final response so raw tags don't leak to output
+    if (finalResponse) {
+        finalResponse = finalResponse.replace(/<tool_call>[\s\S]*?<\/tool_call>/gi, '').trim();
+    }
     // Emit onAgentComplete checkpoint
     await emitChatAgentCheckpoint('onAgentComplete', {
         finalResponse,
@@ -5203,17 +5212,22 @@ function parseToolCall(response, format, allowedTools) {
         toolParameters: null,
     };
     const responseText = typeof response === 'string' ? response : JSON.stringify(response);
-    // Try XML format
+    // Try XML format — match first <tool_call> block, <params> is optional
     if (format === 'auto' || format === 'xml') {
-        const xmlMatch = responseText.match(/<tool_call>\s*<name>([^<]+)<\/name>\s*<params>([\s\S]*?)<\/params>\s*<\/tool_call>/i);
+        const xmlMatch = responseText.match(/<tool_call>\s*<name>([^<]+)<\/name>(?:\s*<params>([\s\S]*?)<\/params>)?\s*<\/tool_call>/i);
         if (xmlMatch) {
             result.hasToolCall = true;
             result.toolName = xmlMatch[1].trim();
-            try {
-                result.toolParameters = JSON.parse(xmlMatch[2].trim());
+            if (xmlMatch[2]) {
+                try {
+                    result.toolParameters = JSON.parse(xmlMatch[2].trim());
+                }
+                catch {
+                    result.toolParameters = { raw: xmlMatch[2].trim() };
+                }
             }
-            catch {
-                result.toolParameters = { raw: xmlMatch[2].trim() };
+            else {
+                result.toolParameters = {};
             }
             return result;
         }