lunel-cli 0.1.32 → 0.1.34

package/dist/index.js

@@ -8,7 +8,7 @@ const ignore = Ignore.default;
 import * as fs from "fs/promises";
 import * as path from "path";
 import * as os from "os";
-import { spawn, execSync } from "child_process";
+import { spawn, execSync, execFileSync } from "child_process";
 import { createServer, createConnection } from "net";
 import { createInterface } from "readline";
 const DEFAULT_PROXY_URL = process.env.LUNEL_PROXY_URL || "https://gateway.lunel.dev";
@@ -17,6 +17,9 @@ const CLI_ARGS = process.argv.slice(2);
 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";
 // Root directory - sandbox all file operations to this
 const ROOT_DIR = process.cwd();
 // Terminal sessions (managed by Rust PTY binary)
@@ -44,6 +47,13 @@ const PORT_SYNC_INTERVAL_MS = 30_000;
 let portSyncTimer = null;
 let portScanInFlight = false;
 let lastDiscoveredPorts = [];
+function redactSensitive(input) {
+    const text = typeof input === "string" ? input : JSON.stringify(input);
+    return text
+        .replace(/([A-Za-z0-9\-_]{20,}\.[A-Za-z0-9\-_]{20,}\.[A-Za-z0-9\-_]{20,})/g, "[redacted_jwt]")
+        .replace(/(password|token|authorization|resumeToken|x-manager-password)\s*[:=]\s*["']?[^"',\s}]+/gi, "$1=[redacted]")
+        .replace(/[A-Za-z0-9+/=_-]{40,}/g, "[redacted_secret]");
+}
 // Popular development server ports to scan on connect
 const DEV_PORTS = [
     1234, // Parcel
@@ -595,14 +605,157 @@ async function handleGitDiscard(payload) {
 // Terminal Handlers (delegates to Rust PTY binary)
 // ============================================================================
 let dataChannel = null;
+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") {
+        const appData = process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming");
+        return path.join(appData, "lunel");
+    }
+    if (platform === "darwin") {
+        return path.join(os.homedir(), "Library", "Application Support", "lunel");
+    }
+    const xdg = process.env.XDG_CONFIG_HOME || path.join(os.homedir(), ".config");
+    return path.join(xdg, "lunel");
+}
 function getPtyBinaryPath() {
-    // TODO: Switch to GitHub releases download for production
-    return path.join(os.homedir(), "lunel-pty");
+    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 {
+        return null;
+    }
+}
+async function downloadPtyBinary(url, destination) {
+    const tempPath = `${destination}.download`;
+    console.log("[pty] Downloading PTY [downloading...]");
+    const response = await fetch(url);
+    if (!response.ok) {
+        throw new Error(`Failed to download PTY binary (${response.status})`);
+    }
+    if (!response.body) {
+        throw new Error("PTY download response had no body");
+    }
+    const reader = response.body.getReader();
+    const chunks = [];
+    let totalBytes = 0;
+    while (true) {
+        const { done, value } = await reader.read();
+        if (done)
+            break;
+        if (value) {
+            chunks.push(value);
+            totalBytes += value.byteLength;
+        }
+    }
+    const binary = Buffer.concat(chunks.map((chunk) => Buffer.from(chunk)));
+    await fs.writeFile(tempPath, binary);
+    if (os.platform() !== "win32") {
+        await fs.chmod(tempPath, 0o755);
+    }
+    await fs.rename(tempPath, destination);
+    console.log(`[pty] Downloaded PTY (${Math.max(1, Math.round(totalBytes / 1024))} KB)`);
+}
+async function ensurePtyBinaryReady() {
+    if (ensurePtyBinaryPromise)
+        return ensurePtyBinaryPromise;
+    ensurePtyBinaryPromise = (async () => {
+        const binPath = getPtyBinaryPath();
+        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);
+        }
+        catch {
+            hasBinary = false;
+        }
+        const installedVersion = hasBinary ? readInstalledPtyVersion(binPath) : null;
+        const shouldDownload = !hasBinary ||
+            !installedVersion ||
+            compareSemver(installedVersion, releaseInfo.version) < 0;
+        if (!shouldDownload)
+            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;
+    }
+    finally {
+        ensurePtyBinaryPromise = null;
+    }
 }
-function ensurePtyProcess() {
+async function ensurePtyProcess() {
     if (ptyProcess && ptyProcess.exitCode === null)
         return;
-    const binPath = getPtyBinaryPath();
+    const binPath = await ensurePtyBinaryReady();
     ptyProcess = spawn(binPath, [], {
         cwd: ROOT_DIR,
         stdio: ["pipe", "pipe", "pipe"],
@@ -690,7 +843,7 @@ function sendToPty(cmd) {
     ptyProcess.stdin.write(JSON.stringify(cmd) + "\n");
 }
 async function handleTerminalSpawn(payload) {
-    ensurePtyProcess();
+    await ensurePtyProcess();
     const shell = payload.shell || process.env.SHELL || "/bin/sh";
     const cols = payload.cols || 80;
     const rows = payload.rows || 24;
@@ -1230,30 +1383,36 @@ function requireData(response, label) {
         const errMsg = response.error
             ? (typeof response.error === "string" ? response.error : JSON.stringify(response.error))
             : `${label} returned no data`;
-        console.error(`[ai] ${label} failed:`, errMsg, "raw response:", JSON.stringify(response).substring(0, 500));
+        console.error(`[ai] ${label} failed:`, redactSensitive(errMsg), "raw response:", redactSensitive(JSON.stringify(response).substring(0, 500)));
         throw new Error(errMsg);
     }
     return response.data;
 }
 async function handleAiCreateSession(payload) {
     const title = payload.title || undefined;
-    console.log("[ai] createSession called, title:", title);
+    if (VERBOSE_AI_LOGS)
+        console.log("[ai] createSession called");
     try {
         const response = await opencodeClient.session.create({ body: { title } });
-        console.log("[ai] createSession response ok:", !!response.data, "error:", response.error ? JSON.stringify(response.error).substring(0, 200) : "none");
+        if (VERBOSE_AI_LOGS) {
+            console.log("[ai] createSession response ok:", !!response.data, "error:", response.error ? redactSensitive(JSON.stringify(response.error).substring(0, 200)) : "none");
+        }
         return { session: requireData(response, "session.create") };
     }
     catch (err) {
-        console.error("[ai] createSession exception:", err.message, err.stack);
+        console.error("[ai] createSession exception:", redactSensitive(err.message));
         throw err;
     }
 }
 async function handleAiListSessions() {
-    console.log("[ai] listSessions called");
+    if (VERBOSE_AI_LOGS)
+        console.log("[ai] listSessions called");
     try {
         const response = await opencodeClient.session.list();
         const data = requireData(response, "session.list");
-        console.log("[ai] listSessions returned", Array.isArray(data) ? data.length : typeof data, "sessions");
+        if (VERBOSE_AI_LOGS) {
+            console.log("[ai] listSessions returned", Array.isArray(data) ? data.length : typeof data, "sessions");
+        }
         return { sessions: data };
     }
     catch (err) {
@@ -1275,7 +1434,8 @@ async function handleAiDeleteSession(payload) {
 }
 async function handleAiGetMessages(payload) {
     const id = payload.id;
-    console.log("[ai] getMessages called, sessionId:", id);
+    if (VERBOSE_AI_LOGS)
+        console.log("[ai] getMessages called");
     try {
         const response = await opencodeClient.session.messages({ path: { id } });
         const raw = requireData(response, "session.messages");
@@ -1287,7 +1447,8 @@ async function handleAiGetMessages(payload) {
             parts: m.parts || [],
             time: m.info.time,
         }));
-        console.log("[ai] getMessages returned", messages.length, "messages");
+        if (VERBOSE_AI_LOGS)
+            console.log("[ai] getMessages returned", messages.length, "messages");
         return { messages };
     }
     catch (err) {
@@ -1300,7 +1461,14 @@ async function handleAiPrompt(payload) {
     const text = payload.text;
     const model = payload.model;
     const agent = payload.agent;
-    console.log("[ai] prompt called, sessionId:", sessionId, "model:", JSON.stringify(model), "agent:", agent, "text:", text.substring(0, 100));
+    if (VERBOSE_AI_LOGS) {
+        console.log("[ai] prompt called", {
+            hasSessionId: Boolean(sessionId),
+            model: redactSensitive(JSON.stringify(model || {})),
+            hasAgent: Boolean(agent),
+            textLength: typeof text === "string" ? text.length : 0,
+        });
+    }
     // Fire and forget — results stream via SSE events forwarded on data channel
     opencodeClient.session.prompt({
         path: { id: sessionId },
@@ -1332,11 +1500,14 @@ async function handleAiAbort(payload) {
     return {};
 }
 async function handleAiAgents() {
-    console.log("[ai] getAgents called");
+    if (VERBOSE_AI_LOGS)
+        console.log("[ai] getAgents called");
     try {
         const response = await opencodeClient.app.agents();
         const data = requireData(response, "app.agents");
-        console.log("[ai] getAgents returned:", JSON.stringify(data).substring(0, 300));
+        if (VERBOSE_AI_LOGS) {
+            console.log("[ai] getAgents returned:", redactSensitive(JSON.stringify(data).substring(0, 300)));
+        }
         return { agents: data };
     }
     catch (err) {
@@ -1345,11 +1516,14 @@ async function handleAiAgents() {
     }
 }
 async function handleAiProviders() {
-    console.log("[ai] getProviders called");
+    if (VERBOSE_AI_LOGS)
+        console.log("[ai] getProviders called");
     try {
         const response = await opencodeClient.config.providers();
         const data = requireData(response, "config.providers");
-        console.log("[ai] getProviders returned", data.providers?.length, "providers, defaults:", JSON.stringify(data.default));
+        if (VERBOSE_AI_LOGS) {
+            console.log("[ai] getProviders returned", data.providers?.length, "providers, defaults:", redactSensitive(JSON.stringify(data.default)));
+        }
         return { providers: data.providers, default: data.default };
     }
     catch (err) {
@@ -1427,7 +1601,7 @@ async function subscribeToOpenCodeEvents(client) {
                 ? parsed.payload
                 : parsed;
             if (!base || typeof base.type !== "string") {
-                console.warn("[sse] Dropped malformed event:", JSON.stringify(parsed).substring(0, 200));
+                console.warn("[sse] Dropped malformed event:", redactSensitive(JSON.stringify(parsed).substring(0, 200)));
                 continue;
             }
             console.log("[sse]", base.type);
@@ -1639,7 +1813,7 @@ async function processMessage(message) {
     }
     // Validate required fields
     if (!ns || !action) {
-        console.warn("[router] Ignoring message with missing ns/action:", JSON.stringify(message).substring(0, 300));
+        console.warn("[router] Ignoring message with missing ns/action:", redactSensitive(JSON.stringify(message).substring(0, 300)));
         return {
             v: 1,
             id,
@@ -2053,7 +2227,11 @@ async function connectWebSocket() {
                                 return;
                             }
                             if (message.type === "close_connection") {
-                                console.log(`[session] closed by gateway: ${message.reason || "expired"}`);
+                                const reason = message.reason || "expired";
+                                console.log(`[session] closed by gateway: ${reason}`);
+                                if (reason === "session ended from app") {
+                                    console.log("[session] Run `npx lunel-cli` again and scan the new QR code to reconnect.");
+                                }
                                 gracefulShutdown();
                                 return;
                             }
@@ -2152,6 +2330,9 @@ async function main() {
         console.log(`Extra ports enabled: ${EXTRA_PORTS.join(", ")}`);
     }
     try {
+        console.log("Checking PTY runtime...");
+        await ensurePtyBinaryReady();
+        console.log("PTY runtime ready.\n");
         // Generate auth credentials (like CodeNomad does)
         const opencodeUsername = "lunel";
         const opencodePassword = crypto.randomBytes(32).toString("base64url");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lunel-cli",
-  "version": "0.1.32",
+  "version": "0.1.34",
   "author": [
     {
       "name": "Soham Bharambe",