dirac-lang 0.1.43 → 0.1.45

package/dist/{chunk-BN7IKYVP.js → chunk-DIDPRJUP.js}

@@ -175,20 +175,32 @@ function executeVariable(session, element) {
 }
 
 // src/tags/assign.ts
-function executeAssign(session, element) {
+async function executeAssign(session, element) {
   const name = element.attributes.name;
   const valueAttr = element.attributes.value;
+  const trimAttr = element.attributes.trim;
   if (!name) {
     throw new Error("<assign> requires name attribute");
   }
   let value;
   if (valueAttr !== void 0) {
     value = substituteVariables(session, valueAttr);
+  } else if (element.children && element.children.length > 0) {
+    const prevOutput = session.output;
+    session.output = [];
+    for (const child of element.children) {
+      await integrate(session, child);
+    }
+    value = session.output.join("");
+    session.output = prevOutput;
   } else if (element.text) {
     value = substituteVariables(session, element.text);
   } else {
     value = "";
   }
+  if (trimAttr === "true" && typeof value === "string") {
+    value = value.trim();
+  }
   for (let i = session.variables.length - 1; i >= 0; i--) {
     if (session.variables[i].name === name) {
       session.variables[i].value = value;
@@ -448,12 +460,12 @@ async function executeIf(session, element) {
   const condition = await evaluatePredicate(session, conditionElement);
   if (condition) {
     if (thenElement) {
-      const { integrateChildren: integrateChildren2 } = await import("./interpreter-7N52YTBH.js");
+      const { integrateChildren: integrateChildren2 } = await import("./interpreter-NAUTRIK2.js");
       await integrateChildren2(session, thenElement);
     }
   } else {
     if (elseElement) {
-      const { integrateChildren: integrateChildren2 } = await import("./interpreter-7N52YTBH.js");
+      const { integrateChildren: integrateChildren2 } = await import("./interpreter-NAUTRIK2.js");
       await integrateChildren2(session, elseElement);
     }
   }
@@ -466,7 +478,7 @@ async function evaluatePredicate(session, predicateElement) {
     return await evaluateCondition(session, predicateElement);
   }
   const outputLengthBefore = session.output.length;
-  const { integrate: integrate2 } = await import("./interpreter-7N52YTBH.js");
+  const { integrate: integrate2 } = await import("./interpreter-NAUTRIK2.js");
   await integrate2(session, predicateElement);
   const newOutputChunks = session.output.slice(outputLengthBefore);
   const result = newOutputChunks.join("").trim();
@@ -489,11 +501,11 @@ async function evaluateCondition(session, condElement) {
   }
   const outputLengthBefore = session.output.length;
   const args = [];
-  const { integrate: integrate2 } = await import("./interpreter-7N52YTBH.js");
+  const { integrate: integrate2 } = await import("./interpreter-NAUTRIK2.js");
   for (const child of condElement.children) {
     if (child.tag.toLowerCase() === "arg") {
       const argOutputStart = session.output.length;
-      const { integrateChildren: integrateChildren2 } = await import("./interpreter-7N52YTBH.js");
+      const { integrateChildren: integrateChildren2 } = await import("./interpreter-NAUTRIK2.js");
       await integrateChildren2(session, child);
       const newChunks = session.output.slice(argOutputStart);
       const argValue = newChunks.join("");
@@ -556,6 +568,23 @@ async function executeLLM(session, element) {
   if (!session.llmClient) {
     throw new Error("<llm> tag requires LLM configuration. Set LLM_PROVIDER (ollama/anthropic/openai/custom) and appropriate API keys in environment or config.yml");
   }
+  const callAnthropic = async (client, model2, maxTokens2, temperature2, messages) => {
+    const systemMessages = messages.filter((m) => m.role === "system");
+    const userAssistantMessages = messages.filter((m) => m.role !== "system");
+    const systemContent = systemMessages.map((m) => m.content).join("\n\n");
+    const anthropicParams = {
+      model: model2,
+      max_tokens: maxTokens2,
+      temperature: temperature2,
+      messages: userAssistantMessages
+    };
+    if (systemContent) {
+      anthropicParams.system = systemContent;
+    }
+    const response = await client.messages.create(anthropicParams);
+    const content = response.content[0];
+    return content.type === "text" ? content.text : "";
+  };
   if (session.limits.currentLLMCalls >= session.limits.maxLLMCalls) {
     throw new Error("Maximum LLM calls exceeded");
   }
@@ -568,6 +597,7 @@ async function executeLLM(session, element) {
   const model = element.attributes.model || process.env.DEFAULT_MODEL || defaultModel;
   const outputVar = element.attributes.output;
   const contextVar = element.attributes.context;
+  const saveDialog = element.attributes["save-dialog"] === "true";
   const executeMode = element.attributes.execute === "true";
   const temperature = parseFloat(element.attributes.temperature || "1.0");
   const maxTokens = parseInt(element.attributes.maxTokens || "4096", 10);
@@ -586,23 +616,29 @@ async function executeLLM(session, element) {
     throw new Error("<LLM> requires prompt content");
   }
   let dialogHistory = [];
-  if (contextVar) {
-    const existing = getVariable(session, contextVar);
+  let hasExistingDialog = false;
+  if (contextVar || saveDialog) {
+    const varName = contextVar || "__llm_dialog__";
+    const existing = getVariable(session, varName);
+    if (session.debug) {
+      console.error(`[LLM] Checking for dialog context in variable: ${varName}`);
+      console.error(`[LLM] Existing value type: ${Array.isArray(existing) ? "array" : typeof existing}`);
+      if (Array.isArray(existing)) {
+        console.error(`[LLM] Existing dialog length: ${existing.length} messages`);
+      }
+    }
     if (Array.isArray(existing)) {
       dialogHistory = [...existing];
+      hasExistingDialog = dialogHistory.length > 0;
     } else if (existing) {
       dialogHistory = [{ role: "system", content: String(existing) }];
+      hasExistingDialog = true;
     }
   }
   const noExtra = element.attributes.noextra === "true";
-  let prompt;
   let systemPrompt = "";
-  if (noExtra) {
-    prompt = userPrompt;
-    if (session.debug || process.env.DIRAC_LOG_PROMPT === "1") {
-      console.error("[LLM] Full prompt sent to LLM (noextra):\n" + prompt + "\n");
-    }
-  } else {
+  let currentUserPrompt = userPrompt;
+  if (!noExtra) {
     const { getAvailableSubroutines: getAvailableSubroutines2 } = await import("./session-UBATJEND.js");
     const subroutines = getAvailableSubroutines2(session);
     if (session.debug) {
@@ -611,48 +647,85 @@ async function executeLLM(session, element) {
         subroutines.map((s) => ({ name: s.name, description: s.description, parameters: s.parameters }))
       );
     }
-    systemPrompt = `Dirac is a XML based language, you define the subroutine like
+    if (hasExistingDialog && (contextVar || saveDialog)) {
+      systemPrompt = "Updated available Dirac XML tags:";
+      for (const sub of subroutines) {
+        systemPrompt += `
+- ${sub.name} : ${sub.description || ""}`;
+        systemPrompt += `
+	Ex: <${sub.name}`;
+        if (sub.parameters && sub.parameters.length > 0) {
+          for (const p of sub.parameters) {
+            systemPrompt += ` ${p.name}="${p.example || "string"}"`;
+          }
+        }
+        let example = sub.meta?.body?.example || "";
+        example = example.replace(/&quot;/g, '"').replace(/&#58;/g, ":");
+        systemPrompt += ">" + example + "</" + sub.name + ">";
+      }
+      currentUserPrompt = systemPrompt + "\n\nUser request: " + userPrompt;
+      if (session.debug || process.env.DIRAC_LOG_PROMPT === "1") {
+        console.error("[LLM] Continuing dialog with updated subroutines\n");
+      }
+    } else {
+      systemPrompt = `Dirac is a XML-based language. To define a subroutine with parameters:
+
 \`\`\`xml
-<subroutine name=background param-color="string">
- <paint_the_color_somewhere />
+<subroutine name="greet" param-name="string">
+  <!-- param-name defines a parameter called "name" -->
+  <!-- Access it inside using: <variable name="name"/> -->
+  <output>Hello, <variable name="name"/>!</output>
 </subroutine>
 \`\`\`
-then you call it like
+
+To call it:
 \`\`\`xml
-<background color="blue" />
+<greet name="Alice" />
+<!-- Use just the parameter name (name), NOT param-name -->
 \`\`\`
+
+CRITICAL: When defining parameters:
+- Use param-NAME="type" format where NAME is the parameter's name
+- Example: param-username="string" means parameter is called "username"
+- Inside the subroutine, access with: <variable name="username"/>
+- When calling: <mytag username="John" /> (use parameter name directly)
 `;
-    systemPrompt += "Now, You are an expert Dirac XML code generator.\nAllowed Dirac XML tags (use ONLY these tags):";
-    for (const sub of subroutines) {
-      systemPrompt += `
+      systemPrompt += "Now, You are an expert Dirac XML code generator.\nAllowed Dirac XML tags (use ONLY these tags):";
+      for (const sub of subroutines) {
+        systemPrompt += `
 - ${sub.name} : ${sub.description || ""}`;
-      systemPrompt += `
+        systemPrompt += `
 	Ex: <${sub.name}`;
-      if (sub.parameters && sub.parameters.length > 0) {
-        for (const p of sub.parameters) {
-          systemPrompt += ` ${p.name}="${p.example || "string"}"`;
+        if (sub.parameters && sub.parameters.length > 0) {
+          for (const p of sub.parameters) {
+            systemPrompt += ` ${p.name}="${p.example || "string"}"`;
+          }
         }
+        let example = sub.meta?.body?.example || "";
+        example = example.replace(/&quot;/g, '"').replace(/&#58;/g, ":");
+        systemPrompt += ">" + example + "</" + sub.name + ">";
+      }
+      systemPrompt += "\n\nIMPORTANT INSTRUCTIONS:";
+      systemPrompt += "\n1. Output ONLY valid XML tags from the list above";
+      systemPrompt += "\n2. Do NOT include any explanations, descriptions, or extra text";
+      systemPrompt += "\n3. Do NOT use bullet points or formatting - just pure XML";
+      systemPrompt += "\n4. Do NOT invent tags - only use tags from the list above";
+      systemPrompt += "\n5. Start your response directly with the XML tag (e.g., <add ...>)";
+      systemPrompt += "\n\nDouble-check: Does your response contain ONLY XML tags? If not, remove all non-XML text.";
+      if (dialogHistory.length === 0) {
+        dialogHistory.push({ role: "system", content: systemPrompt });
       }
-      let example = sub.meta?.body?.example || "";
-      example = example.replace(/&quot;/g, '"').replace(/&#58;/g, ":");
-      systemPrompt += ">" + example + "</" + sub.name + ">";
-    }
-    systemPrompt += "\n\nIMPORTANT INSTRUCTIONS:";
-    systemPrompt += "\n1. Output ONLY valid XML tags from the list above";
-    systemPrompt += "\n2. Do NOT include any explanations, descriptions, or extra text";
-    systemPrompt += "\n3. Do NOT use bullet points or formatting - just pure XML";
-    systemPrompt += "\n4. Do NOT invent tags - only use tags from the list above";
-    systemPrompt += "\n5. Start your response directly with the XML tag (e.g., <add ...>)";
-    systemPrompt += "\n\nDouble-check: Does your response contain ONLY XML tags? If not, remove all non-XML text.";
-    prompt = systemPrompt + "\nUser: " + userPrompt + "\nOutput:";
-    if (session.debug || process.env.DIRAC_LOG_PROMPT === "1") {
-      console.error("[LLM] Full prompt sent to LLM:\n" + prompt + "\n");
-    }
-  }
-  dialogHistory.push({ role: "user", content: noExtra ? userPrompt : prompt });
+      currentUserPrompt = userPrompt;
+      if (session.debug || process.env.DIRAC_LOG_PROMPT === "1") {
+        console.error("[LLM] First call - sending full system prompt\n");
+      }
+    }
+  }
+  dialogHistory.push({ role: "user", content: currentUserPrompt });
   if (session.debug) {
-    console.error(`[LLM] Calling ${model} with prompt length: ${prompt.length}`);
+    console.error(`[LLM] Calling ${model}`);
     console.error(`[LLM] Dialog history length: ${dialogHistory.length} messages`);
+    console.error(`[LLM] Has existing dialog: ${hasExistingDialog}`);
   }
   try {
     let result;
@@ -680,21 +753,21 @@ then you call it like
         messages: dialogHistory
       });
     } else {
-      const response = await session.llmClient.messages.create({
-        model,
-        max_tokens: maxTokens,
-        temperature,
-        messages: dialogHistory
-      });
-      const content = response.content[0];
-      result = content.type === "text" ? content.text : "";
+      result = await callAnthropic(session.llmClient, model, maxTokens, temperature, dialogHistory);
     }
     if (session.debug) {
       console.error(`[LLM] Response length: ${result.length}`);
+      console.error(`[LLM] Generated code:
+${result}
+`);
     }
-    if (contextVar) {
-      dialogHistory.push({ role: "assistant", content: result });
-      setVariable(session, contextVar, dialogHistory, true);
+    dialogHistory.push({ role: "assistant", content: result });
+    const varName = contextVar || (saveDialog ? "__llm_dialog__" : null);
+    if (varName) {
+      if (session.debug) {
+        console.error(`[LLM] Saving dialog history (${dialogHistory.length} messages) to: ${varName}`);
+      }
+      setVariable(session, varName, dialogHistory, true);
     }
     if (outputVar) {
       setVariable(session, outputVar, result, false);
@@ -776,18 +849,13 @@ Please fix these errors and generate valid Dirac XML again. Remember to only use
                   messages: dialogHistory
                 });
               } else {
-                const response = await session.llmClient.messages.create({
-                  model,
-                  max_tokens: maxTokens,
-                  temperature,
-                  messages: dialogHistory
-                });
-                const content = response.content[0];
-                result = content.type === "text" ? content.text : "";
+                result = await callAnthropic(session.llmClient, model, maxTokens, temperature, dialogHistory);
               }
               dialogHistory.push({ role: "assistant", content: result });
               if (contextVar) {
                 setVariable(session, contextVar, dialogHistory, true);
+              } else if (saveDialog) {
+                setVariable(session, "__llm_dialog__", dialogHistory, true);
               }
               if (session.debug) {
                 console.error(`[LLM] Retry ${retryCount} response:
@@ -864,18 +932,13 @@ ${feedbackPrompt}
                 messages: dialogHistory
               });
             } else {
-              const response = await session.llmClient.messages.create({
-                model,
-                max_tokens: maxTokens,
-                temperature,
-                messages: dialogHistory
-              });
-              const content = response.content[0];
-              result = content.type === "text" ? content.text : "";
+              result = await callAnthropic(session.llmClient, model, maxTokens, temperature, dialogHistory);
             }
             dialogHistory.push({ role: "assistant", content: result });
             if (contextVar) {
               setVariable(session, contextVar, dialogHistory, true);
+            } else if (saveDialog) {
+              setVariable(session, "__llm_dialog__", dialogHistory, true);
             }
             if (session.debug) {
               console.error(`[LLM] Feedback response:
@@ -1382,7 +1445,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-7N52YTBH.js");
+      const { integrate: integrate2 } = await import("./interpreter-NAUTRIK2.js");
       await integrate2(session, elementToExecute);
     }
   }
@@ -1391,7 +1454,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-7N52YTBH.js");
+  const { integrateChildren: integrateChildren2 } = await import("./interpreter-NAUTRIK2.js");
   const exceptionDom = {
     tag: "exception-content",
     attributes: { name: exceptionName },
@@ -1404,7 +1467,7 @@ async function executeThrow(session, element) {
 // src/tags/try.ts
 async function executeTry(session, element) {
   setExceptionBoundary(session);
-  const { integrateChildren: integrateChildren2 } = await import("./interpreter-7N52YTBH.js");
+  const { integrateChildren: integrateChildren2 } = await import("./interpreter-NAUTRIK2.js");
   await integrateChildren2(session, element);
   unsetExceptionBoundary(session);
 }
@@ -1414,7 +1477,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-7N52YTBH.js");
+    const { integrateChildren: integrateChildren2 } = await import("./interpreter-NAUTRIK2.js");
     await integrateChildren2(session, element);
   }
   flushCurrentException(session);
@@ -1423,7 +1486,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-7N52YTBH.js");
+  const { integrateChildren: integrateChildren2 } = await import("./interpreter-NAUTRIK2.js");
   for (const exceptionDom of exceptions) {
     await integrateChildren2(session, exceptionDom);
   }
@@ -1886,7 +1949,7 @@ async function executeLoadContext(session, element) {
     query = element.text.trim();
   }
   if (!query && element.children.length > 0) {
-    const { integrate: integrate2 } = await import("./interpreter-7N52YTBH.js");
+    const { integrate: integrate2 } = await import("./interpreter-NAUTRIK2.js");
     const beforeOutput = session.output.length;
     for (const child of element.children) {
       await integrate2(session, child);
@@ -2125,7 +2188,7 @@ async function executeForeach(session, element) {
     const parser2 = new DiracParser2();
     try {
       const fromElement = parser2.parse(fromAttr);
-      const { integrate: integrate2 } = await import("./interpreter-7N52YTBH.js");
+      const { integrate: integrate2 } = await import("./interpreter-NAUTRIK2.js");
       await integrate2(session, fromElement);
     } catch (e) {
       session.output = savedOutput;

package/dist/{chunk-G5UIFJ5I.js → chunk-ZKJVGWKK.js}

@@ -1,6 +1,6 @@
 import {
   integrate
-} from "./chunk-BN7IKYVP.js";
+} from "./chunk-DIDPRJUP.js";
 import {
   DiracParser
 } from "./chunk-HRHAMPOB.js";

package/dist/cli.js

@@ -4,8 +4,8 @@ import {
 } from "./chunk-UEFKQRYN.js";
 import {
   execute
-} from "./chunk-G5UIFJ5I.js";
-import "./chunk-BN7IKYVP.js";
+} from "./chunk-ZKJVGWKK.js";
+import "./chunk-DIDPRJUP.js";
 import "./chunk-HRHAMPOB.js";
 import "./chunk-4QLTSCDG.js";
 import "./chunk-GLXVY235.js";
@@ -16,7 +16,7 @@ import "dotenv/config";
 // package.json
 var package_default = {
   name: "dirac-lang",
-  version: "0.1.42",
+  version: "0.1.45",
   description: "LLM-Augmented Declarative Execution",
   type: "module",
   main: "dist/index.js",
@@ -96,7 +96,7 @@ async function main() {
     process.exit(0);
   }
   if (args[0] === "shell") {
-    const { DiracShell } = await import("./shell-HPRM7WFE.js");
+    const { DiracShell } = await import("./shell-LMUSTGDX.js");
     const shellConfig = { debug: false };
     for (let i = 1; i < args.length; i++) {
       const arg = args[i];
@@ -142,6 +142,9 @@ async function main() {
   let filePath;
   let emitXml = false;
   let configFile;
+  if (process.env.DEBUG === "1") {
+    config.debug = true;
+  }
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
     if (arg === "--debug") {

package/dist/index.js

@@ -2,10 +2,10 @@ import {
   createLLMAdapter,
   execute,
   executeUserCommand
-} from "./chunk-G5UIFJ5I.js";
+} from "./chunk-ZKJVGWKK.js";
 import {
   integrate
-} from "./chunk-BN7IKYVP.js";
+} from "./chunk-DIDPRJUP.js";
 import {
   DiracParser
 } from "./chunk-HRHAMPOB.js";

package/dist/{interpreter-7N52YTBH.js → interpreter-NAUTRIK2.js}

@@ -1,7 +1,7 @@
 import {
   integrate,
   integrateChildren
-} from "./chunk-BN7IKYVP.js";
+} from "./chunk-DIDPRJUP.js";
 import "./chunk-HRHAMPOB.js";
 import "./chunk-4QLTSCDG.js";
 import "./chunk-GLXVY235.js";

package/dist/{schedule-CROFBEVH.js → schedule-WPGXPI26.js}

@@ -3,7 +3,7 @@ import {
   listScheduledTasks,
   stopAllScheduledTasks,
   stopScheduledTask
-} from "./chunk-BN7IKYVP.js";
+} from "./chunk-DIDPRJUP.js";
 import "./chunk-HRHAMPOB.js";
 import "./chunk-4QLTSCDG.js";
 import "./chunk-GLXVY235.js";

package/dist/{shell-HPRM7WFE.js → shell-LMUSTGDX.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-UEFKQRYN.js";
 import {
   integrate
-} from "./chunk-BN7IKYVP.js";
+} from "./chunk-DIDPRJUP.js";
 import {
   DiracParser
 } from "./chunk-HRHAMPOB.js";
@@ -66,7 +66,7 @@ var DiracShell = class {
     });
     this.rl.on("close", () => {
       this.saveHistory();
-      import("./schedule-CROFBEVH.js").then(({ stopAllScheduledTasks }) => {
+      import("./schedule-WPGXPI26.js").then(({ stopAllScheduledTasks }) => {
         stopAllScheduledTasks();
         console.log("\nGoodbye!");
         process.exit(0);
@@ -366,7 +366,7 @@ Examples:
         break;
       case "tasks":
         try {
-          const { listScheduledTasks } = await import("./schedule-CROFBEVH.js");
+          const { listScheduledTasks } = await import("./schedule-WPGXPI26.js");
           const tasks = listScheduledTasks();
           if (tasks.length === 0) {
             console.log("No scheduled tasks running.");
@@ -385,7 +385,7 @@ Examples:
           console.log("Usage: :stop <task-name>");
         } else {
           try {
-            const { stopScheduledTask } = await import("./schedule-CROFBEVH.js");
+            const { stopScheduledTask } = await import("./schedule-WPGXPI26.js");
             const taskName = args[0];
             const stopped = stopScheduledTask(taskName);
             if (stopped) {
@@ -400,7 +400,7 @@ Examples:
         break;
       case "stopall":
         try {
-          const { stopAllScheduledTasks } = await import("./schedule-CROFBEVH.js");
+          const { stopAllScheduledTasks } = await import("./schedule-WPGXPI26.js");
           stopAllScheduledTasks();
           console.log("All scheduled tasks stopped.");
         } catch (error) {

package/dist/test-runner.js

@@ -1,6 +1,6 @@
 import {
   integrate
-} from "./chunk-BN7IKYVP.js";
+} from "./chunk-DIDPRJUP.js";
 import {
   DiracParser
 } from "./chunk-HRHAMPOB.js";

package/package.json

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