@o-lang/olang 1.4.0 → 1.4.2

package/package.json

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

package/src/parser/index.js

@@ -77,6 +77,11 @@ function parseWorkflowLines(lines, filename) {
   let escalationLevels = [];
   let currentLevel = null;
 
+  // ✅ ENHANCED: Track labels for blocks
+  let currentIfLabel = null;
+  let currentParallelLabel = null;
+  let currentEscalationLabel = null;
+
   const flushCurrentStep = () => {
     if (currentStep) {
       workflow.steps.push(currentStep);
@@ -88,6 +93,15 @@ function parseWorkflowLines(lines, filename) {
     let line = lines[i++].trim();
     if (line === '' || line.startsWith('#')) continue;
 
+    // ✅ ENHANCED: Extract "Step N:" label if present
+    let stepLabel = null;
+    let strippedLine = line;
+    const labelMatch = line.match(/^Step\s+(\d+)\s*:\s*(.+)$/i);
+    if (labelMatch) {
+      stepLabel = `Step ${labelMatch[1]}`;
+      strippedLine = labelMatch[2].trim();
+    }
+
     // --- 1. Workflow Declaration ---
     if (line.startsWith('Workflow ')) {
       const match = line.match(/^Workflow\s+"([^"]+)"(?:\s+with\s+(.+))?$/i);
@@ -134,11 +148,13 @@ function parseWorkflowLines(lines, filename) {
     }
 
     // --- 4. Block: Escalation ---
-    if (line.match(/^Run in parallel with escalation:$/i)) {
+    // ✅ ENHANCED: Use strippedLine to match "Step N: Run in parallel with escalation:"
+    if (strippedLine.match(/^Run in parallel with escalation:$/i)) {
       flushCurrentStep();
       inEscalationBlock = true;
       escalationLevels = [];
       currentLevel = null;
+      currentEscalationLabel = stepLabel; // ✅ Save label
       continue;
     }
 
@@ -148,8 +164,10 @@ function parseWorkflowLines(lines, filename) {
         workflow.steps.push({
           type: 'escalation',
           levels: escalationLevels,
-          stepNumber: workflow.steps.length + 1
+          stepNumber: workflow.steps.length + 1,
+          label: currentEscalationLabel // ✅ ENHANCED: Add label
         });
+        currentEscalationLabel = null; // ✅ Reset
         inEscalationBlock = false;
         continue;
       } else if (line.match(/^Level \d+:/i)) {
@@ -185,7 +203,8 @@ function parseWorkflowLines(lines, filename) {
     }
 
     // --- 5. Block: Parallel ---
-    const timedParMatch = line.match(/^Run in parallel for (\d+)\s*([smhd])$/i);
+    // ✅ ENHANCED: Use strippedLine to match "Step N: Run in parallel for Xs"
+    const timedParMatch = strippedLine.match(/^Run in parallel for (\d+)\s*([smhd])$/i);
     if (timedParMatch) {
       flushCurrentStep();
       const value = parseInt(timedParMatch[1]);
@@ -195,14 +214,17 @@ function parseWorkflowLines(lines, filename) {
       
       inParallelBlock = true;
       parallelSteps = [];
+      currentParallelLabel = stepLabel; // ✅ Save label
       continue;
     }
 
-    if (line.match(/^Run in parallel$/i)) {
+    // ✅ ENHANCED: Use strippedLine to match "Step N: Run in parallel"
+    if (strippedLine.match(/^Run in parallel$/i)) {
       flushCurrentStep();
       inParallelBlock = true;
       parallelSteps = [];
       parallelTimeout = null;
+      currentParallelLabel = stepLabel; // ✅ Save label
       continue;
     }
 
@@ -214,8 +236,10 @@ function parseWorkflowLines(lines, filename) {
           type: 'parallel',
           steps: parsedParallel,
           timeout: parallelTimeout,
-          stepNumber: workflow.steps.length + 1
+          stepNumber: workflow.steps.length + 1,
+          label: currentParallelLabel // ✅ ENHANCED: Add label
         });
+        currentParallelLabel = null; // ✅ Reset
         inParallelBlock = false;
         parallelTimeout = null;
         continue;
@@ -227,12 +251,13 @@ function parseWorkflowLines(lines, filename) {
 
     // --- 6. Block: If / Else If / Else (FIXED STATE MACHINE) ---
     
-    // Start If
-    if (line.match(/^(?:If|When)\s+(.+)$/i)) {
+    // ✅ ENHANCED: Use strippedLine to match "Step N: If ..."
+    if (strippedLine.match(/^(?:If|When)\s+(.+)$/i)) {
       flushCurrentStep();
-      const ifMatch = line.match(/^(?:If|When)\s+(.+)$/i);
+      const ifMatch = strippedLine.match(/^(?:If|When)\s+(.+)$/i);
       ifCondition = ifMatch[1].trim();
       inIfBlock = true;
+      currentIfLabel = stepLabel; // ✅ Save label
       
       // Reset accumulators
       mainIfBody = [];
@@ -291,8 +316,10 @@ function parseWorkflowLines(lines, filename) {
           body: parseBlock(mainIfBody),           // Main body correctly isolated
           elseIf: elseIfChain,                    // Else-if chain
           elseBranch: inElseBlock ? parseBlock(currentBranchBody) : [], // Else body
-          stepNumber: workflow.steps.length + 1
+          stepNumber: workflow.steps.length + 1,
+          label: currentIfLabel // ✅ ENHANCED: Add label
         });
+        currentIfLabel = null; // ✅ Reset
 
         // Reset State
         inIfBlock = false;
@@ -315,8 +342,25 @@ function parseWorkflowLines(lines, filename) {
 
     // --- 7. Standard Steps & Keywords ---
 
+    // Calculate (NEW v1.4.0 — math expression evaluation)
+    // ✅ ENHANCED: Use strippedLine
+    const calcMatch = strippedLine.match(/^Calculate\s+(.+)$/i);
+    if (calcMatch) {
+      flushCurrentStep();
+      workflow.steps.push({
+        type: 'calculate',
+        expression: calcMatch[1].trim(),
+        stepNumber: workflow.steps.length + 1,
+        saveAs: null,
+        constraints: {},
+        label: stepLabel // ✅ ENHANCED: Add label
+      });
+      continue;
+    }
+
     // Connect: Connect "name" to url "..." OR Connect "name" to resolver "..."
-    const connectMatch = line.match(/^Connect\s+"([^"]+)"\s+to\s+(url|resolver)\s+"([^"]+)"$/i);
+    // ✅ ENHANCED: Use strippedLine
+    const connectMatch = strippedLine.match(/^Connect\s+"([^"]+)"\s+to\s+(url|resolver)\s+"([^"]+)"$/i);
     if (connectMatch) {
       flushCurrentStep();
       workflow.steps.push({
@@ -324,20 +368,23 @@ function parseWorkflowLines(lines, filename) {
         resource: connectMatch[1],
         endpoint: connectMatch[3],
         targetType: connectMatch[2].toLowerCase(),
-        stepNumber: workflow.steps.length + 1
+        stepNumber: workflow.steps.length + 1,
+        label: stepLabel // ✅ ENHANCED: Add label
       });
       continue;
     }
 
     // Use: Use "logicalName" as "resource"
-    const useMatch = line.match(/^Use\s+"([^"]+)"\s+as\s+"([^"]+)"$/i);
+    // ✅ ENHANCED: Use strippedLine
+    const useMatch = strippedLine.match(/^Use\s+"([^"]+)"\s+as\s+"([^"]+)"$/i);
     if (useMatch) {
       flushCurrentStep();
       workflow.steps.push({
         type: 'agent_use',
         logicalName: useMatch[1],
         resource: useMatch[2],
-        stepNumber: workflow.steps.length + 1
+        stepNumber: workflow.steps.length + 1,
+        label: stepLabel // ✅ ENHANCED: Add label
       });
       continue;
     }
@@ -351,7 +398,8 @@ function parseWorkflowLines(lines, filename) {
         stepNumber: parseInt(stepMatch[1], 10),
         actionRaw: stepMatch[2].trim(),
         saveAs: null,
-        constraints: {}
+        constraints: {},
+        label: `Step ${stepMatch[1]}` // ✅ ENHANCED: Add label
       };
       continue;
     }
@@ -364,59 +412,68 @@ function parseWorkflowLines(lines, filename) {
     }
 
     // Debrief
-    const debriefMatch = line.match(/^Debrief\s+([^\s]+)\s+with\s+"([^"]*)"$/i);
+    // ✅ ENHANCED: Use strippedLine
+    const debriefMatch = strippedLine.match(/^Debrief\s+([^\s]+)\s+with\s+"([^"]*)"$/i);
     if (debriefMatch) {
       flushCurrentStep();
       workflow.steps.push({
         type: 'debrief',
         agent: debriefMatch[1].trim(),
         message: debriefMatch[2],
-        stepNumber: workflow.steps.length + 1
+        stepNumber: workflow.steps.length + 1,
+        label: stepLabel // ✅ ENHANCED: Add label
       });
       continue;
     }
 
     // Prompt
-    const promptMatch = line.match(/^Prompt user to\s+"([^"]*)"$/i);
+    // ✅ ENHANCED: Use strippedLine
+    const promptMatch = strippedLine.match(/^Prompt user to\s+"([^"]*)"$/i);
     if (promptMatch) {
       flushCurrentStep();
       workflow.steps.push({
         type: 'prompt',
         question: promptMatch[1],
         stepNumber: workflow.steps.length + 1,
-        saveAs: null
+        saveAs: null,
+        label: stepLabel // ✅ ENHANCED: Add label
       });
       continue;
     }
 
     // Persist
-    const persistMatch = line.match(/^Persist\s+([^\s]+)\s+to\s+"([^"]*)"$/i);
+    // ✅ ENHANCED: Use strippedLine
+    const persistMatch = strippedLine.match(/^Persist\s+([^\s]+)\s+to\s+"([^"]*)"$/i);
     if (persistMatch) {
       flushCurrentStep();
       workflow.steps.push({
         type: 'persist',
         variable: persistMatch[1].trim(),
         target: persistMatch[2],
-        stepNumber: workflow.steps.length + 1
+        stepNumber: workflow.steps.length + 1,
+        label: stepLabel // ✅ ENHANCED: Add label
       });
       continue;
     }
 
     // Emit
-    const emitMatch = line.match(/^Emit\s+"([^"]+)"\s+with\s+(.+)$/i);
+    // ✅ ENHANCED: Use strippedLine
+    const emitMatch = strippedLine.match(/^Emit\s+"([^"]+)"\s+with\s+(.+)$/i);
     if (emitMatch) {
       flushCurrentStep();
       workflow.steps.push({
         type: 'emit',
         event: emitMatch[1],
         payload: emitMatch[2].trim(),
-        stepNumber: workflow.steps.length + 1
+        stepNumber: workflow.steps.length + 1,
+        label: stepLabel // ✅ ENHANCED: Add label
       });
       continue;
     }
 
     // Ask (Multiline support)
-    const askMatch = line.match(/^Ask\s+(.+)$/i);
+    // ✅ ENHANCED: Use strippedLine
+    const askMatch = strippedLine.match(/^Ask\s+(.+)$/i);
     if (askMatch) {
       flushCurrentStep();
       let actionContent = askMatch[1].trim();
@@ -434,7 +491,8 @@ function parseWorkflowLines(lines, filename) {
         actionRaw: `Action ${actionContent}`,
         stepNumber: workflow.steps.length + 1,
         saveAs: null,
-        constraints: {}
+        constraints: {},
+        label: stepLabel // ✅ ENHANCED: Add label
       });
       continue;
     }
@@ -451,24 +509,26 @@ function parseWorkflowLines(lines, filename) {
     }
 
     // Fallback: Treat as action
-    if (line.trim() !== '') {
+    // ✅ ENHANCED: Use strippedLine for actionRaw
+    if (strippedLine.trim() !== '') {
       if (!currentStep) {
         currentStep = {
           type: 'action',
           stepNumber: workflow.steps.length + 1,
-          actionRaw: line,
+          actionRaw: strippedLine,
           saveAs: null,
-          constraints: {}
+          constraints: {},
+          label: stepLabel // ✅ ENHANCED: Add label
         };
       } else {
-        currentStep.actionRaw += ' ' + line;
+        currentStep.actionRaw += ' ' + strippedLine;
       }
     }
   }
 
   flushCurrentStep();
 
-  // Post-process Save as in actionRaw
+  // Post-process Save as in actionRaw AND expression (calculate steps)
   workflow.steps.forEach(step => {
     if (step.actionRaw && step.saveAs === null) {
       const saveInAction = step.actionRaw.match(/(.+?)\s+Save as\s+(.+)$/i);
@@ -477,6 +537,14 @@ function parseWorkflowLines(lines, filename) {
         step.saveAs = normalizeSymbol(saveInAction[2].trim());
       }
     }
+    // ✅ NEW: Handle Calculate steps with inline Save as
+    if (step.type === 'calculate' && step.expression && step.saveAs === null) {
+      const saveInExpr = step.expression.match(/(.+?)\s+Save as\s+(.+)$/i);
+      if (saveInExpr) {
+        step.expression = saveInExpr[1].trim();
+        step.saveAs = normalizeSymbol(saveInExpr[2].trim());
+      }
+    }
     if (step.saveAs) {
       step.saveAs = normalizeSymbol(step.saveAs);
     }
@@ -504,6 +572,19 @@ function parseBlock(lines) {
     line = line.trim();
     if (!line || line.startsWith('#')) continue;
 
+    // Calculate in Block (NEW v1.4.0)
+    const calcMatch = line.match(/^Calculate\s+(.+)$/i);
+    if (calcMatch) {
+      flush();
+      steps.push({
+        type: 'calculate',
+        expression: calcMatch[1].trim(),
+        saveAs: null,
+        constraints: {}
+      });
+      continue;
+    }
+
     // Connect in Block
     const connectMatch = line.match(/^Connect\s+"([^"]+)"\s+to\s+(url|resolver)\s+"([^"]+)"$/i);
     if (connectMatch) {
@@ -538,7 +619,8 @@ function parseBlock(lines) {
         stepNumber: parseInt(stepMatch[1], 10),
         actionRaw: stepMatch[2].trim(),
         saveAs: null,
-        constraints: {}
+        constraints: {},
+        label: `Step ${stepMatch[1]}` // ✅ ENHANCED: Add label
       };
       continue;
     }
@@ -604,6 +686,14 @@ function parseBlock(lines) {
         step.saveAs = normalizeSymbol(saveInAction[2].trim());
       }
     }
+    // ✅ NEW: Handle Calculate steps with inline Save as in blocks
+    if (step.type === 'calculate' && step.expression && step.saveAs === null) {
+      const saveInExpr = step.expression.match(/(.+?)\s+Save as\s+(.+)$/i);
+      if (saveInExpr) {
+        step.expression = saveInExpr[1].trim();
+        step.saveAs = normalizeSymbol(saveInExpr[2].trim());
+      }
+    }
     if (step.saveAs) {
       step.saveAs = normalizeSymbol(step.saveAs);
     }

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.4.0'; // 🔁 Bumped: PII redaction engine added
+const KERNEL_VERSION = '1.4.1'; // 🔁 Bumped: PII redaction engine added
 
 // ─────────────────────────────────────────────────────────────────────────────
 // ✅ NEW v1.3.0 — SEPARATED PATTERN SETS
@@ -1624,8 +1624,15 @@ class RuntimeAPI {
         }
       }
 
-      let errorMessage = `[O-Lang SAFETY] No resolver handled action: "${action}\n`;
+       // ✅ ENHANCED: Extract step location context for debugging
+      const stepLabel = step.label || `unnamed_${step.type}_step`;
+      const branchContext = step._parentLabel ? ` [Inside ${step._parentLabel} → ${step._branch} branch]` : '';
+      
+      let errorMessage = `[O-Lang SAFETY] No resolver handled action: "${action}"\n`;
+      errorMessage += `  → Location: ${stepLabel}${branchContext}\n`;
+      errorMessage += `  → Workflow: ${this.context.workflow_name || 'unknown'}\n`;
       errorMessage += `Attempted resolvers:\n`;
+      
       resolverAttempts.forEach((attempt, i) => {
         const namePad = attempt.name.padEnd(30);
         if (attempt.status === 'skipped') {
@@ -1682,6 +1689,16 @@ class RuntimeAPI {
         errorMessage += `    → Visit https://www.npmjs.com/search?q=%40o-lang     for resolver packages\n`;
       }
       errorMessage += `\n🛑 Workflow halted to prevent unsafe data propagation to LLMs.`;
+      
+      // ✅ ENHANCED: Log the failure with full context before throwing
+      this._createAuditEntry('resolver_execution_failed', {
+        step_label: stepLabel,
+        branch_context: step._parentLabel ? `${step._parentLabel} (${step._branch})` : null,
+        action: action,
+        attempted_resolvers: resolverAttempts.map(a => a.name),
+        severity: 'high'
+      });
+
       throw new Error(errorMessage);
     };
 
@@ -1859,7 +1876,9 @@ class RuntimeAPI {
       //   3. Auditability: Logs which condition was evaluated and which branch fired.
       // ─────────────────────────────────────────────────────────────────────────────
 
-      case 'if': {
+           case 'if': {
+        const stepLabel = step.label || 'unnamed_if_block';
+        
         // 1. Validate all symbols referenced in the main condition
         const condSymbols = step.condition ? step.condition.match(/\{([^\}]+)\}/g) || [] : [];
         let symbolsValid = true;
@@ -1873,6 +1892,7 @@ class RuntimeAPI {
 
         if (!symbolsValid) {
           this._createAuditEntry('condition_skipped', {
+            step_label: stepLabel,
             condition: step.condition,
             reason: 'One or more symbols missing in context',
             severity: 'warn'
@@ -1884,6 +1904,7 @@ class RuntimeAPI {
         const mainPassed = this.evaluateCondition(step.condition, this.context);
 
         this._createAuditEntry('condition_evaluated', {
+          step_label: stepLabel,
           condition: step.condition,
           passed: mainPassed,
           branch: 'if',
@@ -1892,7 +1913,12 @@ class RuntimeAPI {
 
         if (mainPassed) {
           if (step.body && Array.isArray(step.body)) {
-            for (const s of step.body) await this.executeStep(s, agentResolver);
+            // ✅ ENHANCED: Tag child steps with parent context for debugging
+            for (const s of step.body) {
+              s._parentLabel = stepLabel;
+              s._branch = 'if';
+              await this.executeStep(s, agentResolver);
+            }
           }
           break; // Exit after successful if
         }
@@ -1913,6 +1939,7 @@ class RuntimeAPI {
 
             if (!branchSymbolsValid) {
                this._createAuditEntry('condition_skipped', {
+                step_label: stepLabel,
                 condition: branch.condition,
                 reason: 'One or more symbols missing in context',
                 severity: 'warn'
@@ -1923,6 +1950,7 @@ class RuntimeAPI {
             const branchPassed = this.evaluateCondition(branch.condition, this.context);
 
             this._createAuditEntry('condition_evaluated', {
+              step_label: stepLabel,
               condition: branch.condition,
               passed: branchPassed,
               branch: 'else-if',
@@ -1931,7 +1959,12 @@ class RuntimeAPI {
 
             if (branchPassed) {
               if (branch.body && Array.isArray(branch.body)) {
-                for (const s of branch.body) await this.executeStep(s, agentResolver);
+                // ✅ ENHANCED: Tag child steps with parent context
+                for (const s of branch.body) {
+                  s._parentLabel = stepLabel;
+                  s._branch = 'else-if';
+                  await this.executeStep(s, agentResolver);
+                }
               }
               elseIfFired = true;
               break;
@@ -1943,17 +1976,23 @@ class RuntimeAPI {
         // 4. else fallback
         if (step.elseBranch && Array.isArray(step.elseBranch)) {
           this._createAuditEntry('condition_evaluated', {
+            step_label: stepLabel,
             condition: 'else',
             passed: true,
             branch: 'else',
             severity: 'info'
           });
-          for (const s of step.elseBranch) await this.executeStep(s, agentResolver);
+          // ✅ ENHANCED: Tag child steps with parent context
+          for (const s of step.elseBranch) {
+            s._parentLabel = stepLabel;
+            s._branch = 'else';
+            await this.executeStep(s, agentResolver);
+          }
         }
 
         break;
       }
-
+      
        // ─────────────────────────────────────────────────────────────────────────────
       // PARALLEL
       //