@o-lang/olang 1.0.1 → 1.0.3

package/cli.js

@@ -5,6 +5,21 @@ const { execute } = require('./src/runtime');
 const fs = require('fs');
 const path = require('path');
 
+/**
+ * Enforce .ol extension ONLY
+ */
+function ensureOlExtension(filename) {
+  if (!filename.endsWith('.ol')) {
+    throw new Error(
+      `Invalid file: "${filename}".\n` +
+      `O-Lang workflows must use the ".ol" extension.`
+    );
+  }
+}
+
+/**
+ * Default mock resolver (for demo use)
+ */
 async function defaultMockResolver(action, context) {
   if (action.startsWith('Search for ')) {
     return {
@@ -13,20 +28,27 @@ async function defaultMockResolver(action, context) {
       url: "mock://hr-policy"
     };
   }
+
   if (action.startsWith('Ask ')) {
-    return "✅ [Mock] Summarized for staff.";
+    return "✅ [Mock] Summarized for demonstration.";
   }
+
   if (action.startsWith('Notify ')) {
     const recipient = action.match(/Notify (\S+)/)?.[1] || 'user@example.com';
     return `📬 Notification sent to ${recipient}`;
   }
+
   if (action.startsWith('Debrief ') || action.startsWith('Evolve ')) {
     console.log(`[O-Lang] ${action}`);
     return 'Acknowledged';
   }
+
   return `[Unhandled: ${action}]`;
 }
 
+/**
+ * Resolver chaining mechanism
+ */
 function createResolverChain(resolvers) {
   return async (action, context) => {
     for (const resolver of resolvers) {
@@ -61,7 +83,9 @@ function loadSingleResolver(specifier) {
       console.log(`📁 Loaded resolver: ${absolutePath}`);
       return resolver;
     } catch (e2) {
-      throw new Error(`Failed to load resolver '${specifier}':\n  npm: ${e1.message}\n  file: ${e2.message}`);
+      throw new Error(
+        `Failed to load resolver '${specifier}':\n  npm: ${e1.message}\n  file: ${e2.message}`
+      );
     }
   }
 }
@@ -76,27 +100,41 @@ function loadResolverChain(specifiers) {
   return createResolverChain(resolvers);
 }
 
+/**
+ * CLI Setup
+ */
 const program = new Command();
 
 program
   .name('olang')
-  .description('O-Lang CLI: run .olang workflows')
+  .description('O-Lang CLI: run .ol workflows with rule-enforced agent governance')
   .command('run <file>')
-  .option('-r, --resolver <specifier>', 'Resolver (npm package or local path). Can be used multiple times.\nExample:\n  -r @o-lang/llm-groq\n  -r @o-lang/notify-telegram', (val, acc) => {
-    acc.push(val);
-    return acc;
-  }, [])
-  .option('-i, --input <k=v>', 'Input parameters', (val, acc = {}) => {
-    const [k, v] = val.split('=');
-    acc[k] = v;
-    return acc;
-  }, {})
+  .option(
+    '-r, --resolver <specifier>',
+    'Resolver (npm package or local path). Can be used multiple times.\nExample:\n  -r @o-lang/llm-groq\n  -r @o-lang/notify-telegram',
+    (val, acc) => { acc.push(val); return acc; },
+    []
+  )
+  .option(
+    '-i, --input <k=v>',
+    'Input parameters',
+    (val, acc = {}) => {
+      const [k, v] = val.split('=');
+      acc[k] = v;
+      return acc;
+    },
+    {}
+  )
   .action(async (file, options) => {
     try {
+      ensureOlExtension(file);
+
       const content = fs.readFileSync(file, 'utf8');
       const workflow = parse(content);
+
       const resolver = loadResolverChain(options.resolver);
       const result = await execute(workflow, options.input, resolver);
+
       console.log('\n=== Workflow Result ===');
       console.log(JSON.stringify(result, null, 2));
     } catch (err) {
@@ -106,10 +144,3 @@ program
   });
 
 program.parse(process.argv);
-
-
-
-
-
-
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o-lang/olang",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "author": "Olalekan Ogundipe <info@workfily.com>",
   "description": "O-Lang: A governance language for user-directed, rule-enforced agent workflows",
   "main": "./src/index.js",
@@ -18,11 +18,22 @@
     "commander": "^12.0.0",
     "dotenv": "^17.2.3"
   },
-  "keywords": ["agent", "governance", "workflow", "llm", "automation", "olang", "ai"],
+  "keywords": [
+    "agent",
+    "governance",
+    "workflow",
+    "llm",
+    "automation",
+    "olang",
+    "ai"
+  ],
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/O-Lang-Central/olang-kernel.git"
+    "url": "git+https://github.com/O-Lang-Central/olang-kernel.git"
   },
-  "homepage": "https://github.com/O-Lang-Central/olang-kernel"
-}
+  "homepage": "https://github.com/O-Lang-Central/olang-kernel",
+  "publishConfig": {
+    "access": "public"
+  }
+}

