lunel-cli 0.1.100 → 0.1.102

package/dist/index.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import { WebSocket } from "ws";
 import qrcode from "qrcode-terminal";
+import shell from "shelljs";
 import { createAiManager } from "./ai/index.js";
 import { V2SessionTransport } from "./transport/v2.js";
 import Ignore from "ignore";
@@ -10,7 +11,7 @@ import * as fssync from "fs";
 import * as path from "path";
 import * as os from "os";
 import { randomBytes } from "crypto";
-import { spawn, spawnSync, execSync, execFileSync } from "child_process";
+import { spawn, spawnSync, execSync } from "child_process";
 import { createServer, createConnection } from "net";
 import { createInterface } from "readline";
 const DEFAULT_PROXY_URL = normalizeGatewayUrl(process.env.LUNEL_PROXY_URL || "https://gateway.lunel.dev");
@@ -28,9 +29,22 @@ if (DEBUG_MODE) {
 import { createRequire } from "module";
 const __require = createRequire(import.meta.url);
 const VERSION = __require("../package.json").version;
-const PTY_RELEASE_INFO_URL = process.env.LUNEL_PTY_INFO_URL ||
-    "https://raw.githubusercontent.com/ssbharambe-m/pty-releases/refs/heads/main/info.json";
 const VERBOSE_AI_LOGS = process.env.LUNEL_DEBUG_AI === "1";
+const PTY_RELEASE_BASE_URL = "https://github.com/lunel-dev/lunel/releases/download/v0";
+const PTY_RELEASES = {
+    "linux:x64": {
+        fileName: "lunel-pty-linux-x8664-0",
+        url: `${PTY_RELEASE_BASE_URL}/lunel-pty-linux-x8664-0`,
+    },
+    "darwin:arm64": {
+        fileName: "lunel-pty-macos-arm64-0",
+        url: `${PTY_RELEASE_BASE_URL}/lunel-pty-macos-arm64-0`,
+    },
+    "win32:x64": {
+        fileName: "lunel-pty-windows-x8664-0.exe",
+        url: `${PTY_RELEASE_BASE_URL}/lunel-pty-windows-x8664-0.exe`,
+    },
+};
 // Root directory - sandbox all file operations to this
 const ROOT_DIR = (() => {
     try {
@@ -566,64 +580,82 @@ async function handleFsGrep(payload) {
         throw Object.assign(new Error("pattern is required"), { code: "EINVAL" });
     const safePath = assertSafePath(reqPath);
     const matches = [];
-    const regex = new RegExp(pattern, caseSensitive ? "g" : "gi");
+    let regex;
+    try {
+        regex = new RegExp(pattern, caseSensitive ? "g" : "gi");
+    }
+    catch {
+        throw Object.assign(new Error("pattern must be a valid regular expression"), { code: "EINVAL" });
+    }
     const rootIgnore = await loadGitignore(ROOT_DIR);
-    async function searchFile(filePath, relativePath) {
-        if (matches.length >= maxResults)
-            return;
-        try {
-            const content = await fs.readFile(filePath, "utf-8");
-            const lines = content.split("\n");
-            for (let i = 0; i < lines.length && matches.length < maxResults; i++) {
-                if (regex.test(lines[i])) {
-                    matches.push({
-                        file: relativePath,
-                        line: i + 1,
-                        content: lines[i].substring(0, 500),
-                    });
+    const previousSilent = shell.config.silent;
+    shell.config.silent = true;
+    try {
+        async function searchFile(filePath, relativePath) {
+            if (matches.length >= maxResults)
+                return;
+            try {
+                const grepResult = shell.grep(regex, filePath);
+                if (grepResult.code !== 0 || !grepResult.stdout.trim()) {
+                    regex.lastIndex = 0;
+                    return;
+                }
+                const content = await fs.readFile(filePath, "utf-8");
+                const lines = content.split("\n");
+                for (let i = 0; i < lines.length && matches.length < maxResults; i++) {
+                    if (regex.test(lines[i])) {
+                        matches.push({
+                            file: relativePath,
+                            line: i + 1,
+                            content: lines[i].substring(0, 500),
+                        });
+                    }
+                    regex.lastIndex = 0;
                 }
+            }
+            catch {
                 regex.lastIndex = 0;
             }
         }
-        catch {
-            // Skip unreadable files
-        }
-    }
-    async function searchDir(dirPath, relativePath, ig) {
-        if (matches.length >= maxResults)
-            return;
-        const localIgnore = ignore().add(ig);
-        try {
-            const localGitignorePath = path.join(dirPath, ".gitignore");
-            const content = await fs.readFile(localGitignorePath, "utf-8");
-            localIgnore.add(content);
-        }
-        catch {
-            // No local .gitignore
-        }
-        const entries = await fs.readdir(dirPath, { withFileTypes: true });
-        for (const entry of entries) {
+        async function searchDir(dirPath, relativePath, ig) {
             if (matches.length >= maxResults)
-                break;
-            const relPath = relativePath ? `${relativePath}/${entry.name}` : entry.name;
-            const checkPath = entry.isDirectory() ? `${relPath}/` : relPath;
-            if (localIgnore.ignores(checkPath))
-                continue;
-            const fullPath = path.join(dirPath, entry.name);
-            if (entry.isDirectory()) {
-                await searchDir(fullPath, relPath, localIgnore);
+                return;
+            const localIgnore = ignore().add(ig);
+            try {
+                const localGitignorePath = path.join(dirPath, ".gitignore");
+                const content = await fs.readFile(localGitignorePath, "utf-8");
+                localIgnore.add(content);
             }
-            else if (entry.isFile()) {
-                await searchFile(fullPath, relPath);
+            catch {
+                // No local .gitignore
+            }
+            const entries = await fs.readdir(dirPath, { withFileTypes: true });
+            for (const entry of entries) {
+                if (matches.length >= maxResults)
+                    break;
+                const relPath = relativePath ? `${relativePath}/${entry.name}` : entry.name;
+                const checkPath = entry.isDirectory() ? `${relPath}/` : relPath;
+                if (localIgnore.ignores(checkPath))
+                    continue;
+                const fullPath = path.join(dirPath, entry.name);
+                if (entry.isDirectory()) {
+                    await searchDir(fullPath, relPath, localIgnore);
+                }
+                else if (entry.isFile()) {
+                    await searchFile(fullPath, relPath);
+                }
             }
         }
+        const stat = await fs.stat(safePath);
+        if (stat.isDirectory()) {
+            await searchDir(safePath, reqPath === "." ? "" : reqPath, rootIgnore);
+        }
+        else {
+            await searchFile(safePath, reqPath);
+        }
     }
-    const stat = await fs.stat(safePath);
-    if (stat.isDirectory()) {
-        await searchDir(safePath, reqPath === "." ? "" : reqPath, rootIgnore);
-    }
-    else {
-        await searchFile(safePath, reqPath);
+    finally {
+        shell.config.silent = previousSilent;
     }
     return { matches };
 }
@@ -1200,18 +1232,6 @@ let ensurePtyBinaryPromise = null;
 function normalizeJsonWithTrailingCommas(text) {
     return text.replace(/,\s*([}\]])/g, "$1");
 }
-function compareSemver(a, b) {
-    const aParts = a.split(".").map((part) => Number.parseInt(part, 10) || 0);
-    const bParts = b.split(".").map((part) => Number.parseInt(part, 10) || 0);
-    const max = Math.max(aParts.length, bParts.length);
-    for (let i = 0; i < max; i++) {
-        const left = aParts[i] ?? 0;
-        const right = bParts[i] ?? 0;
-        if (left !== right)
-            return left > right ? 1 : -1;
-    }
-    return 0;
-}
 function getLunelConfigDir() {
     const platform = os.platform();
     if (platform === "win32") {
@@ -1224,52 +1244,14 @@ function getLunelConfigDir() {
     const xdg = process.env.XDG_CONFIG_HOME || path.join(os.homedir(), ".config");
     return path.join(xdg, "lunel");
 }
-function getPtyBinaryPath() {
-    const binName = os.platform() === "win32" ? "lunel-pty.exe" : "lunel-pty";
-    return path.join(getLunelConfigDir(), "pty-releases", binName);
-}
-function getPtyPlatformKey() {
-    const platform = os.platform();
-    if (platform === "win32")
-        return "windows";
-    if (platform === "linux")
-        return "linux";
-    if (platform === "darwin")
-        return "macos";
-    throw new Error(`Unsupported platform for PTY: ${platform}`);
-}
-function getPtyArchKey() {
-    const arch = os.arch();
-    if (arch === "arm64" || arch === "arm")
-        return "arm";
-    if (arch === "x64" || arch === "ia32")
-        return "x86";
-    throw new Error(`Unsupported architecture for PTY: ${arch}`);
-}
-async function fetchPtyReleaseInfo() {
-    const response = await fetch(PTY_RELEASE_INFO_URL);
-    if (!response.ok) {
-        throw new Error(`Failed to fetch PTY release info (${response.status})`);
-    }
-    const raw = await response.text();
-    const parsed = JSON.parse(raw);
-    if (!parsed?.version) {
-        throw new Error("Invalid PTY release info: missing version");
-    }
-    return parsed;
-}
-function readInstalledPtyVersion(binPath) {
-    try {
-        const output = execFileSync(binPath, ["--version"], {
-            encoding: "utf8",
-            stdio: ["ignore", "pipe", "ignore"],
-        });
-        const version = output.trim();
-        return version || null;
-    }
-    catch {
+function getPtyReleaseTarget() {
+    const release = PTY_RELEASES[`${os.platform()}:${os.arch()}`];
+    if (!release)
         return null;
-    }
+    return release;
+}
+function getPtyBinaryPath(fileName) {
+    return path.join(getLunelConfigDir(), "pty-releases", fileName);
 }
 async function downloadPtyBinary(url, destination) {
     const tempPath = `${destination}.download`;
@@ -1305,36 +1287,20 @@ async function ensurePtyBinaryReady() {
     if (ensurePtyBinaryPromise)
         return ensurePtyBinaryPromise;
     ensurePtyBinaryPromise = (async () => {
-        const binPath = getPtyBinaryPath();
+        const release = getPtyReleaseTarget();
+        if (!release)
+            return null;
+        const binPath = getPtyBinaryPath(release.fileName);
         await fs.mkdir(path.dirname(binPath), { recursive: true });
-        const releaseInfo = await fetchPtyReleaseInfo();
-        const platformKey = getPtyPlatformKey();
-        const archKey = getPtyArchKey();
-        const downloadUrl = releaseInfo[platformKey]?.[archKey] || null;
-        if (!downloadUrl) {
-            throw new Error(`PTY binary is not available for ${platformKey}/${archKey} in release ${releaseInfo.version}`);
-        }
-        let hasBinary = true;
         try {
             await fs.access(binPath);
+            return binPath;
         }
         catch {
-            hasBinary = false;
-        }
-        const installedVersion = hasBinary ? readInstalledPtyVersion(binPath) : null;
-        const shouldDownload = !hasBinary ||
-            !installedVersion ||
-            compareSemver(installedVersion, releaseInfo.version) < 0;
-        if (!shouldDownload)
+            console.log(`[pty] PTY missing. Installing ${release.fileName}...`);
+            await downloadPtyBinary(release.url, binPath);
             return binPath;
-        if (!hasBinary) {
-            console.log(`[pty] PTY missing. Installing ${releaseInfo.version}...`);
-        }
-        else {
-            console.log(`[pty] PTY outdated (${installedVersion} -> ${releaseInfo.version}). Updating...`);
         }
-        await downloadPtyBinary(downloadUrl, binPath);
-        return binPath;
     })();
     try {
         return await ensurePtyBinaryPromise;
@@ -1347,6 +1313,9 @@ async function ensurePtyProcess() {
     if (ptyProcess && ptyProcess.exitCode === null)
         return;
     const binPath = await ensurePtyBinaryReady();
+    if (!binPath) {
+        throw new Error(`PTY is not supported on ${os.platform()}/${os.arch()}`);
+    }
     ptyProcess = spawn(binPath, [], {
         cwd: ROOT_DIR,
         stdio: ["pipe", "pipe", "pipe"],
@@ -3103,8 +3072,13 @@ async function main() {
         const cliConfig = await getCliConfig();
         const savedSession = getSavedSessionForRoot(cliConfig, ROOT_DIR);
         debugLog("Checking PTY runtime...");
-        await ensurePtyBinaryReady();
-        debugLog("PTY runtime ready.\n");
+        const ptyBinaryPath = await ensurePtyBinaryReady();
+        if (ptyBinaryPath) {
+            debugLog("PTY runtime ready.\n");
+        }
+        else {
+            debugLog(`PTY runtime unsupported on ${os.platform()}/${os.arch()}. Skipping prefetch.\n`);
+        }
         // Start both AI backends (OpenCode + Codex). Unavailable ones are skipped.
         aiManager = await createAiManager();
         // Wire provider events → mobile app data channel, tagged with backend name.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lunel-cli",
-  "version": "0.1.100",
+  "version": "0.1.102",
   "author": [
     {
       "name": "Soham Bharambe",
@@ -11,7 +11,7 @@
       "email": "rinkit@lunel.dev"
     }
   ],
-  "license": "Functional Source License, Version 1.1, Apache 2.0 Future License",
+  "license": "MIT",
   "type": "module",
   "bin": {
     "lunel-cli": "dist/index.js"
@@ -30,12 +30,14 @@
     "ignore": "^6.0.2",
     "libsodium-wrappers": "^0.7.15",
     "qrcode-terminal": "^0.12.0",
+    "shelljs": "^0.10.0",
     "ws": "^8.18.0"
   },
   "devDependencies": {
     "@types/minimatch": "^5.1.2",
     "@types/node": "^20.0.0",
     "@types/qrcode-terminal": "^0.12.2",
+    "@types/shelljs": "^0.10.0",
     "@types/ws": "^8.5.13",
     "typescript": "^5.0.0"
   },