staklink 0.3.9 → 0.3.10

package/dist/proxy-server.cjs

@@ -33901,7 +33901,7 @@ var SSEManager = class {
 var sseManager = new SSEManager();
 
 // src/proxy/version.ts
-var VERSION = "0.3.9";
+var VERSION = "0.3.10";
 
 // node_modules/uuid/dist/esm/stringify.js
 var byteToHex = [];
@@ -80284,23 +80284,38 @@ async function startProxyServer() {
       const code = req.body;
       const repos = getReposWithChangedFiles(code);
       const createPR = req.query.pr === "true";
+      const shouldCommit = req.query.commit === "true";
       const commits = [];
       const prs = {};
+      console.log(`=> Commit requested: ${shouldCommit}`);
       console.log(`=> PR creation requested: ${createPR}`);
       console.log(
         `=> Git credentials available: ${!!code.git_credentials?.auth_data?.token}`
       );
       for (const r of repos) {
-        console.log(`=> PUSH to ${r.url}`);
         const repo = await NewRepo(r.url);
         const repoName = getRepoNameFromUrl(r.url);
         const stashCreated = await repo.stashDevcontainer();
+        if (shouldCommit) {
+          console.log(`=> COMMIT to ${r.url}`);
+          console.log(`=> COMMIT in ${repo.printcwd()}`);
+          const isOnMain = await repo.isOnMainBranch();
+          const isOnBaseBranch = await repo.isOnBranch(r.base_branch);
+          if (isOnMain || isOnBaseBranch) {
+            console.log(`=> CHECKOUT to new branch: ${r.branch_name}`);
+            await repo.checkoutNew(r.branch_name);
+          }
+          await repo.addAll();
+          console.log(`=> COMMIT to ${r.url} on branch: ${r.branch_name}`);
+          await repo.commitWithCredentials(r.commit_name, code.git_credentials);
+        }
+        console.log(`=> PUSH to ${r.url}`);
         await repo.pushCurrentBranchWithCredentials(code.git_credentials);
+        const link = await repo.getLatestCommitLink();
+        commits.push(link);
         if (stashCreated) {
           await repo.popDevcontainerStash();
         }
-        const link = await repo.getLatestCommitLink();
-        commits.push(link);
         if (createPR) {
           if (!code.git_credentials?.auth_data?.token) {
             console.error(`=> No GitHub token available for PR creation`);
@@ -80313,20 +80328,28 @@ async function startProxyServer() {
             console.log(`=> Base: ${r.base_branch || "main"}`);
             const repoLocation = repo.printcwd();
             console.log(`=> Repo location: ${repoLocation}`);
-            const currentBranch = await repo.execCommand(
+            const currentBranchRaw = await repo.execCommand(
               "git rev-parse --abbrev-ref HEAD"
             );
-            console.log(`=> Current branch: ${currentBranch.trim()}`);
+            const currentBranch = currentBranchRaw.trim();
+            console.log(`=> Current branch: ${currentBranch}`);
             const baseBranch = r.base_branch || "main";
+            if (currentBranch === baseBranch) {
+              console.log(
+                `=> Cannot create PR: currently on base branch (${baseBranch})`
+              );
+              prs[repoName] = `Error: Cannot create PR - currently on base branch (${baseBranch}). Commit changes to a feature branch first.`;
+              continue;
+            }
             try {
               const diff = await repo.execCommand(
                 `git log origin/${baseBranch}..HEAD --oneline`
               );
               if (!diff.trim()) {
                 console.log(
-                  `=> No commits between ${baseBranch} and current branch`
+                  `=> No commits between ${baseBranch} and ${currentBranch}`
                 );
-                prs[repoName] = "Error: No commits to create PR - branch is up to date with base";
+                prs[repoName] = `Error: No commits to create PR - ${currentBranch} is up to date with ${baseBranch}`;
                 continue;
               }
               console.log(`=> Commits to include in PR:
@@ -80336,7 +80359,7 @@ ${diff.trim()}`);
             }
             const gh = new GitHubCLI(
               code.git_credentials.auth_data.token,
-              r.branch_name,
+              currentBranch,
               repoLocation
             );
             await gh.init();
@@ -80346,8 +80369,8 @@ ${diff.trim()}`);
               prs[repoName] = existingPR.url;
             } else {
               const pr = await gh.createPR({
-                title: r.commit_name || `Changes from ${r.branch_name}`,
-                body: `Automated PR from branch ${r.branch_name}`,
+                title: r.commit_name || `Changes from ${currentBranch}`,
+                body: `Automated PR from branch ${currentBranch}`,
                 base: baseBranch,
                 draft: false
               });

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.9";
+var VERSION = "0.3.10";
 
 // 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.9",
+  "version": "0.3.10",
   "type": "module",
   "publisher": "stakwork",
   "engines": {