@o-lang/olang 1.2.33 → 1.2.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o-lang/olang",
-  "version": "1.2.33",
+  "version": "1.2.35",
   "author": "Olalekan Ogundipe <info@olang.cloud>",
   "description": "O-Lang: A governance language for user-directed, rule-enforced agent workflows",
   "main": "./src/runtime/index.js",

package/src/parser/index.js

@@ -427,16 +427,23 @@ function parseWorkflowLines(lines, filename) {
     }
 
     // ✅ ADD: Return keyword support (ensures wf.returnValues is populated)
-    const returnMatch = line.match(/^Return\s+(.+)$/i);
-    if (returnMatch) {
-      flushCurrentStep();
-      workflow.returnValues = returnMatch[1]
-        .split(',')
-        .map(r => r.trim())
-        .filter(r => r !== '');
-      continue;
-    }
-
+// ✅ ADD: Return keyword support (with debug logging)
+const returnMatch = line.match(/^Return\s+(.+)$/i);
+if (returnMatch) {
+  flushCurrentStep();
+  const rawReturns = returnMatch[1];
+  console.log(`[PARSER DEBUG] Return line: "${line}"`);
+  console.log(`[PARSER DEBUG] Return match[1]: "${rawReturns}"`);
+  console.log(`[PARSER DEBUG] Return match[1] char codes: ${Array.from(rawReturns).map(c => c.charCodeAt(0))}`);
+  
+  workflow.returnValues = rawReturns
+    .split(',')
+    .map(r => r.trim())
+    .filter(r => r !== '');
+    
+  console.log(`[PARSER DEBUG] Parsed returnValues: ${JSON.stringify(workflow.returnValues)}`);
+  continue;
+}
     // Fallback: treat as action
     if (line.trim() !== '') {
       if (!currentStep) {

package/src/runtime/RuntimeAPI.js

@@ -1086,12 +1086,15 @@ const forbiddenPatterns = [
   // -----------------------------
   // ✅ CRITICAL FIX: Resolver output unwrapping helper
   // -----------------------------
-  _unwrapResolverResult(result) {
-    if (result && typeof result === 'object' && 'output' in result && result.output !== undefined) {
-      return result.output;
-    }
-    return result;
+_unwrapResolverResult(result) {
+  if (result && typeof result === 'object') {
+    if (result.output !== undefined) return result.output;
+    if (result.response !== undefined) return result.response; // ✅ ADD THIS
+    if (result.text !== undefined) return result.text;
+    if (result.content !== undefined) return result.content;
   }
+  return result;
+}
 
   // -----------------------------
   // Step execution (WHERE RESOLVERS ARE INVOKED)