lua-cli 1.3.2-alpha.3 → 2.0.1

package/dist/utils/files.js

@@ -1,7 +1,7 @@
 import * as fs from "fs";
 import * as path from "path";
 import pkg from 'js-yaml';
-const { load } = pkg;
+const { load, dump } = pkg;
 export function copyTemplateFiles(templateDir, targetDir) {
     const files = fs.readdirSync(templateDir);
     for (const file of files) {
@@ -59,7 +59,6 @@ function updatePackageJson(srcPath, destPath) {
     fs.writeFileSync(destPath, JSON.stringify(templatePackageJson, null, 2) + '\n');
 }
 export function createSkillYaml(agentId, orgId, skillName, skillId, persona, welcomeMessage) {
-    const skillIdSection = skillId ? `  skillId: "${skillId}"\n` : '';
     // Handle multiline strings properly for YAML
     const personaSection = persona ? `  persona: |\n${persona.split('\n').map(line => `    ${line}`).join('\n')}\n` : '';
     const welcomeMessageSection = welcomeMessage ? `  welcomeMessage: "${welcomeMessage}"\n` : '';
@@ -67,16 +66,9 @@ export function createSkillYaml(agentId, orgId, skillName, skillId, persona, wel
   agentId: "${agentId}"
   orgId: "${orgId}"
 ${personaSection}${welcomeMessageSection}
-skill:
-  name: "${skillName}"
-  version: "0.0.1"
-${skillIdSection}  env:
-    # Example environment variables - customize these for your skill
-    PINECONE_API_KEY: "pcsk_5iFtQD_xxxxx"
-    OPENAI_API_KEY: "sk-proj--xxxx"
-    STRIPE_SECRET_KEY: "sk_test_xxxx"
-    # Add your own environment variables below
-    # CUSTOM_VAR: "custom-value"`;
+skills:
+  # Skills will be auto-generated during compilation
+`;
     fs.writeFileSync("lua.skill.yaml", yamlContent);
 }
 export function readSkillYaml() {
@@ -108,18 +100,13 @@ export function updateSkillYamlPersona(persona, welcomeMessage) {
     if (welcomeMessage) {
         data.agent.welcomeMessage = welcomeMessage;
     }
-    // Convert back to YAML with proper formatting
-    const updatedYamlContent = `agent:
-  agentId: "${data.agent.agentId}"
-  orgId: "${data.agent.orgId}"
-  persona: |
-${persona.split('\n').map(line => `    ${line}`).join('\n')}
-  welcomeMessage: "${data.agent.welcomeMessage || ''}"
-
-skill:
-  name: "${data.skill.name}"
-  version: "${data.skill.version}"
-  skillId: "${data.skill.skillId || ''}"
-`;
+    // Use yaml.dump to properly handle both old and new formats
+    const updatedYamlContent = dump(data, {
+        indent: 2,
+        lineWidth: -1,
+        noRefs: true,
+        quotingType: '"',
+        forceQuotes: false
+    });
     fs.writeFileSync(yamlPath, updatedYamlContent);
 }

package/dist/utils/sandbox.d.ts

@@ -8,6 +8,13 @@ export interface ExecuteToolOptions extends SandboxOptions {
     toolCode: string;
     inputs: any;
 }
+/**
+ * Loads environment variables from multiple sources in priority order:
+ * 1. process.env (lowest priority)
+ * 2. .env file (medium priority)
+ * 3. lua.skill.yaml env section (highest priority)
+ */
+export declare function loadEnvironmentVariables(): Record<string, string>;
 /**
  * Creates a VM sandbox context with all necessary globals and utilities
  */

package/dist/utils/sandbox.js

@@ -1,28 +1,60 @@
 import { createRequire } from "module";
 import vm from "vm";
 import path from "path";
+import fs from "fs";
 import { UserDataApi } from "../services/api.js";
 import { readSkillConfig } from "./files.js";
 /**
- * Creates a VM sandbox context with all necessary globals and utilities
+ * Loads environment variables from multiple sources in priority order:
+ * 1. process.env (lowest priority)
+ * 2. .env file (medium priority)
+ * 3. lua.skill.yaml env section (highest priority)
  */
-export function createSandbox(options) {
-    const { apiKey, agentId, customConsole, broadcastLog } = options;
-    // Extract environment variables from YAML config and merge with process.env
-    const config = readSkillConfig();
+export function loadEnvironmentVariables() {
     const envVars = {};
-    // Copy process.env, filtering out undefined values
+    // 1. Start with process.env
     for (const [key, value] of Object.entries(process.env)) {
         if (value !== undefined) {
             envVars[key] = value;
         }
     }
-    // Override with config values
+    // 2. Load from .env file if it exists
+    const envFilePath = path.join(process.cwd(), '.env');
+    if (fs.existsSync(envFilePath)) {
+        try {
+            const envFileContent = fs.readFileSync(envFilePath, 'utf8');
+            const envLines = envFileContent.split('\n');
+            for (const line of envLines) {
+                const trimmedLine = line.trim();
+                if (trimmedLine && !trimmedLine.startsWith('#')) {
+                    const [key, ...valueParts] = trimmedLine.split('=');
+                    if (key && valueParts.length > 0) {
+                        const value = valueParts.join('=').replace(/^["']|["']$/g, ''); // Remove quotes
+                        envVars[key.trim()] = value;
+                    }
+                }
+            }
+        }
+        catch (error) {
+            console.warn('Warning: Could not read .env file:', error);
+        }
+    }
+    // 3. Override with YAML config values (highest priority)
+    const config = readSkillConfig();
     if (config?.skill?.env) {
         for (const [key, value] of Object.entries(config.skill.env)) {
             envVars[key] = value;
         }
     }
+    return envVars;
+}
+/**
+ * Creates a VM sandbox context with all necessary globals and utilities
+ */
+export function createSandbox(options) {
+    const { apiKey, agentId, customConsole, broadcastLog } = options;
+    // Load environment variables from multiple sources (same logic as test command)
+    const envVars = loadEnvironmentVariables();
     // Create a CommonJS context for execution
     const require = createRequire(process.cwd() + '/package.json');
     const updateUserData = async (data) => {
@@ -125,7 +157,6 @@ export function createSandbox(options) {
         clearTimeout,
         clearInterval,
         process: {
-            ...process,
             env: envVars
         },
         global: globalThis,
@@ -188,7 +219,12 @@ const executeFunction = ${toolCode};
 
 // Export the function for testing
 module.exports = async (input) => {
+try{
   return await executeFunction(input);
+}catch(e){
+  console.error(e);
+  return { status: 'error', error: e.message };
+}
 };
 `;
     // Execute the code in the sandbox