dirac-lang 0.1.15 → 0.1.17

package/config.test.yml

@@ -0,0 +1,5 @@
+# Test configuration for verifying embedding config works
+embeddingServer:
+  host: localhost
+  port: 11434
+  model: nomic-embed-text  # Different model to test config loading

package/dist/{chunk-UO6QEXZV.js → chunk-3FECP4IA.js}

@@ -1,6 +1,6 @@
 import {
   integrate
-} from "./chunk-74EQEVS6.js";
+} from "./chunk-OB7IXRFP.js";
 import {
   DiracParser
 } from "./chunk-HRHAMPOB.js";

package/dist/{chunk-74EQEVS6.js → chunk-OB7IXRFP.js}

@@ -396,12 +396,12 @@ async function executeIf(session, element) {
   const condition = await evaluatePredicate(session, conditionElement);
   if (condition) {
     if (thenElement) {
-      const { integrateChildren: integrateChildren2 } = await import("./interpreter-SE5I5ROB.js");
+      const { integrateChildren: integrateChildren2 } = await import("./interpreter-Y465JGHU.js");
       await integrateChildren2(session, thenElement);
     }
   } else {
     if (elseElement) {
-      const { integrateChildren: integrateChildren2 } = await import("./interpreter-SE5I5ROB.js");
+      const { integrateChildren: integrateChildren2 } = await import("./interpreter-Y465JGHU.js");
       await integrateChildren2(session, elseElement);
     }
   }
@@ -414,7 +414,7 @@ async function evaluatePredicate(session, predicateElement) {
     return await evaluateCondition(session, predicateElement);
   }
   const outputLengthBefore = session.output.length;
-  const { integrate: integrate2 } = await import("./interpreter-SE5I5ROB.js");
+  const { integrate: integrate2 } = await import("./interpreter-Y465JGHU.js");
   await integrate2(session, predicateElement);
   const newOutputChunks = session.output.slice(outputLengthBefore);
   const result = newOutputChunks.join("").trim();
@@ -437,11 +437,11 @@ async function evaluateCondition(session, condElement) {
   }
   const outputLengthBefore = session.output.length;
   const args = [];
-  const { integrate: integrate2 } = await import("./interpreter-SE5I5ROB.js");
+  const { integrate: integrate2 } = await import("./interpreter-Y465JGHU.js");
   for (const child of condElement.children) {
     if (child.tag.toLowerCase() === "arg") {
       const argOutputStart = session.output.length;
-      const { integrateChildren: integrateChildren2 } = await import("./interpreter-SE5I5ROB.js");
+      const { integrateChildren: integrateChildren2 } = await import("./interpreter-Y465JGHU.js");
       await integrateChildren2(session, child);
       const newChunks = session.output.slice(argOutputStart);
       const argValue = newChunks.join("");
@@ -677,7 +677,7 @@ ${result}
           const parser = new DiracParser();
           let dynamicAST = parser.parse(diracCode);
           if (validateTags) {
-            const { validateDiracCode, applyCorrectedTags } = await import("./tag-validator-DYWFTEBE.js");
+            const { validateDiracCode, applyCorrectedTags } = await import("./tag-validator-HBCGQV6F.js");
             let validation = await validateDiracCode(session, dynamicAST, { autocorrect });
             let retryCount = 0;
             while (!validation.valid && retryCount < maxRetries) {
@@ -1106,18 +1106,24 @@ import fs from "fs";
 import yaml from "js-yaml";
 var SIMILARITY_CUTOFF = 0.75;
 function getEmbeddingServerConfig() {
-  const config = yaml.load(fs.readFileSync("config.yml", "utf8"));
-  const host = config.embeddingServer?.host || "localhost";
-  const port = config.embeddingServer?.port || 11435;
-  return { host, port };
+  try {
+    const configPath = process.env.DIRAC_CONFIG || "config.yml";
+    const config = yaml.load(fs.readFileSync(configPath, "utf8"));
+    const host = config.embeddingServer?.host || "localhost";
+    const port = config.embeddingServer?.port || 11434;
+    const model = config.embeddingServer?.model || "embeddinggemma";
+    return { host, port, model };
+  } catch (e) {
+    return { host: "localhost", port: 11434, model: "embeddinggemma" };
+  }
 }
 async function getEmbeddings(tags) {
-  const { host, port } = getEmbeddingServerConfig();
+  const { host, port, model } = getEmbeddingServerConfig();
   return await Promise.all(tags.map(async (tag) => {
     const response = await fetch(`http://${host}:${port}/api/embeddings`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ model: "embeddinggemma", prompt: tag })
+      body: JSON.stringify({ model, prompt: tag })
     });
     const data = await response.json();
     return data.embedding;
@@ -1153,6 +1159,9 @@ async function executeTagCheck(session, element) {
   const shouldExecute = element.attributes?.execute === "true";
   for (const child of element.children) {
     const tagName = child.tag;
+    if (!tagName || tagName.trim() === "") {
+      continue;
+    }
     console.error(`[tag-check] Checking tag: <${tagName}>`);
     let allValid = false;
     let correctedTag = null;
@@ -1235,7 +1244,7 @@ async function executeTagCheck(session, element) {
       const executeTag = correctedTag || tagName;
       console.error(`[tag-check] Executing <${executeTag}/> as all checks passed and execute=true.`);
       const elementToExecute = correctedTag ? { ...child, tag: correctedTag } : child;
-      const { integrate: integrate2 } = await import("./interpreter-SE5I5ROB.js");
+      const { integrate: integrate2 } = await import("./interpreter-Y465JGHU.js");
       await integrate2(session, elementToExecute);
     }
   }
@@ -1244,7 +1253,7 @@ async function executeTagCheck(session, element) {
 // src/tags/throw.ts
 async function executeThrow(session, element) {
   const exceptionName = element.attributes?.name || "exception";
-  const { integrateChildren: integrateChildren2 } = await import("./interpreter-SE5I5ROB.js");
+  const { integrateChildren: integrateChildren2 } = await import("./interpreter-Y465JGHU.js");
   const exceptionDom = {
     tag: "exception-content",
     attributes: { name: exceptionName },
@@ -1257,7 +1266,7 @@ async function executeThrow(session, element) {
 // src/tags/try.ts
 async function executeTry(session, element) {
   setExceptionBoundary(session);
-  const { integrateChildren: integrateChildren2 } = await import("./interpreter-SE5I5ROB.js");
+  const { integrateChildren: integrateChildren2 } = await import("./interpreter-Y465JGHU.js");
   await integrateChildren2(session, element);
   unsetExceptionBoundary(session);
 }
@@ -1267,7 +1276,7 @@ async function executeCatch(session, element) {
   const exceptionName = element.attributes?.name || "exception";
   const caughtCount = lookupException(session, exceptionName);
   if (caughtCount > 0) {
-    const { integrateChildren: integrateChildren2 } = await import("./interpreter-SE5I5ROB.js");
+    const { integrateChildren: integrateChildren2 } = await import("./interpreter-Y465JGHU.js");
     await integrateChildren2(session, element);
   }
   flushCurrentException(session);
@@ -1276,7 +1285,7 @@ async function executeCatch(session, element) {
 // src/tags/exception.ts
 async function executeException(session, element) {
   const exceptions = getCurrentExceptions(session);
-  const { integrateChildren: integrateChildren2 } = await import("./interpreter-SE5I5ROB.js");
+  const { integrateChildren: integrateChildren2 } = await import("./interpreter-Y465JGHU.js");
   for (const exceptionDom of exceptions) {
     await integrateChildren2(session, exceptionDom);
   }
@@ -1416,7 +1425,7 @@ async function executeForeach(session, element) {
     const parser2 = new DiracParser2();
     try {
       const fromElement = parser2.parse(fromAttr);
-      const { integrate: integrate2 } = await import("./interpreter-SE5I5ROB.js");
+      const { integrate: integrate2 } = await import("./interpreter-Y465JGHU.js");
       await integrate2(session, fromElement);
     } catch (e) {
       session.output = savedOutput;

package/dist/cli.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import {
   execute
-} from "./chunk-UO6QEXZV.js";
-import "./chunk-74EQEVS6.js";
+} from "./chunk-3FECP4IA.js";
+import "./chunk-OB7IXRFP.js";
 import "./chunk-HRHAMPOB.js";
 import "./chunk-E7PWEMZA.js";
 import "./chunk-52ED23DR.js";
@@ -13,7 +13,7 @@ import "dotenv/config";
 // package.json
 var package_default = {
   name: "dirac-lang",
-  version: "0.1.15",
+  version: "0.1.17",
   description: "LLM-Augmented Declarative Execution",
   type: "module",
   main: "dist/index.js",

package/dist/index.js

@@ -2,10 +2,10 @@ import {
   createLLMAdapter,
   execute,
   executeUserCommand
-} from "./chunk-UO6QEXZV.js";
+} from "./chunk-3FECP4IA.js";
 import {
   integrate
-} from "./chunk-74EQEVS6.js";
+} from "./chunk-OB7IXRFP.js";
 import {
   DiracParser
 } from "./chunk-HRHAMPOB.js";

package/dist/{interpreter-SE5I5ROB.js → interpreter-Y465JGHU.js}

@@ -1,7 +1,7 @@
 import {
   integrate,
   integrateChildren
-} from "./chunk-74EQEVS6.js";
+} from "./chunk-OB7IXRFP.js";
 import "./chunk-HRHAMPOB.js";
 import "./chunk-E7PWEMZA.js";
 import "./chunk-52ED23DR.js";

package/dist/{tag-validator-DYWFTEBE.js → tag-validator-HBCGQV6F.js}

@@ -4,21 +4,23 @@ import yaml from "js-yaml";
 var SIMILARITY_CUTOFF = 0.75;
 function getEmbeddingServerConfig() {
   try {
-    const config = yaml.load(fs.readFileSync("config.yml", "utf8"));
+    const configPath = process.env.DIRAC_CONFIG || "config.yml";
+    const config = yaml.load(fs.readFileSync(configPath, "utf8"));
     const host = config.embeddingServer?.host || "localhost";
-    const port = config.embeddingServer?.port || 11435;
-    return { host, port };
-  } catch {
-    return { host: "localhost", port: 11435 };
+    const port = config.embeddingServer?.port || 11434;
+    const model = config.embeddingServer?.model || "embeddinggemma";
+    return { host, port, model };
+  } catch (e) {
+    return { host: "localhost", port: 11434, model: "embeddinggemma" };
   }
 }
 async function getEmbeddings(tags) {
-  const { host, port } = getEmbeddingServerConfig();
+  const { host, port, model } = getEmbeddingServerConfig();
   return await Promise.all(tags.map(async (tag) => {
     const response = await fetch(`http://${host}:${port}/api/embeddings`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ model: "embeddinggemma", prompt: tag })
+      body: JSON.stringify({ model, prompt: tag })
     });
     const data = await response.json();
     return data.embedding;
@@ -111,7 +113,7 @@ async function validateDiracCode(session, ast, options = {}) {
   const results = [];
   const errorMessages = [];
   async function validateElement(element) {
-    if (element.tag && element.tag !== "dirac" && element.tag !== "") {
+    if (element.tag && element.tag !== "dirac" && element.tag !== "DIRAC-ROOT" && element.tag.trim() !== "") {
       const result = await validateTag(session, element, options);
       results.push(result);
       if (!result.valid) {

package/dist/test-runner.js

@@ -1,6 +1,6 @@
 import {
   integrate
-} from "./chunk-74EQEVS6.js";
+} from "./chunk-OB7IXRFP.js";
 import {
   DiracParser
 } from "./chunk-HRHAMPOB.js";
@@ -19,9 +19,8 @@ var TestRunner = class {
   config;
   constructor(testDir = "tests", configPath) {
     this.testDir = testDir;
-    const defaultConfigPath = configPath || path.resolve(process.cwd(), "config.yml");
-    if (fs.existsSync(defaultConfigPath)) {
-      this.config = yaml.load(fs.readFileSync(defaultConfigPath, "utf8")) || {};
+    if (configPath && fs.existsSync(configPath)) {
+      this.config = yaml.load(fs.readFileSync(configPath, "utf8")) || {};
     } else {
       this.config = { llmProvider: "ollama", llmModel: "llama2" };
     }

package/examples/llm-command-more.di

@@ -0,0 +1,6 @@
+<dirac>
+  <subroutine name="background" description="set the background color." param-color="string:required:color name" >
+    this is my color: <variable name="color" /> 
+  </subroutine>
+  <llm execute="true">what is the color of red mix with yellow and set the background color to that color</llm>
+</dirac>

package/examples/llm-command.di

@@ -2,5 +2,5 @@
   <subroutine name="background" description="set the background color." param-color="string:required:color name" >
     this is my color: <variable name="color" /> 
   </subroutine>
-  <llm execute="true">set the background color to red</llm>
+  <llm execute="true" validate="true">set the background color to red</llm>
 </dirac>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dirac-lang",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "description": "LLM-Augmented Declarative Execution",
   "type": "module",
   "main": "dist/index.js",

package/src/tags/tag-check.ts

@@ -15,20 +15,27 @@ const SIMILARITY_CUTOFF = 0.75;
 
 // Helper: get embedding server config from config.yml
 function getEmbeddingServerConfig() {
-  const config = yaml.load(fs.readFileSync('config.yml', 'utf8')) as any;
-  const host = config.embeddingServer?.host || 'localhost';
-  const port = config.embeddingServer?.port || 11435;
-  return { host, port };
+  try {
+    const configPath = process.env.DIRAC_CONFIG || 'config.yml';
+    const config = yaml.load(fs.readFileSync(configPath, 'utf8')) as any;
+    const host = config.embeddingServer?.host || 'localhost';
+    const port = config.embeddingServer?.port || 11434;
+    const model = config.embeddingServer?.model || 'embeddinggemma';
+    return { host, port, model };
+  } catch (e) {
+    // Fallback to defaults if config file not found
+    return { host: 'localhost', port: 11434, model: 'embeddinggemma' };
+  }
 }
 
 // Helper: call Ollama embedding API directly
 async function getEmbeddings(tags: string[]): Promise<number[][]> {
-  const { host, port } = getEmbeddingServerConfig();
+  const { host, port, model } = getEmbeddingServerConfig();
   return await Promise.all(tags.map(async tag => {
     const response = await fetch(`http://${host}:${port}/api/embeddings`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ model: 'embeddinggemma', prompt: tag })
+      body: JSON.stringify({ model, prompt: tag })
     });
     const data = await response.json();
     return data.embedding;
@@ -67,6 +74,12 @@ export async function executeTagCheck(session: DiracSession, element: DiracEleme
 
   for (const child of element.children) {
     const tagName = child.tag;
+    
+    // Skip text nodes (empty tag names) and whitespace
+    if (!tagName || tagName.trim() === '') {
+      continue;
+    }
+    
     console.error(`[tag-check] Checking tag: <${tagName}>`);
     let allValid = false;
     let correctedTag: string | null = null;

package/src/test-runner.ts

@@ -33,10 +33,10 @@ export class TestRunner {
   constructor(testDir: string = 'tests', configPath?: string) {
     this.testDir = testDir;
     
-    // Load default config
-    const defaultConfigPath = configPath || path.resolve(process.cwd(), 'config.yml');
-    if (fs.existsSync(defaultConfigPath)) {
-      this.config = yaml.load(fs.readFileSync(defaultConfigPath, 'utf8')) || {};
+    // For tests, always use ollama as the default provider (no API keys needed)
+    // Unless a specific test config is provided
+    if (configPath && fs.existsSync(configPath)) {
+      this.config = yaml.load(fs.readFileSync(configPath, 'utf8')) || {};
     } else {
       this.config = { llmProvider: 'ollama', llmModel: 'llama2' };
     }

package/src/utils/tag-validator.ts

@@ -23,23 +23,26 @@ export interface ValidationResult {
 // Helper: get embedding server config from config.yml
 function getEmbeddingServerConfig() {
   try {
-    const config = yaml.load(fs.readFileSync('config.yml', 'utf8')) as any;
+    const configPath = process.env.DIRAC_CONFIG || 'config.yml';
+    const config = yaml.load(fs.readFileSync(configPath, 'utf8')) as any;
     const host = config.embeddingServer?.host || 'localhost';
-    const port = config.embeddingServer?.port || 11435;
-    return { host, port };
-  } catch {
-    return { host: 'localhost', port: 11435 };
+    const port = config.embeddingServer?.port || 11434;
+    const model = config.embeddingServer?.model || 'embeddinggemma';
+    return { host, port, model };
+  } catch (e) {
+    // Fallback to defaults if config file not found
+    return { host: 'localhost', port: 11434, model: 'embeddinggemma' };
   }
 }
 
 // Helper: call Ollama embedding API directly
 async function getEmbeddings(tags: string[]): Promise<number[][]> {
-  const { host, port } = getEmbeddingServerConfig();
+  const { host, port, model } = getEmbeddingServerConfig();
   return await Promise.all(tags.map(async tag => {
     const response = await fetch(`http://${host}:${port}/api/embeddings`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ model: 'embeddinggemma', prompt: tag })
+      body: JSON.stringify({ model, prompt: tag })
     });
     const data = await response.json();
     return data.embedding;
@@ -179,7 +182,8 @@ export async function validateDiracCode(
   
   // Recursively validate all elements
   async function validateElement(element: DiracElement) {
-    if (element.tag && element.tag !== 'dirac' && element.tag !== '') {
+    // Skip text nodes, whitespace-only tags, and root wrapper tags
+    if (element.tag && element.tag !== 'dirac' && element.tag !== 'DIRAC-ROOT' && element.tag.trim() !== '') {
       const result = await validateTag(session, element, options);
       results.push(result);
       

package/tests/llm-validate.test.di

@@ -0,0 +1,17 @@
+<!-- TEST: llm_execute_with_validation -->
+<!-- EXPECT: Background color is: blue -->
+
+<dirac>
+  <subroutine name="set-color" 
+              description="Set a background color"
+              param-color="string:required:Color name">
+    <parameters select="@color"/>
+    <output>Background color is: <variable name="color" /></output>
+  </subroutine>
+
+  <!-- Test: LLM with execute=true and validate=true should work -->
+  <!-- This tests that DIRAC-ROOT wrapper tag is properly skipped during validation -->
+  <llm execute="true" validate="true" maxTokens="100">
+    Set the background color to blue
+  </llm>
+</dirac>

package/tests/tag-check.test.di

@@ -0,0 +1,27 @@
+<!-- TEST: tag_check_autocorrect -->
+<!-- EXPECT: The tag <background-set> was auto-corrected to <background> (similarity: 0.84)
+Color changed to: red -->
+
+<dirac>
+  <subroutine name="background" 
+              description="Change the background color"
+              param-color="string:required:Background color:red|blue|green">
+    <parameters select="@color"/>
+    <output>Color changed to: <variable name="color" /></output>
+  </subroutine>
+
+  <subroutine name="foreground"
+              description="Change the foreground text color"
+              param-color="string:required:Text color:black|white|gray">
+    <parameters select="@color"/>
+    <output>Text color changed to: <variable name="color" /></output>
+  </subroutine>
+
+  <!-- Test: tag-check should auto-correct similar tag names and execute -->
+  <defvar name="result" trim="true">
+    <tag-check execute="true" autocorrect="true">
+      <background-set color="red" />
+    </tag-check>
+  </defvar>
+  <output><variable name="result" /></output>
+</dirac>

package/config.yml

@@ -1,9 +0,0 @@
-# Dirac server configuration
-llmProvider: ollama 
-llmModel: llama3.2:3b 
-
-embeddingServer:
- host: "localhost"
- port: 11434
-
-MONGODB_URI: "mongodb://localhost:27017"

package/config.yml.bak

@@ -1,8 +0,0 @@
-# Dirac server configuration
-#llmProvider: ollama
-#llmModel: llama2 
-llmProvider: OpenAI 
-llmModel:gpt-4.1-2025-04-14 
-# Add other config options as needed
-
-MONGODB_URI: "mongodb://localhost:27017"

package/config.yml.ollama

@@ -1,6 +0,0 @@
-# Dirac server configuration
-llmProvider: ollama
-llmModel: llama2 
-# Add other config options as needed
-
-MONGODB_URI: "mongodb://localhost:27017"

package/config.yml.openai

@@ -1,6 +0,0 @@
-# Dirac server configuration
-llmProvider: openai 
-llmModel: gpt-4.1-2025-04-14 
-# Add other config options as needed
-
-MONGODB_URI: "mongodb://localhost:27017"