staklink 0.4.5 → 0.4.6

package/dist/proxy-server.cjs

@@ -60411,6 +60411,23 @@ var Repo = class {
     log("nowBranch:", nowBranch);
     return nowBranch.includes(`* ${base_branch}`);
   }
+  async getDefaultBranch() {
+    try {
+      const result = await this.execCommand(
+        `git remote show origin | sed -n '/HEAD branch/s/.*: //p'`
+      );
+      return result.trim();
+    } catch {
+      try {
+        await this.execCommand(
+          "git show-ref --verify --quiet refs/heads/main"
+        );
+        return "main";
+      } catch {
+        return "master";
+      }
+    }
+  }
   async checkoutMainBranchOrBaseBranch(base_branch) {
     if (base_branch) {
       return this.execCommand(`git checkout -f ${base_branch}`);
@@ -60777,7 +60794,7 @@ var SSEManager = class {
 var sseManager = new SSEManager();
 
 // src/proxy/version.ts
-var VERSION = "0.4.5";
+var VERSION = "0.4.6";
 
 // node_modules/uuid/dist/esm/stringify.js
 var byteToHex = [];
@@ -141205,37 +141222,42 @@ async function handleBranchDiff(req, res) {
   try {
     const results = [];
     const repos = await getReposMaybe();
-    const baseBranch = req.query.base || "main";
     for (const r of repos) {
       const repo = await NewRepo(r);
       const repoName = getRepoNameFromUrl(r);
       const currentBranch = (await repo.printCurrentBranch()).trim();
-      if (currentBranch === baseBranch) {
-        continue;
-      }
-      let mergeBase;
-      try {
-        mergeBase = (await repo.execCommand(`git merge-base ${baseBranch} HEAD`)).trim();
-      } catch {
+      const baseBranch = req.query.base || await repo.getDefaultBranch();
+      const onBaseBranch = currentBranch === baseBranch;
+      let diffBase;
+      if (onBaseBranch) {
+        diffBase = "HEAD";
+      } else {
         try {
-          mergeBase = (await repo.execCommand(`git merge-base origin/${baseBranch} HEAD`)).trim();
+          diffBase = (await repo.execCommand(`git merge-base ${baseBranch} HEAD`)).trim();
         } catch {
-          warn(
-            `Could not find merge base for ${repoName}, skipping...`
-          );
-          continue;
+          try {
+            diffBase = (await repo.execCommand(
+              `git merge-base origin/${baseBranch} HEAD`
+            )).trim();
+          } catch {
+            warn(
+              `Could not find merge base for ${repoName}, skipping...`
+            );
+            continue;
+          }
         }
       }
       let diffOutput = "";
       try {
         diffOutput = await repo.execCommand(
-          `git diff --name-status ${mergeBase}`
+          `git diff --name-status ${diffBase}`
         );
       } catch (error88) {
         warn(`Error getting branch diff for repo ${repoName}:`, error88);
         continue;
       }
       const lines = diffOutput.trim().split("\n").filter((line) => line);
+      const trackedFiles = /* @__PURE__ */ new Set();
       for (const line of lines) {
         const parts = line.split("	");
         if (parts.length < 2) {
@@ -141243,6 +141265,7 @@ async function handleBranchDiff(req, res) {
         }
         const status = parts[0];
         const filePath = parts[1];
+        trackedFiles.add(filePath);
         let action;
         if (status.startsWith("A")) {
           action = "create";
@@ -141258,7 +141281,7 @@ async function handleBranchDiff(req, res) {
         } else {
           try {
             content = await repo.execCommand(
-              `git diff ${mergeBase} -- "${filePath}"`
+              `git diff ${diffBase} -- "${filePath}"`
             );
           } catch (error88) {
             warn(`Error getting branch diff for ${filePath}:`, error88);
@@ -141272,6 +141295,47 @@ async function handleBranchDiff(req, res) {
           errors: []
         });
       }
+      let untrackedOutput = "";
+      try {
+        untrackedOutput = await repo.execCommand(
+          "git ls-files --others --exclude-standard"
+        );
+      } catch (error88) {
+        warn(
+          `Error getting untracked files for repo ${repoName}:`,
+          error88
+        );
+      }
+      const untrackedLines = untrackedOutput.trim().split("\n").filter((line) => line && !trackedFiles.has(line));
+      for (const filePath of untrackedLines) {
+        let content = "";
+        const binaryContent = await binaryDiffContent(
+          repo,
+          filePath,
+          "create"
+        );
+        if (binaryContent !== null) {
+          content = binaryContent;
+        } else {
+          try {
+            const fileContent = await repo.execCommand(`cat "${filePath}"`);
+            const fileLines = fileContent.split("\n");
+            content = `--- /dev/null
++++ b/${filePath}
+@@ -0,0 +1,${fileLines.length} @@
+${fileLines.map((line) => "+" + line).join("\n")}`;
+          } catch (error88) {
+            warn(`Error reading untracked file ${filePath}:`, error88);
+          }
+        }
+        results.push({
+          file: `${repoName}/${filePath}`,
+          action: "create",
+          content,
+          repoName,
+          errors: []
+        });
+      }
     }
     res.status(200).json(results);
   } catch (error88) {

package/dist/staklink-cli.cjs

@@ -10967,7 +10967,7 @@ var glob = Object.assign(glob_, {
 glob.glob = glob;
 
 // src/proxy/version.ts
-var VERSION = "0.4.5";
+var VERSION = "0.4.6";
 
 // src/deps.ts
 var import_child_process = require("child_process");

package/package.json

@@ -2,7 +2,7 @@
   "name": "staklink",
   "displayName": "staklink",
   "description": "staklink process manager",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "type": "module",
   "publisher": "stakwork",
   "engines": {