staklink 0.3.74 → 0.3.76

package/dist/proxy-server.cjs

@@ -1289,8 +1289,8 @@ var require_node = __commonJS({
           }
           break;
         case "FILE":
-          var fs13 = require("fs");
-          stream3 = new fs13.SyncWriteStream(fd2, { autoClose: false });
+          var fs14 = require("fs");
+          stream3 = new fs14.SyncWriteStream(fd2, { autoClose: false });
           stream3._type = "fs";
           break;
         case "PIPE":
@@ -17508,8 +17508,8 @@ var require_node2 = __commonJS({
           }
           break;
         case "FILE":
-          var fs13 = require("fs");
-          stream3 = new fs13.SyncWriteStream(fd2, { autoClose: false });
+          var fs14 = require("fs");
+          stream3 = new fs14.SyncWriteStream(fd2, { autoClose: false });
           stream3._type = "fs";
           break;
         case "PIPE":
@@ -18227,8 +18227,8 @@ var require_node3 = __commonJS({
           }
           break;
         case "FILE":
-          var fs13 = require("fs");
-          stream3 = new fs13.SyncWriteStream(fd2, { autoClose: false });
+          var fs14 = require("fs");
+          stream3 = new fs14.SyncWriteStream(fd2, { autoClose: false });
           stream3._type = "fs";
           break;
         case "PIPE":
@@ -19120,7 +19120,7 @@ var require_view = __commonJS({
     "use strict";
     var debug = require_src3()("express:view");
     var path11 = require("path");
-    var fs13 = require("fs");
+    var fs14 = require("fs");
     var dirname2 = path11.dirname;
     var basename2 = path11.basename;
     var extname = path11.extname;
@@ -19186,7 +19186,7 @@ var require_view = __commonJS({
     function tryStat(path12) {
       debug('stat "%s"', path12);
       try {
-        return fs13.statSync(path12);
+        return fs14.statSync(path12);
       } catch (e) {
         return void 0;
       }
@@ -19791,8 +19791,8 @@ var require_node4 = __commonJS({
           }
           break;
         case "FILE":
-          var fs13 = require("fs");
-          stream3 = new fs13.SyncWriteStream(fd2, { autoClose: false });
+          var fs14 = require("fs");
+          stream3 = new fs14.SyncWriteStream(fd2, { autoClose: false });
           stream3._type = "fs";
           break;
         case "PIPE":
@@ -19979,7 +19979,7 @@ var require_types = __commonJS({
 var require_mime = __commonJS({
   "node_modules/mime/mime.js"(exports2, module2) {
     var path11 = require("path");
-    var fs13 = require("fs");
+    var fs14 = require("fs");
     function Mime() {
       this.types = /* @__PURE__ */ Object.create(null);
       this.extensions = /* @__PURE__ */ Object.create(null);
@@ -20000,7 +20000,7 @@ var require_mime = __commonJS({
     };
     Mime.prototype.load = function(file3) {
       this._loading = file3;
-      var map3 = {}, content = fs13.readFileSync(file3, "ascii"), lines = content.split(/[\r\n]+/);
+      var map3 = {}, content = fs14.readFileSync(file3, "ascii"), lines = content.split(/[\r\n]+/);
       lines.forEach(function(line) {
         var fields = line.replace(/\s*#.*|^\s*|\s*$/g, "").split(/\s+/);
         map3[fields.shift()] = fields;
@@ -20238,7 +20238,7 @@ var require_send = __commonJS({
     var escapeHtml = require_escape_html();
     var etag = require_etag();
     var fresh = require_fresh();
-    var fs13 = require("fs");
+    var fs14 = require("fs");
     var mime = require_mime();
     var ms = require_ms5();
     var onFinished = require_on_finished();
@@ -20571,7 +20571,7 @@ var require_send = __commonJS({
       var i = 0;
       var self = this;
       debug('stat "%s"', path12);
-      fs13.stat(path12, function onstat(err, stat4) {
+      fs14.stat(path12, function onstat(err, stat4) {
         if (err && err.code === "ENOENT" && !extname(path12) && path12[path12.length - 1] !== sep2) {
           return next(err);
         }
@@ -20586,7 +20586,7 @@ var require_send = __commonJS({
         }
         var p = path12 + "." + self._extensions[i++];
         debug('stat "%s"', p);
-        fs13.stat(p, function(err2, stat4) {
+        fs14.stat(p, function(err2, stat4) {
           if (err2) return next(err2);
           if (stat4.isDirectory()) return next();
           self.emit("file", p, stat4);
@@ -20604,7 +20604,7 @@ var require_send = __commonJS({
         }
         var p = join7(path12, self._index[i]);
         debug('stat "%s"', p);
-        fs13.stat(p, function(err2, stat4) {
+        fs14.stat(p, function(err2, stat4) {
           if (err2) return next(err2);
           if (stat4.isDirectory()) return next();
           self.emit("file", p, stat4);
@@ -20616,7 +20616,7 @@ var require_send = __commonJS({
     SendStream.prototype.stream = function stream2(path12, options) {
       var self = this;
       var res = this.res;
-      var stream3 = fs13.createReadStream(path12, options);
+      var stream3 = fs14.createReadStream(path12, options);
       this.emit("stream", stream3);
       stream3.pipe(res);
       function cleanup2() {
@@ -24146,7 +24146,7 @@ var require_token_util = __commonJS({
     });
     module2.exports = __toCommonJS(token_util_exports);
     var path11 = __toESM2(require("path"));
-    var fs13 = __toESM2(require("fs"));
+    var fs14 = __toESM2(require("fs"));
     var import_token_error = require_token_error();
     var import_token_io = require_token_io();
     function getVercelDataDir() {
@@ -24163,10 +24163,10 @@ var require_token_util = __commonJS({
         return null;
       }
       const tokenPath = path11.join(dataDir, "auth.json");
-      if (!fs13.existsSync(tokenPath)) {
+      if (!fs14.existsSync(tokenPath)) {
         return null;
       }
-      const token = fs13.readFileSync(tokenPath, "utf8");
+      const token = fs14.readFileSync(tokenPath, "utf8");
       if (!token) {
         return null;
       }
@@ -24208,10 +24208,10 @@ var require_token_util = __commonJS({
       }
       try {
         const prjPath = path11.join(dir, ".vercel", "project.json");
-        if (!fs13.existsSync(prjPath)) {
+        if (!fs14.existsSync(prjPath)) {
           throw new import_token_error.VercelOidcTokenError("project.json not found");
         }
-        const prj = JSON.parse(fs13.readFileSync(prjPath, "utf8"));
+        const prj = JSON.parse(fs14.readFileSync(prjPath, "utf8"));
         if (typeof prj.projectId !== "string" && typeof prj.orgId !== "string") {
           throw new TypeError("Expected a string-valued projectId property");
         }
@@ -24228,9 +24228,9 @@ var require_token_util = __commonJS({
         }
         const tokenPath = path11.join(dir, "com.vercel.token", `${projectId}.json`);
         const tokenJson = JSON.stringify(token);
-        fs13.mkdirSync(path11.dirname(tokenPath), { mode: 504, recursive: true });
-        fs13.writeFileSync(tokenPath, tokenJson);
-        fs13.chmodSync(tokenPath, 432);
+        fs14.mkdirSync(path11.dirname(tokenPath), { mode: 504, recursive: true });
+        fs14.writeFileSync(tokenPath, tokenJson);
+        fs14.chmodSync(tokenPath, 432);
         return;
       } catch (e) {
         throw new import_token_error.VercelOidcTokenError(`Failed to save token`, e);
@@ -24243,10 +24243,10 @@ var require_token_util = __commonJS({
           return null;
         }
         const tokenPath = path11.join(dir, "com.vercel.token", `${projectId}.json`);
-        if (!fs13.existsSync(tokenPath)) {
+        if (!fs14.existsSync(tokenPath)) {
           return null;
         }
-        const token = JSON.parse(fs13.readFileSync(tokenPath, "utf8"));
+        const token = JSON.parse(fs14.readFileSync(tokenPath, "utf8"));
         assertVercelOidcTokenResponse(token);
         return token;
       } catch (e) {
@@ -26278,7 +26278,7 @@ var require_auth_config = __commonJS({
       writeAuthConfig: () => writeAuthConfig
     });
     module2.exports = __toCommonJS(auth_config_exports);
-    var fs13 = __toESM2(require("fs"));
+    var fs14 = __toESM2(require("fs"));
     var path11 = __toESM2(require("path"));
     var import_token_util = require_token_util2();
     function getAuthConfigPath() {
@@ -26293,10 +26293,10 @@ var require_auth_config = __commonJS({
     function readAuthConfig() {
       try {
         const authPath = getAuthConfigPath();
-        if (!fs13.existsSync(authPath)) {
+        if (!fs14.existsSync(authPath)) {
           return null;
         }
-        const content = fs13.readFileSync(authPath, "utf8");
+        const content = fs14.readFileSync(authPath, "utf8");
         if (!content) {
           return null;
         }
@@ -26308,10 +26308,10 @@ var require_auth_config = __commonJS({
     function writeAuthConfig(config4) {
       const authPath = getAuthConfigPath();
       const authDir = path11.dirname(authPath);
-      if (!fs13.existsSync(authDir)) {
-        fs13.mkdirSync(authDir, { mode: 504, recursive: true });
+      if (!fs14.existsSync(authDir)) {
+        fs14.mkdirSync(authDir, { mode: 504, recursive: true });
       }
-      fs13.writeFileSync(authPath, JSON.stringify(config4, null, 2), { mode: 384 });
+      fs14.writeFileSync(authPath, JSON.stringify(config4, null, 2), { mode: 384 });
     }
     function isValidAccessToken(authConfig) {
       if (!authConfig.token)
@@ -26458,7 +26458,7 @@ var require_token_util2 = __commonJS({
     });
     module2.exports = __toCommonJS(token_util_exports);
     var path11 = __toESM2(require("path"));
-    var fs13 = __toESM2(require("fs"));
+    var fs14 = __toESM2(require("fs"));
     var import_token_error = require_token_error2();
     var import_token_io = require_token_io2();
     var import_auth_config = require_auth_config();
@@ -26543,12 +26543,12 @@ var require_token_util2 = __commonJS({
         );
       }
       const prjPath = path11.join(dir, ".vercel", "project.json");
-      if (!fs13.existsSync(prjPath)) {
+      if (!fs14.existsSync(prjPath)) {
         throw new import_token_error.VercelOidcTokenError(
           "project.json not found, have you linked your project with `vc link?`"
         );
       }
-      const prj = JSON.parse(fs13.readFileSync(prjPath, "utf8"));
+      const prj = JSON.parse(fs14.readFileSync(prjPath, "utf8"));
       if (typeof prj.projectId !== "string" && typeof prj.orgId !== "string") {
         throw new TypeError(
           "Expected a string-valued projectId property. Try running `vc link` to re-link your project."
@@ -26565,9 +26565,9 @@ var require_token_util2 = __commonJS({
       }
       const tokenPath = path11.join(dir, "com.vercel.token", `${projectId}.json`);
       const tokenJson = JSON.stringify(token);
-      fs13.mkdirSync(path11.dirname(tokenPath), { mode: 504, recursive: true });
-      fs13.writeFileSync(tokenPath, tokenJson);
-      fs13.chmodSync(tokenPath, 432);
+      fs14.mkdirSync(path11.dirname(tokenPath), { mode: 504, recursive: true });
+      fs14.writeFileSync(tokenPath, tokenJson);
+      fs14.chmodSync(tokenPath, 432);
       return;
     }
     function loadToken(projectId) {
@@ -26578,10 +26578,10 @@ var require_token_util2 = __commonJS({
         );
       }
       const tokenPath = path11.join(dir, "com.vercel.token", `${projectId}.json`);
-      if (!fs13.existsSync(tokenPath)) {
+      if (!fs14.existsSync(tokenPath)) {
         return null;
       }
-      const token = JSON.parse(fs13.readFileSync(tokenPath, "utf8"));
+      const token = JSON.parse(fs14.readFileSync(tokenPath, "utf8"));
       assertVercelOidcTokenResponse(token);
       return token;
     }
@@ -52826,6 +52826,14 @@ var require_undici = __commonJS({
 // src/proxy/server.ts
 var import_express = __toESM(require_express2(), 1);
 
+// src/proxy/utils.ts
+var fs5 = __toESM(require("fs/promises"), 1);
+
+// src/proxy/pm2.ts
+var import_util = require("util");
+var proc = __toESM(require("child_process"), 1);
+var fs = __toESM(require("fs"), 1);
+
 // src/proxy/logger.ts
 function formatTimestamp() {
   const now3 = /* @__PURE__ */ new Date();
@@ -52843,110 +52851,7 @@ function warn(...args) {
   console.warn(formatTimestamp(), ...args);
 }
 
-// src/proxy/parse.ts
-function parseXmlResponse(xmlString) {
-  function extractBetweenTags(xml, tag) {
-    const startTag = `<${tag}>`;
-    const endTag = `</${tag}>`;
-    const startIndex = xml.indexOf(startTag) + startTag.length;
-    const endIndex = xml.indexOf(endTag);
-    if (startIndex === -1 + startTag.length || endIndex === -1) {
-      return "";
-    }
-    return xml.slice(startIndex, endIndex);
-  }
-  function extractFiles(xml) {
-    const files2 = [];
-    let remainingXml = xml;
-    while (remainingXml.includes("<file")) {
-      const fileStart = remainingXml.indexOf("<file");
-      const fileEndTag = remainingXml.indexOf("</file>");
-      if (fileEndTag === -1) {
-        break;
-      }
-      const fileEnd = fileEndTag + 7;
-      const fileXml = remainingXml.slice(fileStart, fileEnd);
-      const pathMatch = fileXml.match(/path="([^"]*)"/);
-      const actionMatch = fileXml.match(/action="([^"]*)"/);
-      const path11 = pathMatch ? pathMatch[1] : "";
-      const action = actionMatch ? actionMatch[1] : "modify";
-      const changes = [];
-      let changeXml = fileXml;
-      while (changeXml.includes("<change>")) {
-        const changeStart = changeXml.indexOf("<change>");
-        const changeEndTag = changeXml.indexOf("</change>");
-        if (changeEndTag === -1) {
-          break;
-        }
-        const changeEnd = changeEndTag + 8;
-        const currentChange = changeXml.slice(changeStart, changeEnd);
-        const description = extractBetweenTags(currentChange, "description");
-        let search = void 0;
-        if (currentChange.includes("<search>") && currentChange.includes("</search>")) {
-          const searchText = extractBetweenTags(currentChange, "search");
-          try {
-            if (searchText) {
-              search = extractContent(searchText);
-            }
-          } catch (e) {
-          }
-        }
-        let content = "";
-        if (currentChange.includes("<content>") && currentChange.includes("</content>")) {
-          const contentText = extractBetweenTags(currentChange, "content");
-          try {
-            if (contentText) {
-              content = extractContent(contentText);
-            } else {
-              changeXml = changeXml.slice(changeEnd);
-              continue;
-            }
-          } catch (e) {
-            changeXml = changeXml.slice(changeEnd);
-            continue;
-          }
-        } else {
-          changeXml = changeXml.slice(changeEnd);
-          continue;
-        }
-        changes.push({
-          description,
-          search: search || void 0,
-          content
-        });
-        changeXml = changeXml.slice(changeEnd);
-      }
-      if (changes.length > 0) {
-        files2.push({ path: path11, action, changes });
-      }
-      remainingXml = remainingXml.slice(fileEnd);
-    }
-    return files2;
-  }
-  const plan = extractBetweenTags(xmlString, "Plan").trim();
-  const files = extractFiles(xmlString);
-  return { plan, files };
-}
-function extractContent(text3) {
-  const marker40 = "\n===\n";
-  const firstIndex = text3.indexOf(marker40);
-  const lastIndex = text3.lastIndexOf(marker40);
-  if (firstIndex === -1 || lastIndex === -1 || firstIndex === lastIndex) {
-    log("==============> ERROR no \\n===\\n", JSON.stringify(text3));
-    throw new Error(
-      "Input string must include at least two '\\n===\\n' markers"
-    );
-  }
-  return text3.substring(firstIndex + marker40.length, lastIndex);
-}
-
-// src/proxy/utils.ts
-var fs5 = __toESM(require("fs/promises"), 1);
-
 // src/proxy/pm2.ts
-var import_util = require("util");
-var proc = __toESM(require("child_process"), 1);
-var fs = __toESM(require("fs"), 1);
 var exec2 = (0, import_util.promisify)(proc.exec);
 var PM2Manager = class {
   cwd;
@@ -53189,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}`);
   }
@@ -53942,62 +53845,112 @@ async function getChildDirectories(dirPath) {
   }
 }
 
-// src/proxy/utils.ts
-async function findRepoLocation(repoFullName) {
-  try {
-    log(`Finding location for repo: ${repoFullName}`);
-    if (repoFullName.startsWith("/") && await dirExists(repoFullName)) {
-      return repoFullName;
-    }
-    const repoName = repoFullName.split("/").pop() || "";
-    const repodir1 = `/workspaces/${repoName}`;
-    if (await dirExists(repodir1)) {
-      log(`Found repo in /workspaces: ${repodir1}`);
-      return repodir1;
-    }
-    const repodir2 = `${process.cwd()}/${repoName}`;
-    if (await dirExists(repodir2)) {
-      log(`Found repo in current directory: ${repodir2}`);
-      return repodir2;
+// src/proxy/parse.ts
+function parseXmlResponse(xmlString) {
+  function extractBetweenTags(xml, tag) {
+    const startTag = `<${tag}>`;
+    const endTag = `</${tag}>`;
+    const startIndex = xml.indexOf(startTag) + startTag.length;
+    const endIndex = xml.indexOf(endTag);
+    if (startIndex === -1 + startTag.length || endIndex === -1) {
+      return "";
     }
-    try {
-      const repodirs = (await fs5.readdir("/workspaces")).filter(
-        (dir) => !dir.startsWith(".")
-      );
-      if (repodirs.length === 0) {
-        warn("No workspace folders found");
-        return null;
+    return xml.slice(startIndex, endIndex);
+  }
+  function extractFiles(xml) {
+    const files2 = [];
+    let remainingXml = xml;
+    while (remainingXml.includes("<file")) {
+      const fileStart = remainingXml.indexOf("<file");
+      const fileEndTag = remainingXml.indexOf("</file>");
+      if (fileEndTag === -1) {
+        break;
       }
-      const repodir3 = `/workspaces/${repodirs[0]}`;
-      if (await dirExists(repodir3)) {
-        return repodir3;
+      const fileEnd = fileEndTag + 7;
+      const fileXml = remainingXml.slice(fileStart, fileEnd);
+      const pathMatch = fileXml.match(/path="([^"]*)"/);
+      const actionMatch = fileXml.match(/action="([^"]*)"/);
+      const path11 = pathMatch ? pathMatch[1] : "";
+      const action = actionMatch ? actionMatch[1] : "modify";
+      const changes = [];
+      let changeXml = fileXml;
+      while (changeXml.includes("<change>")) {
+        const changeStart = changeXml.indexOf("<change>");
+        const changeEndTag = changeXml.indexOf("</change>");
+        if (changeEndTag === -1) {
+          break;
+        }
+        const changeEnd = changeEndTag + 8;
+        const currentChange = changeXml.slice(changeStart, changeEnd);
+        const description = extractBetweenTags(currentChange, "description");
+        let search = void 0;
+        if (currentChange.includes("<search>") && currentChange.includes("</search>")) {
+          const searchText = extractBetweenTags(currentChange, "search");
+          try {
+            if (searchText) {
+              search = extractContent(searchText);
+            }
+          } catch (e) {
+          }
+        }
+        let content = "";
+        if (currentChange.includes("<content>") && currentChange.includes("</content>")) {
+          const contentText = extractBetweenTags(currentChange, "content");
+          try {
+            if (contentText) {
+              content = extractContent(contentText);
+            } else {
+              changeXml = changeXml.slice(changeEnd);
+              continue;
+            }
+          } catch (e) {
+            changeXml = changeXml.slice(changeEnd);
+            continue;
+          }
+        } else {
+          changeXml = changeXml.slice(changeEnd);
+          continue;
+        }
+        changes.push({
+          description,
+          search: search || void 0,
+          content
+        });
+        changeXml = changeXml.slice(changeEnd);
       }
-      return null;
-    } catch (readdirError) {
-      return null;
+      if (changes.length > 0) {
+        files2.push({ path: path11, action, changes });
+      }
+      remainingXml = remainingXml.slice(fileEnd);
     }
-  } catch (error87) {
-    error("Error in findRepoLocation:", error87);
-    return null;
+    return files2;
   }
+  const plan = extractBetweenTags(xmlString, "Plan").trim();
+  const files = extractFiles(xmlString);
+  return { plan, files };
 }
-async function hasOnlyOneRepo() {
-  try {
-    const basePath = process.cwd().startsWith("/workspaces") ? "/workspaces" : process.cwd();
-    const dirs = (await fs5.readdir(basePath, { withFileTypes: true })).filter((dirent) => dirent.isDirectory() && !dirent.name.startsWith(".")).map((dirent) => dirent.name);
-    return dirs.length === 1;
-  } catch (error87) {
-    error("Error checking workspace directories:", error87);
-    return false;
+function extractContent(text3) {
+  const marker40 = "\n===\n";
+  const firstIndex = text3.indexOf(marker40);
+  const lastIndex = text3.lastIndexOf(marker40);
+  if (firstIndex === -1 || lastIndex === -1 || firstIndex === lastIndex) {
+    log("==============> ERROR no \\n===\\n", JSON.stringify(text3));
+    throw new Error(
+      "Input string must include at least two '\\n===\\n' markers"
+    );
   }
+  return text3.substring(firstIndex + marker40.length, lastIndex);
 }
-function getRepoNameFromUrl(url3) {
-  const matches = url3.match(/github\.com\/([^\/]+\/[^\/\.]+)(\.git)?$/);
-  if (matches && matches[1]) {
-    return matches[1];
-  }
-  const repoName = url3.split("/").pop()?.replace(".git", "") || "";
-  return repoName;
+
+// src/proxy/utils.ts
+function getReposWithChangedFiles(code) {
+  const repoNames = returnRepoNamesForCodeObject(code);
+  log("Repo names to filter:", repoNames);
+  return code.repos.filter((r) => {
+    const rname = getRepoNameFromUrl(r.url);
+    log("Checking repo:", rname);
+    return repoNames.includes(rname);
+  });
 }
 function returnRepoNamesForCodeObject(code) {
   const repoNames = [];
@@ -54025,19 +53978,66 @@ function returnRepoNamesForCodeObject(code) {
   }
   return repoNames;
 }
+async function findRepoLocation(repoFullName) {
+  try {
+    log(`Finding location for repo: ${repoFullName}`);
+    if (repoFullName.startsWith("/") && await dirExists(repoFullName)) {
+      return repoFullName;
+    }
+    const repoName = repoFullName.split("/").pop() || "";
+    const repodir1 = `/workspaces/${repoName}`;
+    if (await dirExists(repodir1)) {
+      log(`Found repo in /workspaces: ${repodir1}`);
+      return repodir1;
+    }
+    const repodir2 = `${process.cwd()}/${repoName}`;
+    if (await dirExists(repodir2)) {
+      log(`Found repo in current directory: ${repodir2}`);
+      return repodir2;
+    }
+    try {
+      const repodirs = (await fs5.readdir("/workspaces")).filter(
+        (dir) => !dir.startsWith(".")
+      );
+      if (repodirs.length === 0) {
+        warn("No workspace folders found");
+        return null;
+      }
+      const repodir3 = `/workspaces/${repodirs[0]}`;
+      if (await dirExists(repodir3)) {
+        return repodir3;
+      }
+      return null;
+    } catch (readdirError) {
+      return null;
+    }
+  } catch (error87) {
+    error("Error in findRepoLocation:", error87);
+    return null;
+  }
+}
+async function hasOnlyOneRepo() {
+  try {
+    const basePath = process.cwd().startsWith("/workspaces") ? "/workspaces" : process.cwd();
+    const dirs = (await fs5.readdir(basePath, { withFileTypes: true })).filter((dirent) => dirent.isDirectory() && !dirent.name.startsWith(".")).map((dirent) => dirent.name);
+    return dirs.length === 1;
+  } catch (error87) {
+    error("Error checking workspace directories:", error87);
+    return false;
+  }
+}
+function getRepoNameFromUrl(url3) {
+  const matches = url3.match(/github\.com\/([^\/]+\/[^\/\.]+)(\.git)?$/);
+  if (matches && matches[1]) {
+    return matches[1];
+  }
+  const repoName = url3.split("/").pop()?.replace(".git", "") || "";
+  return repoName;
+}
 function is_repo_file(file3, reponame) {
   const pathy = file3.path.replaceAll("ast/examples", "stakwork");
   return pathy.startsWith(reponame + "/");
 }
-function getReposWithChangedFiles(code) {
-  const repoNames = returnRepoNamesForCodeObject(code);
-  log("Repo names to filter:", repoNames);
-  return code.repos.filter((r) => {
-    const rname = getRepoNameFromUrl(r.url);
-    log("Checking repo:", rname);
-    return repoNames.includes(rname);
-  });
-}
 var RULES_PATTERNS = [
   "**/.windsurfrules",
   "**/.cursorrules",
@@ -54053,98 +54053,60 @@ function clean_file(file3, reponame) {
     changes: file3.changes
   };
 }
-
-// src/proxy/actions.ts
-var fs6 = __toESM(require("fs/promises"), 1);
-var path4 = __toESM(require("path"), 1);
-async function applyFileAction(file3, filePath) {
-  switch (file3.action) {
-    case "create":
-      await createFile(filePath, file3.changes[0].content);
-      break;
-    case "rewrite":
-      await rewriteFile(filePath, file3.changes[0].content);
-      break;
-    case "modify":
-      await modifyFile(filePath, file3.changes);
-      break;
-    case "delete":
-      await deleteFile(filePath);
-      break;
-    default:
-      throw new Error(`Unknown action: ${file3.action}`);
-  }
+function fail(res, e) {
+  error(e);
+  res.status(200).json({
+    error: "Internal server error",
+    message: e instanceof Error ? e.message : String(e)
+  });
 }
-async function createFile(filePath, content) {
+async function handleRequest(req, res, endpoint, fallbackHandler, vscodeExtensionUrl) {
   try {
-    await fs6.stat(filePath);
-    throw new Error(`File ${filePath} already exists`);
-  } catch (e) {
-    if (e.code !== "ENOENT") {
-      throw e;
+    let url3 = `${vscodeExtensionUrl}/${endpoint}`;
+    if (req.method === "GET" && Object.keys(req.query).length > 0) {
+      const params = new URLSearchParams(req.query);
+      url3 += `?${params.toString()}`;
     }
-  }
-  const dirPath = path4.dirname(filePath);
-  try {
-    await fs6.mkdir(dirPath, { recursive: true });
-  } catch (e) {
-  }
-  await fs6.writeFile(filePath, content, "utf8");
-}
-async function rewriteFile(filePath, content) {
-  try {
-    await fs6.stat(filePath);
-    await fs6.writeFile(filePath, content, "utf8");
-  } catch (e) {
-    if (e.code === "ENOENT") {
-      await createFile(filePath, content);
-    } else {
-      throw e;
+    const forwardHeaders = {
+      "Content-Type": "application/json"
+    };
+    if (req.headers.authorization) {
+      forwardHeaders.authorization = req.headers.authorization;
     }
-  }
-}
-async function modifyFile(filePath, changes) {
-  try {
-    const originalContent = await fs6.readFile(filePath, "utf8");
-    let newContent = originalContent.replace(/\r\n/g, "\n");
-    const finalChange = changes[changes.length - 1];
-    if (finalChange && finalChange.search) {
-      const normalizedSearch = finalChange.search.replace(/\r\n/g, "\n");
-      const searchIndex = newContent.lastIndexOf(normalizedSearch);
-      if (searchIndex !== -1) {
-        log("Found changes to apply!");
-      } else {
-        const emsg = `Search pattern not found in ${filePath} ${finalChange.search}`;
-        error(emsg);
-        throw new Error(emsg);
-      }
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => controller.abort(), 2e4);
+    const response = await fetch(url3, {
+      method: req.method,
+      headers: forwardHeaders,
+      body: req.method !== "GET" ? JSON.stringify(req.body) : void 0,
+      signal: controller.signal
+    });
+    clearTimeout(timeoutId);
+    if (!response.ok) {
+      throw new Error(
+        `VSCode extension server responded with status ${response.status}`
+      );
     }
-    for (const change of changes) {
-      if (!change.search) {
-        continue;
-      }
-      const normalizedSearch = change.search.replace(/\r\n/g, "\n");
-      const searchIndex = newContent.indexOf(normalizedSearch);
-      if (searchIndex !== -1) {
-        newContent = newContent.substring(0, searchIndex) + change.content + newContent.substring(searchIndex + normalizedSearch.length);
+    const data = await response.json();
+    res.status(response.status).json(data);
+  } catch (error87) {
+    try {
+      await fallbackHandler(req, res);
+    } catch (fallbackError) {
+      error(`Fallback also failed for ${endpoint}:`, fallbackError);
+      if (!res.headersSent) {
+        res.status(500).json({
+          error: "Both VSCode and filesystem operations failed",
+          message: fallbackError instanceof Error ? fallbackError.message : String(fallbackError)
+        });
       }
     }
-    if (originalContent !== newContent) {
-      await fs6.writeFile(filePath, newContent, "utf8");
-    } else {
-      log(`=> NO CHANGES to file ${filePath}`);
-    }
-  } catch (e) {
-    throw new Error(`Failed to modify file ${filePath}: ${e}`);
   }
 }
-async function deleteFile(filePath) {
-  await fs6.unlink(filePath);
-}
 
 // src/proxy/rules.ts
-var fs7 = __toESM(require("fs/promises"), 1);
-var path6 = __toESM(require("path"), 1);
+var fs6 = __toESM(require("fs/promises"), 1);
+var path5 = __toESM(require("path"), 1);
 
 // node_modules/glob/node_modules/minimatch/dist/esm/index.js
 var import_brace_expansion = __toESM(require_brace_expansion(), 1);
@@ -54817,11 +54779,11 @@ var qmarksTestNoExtDot = ([$0]) => {
   return (f) => f.length === len && f !== "." && f !== "..";
 };
 var defaultPlatform = typeof process === "object" && process ? typeof process.env === "object" && process.env && process.env.__MINIMATCH_TESTING_PLATFORM__ || process.platform : "posix";
-var path5 = {
+var path4 = {
   win32: { sep: "\\" },
   posix: { sep: "/" }
 };
-var sep = defaultPlatform === "win32" ? path5.win32.sep : path5.posix.sep;
+var sep = defaultPlatform === "win32" ? path4.win32.sep : path4.posix.sep;
 minimatch.sep = sep;
 var GLOBSTAR = Symbol("globstar **");
 minimatch.GLOBSTAR = GLOBSTAR;
@@ -58870,8 +58832,8 @@ var PathScurryBase = class {
    *
    * @internal
    */
-  constructor(cwd = process.cwd(), pathImpl, sep2, { nocase, childrenCacheSize = 16 * 1024, fs: fs13 = defaultFS } = {}) {
-    this.#fs = fsFromOption(fs13);
+  constructor(cwd = process.cwd(), pathImpl, sep2, { nocase, childrenCacheSize = 16 * 1024, fs: fs14 = defaultFS } = {}) {
+    this.#fs = fsFromOption(fs14);
     if (cwd instanceof URL || cwd.startsWith("file://")) {
       cwd = (0, import_node_url.fileURLToPath)(cwd);
     }
@@ -59429,8 +59391,8 @@ var PathScurryWin32 = class extends PathScurryBase {
   /**
    * @internal
    */
-  newRoot(fs13) {
-    return new PathWin32(this.rootPath, IFDIR, void 0, this.roots, this.nocase, this.childrenCache(), { fs: fs13 });
+  newRoot(fs14) {
+    return new PathWin32(this.rootPath, IFDIR, void 0, this.roots, this.nocase, this.childrenCache(), { fs: fs14 });
   }
   /**
    * Return true if the provided path string is an absolute path
@@ -59458,8 +59420,8 @@ var PathScurryPosix = class extends PathScurryBase {
   /**
    * @internal
    */
-  newRoot(fs13) {
-    return new PathPosix(this.rootPath, IFDIR, void 0, this.roots, this.nocase, this.childrenCache(), { fs: fs13 });
+  newRoot(fs14) {
+    return new PathPosix(this.rootPath, IFDIR, void 0, this.roots, this.nocase, this.childrenCache(), { fs: fs14 });
   }
   /**
    * Return true if the provided path string is an absolute path
@@ -60553,8 +60515,8 @@ async function gatherRulesFiles(workspaceRoot2) {
   }
   const readPromises = Array.from(uniqueFiles).map(async (filePath) => {
     try {
-      const content = await fs7.readFile(filePath, "utf8");
-      const relativePath = path6.relative(workspaceRoot2, filePath);
+      const content = await fs6.readFile(filePath, "utf8");
+      const relativePath = path5.relative(workspaceRoot2, filePath);
       return { path: relativePath, content };
     } catch (error87) {
       error(`Error reading file ${filePath}:`, error87);
@@ -60578,8 +60540,8 @@ async function loadGitignorePatterns(workspaceRoot2) {
     "**/build/**"
   ];
   try {
-    const gitignorePath = path6.join(workspaceRoot2, ".gitignore");
-    const gitignoreContent = await fs7.readFile(gitignorePath, "utf8");
+    const gitignorePath = path5.join(workspaceRoot2, ".gitignore");
+    const gitignoreContent = await fs6.readFile(gitignorePath, "utf8");
     const gitignorePatterns = gitignoreContent.split("\n").map((line) => line.trim()).filter((line) => line && !line.startsWith("#")).map((pattern) => {
       if (pattern.endsWith("/")) {
         return `**/${pattern}**`;
@@ -60596,8 +60558,8 @@ async function loadGitignorePatterns(workspaceRoot2) {
 // src/proxy/git.ts
 var import_util2 = require("util");
 var proc4 = __toESM(require("child_process"), 1);
-var fs8 = __toESM(require("fs/promises"), 1);
-var path7 = __toESM(require("path"), 1);
+var fs7 = __toESM(require("fs/promises"), 1);
+var path6 = __toESM(require("path"), 1);
 
 // node_modules/async-mutex/index.mjs
 var E_TIMEOUT = new Error("timeout while waiting for mutex to become available");
@@ -60839,18 +60801,18 @@ var Repo = class {
     return this.cwd;
   }
   async waitForGitLock(maxWaitMs = 5e3) {
-    const lockFile = path7.join(this.cwd, ".git", "index.lock");
+    const lockFile = path6.join(this.cwd, ".git", "index.lock");
     const startTime = Date.now();
     while (Date.now() - startTime < maxWaitMs) {
       try {
-        await fs8.access(lockFile);
+        await fs7.access(lockFile);
         await new Promise((resolve5) => setTimeout(resolve5, 50));
       } catch {
         return;
       }
     }
     try {
-      await fs8.unlink(lockFile);
+      await fs7.unlink(lockFile);
     } catch {
     }
     throw new Error(`Git lock timeout after ${maxWaitMs}ms`);
@@ -61152,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")) {
@@ -61253,7 +61213,7 @@ var SSEManager = class {
 var sseManager = new SSEManager();
 
 // src/proxy/version.ts
-var VERSION = "0.3.74";
+var VERSION = "0.3.76";
 
 // node_modules/uuid/dist/esm/stringify.js
 var byteToHex = [];
@@ -61407,8 +61367,8 @@ function sanitizeShellArg(arg) {
 }
 
 // src/agent/goose.ts
-var fs9 = __toESM(require("fs"), 1);
-var path8 = __toESM(require("path"), 1);
+var fs8 = __toESM(require("fs"), 1);
+var path7 = __toESM(require("path"), 1);
 var os = __toESM(require("os"), 1);
 
 // src/agent/system_suffix.ts
@@ -121597,10 +121557,17 @@ function goose_env(apiKey) {
     GOOSE_CLI_MIN_PRIORITY: "1.0",
     CONFIGURE: "false",
     ANTHROPIC_API_KEY: apiKey,
-    PATH: `${path8.join(os.homedir(), ".local", "bin")}:${process.env.PATH}`
+    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);
@@ -121630,8 +121597,8 @@ async function runAgent({ prompt, apiKey, cwd, system_prompt, session, summarize
   return output;
 }
 function createGooseConfig() {
-  const configDir = path8.join(os.homedir(), ".config", "goose");
-  const configPath = path8.join(configDir, "config.yaml");
+  const configDir = path7.join(os.homedir(), ".config", "goose");
+  const configPath = path7.join(configDir, "config.yaml");
   const configContent = `extensions:
   extension_name:
     bundled: true
@@ -121642,10 +121609,10 @@ function createGooseConfig() {
     type: "builtin"
 `;
   try {
-    if (!fs9.existsSync(configDir)) {
-      fs9.mkdirSync(configDir, { recursive: true });
+    if (!fs8.existsSync(configDir)) {
+      fs8.mkdirSync(configDir, { recursive: true });
     }
-    fs9.writeFileSync(configPath, configContent, "utf-8");
+    fs8.writeFileSync(configPath, configContent, "utf-8");
     console.log(`Created goose config at ${configPath}`);
   } catch (error87) {
     console.warn("Error creating goose config:", error87);
@@ -121677,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");
   }
@@ -121814,7 +121785,7 @@ function chooseAgent(agentName) {
 }
 
 // src/agent/validate.ts
-var fs10 = __toESM(require("fs/promises"), 1);
+var fs9 = __toESM(require("fs/promises"), 1);
 var SYSTEM3 = `You are a frontend validation expert. Your job is to analyze logs and a screenshot to determine if a frontend application is running correctly.
 
 You will be provided with:
@@ -121845,7 +121816,7 @@ Please analyze:
 Return your analysis in the XML format specified in the system prompt.`;
 };
 async function runValidation(screenshotPath, logs, apiKey) {
-  const imageBuffer = await fs10.readFile(screenshotPath);
+  const imageBuffer = await fs9.readFile(screenshotPath);
   const base64Image = imageBuffer.toString("base64");
   const systemMessage = {
     role: "system",
@@ -132945,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;
@@ -132957,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, {
@@ -132967,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;
         }
       }
@@ -133074,9 +133051,57 @@ function cleanup() {
 }
 setInterval(cleanup, 6e4);
 
-// src/proxy/server.ts
-var import_promises2 = __toESM(require("fs/promises"), 1);
+// src/agent/async_handler.ts
 var import_path2 = __toESM(require("path"), 1);
+var import_promises2 = __toESM(require("fs/promises"), 1);
+var createAsyncAgentHandler = (getParams, transformResult) => {
+  return async (req, res) => {
+    const request_id = startReq();
+    try {
+      const { repoName, apiKey, agent_name, session, summarize } = req.body;
+      const params = getParams(req);
+      const workspaceRoot2 = await workspaceRoot();
+      let repoPath = workspaceRoot2;
+      if (repoName) {
+        const candidate = import_path2.default.join(workspaceRoot2, repoName);
+        try {
+          const stat4 = await import_promises2.default.stat(candidate);
+          if (stat4.isDirectory()) {
+            repoPath = candidate;
+          }
+        } catch {
+        }
+      }
+      const agentFn = chooseAgent(agent_name || "goose");
+      agentFn({
+        prompt: params.prompt,
+        apiKey: apiKey || process.env.ANTHROPIC_API_KEY || "",
+        cwd: repoPath,
+        system_prompt: params.system,
+        session,
+        summarize: summarize ? true : false
+      }).then((result) => {
+        const finalResult = transformResult ? transformResult(result) : result;
+        finishReq(request_id, {
+          success: true,
+          result: finalResult
+        });
+      }).catch((error87) => {
+        failReq(request_id, error87);
+      });
+      res.json({ request_id, status: "pending" });
+    } catch (e) {
+      error("Error running agent:", e);
+      res.status(500).json({
+        error: "Internal server error",
+        message: e instanceof Error ? e.message : String(e)
+      });
+    }
+  };
+};
+
+// src/proxy/server.ts
+var import_promises3 = __toESM(require("fs/promises"), 1);
 
 // src/proxy/gitleaks.ts
 var import_child_process4 = require("child_process");
@@ -133106,424 +133131,6 @@ function gitleaksProtect() {
   }
 }
 
-// src/proxy/gh.ts
-var import_child_process5 = require("child_process");
-var import_util18 = require("util");
-var execAsync = (0, import_util18.promisify)(import_child_process5.exec);
-function sanitizeGitHubText(text3) {
-  return text3.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/`/g, "\\`").replace(/\$/g, "\\$");
-}
-var GitHubCLI = class {
-  token;
-  branch;
-  owner;
-  repo;
-  cwd;
-  constructor(token, branch, cwd) {
-    this.token = token;
-    this.branch = branch;
-    this.cwd = cwd;
-  }
-  /**
-   * Initialize and get repo info from git
-   */
-  async init() {
-    try {
-      const { stdout } = await this.execGH("repo view --json owner,name");
-      const data = JSON.parse(stdout);
-      this.owner = data.owner.login;
-      this.repo = data.name;
-    } catch (error87) {
-      throw new Error(`Failed to initialize: ${error87}`);
-    }
-  }
-  /**
-   * Execute gh CLI command with authentication
-   */
-  async execGH(command) {
-    const fullCommand = `gh ${command}`;
-    try {
-      return await execAsync(fullCommand, {
-        cwd: this.cwd,
-        env: {
-          ...process.env,
-          GH_TOKEN: this.token,
-          GITHUB_TOKEN: this.token
-        }
-      });
-    } catch (error87) {
-      throw new Error(
-        `gh command failed: ${error87.message}
-Stderr: ${error87.stderr}`
-      );
-    }
-  }
-  /**
-   * Sync version of execGH for simple checks
-   */
-  execGHSync(command) {
-    const fullCommand = `gh ${command}`;
-    try {
-      return (0, import_child_process5.execSync)(fullCommand, {
-        cwd: this.cwd,
-        encoding: "utf-8",
-        env: {
-          ...process.env,
-          GH_TOKEN: this.token,
-          GITHUB_TOKEN: this.token
-        }
-      });
-    } catch (error87) {
-      throw new Error(
-        `gh command failed: ${error87.message}
-Stderr: ${error87.stderr}`
-      );
-    }
-  }
-  /**
-   * Check if the branch exists
-   */
-  async branchExists() {
-    try {
-      const { stdout } = await execAsync(
-        "git rev-parse --verify --quiet " + this.branch
-      );
-      return true;
-    } catch {
-      return false;
-    }
-  }
-  /**
-   * Get current branch name
-   */
-  async getCurrentBranch() {
-    const { stdout } = await execAsync("git rev-parse --abbrev-ref HEAD");
-    return stdout.trim();
-  }
-  /**
-   * Checkout the branch
-   */
-  async checkoutBranch() {
-    try {
-      await execAsync(`git checkout ${this.branch}`);
-    } catch (error87) {
-      throw new Error(`Failed to checkout branch ${this.branch}: ${error87}`);
-    }
-  }
-  /**
-   * Create a new PR from the branch
-   */
-  async createPR(options) {
-    const args = [
-      "pr",
-      "create",
-      "--head",
-      this.branch,
-      "--title",
-      `"${sanitizeGitHubText(options.title)}"`
-    ];
-    if (options.body) {
-      args.push("--body", `"${sanitizeGitHubText(options.body)}"`);
-    }
-    if (options.base) {
-      args.push("--base", options.base);
-    }
-    if (options.draft) {
-      args.push("--draft");
-    }
-    if (options.assignees?.length) {
-      args.push("--assignee", options.assignees.join(","));
-    }
-    if (options.reviewers?.length) {
-      args.push("--reviewer", options.reviewers.join(","));
-    }
-    if (options.labels?.length) {
-      args.push("--label", options.labels.join(","));
-    }
-    try {
-      const { stdout } = await this.execGH(args.join(" "));
-      const prUrl = stdout.trim();
-      const prNumber = parseInt(prUrl.split("/").pop() || "0");
-      return await this.getPR(prNumber);
-    } catch (error87) {
-      throw new Error(`Failed to create PR: ${error87}`);
-    }
-  }
-  /**
-   * Find PR by branch name
-   */
-  async findPRByBranch() {
-    try {
-      const { stdout } = await this.execGH(
-        `pr list --head ${this.branch} --json number,title,body,state,url,headRefName,baseRefName,mergeable,mergeStateStatus,isDraft,author,createdAt,updatedAt --limit 1`
-      );
-      const prs = JSON.parse(stdout);
-      if (prs.length === 0) {
-        return null;
-      }
-      const pr = prs[0];
-      return {
-        number: pr.number,
-        title: pr.title,
-        body: pr.body,
-        state: pr.state,
-        url: pr.url,
-        headRefName: pr.headRefName,
-        baseRefName: pr.baseRefName,
-        mergeable: pr.mergeable,
-        mergeStateStatus: pr.mergeStateStatus,
-        isDraft: pr.isDraft,
-        author: pr.author.login,
-        createdAt: pr.createdAt,
-        updatedAt: pr.updatedAt
-      };
-    } catch (error87) {
-      throw new Error(`Failed to find PR: ${error87}`);
-    }
-  }
-  /**
-   * Get PR details by number
-   */
-  async getPR(prNumber) {
-    try {
-      const { stdout } = await this.execGH(
-        `pr view ${prNumber} --json number,title,body,state,url,headRefName,baseRefName,mergeable,mergeStateStatus,isDraft,author,createdAt,updatedAt`
-      );
-      const pr = JSON.parse(stdout);
-      return {
-        number: pr.number,
-        title: pr.title,
-        body: pr.body,
-        state: pr.state,
-        url: pr.url,
-        headRefName: pr.headRefName,
-        baseRefName: pr.baseRefName,
-        mergeable: pr.mergeable,
-        mergeStateStatus: pr.mergeStateStatus,
-        isDraft: pr.isDraft,
-        author: pr.author.login,
-        createdAt: pr.createdAt,
-        updatedAt: pr.updatedAt
-      };
-    } catch (error87) {
-      throw new Error(`Failed to get PR #${prNumber}: ${error87}`);
-    }
-  }
-  /**
-   * Check if PR is auto-mergeable
-   */
-  async isPRMergeable(prNumber) {
-    const pr = await this.getPR(prNumber);
-    const isMergeable = pr.mergeable === "MERGEABLE" && pr.mergeStateStatus === "CLEAN" && pr.state === "OPEN" && !pr.isDraft;
-    let reason;
-    if (!isMergeable) {
-      if (pr.isDraft) {
-        reason = "PR is in draft state";
-      } else if (pr.mergeable === "CONFLICTING") {
-        reason = "PR has merge conflicts";
-      } else if (pr.mergeStateStatus === "BLOCKED") {
-        reason = "PR is blocked by required checks";
-      } else if (pr.mergeStateStatus === "BEHIND") {
-        reason = "Branch is behind base branch";
-      } else if (pr.mergeStateStatus === "UNSTABLE") {
-        reason = "Some checks are failing";
-      } else if (pr.mergeable === "UNKNOWN") {
-        reason = "Mergeability is still being calculated";
-      } else {
-        reason = `Status: ${pr.mergeStateStatus}`;
-      }
-    }
-    return { mergeable: isMergeable, reason };
-  }
-  /**
-   * Merge a PR
-   */
-  async mergePR(prNumber, options) {
-    const {
-      method = "squash",
-      deleteBranch = true,
-      auto = false,
-      commitTitle,
-      commitBody
-    } = options || {};
-    const args = ["pr", "merge", prNumber.toString()];
-    if (auto) {
-      args.push("--auto");
-    }
-    switch (method) {
-      case "squash":
-        args.push("--squash");
-        break;
-      case "rebase":
-        args.push("--rebase");
-        break;
-      case "merge":
-        args.push("--merge");
-        break;
-    }
-    if (deleteBranch) {
-      args.push("--delete-branch");
-    }
-    if (commitTitle) {
-      args.push("--subject", `"${sanitizeGitHubText(commitTitle)}"`);
-    }
-    if (commitBody) {
-      args.push("--body", `"${sanitizeGitHubText(commitBody)}"`);
-    }
-    try {
-      const { stdout } = await this.execGH(args.join(" "));
-      log(stdout);
-    } catch (error87) {
-      throw new Error(`Failed to merge PR #${prNumber}: ${error87}`);
-    }
-  }
-  /**
-   * Check if PR is mergeable and merge if ready
-   */
-  async checkAndMerge(prNumber, options) {
-    const { mergeable, reason } = await this.isPRMergeable(prNumber);
-    if (!mergeable) {
-      log(`PR #${prNumber} is not mergeable: ${reason}`);
-      return false;
-    }
-    await this.mergePR(prNumber, options);
-    return true;
-  }
-  /**
-   * Wait for PR to be mergeable and then merge
-   */
-  async waitAndMerge(prNumber, options) {
-    const {
-      maxWaitTime = 3e5,
-      // 5 minutes
-      checkInterval = 1e4,
-      // 10 seconds
-      ...mergeOptions
-    } = options || {};
-    const startTime = Date.now();
-    while (Date.now() - startTime < maxWaitTime) {
-      const { mergeable, reason } = await this.isPRMergeable(prNumber);
-      if (mergeable) {
-        await this.mergePR(prNumber, mergeOptions);
-        return true;
-      }
-      if (reason?.includes("conflict")) {
-        throw new Error(`PR #${prNumber} has merge conflicts`);
-      }
-      log(`Waiting for PR #${prNumber} to be mergeable... (${reason})`);
-      await new Promise((resolve5) => setTimeout(resolve5, checkInterval));
-    }
-    throw new Error(
-      `Timeout: PR #${prNumber} did not become mergeable within ${maxWaitTime}ms`
-    );
-  }
-  /**
-   * Add comment to PR
-   */
-  async addComment(prNumber, comment) {
-    try {
-      await this.execGH(
-        `pr comment ${prNumber} --body "${sanitizeGitHubText(comment)}"`
-      );
-    } catch (error87) {
-      throw new Error(`Failed to add comment to PR #${prNumber}: ${error87}`);
-    }
-  }
-  /**
-   * Update PR title and/or body
-   */
-  async updatePR(prNumber, updates) {
-    const args = ["pr", "edit", prNumber.toString()];
-    if (updates.title) {
-      args.push("--title", `"${sanitizeGitHubText(updates.title)}"`);
-    }
-    if (updates.body) {
-      args.push("--body", `"${sanitizeGitHubText(updates.body)}"`);
-    }
-    try {
-      await this.execGH(args.join(" "));
-    } catch (error87) {
-      throw new Error(`Failed to update PR #${prNumber}: ${error87}`);
-    }
-  }
-  /**
-   * Close PR
-   */
-  async closePR(prNumber, comment) {
-    try {
-      if (comment) {
-        await this.addComment(prNumber, comment);
-      }
-      await this.execGH(`pr close ${prNumber}`);
-    } catch (error87) {
-      throw new Error(`Failed to close PR #${prNumber}: ${error87}`);
-    }
-  }
-  /**
-   * Reopen PR
-   */
-  async reopenPR(prNumber) {
-    try {
-      await this.execGH(`pr reopen ${prNumber}`);
-    } catch (error87) {
-      throw new Error(`Failed to reopen PR #${prNumber}: ${error87}`);
-    }
-  }
-  /**
-   * Get PR checks status
-   */
-  async getPRChecks(prNumber) {
-    try {
-      const { stdout } = await this.execGH(
-        `pr checks ${prNumber} --json name,state`
-      );
-      return JSON.parse(stdout);
-    } catch (error87) {
-      throw new Error(`Failed to get PR checks for #${prNumber}: ${error87}`);
-    }
-  }
-  /**
-   * Wait for CI checks to appear on a PR
-   */
-  async waitForChecksToExist(prNumber, timeout = 3e4, interval = 2e3) {
-    const start = Date.now();
-    while (Date.now() - start < timeout) {
-      const checks = await this.getPRChecks(prNumber);
-      if (checks.length > 0) {
-        log(`=> Found ${checks.length} CI check(s) for PR #${prNumber}`);
-        return true;
-      }
-      await new Promise((r) => setTimeout(r, interval));
-    }
-    log(`=> No CI checks found for PR #${prNumber} within ${timeout}ms`);
-    return false;
-  }
-  /**
-   * Get repo info
-   */
-  getRepoInfo() {
-    return { owner: this.owner, repo: this.repo };
-  }
-  /**
-   * Get branch name
-   */
-  getBranch() {
-    return this.branch;
-  }
-  async addLabelToPR(prNumber, label) {
-    try {
-      await this.execGH(`pr edit ${prNumber} --add-label ${label}`);
-    } catch (error87) {
-      if (error87 instanceof Error && error87.message.includes("not found")) {
-        await this.execGH(`label create ${label}`);
-        await this.execGH(`pr edit ${prNumber} --add-label "${label}"`);
-      } else {
-        throw error87;
-      }
-    }
-  }
-};
-
 // src/proxy/playwright.ts
 var fs11 = __toESM(require("fs/promises"), 1);
 var path9 = __toESM(require("path"), 1);
@@ -133966,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}`);
@@ -134064,15 +133669,829 @@ async function takeScreenshot(port) {
   }
 }
 
-// src/proxy/server.ts
-var PORT = parseInt(process.env.STAKLINK_PORT || "15552") || 15552;
-var VSCODE_EXTENSION_URL = `http://localhost:${PORT + 1}`;
-var GOOSE_WEB_PORT = PORT - 1;
-var lastHitTimestamp = (/* @__PURE__ */ new Date()).toISOString();
-function updateLastHit(_req, _res, next) {
-  lastHitTimestamp = (/* @__PURE__ */ new Date()).toISOString();
-  next();
+// src/proxy/gh.ts
+var import_child_process5 = require("child_process");
+var import_util18 = require("util");
+var execAsync = (0, import_util18.promisify)(import_child_process5.exec);
+function sanitizeGitHubText(text3) {
+  return text3.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/`/g, "\\`").replace(/\$/g, "\\$");
+}
+var GitHubCLI = class {
+  token;
+  branch;
+  owner;
+  repo;
+  cwd;
+  constructor(token, branch, cwd) {
+    this.token = token;
+    this.branch = branch;
+    this.cwd = cwd;
+  }
+  /**
+   * Initialize and get repo info from git
+   */
+  async init() {
+    try {
+      const { stdout } = await this.execGH("repo view --json owner,name");
+      const data = JSON.parse(stdout);
+      this.owner = data.owner.login;
+      this.repo = data.name;
+    } catch (error87) {
+      throw new Error(`Failed to initialize: ${error87}`);
+    }
+  }
+  /**
+   * Execute gh CLI command with authentication
+   */
+  async execGH(command) {
+    const fullCommand = `gh ${command}`;
+    try {
+      return await execAsync(fullCommand, {
+        cwd: this.cwd,
+        env: {
+          ...process.env,
+          GH_TOKEN: this.token,
+          GITHUB_TOKEN: this.token
+        }
+      });
+    } catch (error87) {
+      throw new Error(
+        `gh command failed: ${error87.message}
+Stderr: ${error87.stderr}`
+      );
+    }
+  }
+  /**
+   * Sync version of execGH for simple checks
+   */
+  execGHSync(command) {
+    const fullCommand = `gh ${command}`;
+    try {
+      return (0, import_child_process5.execSync)(fullCommand, {
+        cwd: this.cwd,
+        encoding: "utf-8",
+        env: {
+          ...process.env,
+          GH_TOKEN: this.token,
+          GITHUB_TOKEN: this.token
+        }
+      });
+    } catch (error87) {
+      throw new Error(
+        `gh command failed: ${error87.message}
+Stderr: ${error87.stderr}`
+      );
+    }
+  }
+  /**
+   * Check if the branch exists
+   */
+  async branchExists() {
+    try {
+      const { stdout } = await execAsync(
+        "git rev-parse --verify --quiet " + this.branch
+      );
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  /**
+   * Get current branch name
+   */
+  async getCurrentBranch() {
+    const { stdout } = await execAsync("git rev-parse --abbrev-ref HEAD");
+    return stdout.trim();
+  }
+  /**
+   * Checkout the branch
+   */
+  async checkoutBranch() {
+    try {
+      await execAsync(`git checkout ${this.branch}`);
+    } catch (error87) {
+      throw new Error(`Failed to checkout branch ${this.branch}: ${error87}`);
+    }
+  }
+  /**
+   * Create a new PR from the branch
+   */
+  async createPR(options) {
+    const args = [
+      "pr",
+      "create",
+      "--head",
+      this.branch,
+      "--title",
+      `"${sanitizeGitHubText(options.title)}"`
+    ];
+    if (options.body) {
+      args.push("--body", `"${sanitizeGitHubText(options.body)}"`);
+    }
+    if (options.base) {
+      args.push("--base", options.base);
+    }
+    if (options.draft) {
+      args.push("--draft");
+    }
+    if (options.assignees?.length) {
+      args.push("--assignee", options.assignees.join(","));
+    }
+    if (options.reviewers?.length) {
+      args.push("--reviewer", options.reviewers.join(","));
+    }
+    if (options.labels?.length) {
+      args.push("--label", options.labels.join(","));
+    }
+    try {
+      const { stdout } = await this.execGH(args.join(" "));
+      const prUrl = stdout.trim();
+      const prNumber = parseInt(prUrl.split("/").pop() || "0");
+      return await this.getPR(prNumber);
+    } catch (error87) {
+      throw new Error(`Failed to create PR: ${error87}`);
+    }
+  }
+  /**
+   * Find PR by branch name
+   */
+  async findPRByBranch() {
+    try {
+      const { stdout } = await this.execGH(
+        `pr list --head ${this.branch} --json number,title,body,state,url,headRefName,baseRefName,mergeable,mergeStateStatus,isDraft,author,createdAt,updatedAt --limit 1`
+      );
+      const prs = JSON.parse(stdout);
+      if (prs.length === 0) {
+        return null;
+      }
+      const pr = prs[0];
+      return {
+        number: pr.number,
+        title: pr.title,
+        body: pr.body,
+        state: pr.state,
+        url: pr.url,
+        headRefName: pr.headRefName,
+        baseRefName: pr.baseRefName,
+        mergeable: pr.mergeable,
+        mergeStateStatus: pr.mergeStateStatus,
+        isDraft: pr.isDraft,
+        author: pr.author.login,
+        createdAt: pr.createdAt,
+        updatedAt: pr.updatedAt
+      };
+    } catch (error87) {
+      throw new Error(`Failed to find PR: ${error87}`);
+    }
+  }
+  /**
+   * Get PR details by number
+   */
+  async getPR(prNumber) {
+    try {
+      const { stdout } = await this.execGH(
+        `pr view ${prNumber} --json number,title,body,state,url,headRefName,baseRefName,mergeable,mergeStateStatus,isDraft,author,createdAt,updatedAt`
+      );
+      const pr = JSON.parse(stdout);
+      return {
+        number: pr.number,
+        title: pr.title,
+        body: pr.body,
+        state: pr.state,
+        url: pr.url,
+        headRefName: pr.headRefName,
+        baseRefName: pr.baseRefName,
+        mergeable: pr.mergeable,
+        mergeStateStatus: pr.mergeStateStatus,
+        isDraft: pr.isDraft,
+        author: pr.author.login,
+        createdAt: pr.createdAt,
+        updatedAt: pr.updatedAt
+      };
+    } catch (error87) {
+      throw new Error(`Failed to get PR #${prNumber}: ${error87}`);
+    }
+  }
+  /**
+   * Check if PR is auto-mergeable
+   */
+  async isPRMergeable(prNumber) {
+    const pr = await this.getPR(prNumber);
+    const isMergeable = pr.mergeable === "MERGEABLE" && pr.mergeStateStatus === "CLEAN" && pr.state === "OPEN" && !pr.isDraft;
+    let reason;
+    if (!isMergeable) {
+      if (pr.isDraft) {
+        reason = "PR is in draft state";
+      } else if (pr.mergeable === "CONFLICTING") {
+        reason = "PR has merge conflicts";
+      } else if (pr.mergeStateStatus === "BLOCKED") {
+        reason = "PR is blocked by required checks";
+      } else if (pr.mergeStateStatus === "BEHIND") {
+        reason = "Branch is behind base branch";
+      } else if (pr.mergeStateStatus === "UNSTABLE") {
+        reason = "Some checks are failing";
+      } else if (pr.mergeable === "UNKNOWN") {
+        reason = "Mergeability is still being calculated";
+      } else {
+        reason = `Status: ${pr.mergeStateStatus}`;
+      }
+    }
+    return { mergeable: isMergeable, reason };
+  }
+  /**
+   * Merge a PR
+   */
+  async mergePR(prNumber, options) {
+    const {
+      method = "squash",
+      deleteBranch = true,
+      auto = false,
+      commitTitle,
+      commitBody
+    } = options || {};
+    const args = ["pr", "merge", prNumber.toString()];
+    if (auto) {
+      args.push("--auto");
+    }
+    switch (method) {
+      case "squash":
+        args.push("--squash");
+        break;
+      case "rebase":
+        args.push("--rebase");
+        break;
+      case "merge":
+        args.push("--merge");
+        break;
+    }
+    if (deleteBranch) {
+      args.push("--delete-branch");
+    }
+    if (commitTitle) {
+      args.push("--subject", `"${sanitizeGitHubText(commitTitle)}"`);
+    }
+    if (commitBody) {
+      args.push("--body", `"${sanitizeGitHubText(commitBody)}"`);
+    }
+    try {
+      const { stdout } = await this.execGH(args.join(" "));
+      log(stdout);
+    } catch (error87) {
+      throw new Error(`Failed to merge PR #${prNumber}: ${error87}`);
+    }
+  }
+  /**
+   * Check if PR is mergeable and merge if ready
+   */
+  async checkAndMerge(prNumber, options) {
+    const { mergeable, reason } = await this.isPRMergeable(prNumber);
+    if (!mergeable) {
+      log(`PR #${prNumber} is not mergeable: ${reason}`);
+      return false;
+    }
+    await this.mergePR(prNumber, options);
+    return true;
+  }
+  /**
+   * Wait for PR to be mergeable and then merge
+   */
+  async waitAndMerge(prNumber, options) {
+    const {
+      maxWaitTime = 3e5,
+      // 5 minutes
+      checkInterval = 1e4,
+      // 10 seconds
+      ...mergeOptions
+    } = options || {};
+    const startTime = Date.now();
+    while (Date.now() - startTime < maxWaitTime) {
+      const { mergeable, reason } = await this.isPRMergeable(prNumber);
+      if (mergeable) {
+        await this.mergePR(prNumber, mergeOptions);
+        return true;
+      }
+      if (reason?.includes("conflict")) {
+        throw new Error(`PR #${prNumber} has merge conflicts`);
+      }
+      log(`Waiting for PR #${prNumber} to be mergeable... (${reason})`);
+      await new Promise((resolve5) => setTimeout(resolve5, checkInterval));
+    }
+    throw new Error(
+      `Timeout: PR #${prNumber} did not become mergeable within ${maxWaitTime}ms`
+    );
+  }
+  /**
+   * Add comment to PR
+   */
+  async addComment(prNumber, comment) {
+    try {
+      await this.execGH(
+        `pr comment ${prNumber} --body "${sanitizeGitHubText(comment)}"`
+      );
+    } catch (error87) {
+      throw new Error(`Failed to add comment to PR #${prNumber}: ${error87}`);
+    }
+  }
+  /**
+   * Update PR title and/or body
+   */
+  async updatePR(prNumber, updates) {
+    const args = ["pr", "edit", prNumber.toString()];
+    if (updates.title) {
+      args.push("--title", `"${sanitizeGitHubText(updates.title)}"`);
+    }
+    if (updates.body) {
+      args.push("--body", `"${sanitizeGitHubText(updates.body)}"`);
+    }
+    try {
+      await this.execGH(args.join(" "));
+    } catch (error87) {
+      throw new Error(`Failed to update PR #${prNumber}: ${error87}`);
+    }
+  }
+  /**
+   * Close PR
+   */
+  async closePR(prNumber, comment) {
+    try {
+      if (comment) {
+        await this.addComment(prNumber, comment);
+      }
+      await this.execGH(`pr close ${prNumber}`);
+    } catch (error87) {
+      throw new Error(`Failed to close PR #${prNumber}: ${error87}`);
+    }
+  }
+  /**
+   * Reopen PR
+   */
+  async reopenPR(prNumber) {
+    try {
+      await this.execGH(`pr reopen ${prNumber}`);
+    } catch (error87) {
+      throw new Error(`Failed to reopen PR #${prNumber}: ${error87}`);
+    }
+  }
+  /**
+   * Get PR checks status
+   */
+  async getPRChecks(prNumber) {
+    try {
+      const { stdout } = await this.execGH(
+        `pr checks ${prNumber} --json name,state`
+      );
+      return JSON.parse(stdout);
+    } catch (error87) {
+      throw new Error(`Failed to get PR checks for #${prNumber}: ${error87}`);
+    }
+  }
+  /**
+   * Wait for CI checks to appear on a PR
+   */
+  async waitForChecksToExist(prNumber, timeout = 3e4, interval = 2e3) {
+    const start = Date.now();
+    while (Date.now() - start < timeout) {
+      const checks = await this.getPRChecks(prNumber);
+      if (checks.length > 0) {
+        log(`=> Found ${checks.length} CI check(s) for PR #${prNumber}`);
+        return true;
+      }
+      await new Promise((r) => setTimeout(r, interval));
+    }
+    log(`=> No CI checks found for PR #${prNumber} within ${timeout}ms`);
+    return false;
+  }
+  /**
+   * Get repo info
+   */
+  getRepoInfo() {
+    return { owner: this.owner, repo: this.repo };
+  }
+  /**
+   * Get branch name
+   */
+  getBranch() {
+    return this.branch;
+  }
+  async addLabelToPR(prNumber, label) {
+    try {
+      await this.execGH(`pr edit ${prNumber} --add-label ${label}`);
+    } catch (error87) {
+      if (error87 instanceof Error && error87.message.includes("not found")) {
+        await this.execGH(`label create ${label}`);
+        await this.execGH(`pr edit ${prNumber} --add-label "${label}"`);
+      } else {
+        throw error87;
+      }
+    }
+  }
+};
+
+// src/proxy/git_actions.ts
+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 ${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"
+      );
+      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 {
+          if (action === "delete") {
+            content = await repo.execCommand(`git diff HEAD -- "${filePath}"`);
+          } else {
+            log("Getting diff for", filePath);
+            content = await repo.execCommand(`git diff HEAD -- "${filePath}"`);
+          }
+        } catch (error87) {
+          warn(`Error getting diff for ${filePath}:`, error87);
+        }
+        results.push({
+          file: `${repoName}/${filePath}`,
+          action,
+          content,
+          repoName,
+          errors: []
+        });
+      }
+      const untrackedLines = untrackedOutput.trim().split("\n").filter((line) => line);
+      for (const filePath of untrackedLines) {
+        let content = "";
+        try {
+          const fileContent = await repo.execCommand(`cat "${filePath}"`);
+          const lines2 = fileContent.split("\n");
+          content = `--- /dev/null
++++ b/${filePath}
+@@ -0,0 +1,${lines2.length} @@
+${lines2.map((line) => "+" + line).join("\n")}`;
+        } catch (error87) {
+          warn(`Error reading untracked file ${filePath}:`, error87);
+        }
+        results.push({
+          file: `${repoName}/${filePath}`,
+          action: "create",
+          content,
+          repoName,
+          errors: []
+        });
+      }
+    }
+    res.status(200).json(results);
+  } catch (error87) {
+    error("Error fetching git diff:", error87);
+    fail(res, error87);
+  }
+}
+async function handleCommit(req, res) {
+  try {
+    const code = req.body;
+    const repos = getReposWithChangedFiles(code);
+    log(`=> COMMIT for repo ${repos.map((r) => r.url).join(", ")}`);
+    if (repos.length === 0) {
+      warn("No repos with changed files found");
+      res.json({ success: false, message: "No changed repos" });
+      return;
+    }
+    for (const repodata of repos) {
+      const repo = await NewRepo(repodata.url);
+      log(`=> COMMIT in ${repo.printcwd()}`);
+      const isOnMain = await repo.isOnMainBranch();
+      const isOnBaseBranch = await repo.isOnBranch(repodata.base_branch);
+      if (isOnMain || isOnBaseBranch) {
+        log(`=> CHECKOUT to new branch: ${repodata.branch_name}`);
+        await repo.checkoutNew(repodata.branch_name);
+      }
+      await repo.addAll();
+      log(
+        `=> COMMIT to ${repodata.url} new branch: ${repodata.branch_name}`
+      );
+      await repo.commitWithCredentials(
+        repodata.commit_name,
+        code.git_credentials
+      );
+    }
+    res.json({ success: true });
+  } catch (e) {
+    error(e);
+    fail(res, e);
+  }
 }
+async function handlePush(req, res) {
+  try {
+    const code = req.body;
+    const repos = getReposWithChangedFiles(code);
+    const createPR = req.query.pr === "true";
+    const shouldCommit = req.query.commit === "true";
+    const autoMerge = req.query.automerge === "true";
+    const label = req.query.label;
+    const stayOnCurrentBranch = req.query.stayOnCurrentBranch === "true";
+    const commits = [];
+    const prs = {};
+    const prErrors = {};
+    const branches = {};
+    log(`=> Commit requested: ${shouldCommit}`);
+    log(`=> PR creation requested: ${createPR}`);
+    log(`=> Auto-merge requested: ${autoMerge}`);
+    log(
+      `=> Git credentials available: ${!!code.git_credentials?.auth_data?.token}`
+    );
+    for (const r of repos) {
+      const repo = await NewRepo(r.url);
+      const repoName = getRepoNameFromUrl(r.url);
+      let currentBranch = (await repo.printCurrentBranch()).trim();
+      const requestedBranch = stayOnCurrentBranch ? currentBranch : await repo.generateUniqueBranchName(r.branch_name);
+      log(`=> Current branch: ${currentBranch}`);
+      log(`=> Requested branch: ${requestedBranch}`);
+      const protectedBranches = ["main", "master"];
+      const isOnProtectedBranch = protectedBranches.includes(currentBranch);
+      const shouldSwitchBranch = (!stayOnCurrentBranch || isOnProtectedBranch) && currentBranch !== requestedBranch;
+      if (shouldSwitchBranch) {
+        const branchExists = await repo.branchExists(requestedBranch);
+        if (branchExists) {
+          log(`=> Switching to existing branch: ${requestedBranch}`);
+          await repo.checkout(requestedBranch);
+        } else {
+          log(
+            `=> Creating new branch from current position: ${requestedBranch}`
+          );
+          await repo.checkoutNew(requestedBranch);
+        }
+      } else {
+        log(`=> Already on correct branch: ${requestedBranch}`);
+      }
+      if (shouldCommit) {
+        log(`=> COMMIT to ${r.url}`);
+        log(`=> COMMIT in ${repo.printcwd()}`);
+        const status = await repo.execCommand("git status --porcelain");
+        if (status.trim()) {
+          log(`=> Found uncommitted changes, committing...`);
+          await repo.addAll();
+          currentBranch = (await repo.printCurrentBranch()).trim();
+          log(`=> COMMIT to ${r.url} on branch: ${currentBranch}`);
+          await repo.commitWithCredentials(
+            r.commit_name || `Changes from ${currentBranch}`,
+            code.git_credentials
+          );
+          log(`=> Commit successful`);
+        } else {
+          log(
+            `=> No uncommitted changes, skipping commit (may have been committed by agent)`
+          );
+        }
+      }
+      log(`=> PUSH to ${r.url}`);
+      await repo.pushCurrentBranchWithCredentials(code.git_credentials);
+      log(`=> Push successful`);
+      const link = await repo.getLatestCommitLink();
+      commits.push(link);
+      currentBranch = (await repo.printCurrentBranch()).trim();
+      branches[repoName] = currentBranch;
+      log(`=> Branch for ${repoName}: ${currentBranch}`);
+      if (createPR) {
+        if (!code.git_credentials?.auth_data?.token) {
+          error(`=> No GitHub token available for PR creation`);
+          prErrors[repoName] = "GitHub token required for PR creation";
+          continue;
+        }
+        try {
+          log(`=> Creating PR for ${r.url}`);
+          log(`=> Branch: ${r.branch_name}`);
+          log(`=> Base: ${r.base_branch || "main"}`);
+          const repoLocation = repo.printcwd();
+          log(`=> Repo location: ${repoLocation}`);
+          const currentBranchRaw = await repo.execCommand(
+            "git rev-parse --abbrev-ref HEAD"
+          );
+          const currentBranch2 = currentBranchRaw.trim();
+          log(`=> Current branch: ${currentBranch2}`);
+          const baseBranch = r.base_branch || "main";
+          if (currentBranch2 === baseBranch) {
+            log(
+              `=> Cannot create PR: currently on base branch (${baseBranch})`
+            );
+            prErrors[repoName] = `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()) {
+              log(
+                `=> No commits between ${baseBranch} and ${currentBranch2}`
+              );
+              prErrors[repoName] = `No commits to create PR - ${currentBranch2} is up to date with ${baseBranch}`;
+              continue;
+            }
+            log(`=> Commits to include in PR:
+${diff.trim()}`);
+          } catch (diffError) {
+            warn(`=> Could not check commit diff: ${diffError}`);
+          }
+          const gh = new GitHubCLI(
+            code.git_credentials.auth_data.token,
+            currentBranch2,
+            repoLocation
+          );
+          await gh.init();
+          const existingPR = await gh.findPRByBranch();
+          let prNumber;
+          if (existingPR) {
+            log(`=> PR already exists: ${existingPR.url}`);
+            prs[repoName] = existingPR.url;
+            prNumber = existingPR.number;
+          } else {
+            const commitMsg = r.commit_name || `Changes from ${currentBranch2}`;
+            const { title, body } = processCommitMessage(commitMsg);
+            const pr = await gh.createPR({
+              title,
+              body,
+              base: baseBranch,
+              draft: false
+            });
+            log(`=> PR created: ${pr.url}`);
+            prs[repoName] = pr.url;
+            prNumber = pr.number;
+            if (label) {
+              try {
+                await gh.addLabelToPR(pr.number, label);
+              } catch (e) {
+                error(`=> PR failed to add label: ${e}`);
+              }
+            }
+          }
+          if (autoMerge) {
+            try {
+              log(
+                `=> Waiting for CI checks to appear for PR #${prNumber}...`
+              );
+              const hasChecks = await gh.waitForChecksToExist(prNumber, 3e4);
+              if (hasChecks) {
+                log(`=> Enabling auto-merge for PR #${prNumber}...`);
+                await gh.mergePR(prNumber, {
+                  auto: true,
+                  method: "squash",
+                  deleteBranch: true
+                });
+                log(`=> Auto-merge enabled for PR #${prNumber}`);
+              } else {
+                log(
+                  `=> No CI checks found, skipping auto-merge for PR #${prNumber}`
+                );
+              }
+            } catch (autoMergeError) {
+              error(
+                `=> Failed to auto-merge PR #${prNumber}:`,
+                autoMergeError
+              );
+            }
+          }
+        } catch (prError) {
+          error(`=> Failed to create PR for ${r.url}:`, prError);
+          prErrors[repoName] = prError instanceof Error ? prError.message : String(prError);
+        }
+      }
+    }
+    const response = { success: true, commits, branches };
+    if (createPR) {
+      response.prs = prs;
+      if (Object.keys(prErrors).length > 0) {
+        response.prErrors = prErrors;
+      }
+    }
+    res.json(response);
+  } catch (e) {
+    fail(res, e);
+  }
+}
+async function handleReset(req, res) {
+  try {
+    const code = req.body;
+    for (const r of code.repos) {
+      const repo = await NewRepo(r.url);
+      await repo.checkoutMainBranchOrBaseBranch(r.base_branch);
+      await repo.fetchLatestWithCredentials(code.git_credentials);
+      await repo.resetHardOriginWithCredentials(r.base_branch);
+      await repo.clean();
+    }
+    res.json({ success: true });
+  } catch (e) {
+    fail(res, e);
+  }
+}
+async function handlePr(req, res) {
+  try {
+    const code = req.body;
+    const repos = getReposWithChangedFiles(code);
+    const results = {};
+    for (const r of repos) {
+      log(`=> NEW PR in ${r}`);
+      const repo = await NewRepo(r.url);
+      const result = await repo.newPr();
+      const repoName = getRepoNameFromUrl(r.url);
+      if (result) {
+        results[repoName] = result;
+      } else {
+        results[repoName] = "No changes to commit";
+      }
+    }
+    res.json({ success: true, results });
+  } catch (e) {
+    error(e);
+    fail(res, e);
+  }
+}
+
+// src/proxy/code_actions.ts
+var fs12 = __toESM(require("fs/promises"), 1);
+var path10 = __toESM(require("path"), 1);
 async function processCode(code) {
   const results = [];
   const workspaceHasOneRepo = await hasOnlyOneRepo();
@@ -134126,6 +134545,100 @@ async function processCode(code) {
   }
   return results;
 }
+async function applyFileAction(file3, filePath) {
+  switch (file3.action) {
+    case "create":
+      await createFile(filePath, file3.changes[0].content);
+      break;
+    case "rewrite":
+      await rewriteFile(filePath, file3.changes[0].content);
+      break;
+    case "modify":
+      await modifyFile(filePath, file3.changes);
+      break;
+    case "delete":
+      await deleteFile(filePath);
+      break;
+    default:
+      throw new Error(`Unknown action: ${file3.action}`);
+  }
+}
+async function createFile(filePath, content) {
+  try {
+    await fs12.stat(filePath);
+    throw new Error(`File ${filePath} already exists`);
+  } catch (e) {
+    if (e.code !== "ENOENT") {
+      throw e;
+    }
+  }
+  const dirPath = path10.dirname(filePath);
+  try {
+    await fs12.mkdir(dirPath, { recursive: true });
+  } catch (e) {
+  }
+  await fs12.writeFile(filePath, content, "utf8");
+}
+async function rewriteFile(filePath, content) {
+  try {
+    await fs12.stat(filePath);
+    await fs12.writeFile(filePath, content, "utf8");
+  } catch (e) {
+    if (e.code === "ENOENT") {
+      await createFile(filePath, content);
+    } else {
+      throw e;
+    }
+  }
+}
+async function modifyFile(filePath, changes) {
+  try {
+    const originalContent = await fs12.readFile(filePath, "utf8");
+    let newContent = originalContent.replace(/\r\n/g, "\n");
+    const finalChange = changes[changes.length - 1];
+    if (finalChange && finalChange.search) {
+      const normalizedSearch = finalChange.search.replace(/\r\n/g, "\n");
+      const searchIndex = newContent.lastIndexOf(normalizedSearch);
+      if (searchIndex !== -1) {
+        log("Found changes to apply!");
+      } else {
+        const emsg = `Search pattern not found in ${filePath} ${finalChange.search}`;
+        error(emsg);
+        throw new Error(emsg);
+      }
+    }
+    for (const change of changes) {
+      if (!change.search) {
+        continue;
+      }
+      const normalizedSearch = change.search.replace(/\r\n/g, "\n");
+      const searchIndex = newContent.indexOf(normalizedSearch);
+      if (searchIndex !== -1) {
+        newContent = newContent.substring(0, searchIndex) + change.content + newContent.substring(searchIndex + normalizedSearch.length);
+      }
+    }
+    if (originalContent !== newContent) {
+      await fs12.writeFile(filePath, newContent, "utf8");
+    } else {
+      log(`=> NO CHANGES to file ${filePath}`);
+    }
+  } catch (e) {
+    throw new Error(`Failed to modify file ${filePath}: ${e}`);
+  }
+}
+async function deleteFile(filePath) {
+  await fs12.unlink(filePath);
+}
+
+// src/proxy/server.ts
+var PORT = parseInt(process.env.STAKLINK_PORT || "15552") || 15552;
+var VSCODE_EXTENSION_URL = `http://localhost:${PORT + 1}`;
+var GOOSE_WEB_PORT = PORT - 1;
+var lastHitTimestamp = (/* @__PURE__ */ new Date()).toISOString();
+function updateLastHit(_req, _res, next) {
+  lastHitTimestamp = (/* @__PURE__ */ new Date()).toISOString();
+  next();
+}
 async function startProxyServer() {
   function requireAuth(req, res, next) {
     const password = process.env.CODE_SERVER_PASSWORD;
@@ -134220,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 });
-    });
+    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 });
-    });
+    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);
-    });
+    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({});
-    });
+    await handleRequest(
+      req,
+      res,
+      "errors",
+      async (req2, res2) => {
+        res2.json({});
+      },
+      VSCODE_EXTENSION_URL
+    );
   });
   app.get("/logs", async (req, res) => {
     log("===> GET logs");
@@ -134303,350 +134840,27 @@ async function startProxyServer() {
   });
   app.get("/diff", async (req, res) => {
     log("===> GET diff");
-    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"
-        );
-        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 {
-            if (action === "delete") {
-              content = await repo.execCommand(
-                `git diff HEAD -- "${filePath}"`
-              );
-            } else {
-              log("Getting diff for", filePath);
-              content = await repo.execCommand(
-                `git diff HEAD -- "${filePath}"`
-              );
-            }
-          } catch (error87) {
-            warn(`Error getting diff for ${filePath}:`, error87);
-          }
-          results.push({
-            file: `${repoName}/${filePath}`,
-            action,
-            content,
-            repoName,
-            errors: []
-          });
-        }
-        const untrackedLines = untrackedOutput.trim().split("\n").filter((line) => line);
-        for (const filePath of untrackedLines) {
-          let content = "";
-          try {
-            const fileContent = await repo.execCommand(`cat "${filePath}"`);
-            const lines2 = fileContent.split("\n");
-            content = `--- /dev/null
-+++ b/${filePath}
-@@ -0,0 +1,${lines2.length} @@
-${lines2.map((line) => "+" + line).join("\n")}`;
-          } catch (error87) {
-            warn(`Error reading untracked file ${filePath}:`, error87);
-          }
-          results.push({
-            file: `${repoName}/${filePath}`,
-            action: "create",
-            content,
-            repoName,
-            errors: []
-          });
-        }
-      }
-      res.status(200).json(results);
-    } catch (error87) {
-      error("Error fetching git diff:", error87);
-      fail(res, error87);
-    }
+    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`);
-    try {
-      const code = req.body;
-      const repos = getReposWithChangedFiles(code);
-      log(`=> COMMIT for repo ${repos.map((r) => r.url).join(", ")}`);
-      if (repos.length === 0) {
-        warn("No repos with changed files found");
-        res.json({ success: false, message: "No changed repos" });
-        return;
-      }
-      for (const repodata of repos) {
-        const repo = await NewRepo(repodata.url);
-        log(`=> COMMIT in ${repo.printcwd()}`);
-        const isOnMain = await repo.isOnMainBranch();
-        const isOnBaseBranch = await repo.isOnBranch(repodata.base_branch);
-        if (isOnMain || isOnBaseBranch) {
-          log(`=> CHECKOUT to new branch: ${repodata.branch_name}`);
-          await repo.checkoutNew(repodata.branch_name);
-        }
-        await repo.addAll();
-        log(
-          `=> COMMIT to ${repodata.url} new branch: ${repodata.branch_name}`
-        );
-        await repo.commitWithCredentials(
-          repodata.commit_name,
-          code.git_credentials
-        );
-      }
-      res.json({ success: true });
-    } catch (e) {
-      error(e);
-      fail(res, e);
-    }
+    await handleCommit(req, res);
   });
   app.post("/push", async (req, res) => {
-    try {
-      log(`===> POST /push`);
-      const code = req.body;
-      const repos = getReposWithChangedFiles(code);
-      const createPR = req.query.pr === "true";
-      const shouldCommit = req.query.commit === "true";
-      const autoMerge = req.query.automerge === "true";
-      const label = req.query.label;
-      const stayOnCurrentBranch = req.query.stayOnCurrentBranch === "true";
-      const commits = [];
-      const prs = {};
-      const prErrors = {};
-      const branches = {};
-      log(`=> Commit requested: ${shouldCommit}`);
-      log(`=> PR creation requested: ${createPR}`);
-      log(`=> Auto-merge requested: ${autoMerge}`);
-      log(
-        `=> Git credentials available: ${!!code.git_credentials?.auth_data?.token}`
-      );
-      for (const r of repos) {
-        const repo = await NewRepo(r.url);
-        const repoName = getRepoNameFromUrl(r.url);
-        let currentBranch = (await repo.printCurrentBranch()).trim();
-        const requestedBranch = stayOnCurrentBranch ? currentBranch : await repo.generateUniqueBranchName(r.branch_name);
-        log(`=> Current branch: ${currentBranch}`);
-        log(`=> Requested branch: ${requestedBranch}`);
-        const protectedBranches = ["main", "master"];
-        const isOnProtectedBranch = protectedBranches.includes(currentBranch);
-        const shouldSwitchBranch = (!stayOnCurrentBranch || isOnProtectedBranch) && currentBranch !== requestedBranch;
-        if (shouldSwitchBranch) {
-          const branchExists = await repo.branchExists(requestedBranch);
-          if (branchExists) {
-            log(`=> Switching to existing branch: ${requestedBranch}`);
-            await repo.checkout(requestedBranch);
-          } else {
-            log(
-              `=> Creating new branch from current position: ${requestedBranch}`
-            );
-            await repo.checkoutNew(requestedBranch);
-          }
-        } else {
-          log(`=> Already on correct branch: ${requestedBranch}`);
-        }
-        if (shouldCommit) {
-          log(`=> COMMIT to ${r.url}`);
-          log(`=> COMMIT in ${repo.printcwd()}`);
-          const status = await repo.execCommand("git status --porcelain");
-          if (status.trim()) {
-            log(`=> Found uncommitted changes, committing...`);
-            await repo.addAll();
-            currentBranch = (await repo.printCurrentBranch()).trim();
-            log(`=> COMMIT to ${r.url} on branch: ${currentBranch}`);
-            await repo.commitWithCredentials(
-              r.commit_name || `Changes from ${currentBranch}`,
-              code.git_credentials
-            );
-            log(`=> Commit successful`);
-          } else {
-            log(
-              `=> No uncommitted changes, skipping commit (may have been committed by agent)`
-            );
-          }
-        }
-        log(`=> PUSH to ${r.url}`);
-        await repo.pushCurrentBranchWithCredentials(code.git_credentials);
-        log(`=> Push successful`);
-        const link = await repo.getLatestCommitLink();
-        commits.push(link);
-        currentBranch = (await repo.printCurrentBranch()).trim();
-        branches[repoName] = currentBranch;
-        log(`=> Branch for ${repoName}: ${currentBranch}`);
-        if (createPR) {
-          if (!code.git_credentials?.auth_data?.token) {
-            error(`=> No GitHub token available for PR creation`);
-            prErrors[repoName] = "GitHub token required for PR creation";
-            continue;
-          }
-          try {
-            log(`=> Creating PR for ${r.url}`);
-            log(`=> Branch: ${r.branch_name}`);
-            log(`=> Base: ${r.base_branch || "main"}`);
-            const repoLocation = repo.printcwd();
-            log(`=> Repo location: ${repoLocation}`);
-            const currentBranchRaw = await repo.execCommand(
-              "git rev-parse --abbrev-ref HEAD"
-            );
-            const currentBranch2 = currentBranchRaw.trim();
-            log(`=> Current branch: ${currentBranch2}`);
-            const baseBranch = r.base_branch || "main";
-            if (currentBranch2 === baseBranch) {
-              log(
-                `=> Cannot create PR: currently on base branch (${baseBranch})`
-              );
-              prErrors[repoName] = `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()) {
-                log(
-                  `=> No commits between ${baseBranch} and ${currentBranch2}`
-                );
-                prErrors[repoName] = `No commits to create PR - ${currentBranch2} is up to date with ${baseBranch}`;
-                continue;
-              }
-              log(`=> Commits to include in PR:
-${diff.trim()}`);
-            } catch (diffError) {
-              warn(`=> Could not check commit diff: ${diffError}`);
-            }
-            const gh = new GitHubCLI(
-              code.git_credentials.auth_data.token,
-              currentBranch2,
-              repoLocation
-            );
-            await gh.init();
-            const existingPR = await gh.findPRByBranch();
-            let prNumber;
-            if (existingPR) {
-              log(`=> PR already exists: ${existingPR.url}`);
-              prs[repoName] = existingPR.url;
-              prNumber = existingPR.number;
-            } else {
-              const commitMsg = r.commit_name || `Changes from ${currentBranch2}`;
-              const { title, body } = processCommitMessage(commitMsg);
-              const pr = await gh.createPR({
-                title,
-                body,
-                base: baseBranch,
-                draft: false
-              });
-              log(`=> PR created: ${pr.url}`);
-              prs[repoName] = pr.url;
-              prNumber = pr.number;
-              if (label) {
-                try {
-                  await gh.addLabelToPR(pr.number, label);
-                } catch (e) {
-                  error(`=> PR failed to add label: ${e}`);
-                }
-              }
-            }
-            if (autoMerge) {
-              try {
-                log(
-                  `=> Waiting for CI checks to appear for PR #${prNumber}...`
-                );
-                const hasChecks = await gh.waitForChecksToExist(
-                  prNumber,
-                  3e4
-                );
-                if (hasChecks) {
-                  log(`=> Enabling auto-merge for PR #${prNumber}...`);
-                  await gh.mergePR(prNumber, {
-                    auto: true,
-                    method: "squash",
-                    deleteBranch: true
-                  });
-                  log(`=> Auto-merge enabled for PR #${prNumber}`);
-                } else {
-                  log(
-                    `=> No CI checks found, skipping auto-merge for PR #${prNumber}`
-                  );
-                }
-              } catch (autoMergeError) {
-                error(
-                  `=> Failed to auto-merge PR #${prNumber}:`,
-                  autoMergeError
-                );
-              }
-            }
-          } catch (prError) {
-            error(`=> Failed to create PR for ${r.url}:`, prError);
-            prErrors[repoName] = prError instanceof Error ? prError.message : String(prError);
-          }
-        }
-      }
-      const response = { success: true, commits, branches };
-      if (createPR) {
-        response.prs = prs;
-        if (Object.keys(prErrors).length > 0) {
-          response.prErrors = prErrors;
-        }
-      }
-      res.json(response);
-    } catch (e) {
-      fail(res, e);
-    }
+    log(`===> POST /push`);
+    await handlePush(req, res);
   });
   app.post("/reset", async (req, res) => {
     log(`===> POST /reset`);
-    try {
-      const code = req.body;
-      for (const r of code.repos) {
-        const repo = await NewRepo(r.url);
-        await repo.checkoutMainBranchOrBaseBranch(r.base_branch);
-        await repo.fetchLatestWithCredentials(code.git_credentials);
-        await repo.resetHardOriginWithCredentials(r.base_branch);
-        await repo.clean();
-      }
-      res.json({ success: true });
-    } catch (e) {
-      fail(res, e);
-    }
+    await handleReset(req, res);
   });
   app.post("/pr", async (req, res) => {
     log(`===> POST /pr`);
-    try {
-      const code = req.body;
-      const repos = getReposWithChangedFiles(code);
-      const results = {};
-      for (const r of repos) {
-        log(`=> NEW PR in ${r}`);
-        const repo = await NewRepo(r.url);
-        const result = await repo.newPr();
-        const repoName = getRepoNameFromUrl(r.url);
-        if (result) {
-          results[repoName] = result;
-        } else {
-          results[repoName] = "No changes to commit";
-        }
-      }
-      res.json({ success: true, results });
-    } catch (e) {
-      error(e);
-      fail(res, e);
-    }
+    await handlePr(req, res);
   });
   app.get("/events", (req, res) => {
     log("===> GET /events");
@@ -134961,6 +135175,19 @@ ${diff.trim()}`);
     res.setHeader("Connection", "keep-alive");
     res.setHeader("X-Accel-Buffering", "no");
     res.flushHeaders();
+    req.socket.setTimeout(0);
+    const keepAliveInterval = setInterval(() => {
+      if (!res.writableEnded) {
+        res.write(`:keepalive
+
+`);
+      } else {
+        clearInterval(keepAliveInterval);
+      }
+    }, 15e3);
+    req.on("close", () => {
+      clearInterval(keepAliveInterval);
+    });
     await streamGooseToSSE(
       sessionId,
       prompt,
@@ -134968,6 +135195,7 @@ ${diff.trim()}`);
       res,
       { system, webhookUrl: session.webhookUrl }
     );
+    clearInterval(keepAliveInterval);
   });
   app.use(requireAuth);
   app.post("/session", async (req, res) => {
@@ -134986,48 +135214,6 @@ ${diff.trim()}`);
       streamUrl: `${req.protocol}://${req.get("host")}/stream/${sessionId}`
     });
   });
-  const createAsyncAgentHandler = (getParams, transformResult) => {
-    return async (req, res) => {
-      const request_id = startReq();
-      try {
-        const { repoName, apiKey, agent_name, session, summarize } = req.body;
-        const params = getParams(req);
-        const workspaceRoot2 = await workspaceRoot();
-        let repoPath = workspaceRoot2;
-        if (repoName) {
-          const candidate = import_path2.default.join(workspaceRoot2, repoName);
-          try {
-            const stat4 = await import_promises2.default.stat(candidate);
-            if (stat4.isDirectory()) {
-              repoPath = candidate;
-            }
-          } catch {
-          }
-        }
-        const agentFn = chooseAgent(agent_name || "goose");
-        agentFn({
-          prompt: params.prompt,
-          apiKey: apiKey || process.env.ANTHROPIC_API_KEY || "",
-          cwd: repoPath,
-          system_prompt: params.system,
-          session,
-          summarize: summarize ? true : false
-        }).then((result) => {
-          const finalResult = transformResult ? transformResult(result) : result;
-          finishReq(request_id, {
-            success: true,
-            result: finalResult
-          });
-        }).catch((error87) => {
-          failReq(request_id, error87);
-        });
-        res.json({ request_id, status: "pending" });
-      } catch (e) {
-        error("Error running claude scripts:", e);
-        fail(res, e);
-      }
-    };
-  };
   app.post("/validate_session", async (req, res) => {
     log("===> POST /validate_session");
     const { session } = req.body;
@@ -135131,7 +135317,7 @@ ${logs}
         );
         const validation = parseValidationResponse(result);
         try {
-          await import_promises2.default.unlink(screenshotPath);
+          await import_promises3.default.unlink(screenshotPath);
         } catch (error87) {
           warn("Failed to cleanup screenshot:", error87);
         }
@@ -135194,56 +135380,6 @@ ${logs}
   server.keepAliveTimeout = 6e5;
   server.headersTimeout = 61e4;
 }
-async function handleRequest(req, res, endpoint, fallbackHandler) {
-  try {
-    let url3 = `${VSCODE_EXTENSION_URL}/${endpoint}`;
-    if (req.method === "GET" && Object.keys(req.query).length > 0) {
-      const params = new URLSearchParams(req.query);
-      url3 += `?${params.toString()}`;
-    }
-    const forwardHeaders = {
-      "Content-Type": "application/json"
-    };
-    if (req.headers.authorization) {
-      forwardHeaders.authorization = req.headers.authorization;
-    }
-    const controller = new AbortController();
-    const timeoutId = setTimeout(() => controller.abort(), 2e4);
-    const response = await fetch(url3, {
-      method: req.method,
-      headers: forwardHeaders,
-      body: req.method !== "GET" ? JSON.stringify(req.body) : void 0,
-      signal: controller.signal
-    });
-    clearTimeout(timeoutId);
-    if (!response.ok) {
-      throw new Error(
-        `VSCode extension server responded with status ${response.status}`
-      );
-    }
-    const data = await response.json();
-    res.status(response.status).json(data);
-  } catch (error87) {
-    try {
-      await fallbackHandler(req, res);
-    } catch (fallbackError) {
-      error(`Fallback also failed for ${endpoint}:`, fallbackError);
-      if (!res.headersSent) {
-        res.status(500).json({
-          error: "Both VSCode and filesystem operations failed",
-          message: fallbackError instanceof Error ? fallbackError.message : String(fallbackError)
-        });
-      }
-    }
-  }
-}
-function fail(res, e) {
-  error(e);
-  res.status(200).json({
-    error: "Internal server error",
-    message: e instanceof Error ? e.message : String(e)
-  });
-}
 
 // src/proxy/main.ts
 console.log("Starting staklink proxy server...");