@o-lang/olang 1.0.15 → 1.0.17

package/cli.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 const { Command } = require('commander');
 const { parse } = require('./src/parser');
 const { execute } = require('./src/runtime');
@@ -22,7 +22,6 @@ function ensureOlExtension(filename) {
  */
 async function defaultMockResolver(action, context) {
   if (!action || typeof action !== 'string') return `[Unhandled: ${String(action)}]`;
-
   if (action.startsWith('Search for ')) {
     return {
       title: "HR Policy 2025",
@@ -30,45 +29,38 @@ async function defaultMockResolver(action, context) {
       url: "mock://hr-policy"
     };
   }
-
   if (action.startsWith('Ask ')) {
-    return "✅ [Mock] Summarized for demonstration.";
+    return " ✅  [Mock] Summarized for demonstration.";
   }
-
   if (action.startsWith('Notify ')) {
     const recipient = action.match(/Notify (\S+)/)?.[1] || 'user@example.com';
-    return `📬 Notification sent to ${recipient}`;
+    return ` 📬  Notification sent to ${recipient}`;
   }
-
   if (action.startsWith('Debrief ') || action.startsWith('Evolve ')) {
     console.log(`[O-Lang] ${action}`);
     return 'Acknowledged';
   }
-
   return `[Unhandled: ${action}]`;
 }
+defaultMockResolver.resolverName = 'defaultMockResolver';
 
 /**
  * Built-in Math Resolver
  */
 async function builtInMathResolver(action, context) {
   if (!action || typeof action !== 'string') return null;
-
   const a = action.replace(/\{([^\}]+)\}/g, (_, k) => {
     const v = context[k.trim()];
     return v !== undefined ? v : `{${k}}`;
   });
-
   let m;
   m = a.match(/^add\(([^,]+),\s*([^)]+)\)$/i); if (m) return parseFloat(m[1]) + parseFloat(m[2]);
   m = a.match(/^subtract\(([^,]+),\s*([^)]+)\)$/i); if (m) return parseFloat(m[1]) - parseFloat(m[2]);
   m = a.match(/^multiply\(([^,]+),\s*([^)]+)\)$/i); if (m) return parseFloat(m[1]) * parseFloat(m[2]);
   m = a.match(/^divide\(([^,]+),\s*([^)]+)\)$/i); if (m) return parseFloat(m[1]) / parseFloat(m[2]);
   m = a.match(/^sum\(\s*\[([^\]]+)\]\s*\)$/i); if (m) return m[1].split(',').map(s => parseFloat(s.trim())).reduce((s, v) => s + v, 0);
-
   return null;
 }
-// Add resolver metadata so workflow policy recognizes it
 builtInMathResolver.resolverName = 'builtInMathResolver';
 
 /**
@@ -84,7 +76,7 @@ function createResolverChain(resolvers, verbose = false) {
         context[`__resolver_${i}`] = res;
         lastResult = res;
       } catch (e) {
-        console.error(`❌ Resolver ${i} failed for action "${action}":`, e.message);
+        console.error(` ❌  Resolver ${i} failed for action "${action}":`, e.message);
       }
     }
     if (verbose) console.log(`[Resolver Chain] action="${action}" lastResult=`, lastResult);
@@ -96,17 +88,16 @@ function createResolverChain(resolvers, verbose = false) {
 
 function loadSingleResolver(specifier) {
   if (!specifier) return defaultMockResolver;
-
   try {
     const resolver = require(specifier);
     if (typeof resolver !== 'function') throw new Error(`Resolver must export a function`);
-    console.log(`📦 Loaded resolver: ${specifier}`);
+    console.log(` 📦  Loaded resolver: ${specifier}`);
     return resolver;
   } catch (e1) {
     try {
       const absolutePath = path.resolve(process.cwd(), specifier);
       const resolver = require(absolutePath);
-      console.log(`📁 Loaded resolver: ${absolutePath}`);
+      console.log(` 📁  Loaded resolver: ${absolutePath}`);
       return resolver;
     } catch (e2) {
       throw new Error(
@@ -117,16 +108,40 @@ function loadSingleResolver(specifier) {
 }
 
 /**
- * loadResolverChain: include built-in math resolver first, then user resolvers, then default mock resolver
+ * ✅ POLICY-AWARE resolver loader: only includes resolvers in allowedResolvers
  */
