staklink 0.3.75 → 0.3.76

package/dist/proxy-server.cjs

@@ -53094,9 +53094,7 @@ async function startup() {
   try {
     await runner.runRebuildCommands(config4);
     await runner.runInstallCommands(config4);
-    log(
-      `\u2705 Install commands executed successfully in ${workspaceRoot2}`
-    );
+    log(`\u2705 Install commands executed successfully in ${workspaceRoot2}`);
   } catch (error87) {
     log(`\u274C Failed to run install/rebuild commands: ${error87}`);
   }
@@ -61116,9 +61114,7 @@ var Repo = class {
         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}`
-            );
+            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")) {
@@ -61217,7 +61213,7 @@ var SSEManager = class {
 var sseManager = new SSEManager();
 
 // src/proxy/version.ts
-var VERSION = "0.3.75";
+var VERSION = "0.3.76";
 
 // node_modules/uuid/dist/esm/stringify.js
 var byteToHex = [];
@@ -121564,7 +121560,14 @@ function goose_env(apiKey) {
     PATH: `${path7.join(os.homedir(), ".local", "bin")}:${process.env.PATH}`
   };
 }
-async function runAgent({ prompt, apiKey, cwd, system_prompt, session, summarize }) {
+async function runAgent({
+  prompt,
+  apiKey,
+  cwd,
+  system_prompt,
+  session,
+  summarize
+}) {
   createGooseConfig();
   const env = goose_env(apiKey);
   console.log("RUN goose with env", env);
@@ -121641,7 +121644,11 @@ async function runGooseWeb(apiKey, cwd, port) {
 
 // src/agent/claude_code.ts
 var import_child_process3 = require("child_process");
-async function runAgent2({ prompt, apiKey, cwd }) {
+async function runAgent2({
+  prompt,
+  apiKey,
+  cwd
+}) {
   if (!apiKey) {
     throw new Error("Missing ANTHROPIC_API_KEY");
   }
@@ -132909,7 +132916,9 @@ async function streamGooseToSSE(sessionId, prompt, apiKey, res, options) {
                 id: completed.id,
                 text: completed.text,
                 timestamp: Date.now()
-              }).catch((error87) => error("Error posting to webhook", error87));
+              }).catch(
+                (error87) => error("Error posting to webhook", error87)
+              );
               textAccumulators.delete(p.id);
             }
             break;
@@ -132921,7 +132930,9 @@ async function streamGooseToSSE(sessionId, prompt, apiKey, res, options) {
               toolName: p.toolName,
               input: p.input,
               timestamp: Date.now()
-            }).catch((error87) => error("Error posting to webhook", error87));
+            }).catch(
+              (error87) => error("Error posting to webhook", error87)
+            );
             break;
           case "tool-result":
             postToWebhook(options.webhookUrl, {
@@ -132931,7 +132942,9 @@ async function streamGooseToSSE(sessionId, prompt, apiKey, res, options) {
               toolName: p.toolName,
               output: truncateOutput(p.output),
               timestamp: Date.now()
-            }).catch((error87) => error("Error posting to webhook", error87));
+            }).catch(
+              (error87) => error("Error posting to webhook", error87)
+            );
             break;
         }
       }
@@ -133560,9 +133573,7 @@ async function cleanupConfig(configState) {
     try {
       if (configState.wasCreated) {
         await fs11.unlink(configState.configPath);
-        log(
-          `Cleaned up created config file: ${configState.configPath}`
-        );
+        log(`Cleaned up created config file: ${configState.configPath}`);
       } else if (configState.wasModified && configState.originalContent) {
         await fs11.writeFile(configState.configPath, configState.originalContent);
         log(`Restored original config: ${configState.configPath}`);
@@ -134077,16 +134088,81 @@ Stderr: ${error87.stderr}`
 };
 
 // src/proxy/git_actions.ts
