@o-lang/olang 1.2.1 → 1.2.3

package/package.json

@@ -1,24 +1,25 @@
 {
   "name": "@o-lang/olang",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "author": "Olalekan Ogundipe <info@workfily.com>",
   "description": "O-Lang: A governance language for user-directed, rule-enforced agent workflows",
   "main": "./src/index.js",
-"bin": {
-  "olang": "./cli/olang.js"
-},
+  "bin": {
+    "olang": "./cli/olang.js"
+  },
   "files": [
     "cli.js",
     "src/"
   ],
   "scripts": {
-    "start": "node cli.js"
+    "start": "node cli.js",
+    "test": "jest"
   },
   "dependencies": {
-   "commander": "^12.0.0",
-  "dotenv": "^17.2.3",
-  "lodash": "^4.17.21",
-  "fastify": "^4.26.0"
+    "commander": "^12.0.0",
+    "dotenv": "^17.2.3",
+    "fastify": "^4.26.0",
+    "lodash": "^4.17.21"
   },
   "keywords": [
     "agent",
@@ -37,5 +38,8 @@
   "homepage": "https://github.com/O-Lang-Central/olang-kernel",
   "publishConfig": {
     "access": "public"
+  },
+  "devDependencies": {
+    "jest": "^30.2.0"
   }
 }

package/src/parser/index.js

@@ -385,18 +385,18 @@ function parseWorkflowLines(lines, filename) {
     }
 
     // Ask (for Notify/resolver calls) - ✅ PRESERVE TARGET EXACTLY (NO NORMALIZATION)
-    const askMatch = line.match(/^Ask\s+(.+)$/i);
-    if (askMatch) {
-      flushCurrentStep();
-      workflow.steps.push({
-        type: 'ask',
-        target: askMatch[1].trim(),  // ← PRESERVED EXACTLY (no normalizeAction)
-        stepNumber: workflow.steps.length + 1,
-        saveAs: null,
-        constraints: {}
-      });
-      continue;
-    }
+const askMatch = line.match(/^Ask\s+(.+)$/i);
+if (askMatch) {
+  flushCurrentStep();
+  workflow.steps.push({
+    type: 'action',
+    actionRaw: `Action ${askMatch[1].trim()}`,
+    stepNumber: workflow.steps.length + 1,
+    saveAs: null,
+    constraints: {}
+  });
+  continue;
+}
 
     // Return
     const returnMatch = line.match(/^Return\s+(.+)$/i);
@@ -530,30 +530,33 @@ function parseBlock(lines) {
     }
 
     // Use in block - ✅ PRESERVE TOOL EXACTLY (NO NORMALIZATION)
-    const useMatch = line.match(/^Use\s+(.+)$/i);
-    if (useMatch) {
-      flush();
-      steps.push({ 
-        type: 'use', 
-        tool: useMatch[1].trim(),  // ← PRESERVED EXACTLY
-        saveAs: null, 
-        constraints: {} 
-      });
-      continue;
-    }
+const useMatch = line.match(/^Use\s+(.+)$/i);
+if (useMatch) {
+  flushCurrentStep();
+  workflow.steps.push({
+    type: 'action',
+    actionRaw: `Action ${useMatch[1].trim()}`,
+    stepNumber: workflow.steps.length + 1,
+    saveAs: null,
+    constraints: {}
+  });
+  continue;
+}
+
+
+   // Ask in block — CANONICALIZE AT PARSE TIME
+const askMatch = line.match(/^Ask\s+(.+)$/i);
+if (askMatch) {
+  flush();
+  steps.push({
+    type: 'action',
+    actionRaw: `Action ${askMatch[1].trim()}`,
+    saveAs: null,
+    constraints: {}
+  });
+  continue;
+}
 
-    // Ask in block - ✅ PRESERVE TARGET EXACTLY (NO NORMALIZATION)
-    const askMatch = line.match(/^Ask\s+(.+)$/i);
-    if (askMatch) {
-      flush();
-      steps.push({ 
-        type: 'ask', 
-        target: askMatch[1].trim(),  // ← PRESERVED EXACTLY
-        saveAs: null, 
-        constraints: {} 
-      });
-      continue;
-    }
 
     // Constraint inside block
     const constraintMatch = line.match(/^Constraint:\s*(.+)$/i);

package/src/runtime/RuntimeAPI.js

@@ -4,7 +4,7 @@ const path = require('path');
 
 class RuntimeAPI {
   constructor({ verbose = false } = {}) {
-   console.log('✅ KERNEL FIX VERIFIED - Unwrapping active');
+  //  console.log('✅ KERNEL FIX VERIFIED - Unwrapping active');
     this.context = {};
     this.resources = {};
     this.agentMap = {};
@@ -552,34 +552,59 @@ class RuntimeAPI {
         break;
       }
 
-      case 'action': {
-        // ✅ SAFE INTERPOLATION: Block object→string coercion BEFORE resolver invocation
-        const action = this._safeInterpolate(step.actionRaw, this.context, 'action step');
+       case 'action': {
+  // 🔒 Interpolate workflow variables first
+  let action = this._safeInterpolate(
+    step.actionRaw,
+    this.context,
+    'action step'
+  );
 
-        const mathCall = action.match(/^(add|subtract|multiply|divide|sum|avg|min|max|round|floor|ceil|abs)\((.*)\)$/i);
-        if (mathCall) {
-          const fn = mathCall[1].toLowerCase();
-          const args = mathCall[2].split(',').map(s => {
-            s = s.trim();
-            if (!isNaN(s)) return parseFloat(s);
-            return this.getNested(this.context, s.replace(/^\{|\}$/g, ''));
-          });
-          if (this.mathFunctions[fn]) {
-            const value = this.mathFunctions[fn](...args);
-            if (step.saveAs) this.context[step.saveAs] = value;
-            break;
-          }
-        }
+  // ✅ CANONICALIZATION: Normalize DSL verbs → runtime Action
+  if (action.startsWith('Ask ')) {
+    action = 'Action ' + action.slice(4);
+  } else if (action.startsWith('Use ')) {
+    action = 'Action ' + action.slice(4);
+  }
 
-        // ✅ CRITICAL FIX: UNWRAP resolver result BEFORE saving to context
-        const rawResult = await runResolvers(action);
-        const unwrapped = this._unwrapResolverResult(rawResult);
-        
-        if (step.saveAs) {
-          this.context[step.saveAs] = unwrapped;
-        }
-        break;
-      }
+  // ❌ Reject non-canonical runtime actions early
+  if (!action.startsWith('Action ')) {
+    throw new Error(
+      `[O-Lang SAFETY] Non-canonical action received: "${action}"\n` +
+      `  → Expected format: Action <resolver> <args>\n` +
+      `  → This indicates a kernel or workflow authoring error.`
+    );
+  }
+
+  // ✅ Inline math support (language feature)
+  const mathCall = action.match(
+    /^(add|subtract|multiply|divide|sum|avg|min|max|round|floor|ceil|abs)\((.*)\)$/i
+  );
+
+  if (mathCall) {
+    const fn = mathCall[1].toLowerCase();
+    const args = mathCall[2].split(',').map(s => {
+      s = s.trim();
+      if (!isNaN(s)) return parseFloat(s);
+      return this.getNested(this.context, s.replace(/^\{|\}$/g, ''));
+    });
+
+    if (this.mathFunctions[fn]) {
+      const value = this.mathFunctions[fn](...args);
+      if (step.saveAs) this.context[step.saveAs] = value;
+      break;
+    }
+  }
+
+  // ✅ Resolver dispatch receives ONLY canonical actions
+  const rawResult = await runResolvers(action);
+  const unwrapped = this._unwrapResolverResult(rawResult);
+
+  if (step.saveAs) {
+    this.context[step.saveAs] = unwrapped;
+  }
+  break;
+}
 
       case 'use': {
         // ✅ SAFE INTERPOLATION for tool name