-function loadResolverChain(specifiers, verbose = false) {
+function loadResolverChain(specifiers, verbose = false, allowedResolvers = new Set()) {
   const userResolvers = specifiers?.map(loadSingleResolver) || [];
-  const resolvers = [builtInMathResolver, ...userResolvers, defaultMockResolver];
+  const resolvers = [];
 
-  if (!specifiers || specifiers.length === 0) {
-    console.log('ℹ️ No resolver provided. Using built-in math + default mock resolver.');
+  // Only add builtInMathResolver if allowed
+  if (allowedResolvers.has('builtInMathResolver')) {
+    resolvers.push(builtInMathResolver);
+  }
+
+  // Add user resolvers only if their name is allowed
+  for (const r of userResolvers) {
+    const name = r.resolverName || r.name || 'unknown';
+    if (allowedResolvers.has(name)) {
+      resolvers.push(r);
+    } else if (verbose) {
+      console.warn(` ⚠️  Skipping disallowed user resolver: ${name}`);
+    }
+  }
+
+  // Only add defaultMockResolver if explicitly allowed
+  if (allowedResolvers.has('defaultMockResolver')) {
+    resolvers.push(defaultMockResolver);
+  }
+
+  if (resolvers.length === 0) {
+    if (verbose) {
+      console.warn(' ⚠️  No allowed resolvers loaded. Actions may fail.');
+    }
   } else {
-    console.log(`📦 Loaded user resolvers: ${specifiers.join(', ')}`);
+    if (verbose) {
+      console.log(` ℹ️  Loaded allowed resolvers: ${resolvers.map(r => r.resolverName || 'anonymous').join(', ')}`);
+    }
   }
 
   return createResolverChain(resolvers, verbose);
@@ -136,7 +151,6 @@ function loadResolverChain(specifiers, verbose = false) {
  * CLI Setup
  */
 const program = new Command();
-
 program
   .name('olang')
   .description('O-Lang CLI: run .ol workflows with rule-enforced agent governance')
@@ -162,29 +176,27 @@ program
   .action(async (file, options) => {
     try {
       ensureOlExtension(file);
-
       const content = fs.readFileSync(file, 'utf8');
-      const workflow = parse(content);
-
+      const workflow = parse(content, file);
       if (!workflow || typeof workflow !== 'object') {
-        console.error('❌ Error: Parsed workflow is invalid or empty');
+        console.error(' ❌  Error: Parsed workflow is invalid or empty');
         process.exit(1);
       }
-
       if (options.verbose) {
-        console.log('📄 Parsed Workflow:', JSON.stringify(workflow, null, 2));
+        console.log(' 📄  Parsed Workflow:', JSON.stringify(workflow, null, 2));
       }
 
-      const resolver = loadResolverChain(options.resolver, options.verbose);
+      // ✅ Pass allowedResolvers to loadResolverChain
+      const allowedSet = new Set(workflow.allowedResolvers.map(r => r.trim()));
+      const resolver = loadResolverChain(options.resolver, options.verbose, allowedSet);
 
       const result = await execute(workflow, options.input, resolver, options.verbose);
-
       console.log('\n=== Workflow Result ===');
       console.log(JSON.stringify(result, null, 2));
     } catch (err) {
-      console.error('❌ Error:', err.message);
+      console.error(' ❌  Error:', err.message);
       process.exit(1);
     }
   });
 
-program.parse(process.argv);
+program.parse(process.argv);

package/package.json

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

package/src/parser.js

@@ -1,12 +1,9 @@
 // src/parser.js
-
 function parse(code, fileName = null) {
   if (fileName && !fileName.endsWith(".ol")) {
     throw new Error(`Expected .ol workflow, got: ${fileName}`);
   }
-
   const rawLines = code.split(/\r?\n/);
-
   const lines = rawLines
     .map(l => l.trim())
     .filter(l => l && !l.startsWith('#') && !l.startsWith('//'));
@@ -17,37 +14,41 @@ function parse(code, fileName = null) {
     steps: [],
     returnValues: [],
     allowedResolvers: [],
-
     resolverPolicy: {
       declared: [],
       autoInjected: [],
       used: [],
       warnings: []
     },
-
     __warnings: [],
     __requiresMath: false
   };
 
   let i = 0;
-
   while (i < lines.length) {
     let line = lines[i];
 
-    const allowMatch = line.match(/^Allow resolvers\s*:\s*$/i);
+    // ✅ FIXED: Match both "Allow resolvers" and "Allowed resolvers"
+    const allowMatch = line.match(/^Allow(?:ed)?\s+resolvers\s*:\s*$/i);
     if (allowMatch) {
       i++;
-      while (i < lines.length && !/^[A-Za-z]/.test(lines[i])) {
-        const val = lines[i].trim();
-        if (val) {
-          workflow.allowedResolvers.push(val);
-          workflow.resolverPolicy.declared.push(val);
+      // Read all subsequent non-empty lines until a new top-level section (starts with capital letter)
+      while (i < lines.length) {
+        const nextLine = lines[i].trim();
+        // Stop if line is empty or appears to be a new top-level keyword (e.g., Step, Workflow, Return)
+        if (nextLine === '' || /^[A-Z][a-z]/.test(nextLine)) {
+          break;
+        }
+        if (nextLine) {
+          workflow.allowedResolvers.push(nextLine);
+          workflow.resolverPolicy.declared.push(nextLine);
         }
         i++;
       }
       continue;
     }
 
+    // ---- Math step patterns (standalone) ----
     let mathAdd = line.match(/^Add\s+\{(.+?)\}\s+and\s+\{(.+?)\}\s+Save as\s+(.+)$/i);
     if (mathAdd) {
       workflow.__requiresMath = true;
@@ -65,7 +66,7 @@ function parse(code, fileName = null) {
       workflow.__requiresMath = true;
       workflow.steps.push({
         type: 'calculate',
-        expression: `subtract({${mathSub[2]}}, {${mathSub[1]}})`,
+        expression: `subtract({${mathAdd[2]}}, {${mathAdd[1]}})`,
         saveAs: mathSub[3].trim()
       });
       i++;
@@ -96,6 +97,7 @@ function parse(code, fileName = null) {
       continue;
     }
 
+    // ---- Workflow declaration ----
     const wfMatch = line.match(/^Workflow\s+"([^"]+)"(?:\s+with\s+(.+))?/i);
     if (wfMatch) {
       workflow.name = wfMatch[1];
@@ -106,96 +108,84 @@ function parse(code, fileName = null) {
       continue;
     }
 
-// ---------------------------
-// Return statement (updated: auto-detect math)
-// ---------------------------
-const returnMatch = line.match(/^Return\s+(.+)$/i);
-if (returnMatch) {
-  const returns = returnMatch[1].split(',').map(v => v.trim());
-  workflow.returnValues = returns;
-
-  // --- Check if any return vars come from math steps ---
-  for (const retVar of returns) {
-    const producedByMath = workflow.steps.some(
-      s => s.saveAs === retVar && s.type === 'calculate'
-    );
-    if (producedByMath) workflow.__requiresMath = true;
-  }
-
-  i++;
-  continue;
-}
-
-
-    // ---------------------------
-// Steps (updated: auto-detect math + saveAs)
-// ---------------------------
-const stepMatch = line.match(/^Step\s+(\d+)\s*:\s*(.+)$/i);
-if (stepMatch) {
-  const stepNum = parseInt(stepMatch[1], 10);
-  const raw = stepMatch[2].trim();
-
-  // --- Detect math inside Step ---
-  let mathDetected = null;
-  let expr = '';
-  let saveVar = null;
-
-  const mathOps = [
-    { re: /^Add\s+\{(.+?)\}\s+and\s+\{(.+?)\}\s+Save as\s+(.+)$/i, fn: 'add' },
-    { re: /^Subtract\s+\{(.+?)\}\s+from\s+\{(.+?)\}\s+Save as\s+(.+)$/i, fn: 'subtract' },
-    { re: /^Multiply\s+\{(.+?)\}\s+and\s+\{(.+?)\}\s+Save as\s+(.+)$/i, fn: 'multiply' },
-    { re: /^Divide\s+\{(.+?)\}\s+by\s+\{(.+?)\}\s+Save as\s+(.+)$/i, fn: 'divide' }
-  ];
-
-  for (const op of mathOps) {
-    const m = raw.match(op.re);
-    if (m) {
-      mathDetected = op.fn;
-      saveVar = m[3].trim();
-      if (op.fn === 'subtract') expr = `subtract({${m[2]}}, {${m[1]}})`;
-      else expr = `${op.fn}({${m[1]}}, {${m[2]}})`;
-      break;
+    // ---- Return statement (updated: auto-detect math) ----
+    const returnMatch = line.match(/^Return\s+(.+)$/i);
+    if (returnMatch) {
+      const returns = returnMatch[1].split(',').map(v => v.trim());
+      workflow.returnValues = returns;
+      // Check if any return vars come from math steps
+      for (const retVar of returns) {
+        const producedByMath = workflow.steps.some(
+          s => s.saveAs === retVar && s.type === 'calculate'
+        );
+        if (producedByMath) workflow.__requiresMath = true;
+      }
+      i++;
+      continue;
     }
-  }
-
-  if (mathDetected) workflow.__requiresMath = true;
-
-  workflow.steps.push({
-    type: mathDetected ? 'calculate' : 'action',
-    stepNumber: stepNum,
-    actionRaw: mathDetected ? null : raw,
-    expression: mathDetected ? expr : undefined,
-    saveAs: saveVar,
-    constraints: {}
-  });
 
-  i++;
-  continue;
-}
+    // ---- Step parsing (with inline math detection) ----
+    const stepMatch = line.match(/^Step\s+(\d+)\s*:\s*(.+)$/i);
+    if (stepMatch) {
+      const stepNum = parseInt(stepMatch[1], 10);
+      const raw = stepMatch[2].trim();
+
+      let mathDetected = null;
+      let expr = '';
+      let saveVar = null;
+      const mathOps = [
+        { re: /^Add\s+\{(.+?)\}\s+and\s+\{(.+?)\}\s+Save as\s+(.+)$/i, fn: 'add' },
+        { re: /^Subtract\s+\{(.+?)\}\s+from\s+\{(.+?)\}\s+Save as\s+(.+)$/i, fn: 'subtract' },
+        { re: /^Multiply\s+\{(.+?)\}\s+and\s+\{(.+?)\}\s+Save as\s+(.+)$/i, fn: 'multiply' },
+        { re: /^Divide\s+\{(.+?)\}\s+by\s+\{(.+?)\}\s+Save as\s+(.+)$/i, fn: 'divide' }
+      ];
+      for (const op of mathOps) {
+        const m = raw.match(op.re);
+        if (m) {
+          mathDetected = op.fn;
+          saveVar = m[3].trim();
+          if (op.fn === 'subtract') {
+            expr = `subtract({${m[2]}}, {${m[1]}})`;
+          } else {
+            expr = `${op.fn}({${m[1]}}, {${m[2]}})`;
+          }
+          break;
+        }
+      }
+      if (mathDetected) workflow.__requiresMath = true;
+      workflow.steps.push({
+        type: mathDetected ? 'calculate' : 'action',
+        stepNumber: stepNum,
+        actionRaw: mathDetected ? null : raw,
+        expression: mathDetected ? expr : undefined,
+        saveAs: saveVar,
+        constraints: {}
+      });
+      i++;
+      continue;
+    }
 
+    // ---- Save as (for legacy or multi-line steps) ----
     const saveMatch = line.match(/^Save as\s+(.+)$/i);
     if (saveMatch && workflow.steps.length > 0) {
       const lastStep = workflow.steps[workflow.steps.length - 1];
       lastStep.saveAs = saveMatch[1].trim();
-
       if (lastStep.saveAs.match(/[A-Z][A-Za-z0-9_]*/)) {
         workflow.__requiresMath = true;
       }
-
       i++;
       continue;
     }
 
+    // ---- Constraint parsing ----
     const constraintMatch = line.match(/^Constraint:\s*(.+)$/i);
     if (constraintMatch && workflow.steps.length > 0) {
       const lastStep = workflow.steps[workflow.steps.length - 1];
       if (!lastStep.constraints) lastStep.constraints = {};
-
       const eq = constraintMatch[1].match(/^([^=]+)=\s*(.+)$/);
       if (eq) {
         let key = eq[1].trim();
         let value = eq[2].trim();
-
         if (value.startsWith('[') && value.endsWith(']')) {
           value = value.slice(1, -1).split(',').map(v =>
             v.trim().replace(/^"/, '').replace(/"$/, '')
@@ -205,7 +195,6 @@ if (stepMatch) {
         } else if (value.startsWith('"') && value.endsWith('"')) {
           value = value.slice(1, -1);
         }
-
         lastStep.constraints[key] = value;
       }
       i++;
@@ -220,7 +209,6 @@ if (stepMatch) {
   // ============================
   if (workflow.__requiresMath) {
     workflow.resolverPolicy.used.push('builtInMathResolver');
-
     if (!workflow.resolverPolicy.declared.includes('builtInMathResolver')) {
       workflow.resolverPolicy.autoInjected.push('builtInMathResolver');
       workflow.allowedResolvers.unshift('builtInMathResolver');
@@ -237,7 +225,6 @@ if (stepMatch) {
   }
 
   workflow.resolverPolicy.warnings = workflow.__warnings.slice();
-
   return workflow;
 }
 
@@ -247,7 +234,6 @@ if (stepMatch) {
 function parseBlock(lines) {
   const steps = [];
   let current = null;
-
   for (const line of lines) {
     const stepMatch = line.match(/^Step\s+(\d+)\s*:\s*(.+)$/i);
     if (stepMatch) {
@@ -261,37 +247,30 @@ function parseBlock(lines) {
       steps.push(current);
       continue;
     }
-
     const saveMatch = line.match(/^Save as\s+(.+)$/i);
     if (saveMatch && current) current.saveAs = saveMatch[1].trim();
-
     const debriefMatch = line.match(/^Debrief\s+(\w+)\s+with\s+"(.+)"$/i);
     if (debriefMatch) {
       steps.push({ type: 'debrief', agent: debriefMatch[1], message: debriefMatch[2] });
     }
-
     const evolveMatch = line.match(/^Evolve\s+(\w+)\s+using\s+feedback:\s+"(.+)"$/i);
     if (evolveMatch) {
       steps.push({ type: 'evolve', agent: evolveMatch[1], feedback: evolveMatch[2] });
     }
-
     const promptMatch = line.match(/^Prompt user to\s+"(.+)"$/i);
     if (promptMatch) {
       steps.push({ type: 'prompt', question: promptMatch[1], saveAs: null });
     }
-
     const useMatch = line.match(/^Use\s+(.+)$/i);
     if (useMatch) {
       steps.push({ type: 'use', tool: useMatch[1].trim(), saveAs: null, constraints: {} });
     }
-
     const askMatch = line.match(/^Ask\s+(.+)$/i);
     if (askMatch) {
       steps.push({ type: 'ask', target: askMatch[1].trim(), saveAs: null, constraints: {} });
     }
   }
-
   return steps;
 }
 
-module.exports = { parse };
+module.exports = { parse };