staklink 0.4.14 → 0.4.16

package/dist/proxy-server.cjs

@@ -60927,7 +60927,7 @@ var SSEManager = class {
 var sseManager = new SSEManager();
 
 // src/proxy/version.ts
-var VERSION = "0.4.14";
+var VERSION = "0.4.16";
 
 // node_modules/uuid/dist/esm/stringify.js
 var byteToHex = [];
@@ -141651,16 +141651,18 @@ function buildPushPrompt(opts) {
   const lines = [
     `You are in the git repo at: ${opts.repoPath}`,
     "",
-    "Perform the following git operations. If any step fails, diagnose the problem and fix it (resolve merge conflicts, pull and rebase, etc). Be resilient - the goal is to get code pushed successfully.",
+    "Perform the following git operations if needed. If any step fails, diagnose the problem and fix it (resolve merge conflicts, pull and rebase, etc). Be resilient - the goal is to get code pushed successfully (if there is code to push of course!).",
     "",
-    "1. Check the current branch. If you are on main or master, create a new feature branch and switch to it. Otherwise stay on the current branch.",
-    "2. Check git status. If there are uncommitted changes, stage them (git add .) and commit with a short descriptive message. If everything is already committed, skip this step.",
-    "3. Push the current branch to origin. If the push is rejected (non-fast-forward, remote has new work, etc), pull with rebase and try again. If there are merge conflicts during rebase, resolve them sensibly and continue."
+    "CRITICAL: Before doing anything, run `git status` and `git log origin/<current-branch>..HEAD` (if the remote branch exists) to check whether there are actually any changes to commit or push. If the working tree is clean AND there are no unpushed commits, STOP IMMEDIATELY. Do NOT create a commit, do NOT push, do NOT create a PR. Just output that there were no changes and exit.",
+    "",
+    `1. Check the current branch. If you are on main or master, create a new feature branch${opts.branchName ? ` named "${opts.branchName}"` : ""} and switch to it. Otherwise stay on the current branch.`,
+    `2. Check git status. If there are uncommitted changes, stage them (git add .) and commit${opts.commitName ? " using the exact commit message provided below" : " with a short descriptive message"}. If everything is already committed, skip this step.`,
+    "3. Push the current branch to origin ONLY if there are unpushed commits. If the branch is already up-to-date with origin, skip this step. If the push is rejected (non-fast-forward, remote has new work, etc), pull with rebase and try again. If there are merge conflicts during rebase, resolve them sensibly and continue."
   ];
   if (opts.createPR) {
     let step = 4;
     lines.push(
-      `${step}. Create a pull request from the current branch to "${opts.baseBranch}" using the gh CLI. The PR title should be derived from the commit message. If a PR already exists for this branch, skip creation.`
+      `${step}. ONLY if you actually pushed commits in step 3, create a pull request from the current branch to "${opts.baseBranch}" using the gh CLI. The PR title should be derived from the commit message. If a PR already exists for this branch, or if there was nothing to push, skip creation.`
     );
     if (opts.label) {
       step++;
@@ -141682,12 +141684,22 @@ function buildPushPrompt(opts) {
   lines.push(
     "",
     "IMPORTANT:",
+    "- If there are NO changes to commit and NO unpushed commits, do NOTHING. Do not commit, do not push, do not create a PR. Just report that there were no changes.",
     "- Do NOT ask for confirmation. Just do it.",
     "- If push fails, try pulling with rebase first. If that fails with conflicts, resolve them and continue.",
     "- Output the PR URL if you created one.",
     "- Output the branch name you ended up on.",
     "- Output the commit hash after pushing."
   );
+  if (opts.commitName) {
+    lines.push(
+      "",
+      "COMMIT MESSAGE (use this exactly with git commit -m, preserve the formatting):",
+      "---",
+      opts.commitName.replace(/[\\"`$]/g, "\\$&"),
+      "---"
+    );
+  }
   return lines.join("\n");
 }
 async function handleAgentPush(req, res) {
@@ -141720,6 +141732,8 @@ async function handleAgentPush(req, res) {
         const repoPath = repo.printcwd();
         const repoName = getRepoNameFromUrl(r.url);
         const baseBranch = r.base_branch || "main";
+        const commitName = r.commit_name;
+        const branchName = r.branch_name;
         const { env: credEnv, teardown } = await setupGlobalGitCredentials(
           repoPath,
           code.git_credentials
@@ -141730,7 +141744,9 @@ async function handleAgentPush(req, res) {
             createPR,
             autoMerge,
             label,
-            baseBranch
+            baseBranch,
+            commitName,
+            branchName
           });
           log(`=> agent/push prompt for ${repoName}:
 ${prompt}`);

package/dist/staklink-cli.cjs

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