staklink 0.3.7 → 0.3.9

package/dist/proxy-server.cjs

@@ -33901,7 +33901,7 @@ var SSEManager = class {
 var sseManager = new SSEManager();
 
 // src/proxy/version.ts
-var VERSION = "0.3.7";
+var VERSION = "0.3.9";
 
 // node_modules/uuid/dist/esm/stringify.js
 var byteToHex = [];
@@ -79588,9 +79588,11 @@ var GitHubCLI = class {
   branch;
   owner;
   repo;
-  constructor(token, branch) {
+  cwd;
+  constructor(token, branch, cwd) {
     this.token = token;
     this.branch = branch;
+    this.cwd = cwd;
   }
   /**
    * Initialize and get repo info from git
@@ -79612,6 +79614,7 @@ var GitHubCLI = class {
     const fullCommand = `gh ${command}`;
     try {
       return await execAsync(fullCommand, {
+        cwd: this.cwd,
         env: {
           ...process.env,
           GH_TOKEN: this.token,
@@ -79632,6 +79635,7 @@ Stderr: ${error82.stderr}`
     const fullCommand = `gh ${command}`;
     try {
       return (0, import_child_process4.execSync)(fullCommand, {
+        cwd: this.cwd,
         encoding: "utf-8",
         env: {
           ...process.env,
@@ -80289,6 +80293,7 @@ async function startProxyServer() {
       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();
         await repo.pushCurrentBranchWithCredentials(code.git_credentials);
         if (stashCreated) {
@@ -80297,7 +80302,6 @@ async function startProxyServer() {
         const link = await repo.getLatestCommitLink();
         commits.push(link);
         if (createPR) {
-          const repoName = getRepoNameFromUrl(r.url);
           if (!code.git_credentials?.auth_data?.token) {
             console.error(`=> No GitHub token available for PR creation`);
             prs[repoName] = "Error: GitHub token required for PR creation";
@@ -80307,9 +80311,33 @@ async function startProxyServer() {
             console.log(`=> Creating PR for ${r.url}`);
             console.log(`=> Branch: ${r.branch_name}`);
             console.log(`=> Base: ${r.base_branch || "main"}`);
+            const repoLocation = repo.printcwd();
+            console.log(`=> Repo location: ${repoLocation}`);
+            const currentBranch = await repo.execCommand(
+              "git rev-parse --abbrev-ref HEAD"
+            );
+            console.log(`=> Current branch: ${currentBranch.trim()}`);
+            const baseBranch = r.base_branch || "main";
+            try {
+              const diff = await repo.execCommand(
+                `git log origin/${baseBranch}..HEAD --oneline`
+              );
+              if (!diff.trim()) {
+                console.log(
+                  `=> No commits between ${baseBranch} and current branch`
+                );
+                prs[repoName] = "Error: No commits to create PR - branch is up to date with base";
+                continue;
+              }
+              console.log(`=> Commits to include in PR:
+${diff.trim()}`);
+            } catch (diffError) {
+              console.warn(`=> Could not check commit diff: ${diffError}`);
+            }
             const gh = new GitHubCLI(
               code.git_credentials.auth_data.token,
-              r.branch_name
+              r.branch_name,
+              repoLocation
             );
             await gh.init();
             const existingPR = await gh.findPRByBranch();
@@ -80320,7 +80348,7 @@ async function startProxyServer() {
               const pr = await gh.createPR({
                 title: r.commit_name || `Changes from ${r.branch_name}`,
                 body: `Automated PR from branch ${r.branch_name}`,
-                base: r.base_branch || "main",
+                base: baseBranch,
                 draft: false
               });
               console.log(`=> PR created: ${pr.url}`);

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