node-red-contrib-ai-agent 0.5.15 → 0.5.17

package/orchestrator/orchestrator.html

@@ -13,8 +13,8 @@
             debug: { value: false }
         },
         inputs: 1,
-        outputs: 1,
-        outputLabels: ["Final Result"],
+        outputs: 2,
+        outputLabels: ["Success", "Failure"],
         icon: "font-awesome/fa-sitemap",
         label: function () {
             return this.name || "AI Orchestrator";
@@ -76,16 +76,20 @@
 
     <h3>Outputs</h3>
     <ol class="node-ports">
-        <li>Task Dispatch
+        <li>Success
             <dl class="message-properties">
-                <dt>msg.payload <span class="property-type">string</span></dt>
-                <dd>The instruction for the next task.</dd>
+                <dt>msg.payload <span class="property-type">string | object</span></dt>
+                <dd>The final successful result once the plan completes.</dd>
+                <dt>msg.orchestration <span class="property-type">object</span></dt>
+                <dd>Complete orchestration metadata and history.</dd>
             </dl>
         </li>
-        <li>Final Result
+        <li>Failure
             <dl class="message-properties">
+                 <dt>msg.error <span class="property-type">string</span></dt>
+                 <dd>Error message explaining why orchestration failed.</dd>
                  <dt>msg.orchestration <span class="property-type">object</span></dt>
-                 <dd>The full orchestration history and final result status.</dd>
+                 <dd>Orchestration state including failure details.</dd>
             </dl>
         </li>
     </ol>
@@ -98,5 +102,5 @@
         <li><strong>Priorities:</strong> Tasks with higher <code>priority</code> numbers are executed first.</li>
         <li><strong>Error Recovery:</strong> If a task fails, the orchestrator reflects on the error and can revise the plan to retry or try an alternative approach.</li>
     </ul>
-    <p>When the goal is achieved or max iterations are reached, the final message is sent to the second output.</p>
+    <p>The first output fires when the orchestration succeeds. All failure paths (validation errors, missing agents, iteration limits, plan errors, etc.) send a message out of the second output with <code>msg.error</code> describing the issue.</p>
 </script>

package/orchestrator/orchestrator.js

@@ -64,9 +64,11 @@ module.exports = function (RED) {
                 msg.orchestration._running = true;
                 setImmediate(() => processNextStep(RED, node, msg, send, done));
             } catch (error) {
-                node.status({ fill: 'red', shape: 'ring', text: 'error' });
                 node.error(error.message, msg);
-                if (done) done(error);
+                msg.orchestration = msg.orchestration || {};
+                msg.orchestration.status = 'failed';
+                msg.orchestration.error = error && error.message ? error.message : String(error);
+                finalizeOrchestration(node, msg, send, done, error);
             }
         });
     }
@@ -155,9 +157,25 @@ module.exports = function (RED) {
     }
 
     function finalizeOrchestration(node, msg, send, done, error) {
+        send = send || function () { node.send.apply(node, arguments) };
+        msg.orchestration = msg.orchestration || {};
         msg.orchestration._running = false;
-        node.status({ fill: msg.orchestration.status === 'completed' ? 'green' : 'red', shape: 'dot', text: msg.orchestration.status });
-        send(msg);
+
+        const isSuccess = msg.orchestration.status === 'completed';
+        if (!isSuccess) {
+            const errorMessage = msg.orchestration.error || (error && error.message) || msg.error || 'Unknown error';
+            msg.error = errorMessage;
+            msg.orchestration.error = errorMessage;
+        }
+
+        node.status({
+            fill: isSuccess ? 'green' : 'red',
+            shape: 'dot',
+            text: msg.orchestration.status || (isSuccess ? 'completed' : 'failed')
+        });
+
+        const outputs = isSuccess ? [msg, null] : [null, msg];
+        send(outputs);
         if (done) done(error);
     }
 
@@ -216,6 +234,14 @@ Example:
             const response = await callAI(node, msg.aiagent, prompt, "You are an AI Orchestrator that creates non-linear plans with dependencies.");
             debugLog(node, 'Planning Response', response);
             const planData = parseJsonResponse(response);
