staklink 0.3.21 → 0.3.22

package/README.md

@@ -8,6 +8,16 @@ VSCode extension for automating development and debugging in Codespaces.
 
 npx -y staklink@latest start
 
+### local cli testing
+
+pm2 stop all
+pm2 delete all
+
+yarn build:cli
+yarn build:proxy
+
+node bin/staklink.cjs start
+
 ## processes
 
 There are 2 ways to configure your dev processes (like your backend, frontend, db, etc)

package/dist/proxy-server.cjs

@@ -26614,8 +26614,25 @@ async function dirExists(dirPath) {
 }
 async function getReposMaybe() {
   const root = await workspaceRoot();
+  const rootGitPath = path3.join(root, ".git");
+  const isRootGitRepo = await dirExists(rootGitPath);
+  if (isRootGitRepo) {
+    return [root];
+  }
   const children = await getChildDirectories(root);
-  return children.filter((dir) => !dir.startsWith("."));
+  const gitRepos = [];
+  for (const child of children) {
+    if (child.startsWith(".")) {
+      continue;
+    }
+    const childPath = path3.join(root, child);
+    const childGitPath = path3.join(childPath, ".git");
+    const isGitRepo = await dirExists(childGitPath);
+    if (isGitRepo) {
+      gitRepos.push(child);
+    }
+  }
+  return gitRepos;
 }
 async function getAppsPortAndLabel() {
   const root = await workspaceRoot();
@@ -26648,6 +26665,9 @@ async function getChildDirectories(dirPath) {
 // src/proxy/utils.ts
 async function findRepoLocation(repoFullName) {
   try {
+    if (repoFullName.startsWith("/") && await dirExists(repoFullName)) {
+      return repoFullName;
+    }
     const repoName = repoFullName.split("/").pop() || "";
     const repodir1 = `/workspaces/${repoName}`;
     if (await dirExists(repodir1)) {
@@ -33882,6 +33902,13 @@ var Repo = class {
   }
 };
 async function NewRepo(url3) {
+  if (url3.startsWith("/")) {
+    const repoLocation2 = await findRepoLocation(url3);
+    if (!repoLocation2) {
+      throw new Error(`Repository not found for ${url3}`);
+    }
+    return new Repo(repoLocation2);
+  }
   const repoName = getRepoNameFromUrl(url3);
   const repoLocation = await findRepoLocation(repoName);
   if (!repoLocation) {
@@ -33935,7 +33962,7 @@ var SSEManager = class {
 var sseManager = new SSEManager();
 
 // src/proxy/version.ts
-var VERSION = "0.3.21";
+var VERSION = "0.3.22";
 
 // node_modules/uuid/dist/esm/stringify.js
 var byteToHex = [];
@@ -80249,6 +80276,7 @@ async function startProxyServer() {
       for (const r of repos) {
         const repo = await NewRepo(r);
         const repoName = getRepoNameFromUrl(r);
+        const stashCreated = await repo.stashDevcontainer();
         const diffOutput = await repo.execCommand(
           "git diff --name-status HEAD"
         );
@@ -80315,6 +80343,9 @@ ${lines2.map((line) => "+" + line).join("\n")}`;
             errors: []
           });
         }
+        if (stashCreated) {
+          await repo.popDevcontainerStash();
+        }
       }
       res.status(200).json(results);
     } catch (error82) {
@@ -80369,6 +80400,7 @@ ${lines2.map((line) => "+" + line).join("\n")}`;
       const createPR = req.query.pr === "true";
       const shouldCommit = req.query.commit === "true";
       const autoMerge = req.query.automerge === "true";
+      const stayOnCurrentBranch = req.query.stayOnCurrentBranch === "true";
       const commits = [];
       const prs = {};
       const branches = {};
@@ -80382,17 +80414,22 @@ ${lines2.map((line) => "+" + line).join("\n")}`;
         const repo = await NewRepo(r.url);
         const repoName = getRepoNameFromUrl(r.url);
         const stashCreated = await repo.stashDevcontainer();
-        const requestedBranch = await repo.generateUniqueBranchName(r.branch_name);
         let currentBranch = (await repo.printCurrentBranch()).trim();
+        const requestedBranch = stayOnCurrentBranch ? currentBranch : await repo.generateUniqueBranchName(r.branch_name);
         console.log(`=> Current branch: ${currentBranch}`);
         console.log(`=> Requested branch: ${requestedBranch}`);
-        if (currentBranch !== requestedBranch) {
+        const protectedBranches = ["main", "master"];
+        const isOnProtectedBranch = protectedBranches.includes(currentBranch);
+        const shouldSwitchBranch = (!stayOnCurrentBranch || isOnProtectedBranch) && currentBranch !== requestedBranch;
+        if (shouldSwitchBranch) {
           const branchExists = await repo.branchExists(requestedBranch);
           if (branchExists) {
             console.log(`=> Switching to existing branch: ${requestedBranch}`);
             await repo.checkout(requestedBranch);
           } else {
-            console.log(`=> Creating new branch from current position: ${requestedBranch}`);
+            console.log(
+              `=> Creating new branch from current position: ${requestedBranch}`
+            );
             await repo.checkoutNew(requestedBranch);
           }
         } else {

package/dist/staklink-cli.cjs

@@ -10905,7 +10905,7 @@ var glob = Object.assign(glob_, {
 glob.glob = glob;
 
 // src/proxy/version.ts
-var VERSION = "0.3.21";
+var VERSION = "0.3.22";
 
 // src/cli.ts
 var STAKLINK_PROXY = "staklink-proxy";

package/package.json

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