staklink 0.5.2 → 0.5.4

package/dist/proxy-server.cjs

@@ -5257,7 +5257,7 @@ var require_read = __commonJS({
       var stream2;
       req._body = true;
       var encoding = opts.encoding !== null ? opts.encoding : null;
-      var verify2 = opts.verify;
+      var verify = opts.verify;
       try {
         stream2 = contentstream(req, debug, opts.inflate);
         length = stream2.length;
@@ -5266,7 +5266,7 @@ var require_read = __commonJS({
         return next(err);
       }
       opts.length = length;
-      opts.encoding = verify2 ? null : encoding;
+      opts.encoding = verify ? null : encoding;
       if (opts.encoding === null && encoding !== null && !iconv.encodingExists(encoding)) {
         return next(createError(415, 'unsupported charset "' + encoding.toUpperCase() + '"', {
           charset: encoding.toLowerCase(),
@@ -5294,10 +5294,10 @@ var require_read = __commonJS({
           });
           return;
         }
-        if (verify2) {
+        if (verify) {
           try {
             debug("verify body");
-            verify2(req, res, body, encoding);
+            verify(req, res, body, encoding);
           } catch (err) {
             next(createError(403, err, {
               body,
@@ -14238,8 +14238,8 @@ var require_json = __commonJS({
       var reviver = opts.reviver;
       var strict = opts.strict !== false;
       var type = opts.type || "application/json";
-      var verify2 = opts.verify || false;
-      if (verify2 !== false && typeof verify2 !== "function") {
+      var verify = opts.verify || false;
+      if (verify !== false && typeof verify !== "function") {
         throw new TypeError("option verify must be function");
       }
       var shouldParse = typeof type !== "function" ? typeChecker(type) : type;
@@ -14295,7 +14295,7 @@ var require_json = __commonJS({
           encoding: charset,
           inflate,
           limit,
-          verify: verify2
+          verify
         });
       };
     }
@@ -14365,8 +14365,8 @@ var require_raw = __commonJS({
       var inflate = opts.inflate !== false;
       var limit = typeof opts.limit !== "number" ? bytes.parse(opts.limit || "100kb") : opts.limit;
       var type = opts.type || "application/octet-stream";
-      var verify2 = opts.verify || false;
-      if (verify2 !== false && typeof verify2 !== "function") {
+      var verify = opts.verify || false;
+      if (verify !== false && typeof verify !== "function") {
         throw new TypeError("option verify must be function");
       }
       var shouldParse = typeof type !== "function" ? typeChecker(type) : type;
@@ -14395,7 +14395,7 @@ var require_raw = __commonJS({
           encoding: null,
           inflate,
           limit,
-          verify: verify2
+          verify
         });
       };
     }
@@ -14423,8 +14423,8 @@ var require_text = __commonJS({
       var inflate = opts.inflate !== false;
       var limit = typeof opts.limit !== "number" ? bytes.parse(opts.limit || "100kb") : opts.limit;
       var type = opts.type || "text/plain";
-      var verify2 = opts.verify || false;
-      if (verify2 !== false && typeof verify2 !== "function") {
+      var verify = opts.verify || false;
+      if (verify !== false && typeof verify !== "function") {
         throw new TypeError("option verify must be function");
       }
       var shouldParse = typeof type !== "function" ? typeChecker(type) : type;
@@ -14454,7 +14454,7 @@ var require_text = __commonJS({
           encoding: charset,
           inflate,
           limit,
-          verify: verify2
+          verify
         });
       };
     }
@@ -15232,7 +15232,7 @@ var require_sign = __commonJS({
   "node_modules/math-intrinsics/sign.js"(exports2, module2) {
     "use strict";
     var $isNaN = require_isNaN();
-    module2.exports = function sign2(number7) {
+    module2.exports = function sign(number7) {
       if ($isNaN(number7) || number7 === 0) {
         return number7;
       }
@@ -15596,7 +15596,7 @@ var require_get_intrinsic = __commonJS({
     var min = require_min();
     var pow = require_pow();
     var round = require_round();
-    var sign2 = require_sign();
+    var sign = require_sign();
     var $Function = Function;
     var getEvalledConstructor = function(expressionSyntax) {
       try {
@@ -15710,7 +15710,7 @@ var require_get_intrinsic = __commonJS({
       "%Math.min%": min,
       "%Math.pow%": pow,
       "%Math.round%": round,
-      "%Math.sign%": sign2,
+      "%Math.sign%": sign,
       "%Reflect.getPrototypeOf%": $ReflectGPO
     };
     if (getProto) {
@@ -16874,9 +16874,9 @@ var require_urlencoded = __commonJS({
       var inflate = opts.inflate !== false;
       var limit = typeof opts.limit !== "number" ? bytes.parse(opts.limit || "100kb") : opts.limit;
       var type = opts.type || "application/x-www-form-urlencoded";
-      var verify2 = opts.verify || false;
+      var verify = opts.verify || false;
       var depth = typeof opts.depth !== "number" ? Number(opts.depth || 32) : opts.depth;
-      if (verify2 !== false && typeof verify2 !== "function") {
+      if (verify !== false && typeof verify !== "function") {
         throw new TypeError("option verify must be function");
       }
       var queryparse = extended ? extendedparser(opts) : simpleparser(opts);
@@ -16916,7 +16916,7 @@ var require_urlencoded = __commonJS({
           encoding: charset,
           inflate,
           limit,
-          verify: verify2,
+          verify,
           depth
         });
       };
@@ -23029,7 +23029,7 @@ var require_response = __commonJS({
     var path13 = require("path");
     var statuses = require_statuses();
     var merge3 = require_utils_merge();
-    var sign2 = require_cookie_signature().sign;
+    var sign = require_cookie_signature().sign;
     var normalizeType = require_utils2().normalizeType;
     var normalizeTypes = require_utils2().normalizeTypes;
     var setCharset = require_utils2().setCharset;
@@ -23384,7 +23384,7 @@ var require_response = __commonJS({
       }
       var val = typeof value === "object" ? "j:" + JSON.stringify(value) : String(value);
       if (signed) {
-        val = "s:" + sign2(val, secret);
+        val = "s:" + sign(val, secret);
       }
       if (opts.maxAge != null) {
         var maxAge = opts.maxAge - 0;
@@ -26688,7 +26688,7 @@ var require_jwa = __commonJS({
       return thing;
     }
     function createHmacSigner(bits) {
-      return function sign2(thing, secret) {
+      return function sign(thing, secret) {
         checkIsSecretKey(secret);
         thing = normalizeInput(thing);
         var hmac = crypto3.createHmac("sha" + bits, secret);
@@ -26709,13 +26709,13 @@ var require_jwa = __commonJS({
       return bufferEqual(a, b);
     };
     function createHmacVerifier(bits) {
-      return function verify2(thing, signature, secret) {
+      return function verify(thing, signature, secret) {
         var computedSig = createHmacSigner(bits)(thing, secret);
         return timingSafeEqual(Buffer2.from(signature), Buffer2.from(computedSig));
       };
     }
     function createKeySigner(bits) {
-      return function sign2(thing, privateKey) {
+      return function sign(thing, privateKey) {
         checkIsPrivateKey(privateKey);
         thing = normalizeInput(thing);
         var signer = crypto3.createSign("RSA-SHA" + bits);
@@ -26724,7 +26724,7 @@ var require_jwa = __commonJS({
       };
     }
     function createKeyVerifier(bits) {
-      return function verify2(thing, signature, publicKey) {
+      return function verify(thing, signature, publicKey) {
         checkIsPublicKey(publicKey);
         thing = normalizeInput(thing);
         signature = toBase64(signature);
@@ -26734,7 +26734,7 @@ var require_jwa = __commonJS({
       };
     }
     function createPSSKeySigner(bits) {
-      return function sign2(thing, privateKey) {
+      return function sign(thing, privateKey) {
         checkIsPrivateKey(privateKey);
         thing = normalizeInput(thing);
         var signer = crypto3.createSign("RSA-SHA" + bits);
@@ -26747,7 +26747,7 @@ var require_jwa = __commonJS({
       };
     }
     function createPSSKeyVerifier(bits) {
-      return function verify2(thing, signature, publicKey) {
+      return function verify(thing, signature, publicKey) {
         checkIsPublicKey(publicKey);
         thing = normalizeInput(thing);
         signature = toBase64(signature);
@@ -26762,7 +26762,7 @@ var require_jwa = __commonJS({
     }
     function createECDSASigner(bits) {
       var inner = createKeySigner(bits);
-      return function sign2() {
+      return function sign() {
         var signature = inner.apply(null, arguments);
         signature = formatEcdsa.derToJose(signature, "ES" + bits);
         return signature;
@@ -26770,19 +26770,19 @@ var require_jwa = __commonJS({
     }
     function createECDSAVerifer(bits) {
       var inner = createKeyVerifier(bits);
-      return function verify2(thing, signature, publicKey) {
+      return function verify(thing, signature, publicKey) {
         signature = formatEcdsa.joseToDer(signature, "ES" + bits).toString("base64");
         var result = inner(thing, signature, publicKey);
         return result;
       };
     }
     function createNoneSigner() {
-      return function sign2() {
+      return function sign() {
         return "";
       };
     }
     function createNoneVerifier() {
-      return function verify2(thing, signature) {
+      return function verify(thing, signature) {
         return signature === "";
       };
     }
@@ -26879,7 +26879,7 @@ var require_sign_stream = __commonJS({
       }.bind(this));
     }
     util3.inherits(SignStream, Stream2);
-    SignStream.prototype.sign = function sign2() {
+    SignStream.prototype.sign = function sign() {
       try {
         var signature = jwsSign({
           header: this.header,
@@ -26996,7 +26996,7 @@ var require_verify_stream = __commonJS({
       }.bind(this));
     }
     util3.inherits(VerifyStream, Stream2);
-    VerifyStream.prototype.verify = function verify2() {
+    VerifyStream.prototype.verify = function verify() {
       try {
         var valid = jwsVerify(this.signature.buffer, this.algorithm, this.key.buffer);
         var obj = jwsDecode(this.signature.buffer, this.encoding);
@@ -29455,8 +29455,8 @@ var require_lodash = __commonJS({
       }
       value = toNumber(value);
       if (value === INFINITY || value === -INFINITY) {
-        var sign2 = value < 0 ? -1 : 1;
-        return sign2 * MAX_INTEGER;
+        var sign = value < 0 ? -1 : 1;
+        return sign * MAX_INTEGER;
       }
       return value === value ? value : 0;
     }
@@ -29541,8 +29541,8 @@ var require_lodash3 = __commonJS({
       }
       value = toNumber(value);
       if (value === INFINITY || value === -INFINITY) {
-        var sign2 = value < 0 ? -1 : 1;
-        return sign2 * MAX_INTEGER;
+        var sign = value < 0 ? -1 : 1;
+        return sign * MAX_INTEGER;
       }
       return value === value ? value : 0;
     }
@@ -29699,8 +29699,8 @@ var require_lodash7 = __commonJS({
       }
       value = toNumber(value);
       if (value === INFINITY || value === -INFINITY) {
-        var sign2 = value < 0 ? -1 : 1;
-        return sign2 * MAX_INTEGER;
+        var sign = value < 0 ? -1 : 1;
+        return sign * MAX_INTEGER;
       }
       return value === value ? value : 0;
     }
@@ -60528,10 +60528,13 @@ var Repo = class {
   }
   async checkoutMainBranchOrBaseBranch(base_branch) {
     if (base_branch) {
-      return this.execCommand(`git checkout -f ${base_branch}`);
+      return this.execCommand(
+        `git checkout -f -B ${base_branch} origin/${base_branch}`
+      );
     }
+    const mainBranch = (await this.printMainBranch()).trim();
     return this.execCommand(
-      `git checkout -f $(git remote show origin | sed -n '/HEAD branch/s/.*: //p')`
+      `git checkout -f -B ${mainBranch} origin/${mainBranch}`
     );
   }
   async branchExists(branch) {
@@ -60988,7 +60991,7 @@ var SSEManager = class {
 var sseManager = new SSEManager();
 
 // src/proxy/version.ts
-var VERSION = "0.5.2";
+var VERSION = "0.5.4";
 
 // node_modules/uuid/dist/esm/stringify.js
 var byteToHex = [];
@@ -145118,35 +145121,33 @@ async function streamCodexToSSE(sessionId, prompt, apiKey, res, options) {
 }
 
 // src/agent/goose-session-manager.ts
-var jwt3 = __toESM(require_jsonwebtoken(), 1);
+var import_jsonwebtoken = __toESM(require_jsonwebtoken(), 1);
 var crypto2 = __toESM(require("crypto"), 1);
 var JWT_SECRET = process.env.JWT_SECRET || crypto2.randomBytes(32).toString("hex");
 var TOKEN_EXPIRY = "10m";
 var SESSION_INACTIVITY_TTL = 24 * 60 * 60 * 1e3;
 var SESSIONS = /* @__PURE__ */ new Map();
 function issueToken(sessionId) {
-  return jwt3.sign({ sessionId }, JWT_SECRET, { expiresIn: TOKEN_EXPIRY });
+  return import_jsonwebtoken.default.sign({ sessionId }, JWT_SECRET, { expiresIn: TOKEN_EXPIRY });
 }
-function createSession(sessionId, webhookUrl, apiKey, searchApiKey, model, agent) {
+function createSession(sessionId, webhookUrl, apiKey, searchApiKey, model, agent, system, temperature, jsonMode, summaryApiKey, mcpServers, baseUrl, headers, repoName) {
   const now2 = Date.now();
   const existing = SESSIONS.get(sessionId);
   if (existing) {
     existing.lastActivity = now2;
-    if (webhookUrl !== void 0) {
-      existing.webhookUrl = webhookUrl;
-    }
-    if (apiKey !== void 0) {
-      existing.apiKey = apiKey;
-    }
-    if (searchApiKey !== void 0) {
-      existing.searchApiKey = searchApiKey;
-    }
-    if (model !== void 0) {
-      existing.model = model;
-    }
-    if (agent !== void 0) {
-      existing.agent = agent;
-    }
+    if (webhookUrl !== void 0) existing.webhookUrl = webhookUrl;
+    if (apiKey !== void 0) existing.apiKey = apiKey;
+    if (searchApiKey !== void 0) existing.searchApiKey = searchApiKey;
+    if (model !== void 0) existing.model = model;
+    if (agent !== void 0) existing.agent = agent;
+    if (system !== void 0) existing.system = system;
+    if (temperature !== void 0) existing.temperature = temperature;
+    if (jsonMode !== void 0) existing.jsonMode = jsonMode;
+    if (summaryApiKey !== void 0) existing.summaryApiKey = summaryApiKey;
+    if (mcpServers !== void 0) existing.mcpServers = mcpServers;
+    if (baseUrl !== void 0) existing.baseUrl = baseUrl;
+    if (headers !== void 0) existing.headers = headers;
+    if (repoName !== void 0) existing.repoName = repoName;
     return { token: issueToken(sessionId), created: false };
   }
   SESSIONS.set(sessionId, {
@@ -145157,13 +145158,21 @@ function createSession(sessionId, webhookUrl, apiKey, searchApiKey, model, agent
     apiKey,
     searchApiKey,
     model,
-    agent
+    agent,
+    system,
+    temperature,
+    jsonMode,
+    summaryApiKey,
+    mcpServers,
+    baseUrl,
+    headers,
+    repoName
   });
   return { token: issueToken(sessionId), created: true };
 }
 function validateAndGetSession(sessionId, token) {
   try {
-    const decoded = jwt3.verify(token, JWT_SECRET);
+    const decoded = import_jsonwebtoken.default.verify(token, JWT_SECRET);
     if (decoded.sessionId !== sessionId) {
       return null;
     }
@@ -147104,7 +147113,7 @@ async function handleAgentPush(req, res) {
           code.git_credentials
         );
         try {
-          const prompt = buildPushPrompt({
+          const prompt = code.prompt || buildPushPrompt({
             repoPath,
             createPR,
             autoMerge,
@@ -147758,8 +147767,8 @@ async function startProxyServer() {
         log("=> LATEST: Running reset...");
         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.checkoutMainBranchOrBaseBranch(r.base_branch);
           await repo.resetHardOriginWithCredentials(r.base_branch);
           await repo.clean();
         }

package/dist/staklink-cli.cjs

@@ -11004,7 +11004,7 @@ var glob = Object.assign(glob_, {
 glob.glob = glob;
 
 // src/proxy/version.ts
-var VERSION = "0.5.2";
+var VERSION = "0.5.4";
 
 // src/deps.ts
 var import_child_process = require("child_process");

package/package.json

@@ -2,7 +2,7 @@
   "name": "staklink",
   "displayName": "staklink",
   "description": "staklink process manager",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "type": "module",
   "publisher": "stakwork",
   "engines": {