+
+            if (!planData || typeof planData !== 'object') {
+                throw new Error('Planning response was not valid JSON.');
+            }
+            if (!Array.isArray(planData.tasks)) {
+                throw new Error('Planning response must include a tasks array.');
+            }
+
             msg.orchestration.plan = planData;
             msg.orchestration.status = 'executing';
         } catch (error) {
@@ -303,6 +329,10 @@ Return a JSON object:
             const response = await callAI(node, msg.aiagent, prompt, "You are an AI Orchestrator that reflects on progress and manages plan revisions.");
             const reflection = parseJsonResponse(response);
 
+            if (!reflection || typeof reflection !== 'object') {
+                throw new Error('Reflection response was not valid JSON.');
+            }
+
             msg.orchestration.status = reflection.status;
             if (reflection.updatedPlan) {
                 msg.orchestration.plan = reflection.updatedPlan;
@@ -425,23 +455,89 @@ Return a JSON object:
      * @returns {string} The extracted JSON string
      */
     function extractJson(text) {
+        if (typeof text !== 'string') return '';
+
+        // Prefer a balanced-brace extraction to avoid greedy matching issues.
+        const extracted = extractBalancedJsonObject(text);
+        if (extracted) return extracted;
+
+        // Fallback to a simple greedy match if needed.
         const match = text.match(/\{[\s\S]*\}/);
         return match ? match[0] : text;
     }
 
+    /**
+     * Extract the first balanced JSON object (starting at the first '{') from arbitrary text.
+     * @param {string} text - The input text
+     * @returns {string} Extracted JSON object text or empty string if not found
+     */
+    function extractBalancedJsonObject(text) {
+        const start = text.indexOf('{');
+        if (start === -1) return '';
+
+        let depth = 0;
+        let inString = false;
+        let escape = false;
+
+        for (let i = start; i < text.length; i++) {
+            const ch = text[i];
+
+            if (inString) {
+                if (escape) {
+                    escape = false;
+                    continue;
+                }
+                if (ch === '\\') {
+                    escape = true;
+                    continue;
+                }
+                if (ch === '"') {
+                    inString = false;
+                }
+                continue;
+            }
+
+            if (ch === '"') {
+                inString = true;
+                escape = false;
+                continue;
+            }
+
+            if (ch === '{') {
+                depth++;
+                continue;
+            }
+
+            if (ch === '}') {
+                depth--;
+                if (depth === 0) {
+                    return text.slice(start, i + 1);
+                }
+            }
+        }
+
+        return '';
+    }
+
     /**
      * Parses a JSON object from an AI response, tolerating common non-JSON wrappers.
+     * Returns an empty string if parsing fails after sanitization attempts.
      * @param {string} text - The AI response
-     * @returns {any} Parsed JSON
+     * @returns {any|string} Parsed JSON or empty string on failure
      */
     function parseJsonResponse(text) {
         const extracted = extractJson(text);
         try {
             return JSON.parse(extracted);
-        } catch (_err) {
+        } catch (err1) {
             const sanitized = sanitizeJsonLikeText(extracted);
-            return JSON.parse(sanitized);
+            try {
+                return JSON.parse(sanitized);
+            } catch (err2) {
+                // no need to catch anything, default to empty string
+            }
         }
+        return "";
     }
 
     /**
@@ -528,7 +624,62 @@ Return a JSON object:
             out += ch;
         }
 
-        return out.trim();
+        return removeTrailingCommas(out).trim();
+    }
+
+    /**
+     * Removes trailing commas before closing braces/brackets outside of string literals.
+     * Example: {"a":1,} -> {"a":1}
+     * @param {string} input - JSON-like string
+     * @returns {string}
+     */
+    function removeTrailingCommas(input) {
+        if (typeof input !== 'string') return '';
+
+        let out = '';
+        let inString = false;
+        let escape = false;
+
+        for (let i = 0; i < input.length; i++) {
+            const ch = input[i];
+
+            if (inString) {
+                out += ch;
+                if (escape) {
+                    escape = false;
+                    continue;
+                }
+                if (ch === '\\') {
+                    escape = true;
+                    continue;
+                }
+                if (ch === '"') {
+                    inString = false;
+                }
+                continue;
+            }
+
+            if (ch === '"') {
+                out += ch;
+                inString = true;
+                escape = false;
+                continue;
+            }
+
+            if (ch === ',') {
+                // Look ahead for the next non-whitespace character.
+                let j = i + 1;
+                while (j < input.length && /\s/.test(input[j])) j++;
+                const nextNonWs = j < input.length ? input[j] : '';
+                if (nextNonWs === '}' || nextNonWs === ']') {
+                    continue;
+                }
+            }
+
+            out += ch;
+        }
+
+        return out;
     }
 
     function debugLog(node, label, payload) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-ai-agent",
-    "version": "0.5.15",
+    "version": "0.5.17",
     "description": "AI Agent for Node-RED",
     "repository": {
         "type": "git",