@prompd/cli 0.4.10 → 0.5.0-beta.1

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)
@@ -1357,30 +1358,30 @@ async function executeGuardrailNode(node, context, options, trace, workflowFile)
         : JSON.stringify(inputToValidate, null, 2);
     // Create a raw prompt that validates the input
     // The system prompt should instruct the LLM to analyze and return a structured response
-    const validationPrompt = `---
-id: guardrail-validation
-name: Guardrail Validation
-version: 1.0.0
-description: Validates input against guardrail criteria
----
-
-# System
-${data.systemPrompt}
-
-# Input to Validate
-\`\`\`
-${inputStr}
-\`\`\`
-
-# Instructions
-Analyze the input above according to the system criteria. Return your analysis as a JSON object with the following structure:
-\`\`\`json
-{
-  "analysis": "Your analysis of the input",
-  "score": 0.0 to 1.0,
-  "rejected": true or false
-}
-\`\`\`
+    const validationPrompt = `---
+id: guardrail-validation
+name: Guardrail Validation
+version: 1.0.0
+description: Validates input against guardrail criteria
+---
+
+# System
+${data.systemPrompt}
+
+# Input to Validate
+\`\`\`
+${inputStr}
+\`\`\`
+
+# Instructions
+Analyze the input above according to the system criteria. Return your analysis as a JSON object with the following structure:
+\`\`\`json
+{
+  "analysis": "Your analysis of the input",
+  "score": 0.0 to 1.0,
+  "rejected": true or false
+}
+\`\`\`
 `;
     // Emit beforeValidation checkpoint event
     const beforeEvent = {
@@ -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) {
@@ -4471,29 +4476,29 @@ async function executeChatAgentNode(node, context, options, trace, state, workfl
         }
         // Build guardrail validation prompt
         const inputStr = typeof currentInput === 'string' ? currentInput : JSON.stringify(currentInput, null, 2);
-        const validationPrompt = `---
-id: chat-agent-guardrail
-name: Chat Agent Guardrail
-version: 1.0.0
----
-
-# System
-${data.guardrailSystemPrompt}
-
-# Input to Validate
-\`\`\`
-${inputStr}
-\`\`\`
-
-# Instructions
-Analyze the input above. Return a JSON object:
-\`\`\`json
-{
-  "analysis": "Your analysis",
-  "score": 0.0 to 1.0,
-  "rejected": true or false
-}
-\`\`\`
+        const validationPrompt = `---
+id: chat-agent-guardrail
+name: Chat Agent Guardrail
+version: 1.0.0
+---
+
+# System
+${data.guardrailSystemPrompt}
+
+# Input to Validate
+\`\`\`
+${inputStr}
+\`\`\`
+
+# Instructions
+Analyze the input above. Return a JSON object:
+\`\`\`json
+{
+  "analysis": "Your analysis",
+  "score": 0.0 to 1.0,
+  "rejected": true or false
+}
+\`\`\`
 `;
         if (!options.executePrompt) {
             throw new Error('No executePrompt function provided for guardrail validation');
@@ -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,
@@ -5169,28 +5178,28 @@ function buildSystemPromptWithTools(systemPrompt, tools, format) {
     const toolDescriptions = tools.map(t => `- ${t.name}: ${t.description}${t.parameters?.properties ? ` (params: ${Object.keys(t.parameters.properties).join(', ')})` : ''}`).join('\n');
     let formatInstructions = '';
     if (format === 'xml' || format === 'auto') {
-        formatInstructions = `
-
-To use a tool, respond with XML in this format:
-<tool_call>
-<name>tool_name</name>
-<params>{"param1": "value1"}</params>
-</tool_call>
-
+        formatInstructions = `
+
+To use a tool, respond with XML in this format:
+<tool_call>
+<name>tool_name</name>
+<params>{"param1": "value1"}</params>
+</tool_call>
+
 When you have the final answer and don't need any more tools, respond normally without XML tags.`;
     }
     else if (format === 'json') {
-        formatInstructions = `
-
-To use a tool, respond with JSON in this format:
-{"tool": "tool_name", "parameters": {"param1": "value1"}}
-
+        formatInstructions = `
+
+To use a tool, respond with JSON in this format:
+{"tool": "tool_name", "parameters": {"param1": "value1"}}
+
 When you have the final answer and don't need any more tools, respond with plain text (no JSON).`;
     }
-    return `${systemPrompt}
-
-You have access to the following tools:
-${toolDescriptions}
+    return `${systemPrompt}
+
+You have access to the following tools:
+${toolDescriptions}
 ${formatInstructions}`;
 }
 /**
@@ -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;
         }