@o-lang/olang 1.2.29 → 1.2.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o-lang/olang",
-  "version": "1.2.29",
+  "version": "1.2.31",
   "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

@@ -305,7 +305,7 @@ function parseWorkflowLines(lines, filename) {
       continue;
     }
 
-       // ✅ ADD: Set keyword (e.g., Set analysis_result = "")
+    // ✅ ADD: Set keyword (e.g., Set analysis_result = "")
     const setMatch = line.match(/^Set\s+(\w+)\s*=\s*(.+)$/i);
     if (setMatch) {
       flushCurrentStep();
@@ -399,38 +399,41 @@ function parseWorkflowLines(lines, filename) {
     }
 
     // Ask (for Notify/resolver calls) - ✅ PRESERVE TARGET EXACTLY (NO NORMALIZATION)
-const askMatch = line.match(/^Ask\s+(.+)$/i);
-if (askMatch) {
-  flushCurrentStep();
-  let actionContent = askMatch[1].trim();
-
-  // ✅ Multiline heredoc support: Ask llm-groq """
-  if (actionContent.endsWith('"""')) {
-    // Consume lines until closing """
-    let multiline = actionContent.slice(0, -3).trim() + ' ';
-    while (i < lines.length) {
-      const nextLine = lines[i++].trim();
-      if (nextLine === '"""') break;
-      multiline += nextLine + ' ';
-    }
-    actionContent = multiline.trim();
-  }
+    const askMatch = line.match(/^Ask\s+(.+)$/i);
+    if (askMatch) {
+      flushCurrentStep();
+      let actionContent = askMatch[1].trim();
+
+      // ✅ Multiline heredoc support: Ask llm-groq """
+      if (actionContent.endsWith('"""')) {
+        // Consume lines until closing """
+        let multiline = actionContent.slice(0, -3).trim() + ' ';
+        while (i < lines.length) {
+          const nextLine = lines[i++].trim();
+          if (nextLine === '"""') break;
+          multiline += nextLine + ' ';
+        }
+        actionContent = multiline.trim();
+      }
 
-  workflow.steps.push({
-    type: 'action',
-    actionRaw: `Action ${actionContent}`,
-    stepNumber: workflow.steps.length + 1,
-    saveAs: null,
-    constraints: {}
-  });
-  continue;
-}
+      workflow.steps.push({
+        type: 'action',
+        actionRaw: `Action ${actionContent}`,
+        stepNumber: workflow.steps.length + 1,
+        saveAs: null,
+        constraints: {}
+      });
+      continue;
+    }
 
-    // Return
+    // ✅ 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 !== '');
+      workflow.returnValues = returnMatch[1]
+        .split(',')
+        .map(r => r.trim())
+        .filter(r => r !== '');
       continue;
     }
 
@@ -603,7 +606,7 @@ function parseBlock(lines) {
       continue;
     }
 
-        // ✅ ADD: Set keyword inside blocks (e.g., Set analysis_result = "")
+    // ✅ ADD: Set keyword inside blocks (e.g., Set analysis_result = "")
     const setMatch = line.match(/^Set\s+(\w+)\s*=\s*(.+)$/i);
     if (setMatch) {
       flush(); // Flush any pending step
@@ -615,6 +618,15 @@ function parseBlock(lines) {
       });
       continue;
     }
+
+    // ✅ ADD: Return keyword inside blocks (rare but supported)
+    const returnMatch = line.match(/^Return\s+(.+)$/i);
+    if (returnMatch) {
+      flush();
+      // Note: Return inside blocks is unusual; this just parses it
+      continue;
+    }
+
     // Fallback
     if (current) {
       current.actionRaw += ' ' + line;  // ← PRESERVED EXACTLY (no normalizeAction)

package/src/runtime/RuntimeAPI.js

@@ -3,7 +3,7 @@ const path = require('path');
 const crypto = require('crypto'); // ✅ CRYPTOGRAPHIC AUDIT LOGS
 
 // ✅ O-Lang Kernel Version (Safety Logic & Governance Rules)
-const KERNEL_VERSION = '1.2.20-alpha'; // 🔁 Update when safety rules change
+const KERNEL_VERSION = '1.2.30-alpha'; // 🔁 Update when safety rules change
 
 class RuntimeAPI {
   constructor({ verbose = false } = {}) {
@@ -878,41 +878,57 @@ class RuntimeAPI {
     if (!output || typeof output !== 'string') return { passed: true };
 
     // ── __verified_intent takes priority ──────────────────────────────────────
-    // If the workflow author has defined intent rules, use those exclusively.
-    // This makes governance dynamic — skip hardcoded patterns entirely.
-    const intent = this.context.__verified_intent;
-    if (intent) {
-      if (intent.prohibited_actions && Array.isArray(intent.prohibited_actions)) {
-        const lower = output.toLowerCase();
-        for (const action of intent.prohibited_actions) {
-          if (lower.includes(action.toLowerCase())) {
-            return {
-              passed: false,
-              reason: `Output violates prohibited action "${action}" defined in __verified_intent`,
-              detected: action,
-              language: 'multi'
-            };
-          }
-        }
+const intent = this.context.__verified_intent;
+if (intent) {
+  if (intent.prohibited_actions && Array.isArray(intent.prohibited_actions)) {
+    const lower = output.toLowerCase();
+    for (const action of intent.prohibited_actions) {
+      if (lower.includes(action.toLowerCase())) {
+        return {
+          passed: false,
+          reason: `Output violates prohibited action "${action}" defined in __verified_intent`,
+          detected: action,
+          language: 'multi'
+        };
       }
+    }
+  }
 
-      if (intent.prohibited_topics && Array.isArray(intent.prohibited_topics)) {
-        const lower = output.toLowerCase();
-        for (const topic of intent.prohibited_topics) {
-          if (lower.includes(topic.toLowerCase())) {
-            return {
-              passed: false,
-              reason: `Output violates prohibited topic "${topic}" defined in __verified_intent`,
-              detected: topic,
-              language: 'multi'
-            };
-          }
+  if (intent.prohibited_topics && Array.isArray(intent.prohibited_topics)) {
+    for (const topic of intent.prohibited_topics) {
+      const isRegex = typeof topic === 'object' && topic.pattern;
+      let matched = false;
+      let detected = '';
+
+      if (isRegex) {
+        try {
+          const re = new RegExp(topic.pattern, topic.flags || 'i');
+          const match = output.match(re);
+          matched = !!match;
+          detected = match ? match[0] : topic.pattern;
+        } catch (e) {
+          this.addWarning(`Invalid prohibited_topic regex: "${topic.pattern}" — ${e.message}`);
+          continue;
         }
+      } else {
+        matched = output.toLowerCase().includes(topic.toLowerCase());
+        detected = topic;
       }
 
-      // __verified_intent present and passed — skip hardcoded patterns
-      return { passed: true };
+      if (matched) {
+        return {
+          passed: false,
+          reason: `Output violates prohibited topic "${isRegex ? topic.pattern : topic}" defined in __verified_intent`,
+          detected,
+          language: 'multi'
+        };
+      }
     }
+  }
+
+  // __verified_intent present and passed — skip hardcoded patterns
+  return { passed: true };
+}
 
     // ── No __verified_intent — fall through to hardcoded patterns ─────────────
     // 🔑 Extract allowed capabilities from workflow allowlist