-async function handleDiff(_req, res) {
+async function handleBranchDiff(req, res) {
   try {
     const results = [];
     const repos = await getReposMaybe();
+    const baseBranch = req.query.base || "main";
     for (const r of repos) {
       const repo = await NewRepo(r);
       const repoName = getRepoNameFromUrl(r);
+      const currentBranch = (await repo.printCurrentBranch()).trim();
+      if (currentBranch === baseBranch) {
+        continue;
+      }
+      let mergeBase;
+      try {
+        mergeBase = (await repo.execCommand(`git merge-base ${baseBranch} HEAD`)).trim();
+      } catch {
+        try {
+          mergeBase = (await repo.execCommand(`git merge-base origin/${baseBranch} HEAD`)).trim();
+        } catch {
+          warn(
+            `Could not find merge base for ${repoName}, skipping...`
+          );
+          continue;
+        }
+      }
       const diffOutput = await repo.execCommand(
-        "git diff --name-status HEAD"
+        `git diff --name-status ${mergeBase}`
       );
+      const lines = diffOutput.trim().split("\n").filter((line) => line);
+      for (const line of lines) {
+        const parts = line.split("	");
+        if (parts.length < 2) {
+          continue;
+        }
+        const status = parts[0];
+        const filePath = parts[1];
+        let action;
+        if (status.startsWith("A")) {
+          action = "create";
+        } else if (status.startsWith("D")) {
+          action = "delete";
+        } else {
+          action = "modify";
+        }
+        let content = "";
+        try {
+          content = await repo.execCommand(
+            `git diff ${mergeBase} -- "${filePath}"`
+          );
+        } catch (error87) {
+          warn(`Error getting branch diff for ${filePath}:`, error87);
+        }
+        results.push({
+          file: `${repoName}/${filePath}`,
+          action,
+          content,
+          repoName,
+          errors: []
+        });
+      }
+    }
+    res.status(200).json(results);
+  } catch (error87) {
+    error("Error fetching branch diff:", error87);
+    fail(res, error87);
+  }
+}
+async function handleDiff(_req, res) {
+  try {
+    const results = [];
+    const repos = await getReposMaybe();
+    for (const r of repos) {
+      const repo = await NewRepo(r);
+      const repoName = getRepoNameFromUrl(r);
+      const diffOutput = await repo.execCommand("git diff --name-status HEAD");
       const untrackedOutput = await repo.execCommand(
         "git ls-files --others --exclude-standard"
       );
@@ -134109,14 +134185,10 @@ async function handleDiff(_req, res) {
         let content = "";
         try {
           if (action === "delete") {
-            content = await repo.execCommand(
-              `git diff HEAD -- "${filePath}"`
-            );
+            content = await repo.execCommand(`git diff HEAD -- "${filePath}"`);
           } else {
             log("Getting diff for", filePath);
-            content = await repo.execCommand(
-              `git diff HEAD -- "${filePath}"`
-            );
+            content = await repo.execCommand(`git diff HEAD -- "${filePath}"`);
           }
         } catch (error87) {
           warn(`Error getting diff for ${filePath}:`, error87);
@@ -134340,10 +134412,7 @@ ${diff.trim()}`);
               log(
                 `=> Waiting for CI checks to appear for PR #${prNumber}...`
               );
-              const hasChecks = await gh.waitForChecksToExist(
-                prNumber,
-                3e4
-              );
+              const hasChecks = await gh.waitForChecksToExist(prNumber, 3e4);
               if (hasChecks) {
                 log(`=> Enabling auto-merge for PR #${prNumber}...`);
                 await gh.mergePR(prNumber, {
@@ -134664,41 +134733,65 @@ async function startProxyServer() {
   app.use(updateLastHit);
   app.post("/code", async (req, res) => {
     log("===> POST code");
-    await handleRequest(req, res, "code", async (req2, res2) => {
-      let restartAfter = req2.query.restart === "false" ? false : true;
-      const code = req2.body;
-      const result = await processCode(code);
-      if (restartAfter) {
-        await restartConfiguredProcesses();
-      }
-      res2.json({ success: true, result });
-    }, VSCODE_EXTENSION_URL);
+    await handleRequest(
+      req,
+      res,
+      "code",
+      async (req2, res2) => {
+        let restartAfter = req2.query.restart === "false" ? false : true;
+        const code = req2.body;
+        const result = await processCode(code);
+        if (restartAfter) {
+          await restartConfiguredProcesses();
+        }
+        res2.json({ success: true, result });
+      },
+      VSCODE_EXTENSION_URL
+    );
   });
   app.post("/actions", async (req, res) => {
     log("===> POST actions");
-    await handleRequest(req, res, "actions", async (req2, res2) => {
-      let restartAfter = req2.query.restart === "false" ? false : true;
-      const code = req2.body;
-      const result = await processCode(code);
-      if (restartAfter) {
-        await restartConfiguredProcesses();
-      }
-      res2.json({ success: true, result });
-    }, VSCODE_EXTENSION_URL);
+    await handleRequest(
+      req,
+      res,
+      "actions",
+      async (req2, res2) => {
+        let restartAfter = req2.query.restart === "false" ? false : true;
+        const code = req2.body;
+        const result = await processCode(code);
+        if (restartAfter) {
+          await restartConfiguredProcesses();
+        }
+        res2.json({ success: true, result });
+      },
+      VSCODE_EXTENSION_URL
+    );
   });
   app.get("/rules", async (req, res) => {
     log("===> GET rules");
-    await handleRequest(req, res, "rules", async (req2, res2) => {
-      const root = await workspaceRoot();
-      const rules = await gatherRulesFiles(root);
-      res2.json(rules);
-    }, VSCODE_EXTENSION_URL);
+    await handleRequest(
+      req,
+      res,
+      "rules",
+      async (req2, res2) => {
+        const root = await workspaceRoot();
+        const rules = await gatherRulesFiles(root);
+        res2.json(rules);
+      },
+      VSCODE_EXTENSION_URL
+    );
   });
   app.get("/errors", async (req, res) => {
     log("===> GET errors");
-    await handleRequest(req, res, "errors", async (req2, res2) => {
-      res2.json({});
-    }, VSCODE_EXTENSION_URL);
+    await handleRequest(
+      req,
+      res,
+      "errors",
+      async (req2, res2) => {
+        res2.json({});
+      },
+      VSCODE_EXTENSION_URL
+    );
   });
   app.get("/logs", async (req, res) => {
     log("===> GET logs");
@@ -134749,6 +134842,10 @@ async function startProxyServer() {
     log("===> GET diff");
     await handleDiff(req, res);
   });
+  app.get("/branch-diff", async (req, res) => {
+    log("===> GET branch-diff");
+    await handleBranchDiff(req, res);
+  });
   app.post("/commit", async (req, res) => {
     log(`===> POST /commit`);
     await handleCommit(req, res);

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