dirac-lang 0.1.63 → 0.1.65

package/dist/cli.js

@@ -16,13 +16,14 @@ import "dotenv/config";
 // package.json
 var package_default = {
   name: "dirac-lang",
-  version: "0.1.62",
+  version: "0.1.64",
   description: "LLM-Augmented Declarative Execution",
   type: "module",
   main: "dist/index.js",
   types: "dist/index.d.ts",
   bin: {
-    dirac: "dist/cli.js"
+    dirac: "dist/cli.js",
+    dish: "dist/cli.js"
   },
   exports: {
     ".": "./dist/index.js"
@@ -70,11 +71,54 @@ var package_default = {
 import fs from "fs";
 import yaml from "js-yaml";
 import { resolve, extname } from "path";
+function loadShellConfig(args = []) {
+  const shellConfig = { debug: false };
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+    if (arg === "--debug") {
+      shellConfig.debug = true;
+    } else if ((arg === "-f" || arg === "--config") && i + 1 < args.length) {
+      const configPath = resolve(args[++i]);
+      if (fs.existsSync(configPath)) {
+        const configData = yaml.load(fs.readFileSync(configPath, "utf-8"));
+        Object.assign(shellConfig, {
+          llmProvider: configData.llmProvider,
+          llmModel: configData.llmModel,
+          customLLMUrl: configData.customLLMUrl,
+          initScript: configData.initScript
+        });
+      }
+    }
+  }
+  if (!shellConfig.llmProvider) {
+    const defaultConfigPath = resolve(process.cwd(), "config.yml");
+    if (fs.existsSync(defaultConfigPath)) {
+      try {
+        const configData = yaml.load(fs.readFileSync(defaultConfigPath, "utf-8"));
+        shellConfig.llmProvider = shellConfig.llmProvider || configData.llmProvider;
+        shellConfig.llmModel = shellConfig.llmModel || configData.llmModel;
+        shellConfig.customLLMUrl = shellConfig.customLLMUrl || configData.customLLMUrl;
+        shellConfig.initScript = shellConfig.initScript || configData.initScript;
+      } catch (err) {
+      }
+    }
+  }
+  return shellConfig;
+}
 async function main() {
   const args = process.argv.slice(2);
+  const calledAs = process.argv[1];
+  if (calledAs && calledAs.endsWith("/dish")) {
+    const { DiracShell } = await import("./shell-6NG7WK5Z.js");
+    const shellConfig = loadShellConfig(args);
+    const shell = new DiracShell(shellConfig);
+    await shell.start();
+    return;
+  }
   if (args.includes("--help") || args.includes("-h")) {
     console.log("Usage: dirac <file.di|file.bk>");
     console.log("       dirac shell [options]");
+    console.log("       dish              Start interactive shell (short alias)");
     console.log("       dirac agent <command>");
     console.log("");
     console.log("Commands:");
@@ -145,46 +189,14 @@ async function main() {
     return;
   }
   if (args[0] === "shell") {
-    const { DiracShell } = await import("./shell-SN7XYIDA.js");
+    const { DiracShell } = await import("./shell-6NG7WK5Z.js");
     const { SessionServer, isSessionRunning, getSocketPath } = await import("./session-server-GEISBLMU.js");
     const { SessionClient } = await import("./session-client-3VTC5MLO.js");
     const daemonMode = args.includes("--daemon") || args.includes("-d");
     const agentMode = args.includes("--agent") || args.includes("-a");
-    const shellConfig = { debug: false };
-    for (let i = 1; i < args.length; i++) {
-      const arg = args[i];
-      if (arg === "--debug") {
-        shellConfig.debug = true;
-      } else if (arg === "--daemon" || arg === "-d") {
-        continue;
-      } else if (arg === "--agent" || arg === "-a") {
-        continue;
-      } else if ((arg === "-f" || arg === "--config") && i + 1 < args.length) {
-        const configPath = resolve(args[++i]);
-        if (fs.existsSync(configPath)) {
-          const configData = yaml.load(fs.readFileSync(configPath, "utf-8"));
-          Object.assign(shellConfig, {
-            llmProvider: configData.llmProvider,
-            llmModel: configData.llmModel,
-            customLLMUrl: configData.customLLMUrl,
-            initScript: configData.initScript
-          });
-        }
-      }
-    }
-    if (!shellConfig.llmProvider) {
-      const defaultConfigPath = resolve(process.cwd(), "config.yml");
-      if (fs.existsSync(defaultConfigPath)) {
-        try {
-          const configData = yaml.load(fs.readFileSync(defaultConfigPath, "utf-8"));
-          shellConfig.llmProvider = shellConfig.llmProvider || configData.llmProvider;
-          shellConfig.llmModel = shellConfig.llmModel || configData.llmModel;
-          shellConfig.customLLMUrl = shellConfig.customLLMUrl || configData.customLLMUrl;
-          shellConfig.initScript = shellConfig.initScript || configData.initScript;
-        } catch (err) {
-        }
-      }
-    }
+    const shellConfig = loadShellConfig(args.slice(1).filter(
+      (arg) => arg !== "--daemon" && arg !== "-d" && arg !== "--agent" && arg !== "-a"
+    ));
     if (agentMode) {
       if (!isSessionRunning()) {
         console.error("Error: No agent is running");

package/dist/{shell-SN7XYIDA.js → shell-6NG7WK5Z.js}

@@ -68,6 +68,65 @@ var DiracShell = class {
   }
   completer(line) {
     const subroutines = this.client ? this.cachedSubroutines : this.session.subroutines;
+    const varMatch = line.match(/\$([a-zA-Z0-9_-]*)$/);
+    if (varMatch) {
+      const partial = varMatch[1];
+      const varNames = Object.keys(this.session.variables || {});
+      const commonEnvVars = [
+        "HOME",
+        "PATH",
+        "USER",
+        "SHELL",
+        "PWD",
+        "OLDPWD",
+        "TERM",
+        "LANG",
+        "EDITOR",
+        "TMPDIR",
+        "PS1"
+      ];
+      const envVarNames = Object.keys(process.env).filter(
+        (name) => commonEnvVars.includes(name) || name.startsWith("DIRAC_") || name.startsWith("TELEGRAM_")
+      );
+      const allVars = [...varNames, ...envVarNames];
+      const matches = allVars.filter(
+        (name) => name.toLowerCase().startsWith(partial.toLowerCase())
+      );
+      const completions = matches.map((name) => `$${name}`);
+      return [completions, varMatch[0]];
+    }
+    const pathMatch = line.match(/((?:\.\.?\/|~\/|\/)[^\s]*)$/);
+    if (pathMatch) {
+      const partial = pathMatch[1];
+      try {
+        let searchPath = partial;
+        if (searchPath.startsWith("~/")) {
+          searchPath = path.join(os.homedir(), searchPath.slice(2));
+        }
+        const dirPath = path.dirname(searchPath);
+        const filePrefix = path.basename(searchPath);
+        if (fs.existsSync(dirPath) && fs.statSync(dirPath).isDirectory()) {
+          const entries = fs.readdirSync(dirPath, { withFileTypes: true });
+          const matches = entries.filter((entry) => entry.name.startsWith(filePrefix)).map((entry) => {
+            const fullPath = path.join(dirPath, entry.name);
+            let displayPath = fullPath;
+            if (partial.startsWith("~/")) {
+              displayPath = "~/" + path.relative(os.homedir(), fullPath);
+            } else if (partial.startsWith("./") || partial.startsWith("../")) {
+              displayPath = path.relative(process.cwd(), fullPath);
+              if (!displayPath.startsWith(".")) {
+                displayPath = "./" + displayPath;
+              }
+            }
+            return entry.isDirectory() ? displayPath + "/" : displayPath;
+          });
+          if (matches.length > 0) {
+            return [matches, pathMatch[0]];
+          }
+        }
+      } catch (error) {
+      }
+    }
     const attrMatch = line.match(/\|([a-z0-9_-]+)\s+.*?([a-z0-9_-]*)$/i);
     if (attrMatch) {
       const tagName = attrMatch[1];
@@ -143,11 +202,57 @@ var DiracShell = class {
     const commandMatch = line.match(/:([a-z]*)$/i);
     if (commandMatch) {
       const partial = commandMatch[1];
-      const commands = ["help", "quit", "exit", "vars", "subs", "clear", "history", "save", "debug", "llm"];
+      const commands = ["help", "quit", "exit", "vars", "subs", "clear", "history", "save", "debug", "llm", "index"];
       const matches = commands.filter((cmd) => cmd.startsWith(partial.toLowerCase()));
       const completions = matches.map((cmd) => `:${cmd}`);
       return [completions, commandMatch[0]];
     }
+    if (line.includes("<system>") || line.includes("|system>")) {
+      const systemMatch = line.match(/(?:<system>|\\|system>)\s*([a-z]*)$/i);
+      if (systemMatch) {
+        const partial = systemMatch[1];
+        const commonCommands = [
+          "ls",
+          "cd",
+          "pwd",
+          "cat",
+          "grep",
+          "find",
+          "echo",
+          "cp",
+          "mv",
+          "rm",
+          "mkdir",
+          "touch",
+          "git",
+          "npm",
+          "node",
+          "python",
+          "curl",
+          "wget",
+          "ssh",
+          "scp",
+          "tar",
+          "gzip",
+          "diff",
+          "ps",
+          "top",
+          "kill",
+          "chmod",
+          "chown",
+          "ln",
+          "du",
+          "df",
+          "which",
+          "man",
+          "history"
+        ];
+        const matches = commonCommands.filter((cmd) => cmd.startsWith(partial.toLowerCase()));
+        if (matches.length > 0) {
+          return [matches, partial];
+        }
+      }
+    }
     return [[], line];
   }
   loadHistory() {

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "dirac-lang",
-  "version": "0.1.63",
+  "version": "0.1.65",
   "description": "LLM-Augmented Declarative Execution",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": {
-    "dirac": "dist/cli.js"
+    "dirac": "dist/cli.js",
+    "dish": "dist/cli.js"
   },
   "exports": {
     ".": "./dist/index.js"