package/src/parser.js

@@ -1,5 +1,11 @@
 // src/parser.js
-function parse(code) {
+
+function parse(code, fileName = null) {
+  // --- New: Enforce .ol extension if filename provided ---
+  if (fileName && !fileName.endsWith(".ol")) {
+    throw new Error(`Expected .ol workflow, got: ${fileName}`);
+  }
+
   const lines = code
     .split(/\r?\n/)
     .map(l => l.trim())
@@ -33,7 +39,7 @@ function parse(code) {
         stepNumber: parseInt(stepMatch[1], 10),
         actionRaw: stepMatch[2].trim(),
         saveAs: null,
-        constraints: {} // Initialize constraints
+        constraints: {}
       });
       i++;
       continue;
@@ -47,7 +53,7 @@ function parse(code) {
       continue;
     }
 
-    // Constraint (NEW: parse key = value lines and attach to last step)
+    // Constraint
     const constraintMatch = line.match(/^Constraint:\s*(.+)$/i);
     if (constraintMatch && workflow.steps.length > 0) {
       const lastStep = workflow.steps[workflow.steps.length - 1];
@@ -59,16 +65,11 @@ function parse(code) {
         let key = eq[1].trim();
         let value = eq[2].trim();
 
-        // Parse list: [a, b, c]
         if (value.startsWith('[') && value.endsWith(']')) {
           value = value.slice(1, -1).split(',').map(v => v.trim().replace(/^"/, '').replace(/"$/, ''));
-        }
-        // Parse number
-        else if (!isNaN(value)) {
+        } else if (!isNaN(value)) {
           value = Number(value);
-        }
-        // Keep string (remove quotes if present)
-        else if (value.startsWith('"') && value.endsWith('"')) {
+        } else if (value.startsWith('"') && value.endsWith('"')) {
           value = value.slice(1, -1);
         }
 
@@ -88,7 +89,7 @@ function parse(code) {
         body.push(lines[i]);
         i++;
       }
-      if (i < lines.length) i++; // skip 'End If'
+      if (i < lines.length) i++;
       workflow.steps.push({ type: 'if', condition, body: parseBlock(body) });
       continue;
     }
@@ -119,7 +120,7 @@ function parse(code) {
       continue;
     }
 
-    // Agent ... uses ...
+    // Agent uses
     const agentUseMatch = line.match(/^Agent\s+"([^"]+)"\s+uses\s+"([^"]+)"$/i);
     if (agentUseMatch) {
       workflow.steps.push({
@@ -199,6 +200,32 @@ function parse(code) {
       continue;
     }
 
+    // Use <Tool>
+    const useMatch = line.match(/^Use\s+(.+)$/i);
+    if (useMatch) {
+      workflow.steps.push({
+        type: 'use',
+        tool: useMatch[1].trim(),
+        saveAs: null,
+        constraints: {}
+      });
+      i++;
+      continue;
+    }
+
+    // Ask <Target>
+    const askMatch = line.match(/^Ask\s+(.+)$/i);
+    if (askMatch) {
+      workflow.steps.push({
+        type: 'ask',
+        target: askMatch[1].trim(),
+        saveAs: null,
+        constraints: {}
+      });
+      i++;
+      continue;
+    }
+
     i++;
   }
 
@@ -221,25 +248,38 @@ 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 };
-

package/src/runtime.js

@@ -35,7 +35,6 @@ class RuntimeAPI {
     return path.split('.').reduce((o, k) => (o && o[k] !== undefined) ? o[k] : undefined, obj);
   }
 
-  // 🔍 Find the last "Ask ... Save as ..." step that can be evolved
   findLastSummaryStep() {
     for (let i = this.workflowSteps.length - 1; i >= 0; i--) {
       const step = this.workflowSteps[i];
@@ -58,6 +57,20 @@ class RuntimeAPI {
         break;
       }
 
+      case 'use': {
+        // "Use <Tool>" step
+        const res = await agentResolver(`Use ${step.tool}`, this.context);
+        if (step.saveAs) this.context[step.saveAs] = res;
+        break;
+      }
+
+      case 'ask': {
+        // "Ask <Target>" step
+        const res = await agentResolver(`Ask ${step.target}`, this.context);
+        if (step.saveAs) this.context[step.saveAs] = res;
+        break;
+      }
+
       case 'if': {
         if (this.evaluateCondition(step.condition, this.context)) {
           for (const s of step.body) await this.executeStep(s, agentResolver);
@@ -86,7 +99,6 @@ class RuntimeAPI {
       }
 
       case 'evolve': {
-        // ✅ Runtime-enforced bounded evolution
         const maxGen = step.constraints?.max_generations || 1;
         if (maxGen < 1) {
           this.context['improved_summary'] = this.context['summary'] || '';
@@ -100,34 +112,28 @@ class RuntimeAPI {
           return;
         }
 
-        const varName = summaryStep.saveAs; // e.g., "summary"
+        const varName = summaryStep.saveAs;
         let currentOutput = this.context[varName] || '';
 
-        // Run up to max_generations attempts
         for (let attempt = 0; attempt < maxGen; attempt++) {
-          // Rebuild the original action with current context (re-interpolates {doc.text}, etc.)
           let revisedAction = summaryStep.actionRaw.replace(/\{([^\}]+)\}/g, (_, path) => {
             const val = this.getNested(this.context, path.trim());
             return val !== undefined ? String(val) : `{${path}}`;
           });
 
-          // Append improvement feedback on every attempt (including first)
           if (step.feedback) {
-            revisedAction = revisedAction.replace(/(")$/ , `\n\n[IMPROVEMENT FEEDBACK: ${step.feedback}]$1`);
+            revisedAction = revisedAction.replace(/(")$/, `\n\n[IMPROVEMENT FEEDBACK: ${step.feedback}]$1`);
           }
 
-          // Delegate ONLY the "Ask ..." action to the resolver
           currentOutput = await agentResolver(revisedAction, this.context);
-          this.context[varName] = currentOutput; // update original variable
+          this.context[varName] = currentOutput;
 
-          // Optional: emit debrief for observability
           this.emit('debrief', {
             agent: step.agent || 'Evolver',
             message: `Evolve attempt ${attempt + 1}/${maxGen}: ${currentOutput.substring(0, 80)}...`
           });
         }
 
-        // ✅ Always expose final result as 'improved_summary' for downstream use
         this.context['improved_summary'] = currentOutput;
         break;
       }
@@ -167,7 +173,7 @@ class RuntimeAPI {
 
   async executeWorkflow(workflow, inputs, agentResolver) {
     this.context = { ...inputs };
-    this.workflowSteps = workflow.steps; // critical for evolve lookup
+    this.workflowSteps = workflow.steps;
 
     for (const step of workflow.steps) {
       await this.executeStep(step, agentResolver);