staklink 0.3.72 → 0.3.74

package/dist/proxy-server.cjs

@@ -61136,16 +61136,40 @@ var Repo = class {
     await this.unsetUserConfig();
   }
   // Enhanced push method that accepts user credentials
+  // Automatically handles the case where remote has new commits (e.g., from GitHub rebase)
+  // by pulling with rebase and pushing again
   async pushCurrentBranchWithCredentials(credentials) {
     const currentBranch = (await this.printCurrentBranch()).trim();
     try {
       if (credentials) {
         await this.setUserCredentials(credentials);
       }
-      const result = await this.push(currentBranch);
-      return result;
-    } catch (e) {
-      throw e;
+      try {
+        const result = await this.push(currentBranch);
+        return result;
+      } catch (pushError) {
+        const errorMessage = pushError instanceof Error ? pushError.message : String(pushError);
+        const isRejectedDueToRemoteChanges = errorMessage.includes("[rejected]") || errorMessage.includes("non-fast-forward") || errorMessage.includes("Updates were rejected");
+        if (isRejectedDueToRemoteChanges) {
+          try {
+            await this.execCommand(
+              `git pull --rebase origin ${currentBranch}`
+            );
+          } catch (pullError) {
+            const status = await this.execCommand("git status");
+            if (status.includes("rebase in progress") || status.includes("Unmerged") || status.includes("both modified")) {
+              await this.execCommand("git rebase --abort");
+              throw new Error(
+                `Push failed: Remote has conflicting changes that cannot be automatically rebased. Please resolve conflicts manually.`
+              );
+            }
+            throw pullError;
+          }
+          const result = await this.push(currentBranch);
+          return result;
+        }
+        throw pushError;
+      }
     } finally {
       if (credentials) {
         await this.restoreOriginalCredentials();
@@ -61229,7 +61253,7 @@ var SSEManager = class {
 var sseManager = new SSEManager();
 
 // src/proxy/version.ts
-var VERSION = "0.3.72";
+var VERSION = "0.3.74";
 
 // node_modules/uuid/dist/esm/stringify.js
 var byteToHex = [];
@@ -121727,9 +121751,6 @@ services:
 <Dockerfile>
 FROM ghcr.io/stakwork/staklink-js:latest
 </Dockerfile>
-<.env>
-NEW_ENV_VAR=some_value
-</.env>
 
 IMPORTANT: YOU DO NOT NEED TO INCLUDE FILES THAT DID NOT CHANGE. Only include files that you modified.`;
 var REPAIR_PROMPT = `Please inspect the current running environment, and try to fix it. The user tried to load the frontend on the defined PORT, but something went wrong.`;
@@ -121737,13 +121758,13 @@ var makeRepairPrompt = (podConfigPath, history, initialPrompt) => {
   let p = initialPrompt ? initialPrompt : REPAIR_PROMPT;
   p += `
   
-The config files can be read at ${podConfigPath}. You must find out how to edit the pm2.config.js and the docker-compose.yaml in order to get the project to run successfully (there is also a Dockerfile which may also be changed if absolutely needed). Also you may need to return required environment variables in a .env file. Focus on the frontend app defined in the pm2 config file, don't worry about other services unless they are needed to run the frontend. For example, if its a next.js app, you can read the package.json to see what SHOULD be in the pm2 "script" command or the special install/build/etc commands. REMEMBER: this is a development environment, so the pm2 script should be something like "npm run dev" or something similar... we want to default to whatever start script is best for development (like whatever has hot-reload etc).
+The config files can be read at ${podConfigPath}. You must find out how to edit the pm2.config.js and the docker-compose.yaml in order to get the project to run successfully (there is also a Dockerfile which may also be changed if absolutely needed). Remember that you may need to add or alter env vars in the pm2.config.js file. Focus on the frontend app defined in the pm2 config file, don't worry about other services unless they are needed to run the frontend. For example, if its a next.js app, you can read the package.json to see what SHOULD be in the pm2 "script" command or the special install/build/etc commands. REMEMBER: this is a development environment, so the pm2 script should be something like "npm run dev" or something similar... we want to default to whatever start script is best for development (like whatever has hot-reload etc).
 
 This project is currently running a remote code-server instance. Docker is optional, but may be used. The docker-compose file has already been started. You can use the regular docker commands (docker ps, docker logs, etc) to inspect the running containers.
 
 The actual core project code is being run with pm2! You can use pm2 commands to inspect the running processes. However, there is another service running in pm2 also (called staklink-proxy), that is not part of the software project at hand. DO NOT run "pm2 logs" just like that... only read logs of specific processes from the pm2 config file one at a time! Your goal is to get all supporting services and processes running in order to run the main project frontend. (Of course, sometimes its just one simple frontend process without supporting services. It really just depends on the project).
 
-We have SPECIAL env vars for pm2, that tell the code-server system how to automatically build and start the project.
+Along with general env vars, we have SPECIAL env vars for pm2, that tell the code-server system how to automatically build and start the project.
 - PORT: The port the project runs on (e.g. 3000)
 - INSTALL_COMMAND: The command to install dependencies (e.g. npm install)
 - BUILD_COMMAND: The command to build the project (e.g. npm run build)

package/dist/staklink-cli.cjs

@@ -10967,7 +10967,7 @@ var glob = Object.assign(glob_, {
 glob.glob = glob;
 
 // src/proxy/version.ts
-var VERSION = "0.3.72";
+var VERSION = "0.3.74";
 
 // 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.72",
+  "version": "0.3.74",
   "type": "module",
   "publisher": "stakwork",
   "engines": {