lunel-cli 0.1.38 → 0.1.40

package/dist/index.js

@@ -11,7 +11,6 @@ import * as os from "os";
 import { spawn, execSync, execFileSync } from "child_process";
 import { createServer, createConnection } from "net";
 import { createInterface } from "readline";
-import { simpleGit } from "simple-git";
 const DEFAULT_PROXY_URL = process.env.LUNEL_PROXY_URL || "https://gateway.lunel.dev";
 const MANAGER_URL = process.env.LUNEL_MANAGER_URL || "https://manager.lunel.dev";
 const CLI_ARGS = process.argv.slice(2);
@@ -23,7 +22,6 @@ const PTY_RELEASE_INFO_URL = process.env.LUNEL_PTY_INFO_URL ||
 const VERBOSE_AI_LOGS = process.env.LUNEL_DEBUG_AI === "1";
 // Root directory - sandbox all file operations to this
 const ROOT_DIR = process.cwd();
-const gitClient = simpleGit(ROOT_DIR);
 // Terminal sessions (managed by Rust PTY binary)
 const terminals = new Set();
 // PTY binary process
@@ -200,6 +198,24 @@ function samePortSet(a, b) {
     }
     return true;
 }
+function isProtocolRequest(value) {
+    if (!value || typeof value !== "object")
+        return false;
+    const msg = value;
+    return (msg.v === 1 &&
+        typeof msg.id === "string" &&
+        typeof msg.ns === "string" &&
+        typeof msg.action === "string" &&
+        typeof msg.payload === "object" &&
+        msg.payload !== null &&
+        typeof msg.ok === "undefined");
+}
+function isProtocolResponse(value) {
+    if (!value || typeof value !== "object")
+        return false;
+    const msg = value;
+    return msg.v === 1 && typeof msg.id === "string" && typeof msg.ok === "boolean";
+}
 // ============================================================================
 // Path Safety
 // ============================================================================
@@ -607,26 +623,27 @@ async function handleGitLog(payload) {
     return { commits };
 }
 async function handleGitCommitDetails(payload) {
-    const hash = payload.hash;
+    const hash = payload.hash?.trim();
     if (!hash)
         throw Object.assign(new Error("hash is required"), { code: "EINVAL" });
     try {
-        const logResult = await gitClient.log({
-            from: hash,
-            to: hash,
-            maxCount: 1,
-            format: {
-                fullHash: "%H",
-                message: "%s",
-                author: "%an",
-                timestamp: "%at",
-            },
-        });
-        const latest = logResult.latest;
-        if (!latest) {
+        const commitResult = await runGit(["show", "-s", "--format=%H%n%s%n%an%n%at", hash]);
+        if (commitResult.code !== 0 || !commitResult.stdout.trim()) {
+            throw Object.assign(new Error("Commit not found"), { code: "EGIT" });
+        }
+        const commitLines = commitResult.stdout.split(/\r?\n/);
+        const fullHash = commitLines[0]?.trim() || "";
+        const message = commitLines[1] ?? "";
+        const author = commitLines[2] ?? "";
+        const timestamp = Number.parseInt(commitLines[3] ?? "0", 10);
+        if (!fullHash) {
             throw Object.assign(new Error("Commit not found"), { code: "EGIT" });
         }
-        const filesRaw = await gitClient.show(["--name-status", "--format=", hash]);
+        const filesResult = await runGit(["show", "--name-status", "--format=", hash]);
+        if (filesResult.code !== 0) {
+            throw Object.assign(new Error(filesResult.stderr || "git show failed"), { code: "EGIT" });
+        }
+        const filesRaw = filesResult.stdout;
         const files = filesRaw
             .split(/\r?\n/)
             .map((line) => line.trim())
@@ -639,7 +656,11 @@ async function handleGitCommitDetails(payload) {
             return { status, path };
         })
             .filter((entry) => !!entry.path);
-        const diff = await gitClient.show(["--patch", "--format=", hash]);
+        const diffResult = await runGit(["show", "--patch", "--format=", hash]);
+        if (diffResult.code !== 0) {
+            throw Object.assign(new Error(diffResult.stderr || "git show failed"), { code: "EGIT" });
+        }
+        const diff = diffResult.stdout;
         const fileDiffs = {};
         const fileChunks = diff.split(/^diff --git /m).filter(Boolean);
         for (const chunk of fileChunks) {
@@ -652,11 +673,11 @@ async function handleGitCommitDetails(payload) {
         }
         return {
             commit: {
-                hash: latest.fullHash.substring(0, 7),
-                fullHash: latest.fullHash,
-                message: latest.message,
-                author: latest.author,
-                date: parseInt(latest.timestamp, 10) * 1000,
+                hash: fullHash.substring(0, 7),
+                fullHash,
+                message,
+                author,
+                date: timestamp * 1000,
             },
             files,
             diff,
@@ -2402,6 +2423,9 @@ async function processMessage(message) {
         };
     }
 }
+function sendResponseOnData(response, dataWs) {
+    dataWs.send(JSON.stringify(response));
+}
 function normalizeGatewayUrl(input) {
     if (/^https?:\/\//.test(input))
         return input.replace(/\/+$/, "");
@@ -2558,10 +2582,16 @@ async function connectWebSocket() {
                                 return;
                             }
                         }
-                        if (message.v === 1) {
+                        if (isProtocolResponse(message)) {
+                            // Ignore server/app responses forwarded over WS; CLI only processes requests.
+                            return;
+                        }
+                        if (isProtocolRequest(message)) {
                             const response = await processMessage(message);
-                            controlWs.send(JSON.stringify(response));
+                            sendResponseOnData(response, dataWs);
+                            return;
                         }
+                        console.warn("[router] Ignoring non-request control frame");
                     }
                     catch (error) {
                         console.error("Error processing control message:", error);
@@ -2590,10 +2620,16 @@ async function connectWebSocket() {
                         const message = JSON.parse(data.toString());
                         if (message.type === "connected")
                             return;
-                        if (message.v === 1) {
+                        if (isProtocolResponse(message)) {
+                            // Ignore server/app responses forwarded over WS; CLI only processes requests.
+                            return;
+                        }
+                        if (isProtocolRequest(message)) {
                             const response = await processMessage(message);
-                            dataWs.send(JSON.stringify(response));
+                            sendResponseOnData(response, dataWs);
+                            return;
                         }
+                        console.warn("[router] Ignoring non-request data frame");
                     }
                     catch (error) {
                         console.error("Error processing data message:", error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lunel-cli",
-  "version": "0.1.38",
+  "version": "0.1.40",
   "author": [
     {
       "name": "Soham Bharambe",
@@ -29,7 +29,6 @@
     "@opencode-ai/sdk": "^1.1.56",
     "ignore": "^6.0.2",
     "qrcode-terminal": "^0.12.0",
-    "simple-git": "^3.32.3",
     "ws": "^8.18.0"
   },
   "devDependencies": {