staklink 0.5.8 → 0.5.9

package/dist/proxy-server.cjs

@@ -61009,7 +61009,7 @@ var SSEManager = class {
 var sseManager = new SSEManager();
 
 // src/proxy/version.ts
-var VERSION = "0.5.8";
+var VERSION = "0.5.9";
 
 // node_modules/uuid/dist/esm/stringify.js
 var byteToHex = [];
@@ -61129,7 +61129,7 @@ function isReqTypeBusy(req_type) {
 // src/agent/utils.ts
 var proc5 = __toESM(require("child_process"), 1);
 var COMMAND_TIMEOUT_MS = 90 * 60 * 1e3;
-async function executeCommand(command, cwd, env2, log_cb) {
+async function executeCommand(command, cwd, env2, log_cb, ctx) {
   return new Promise((resolve3, reject) => {
     const child = proc5.spawn("sh", ["-c", command], {
       cwd,
@@ -61141,7 +61141,9 @@ async function executeCommand(command, cwd, env2, log_cb) {
     let timedOut = false;
     const timeout = setTimeout(() => {
       timedOut = true;
-      log_cb && log_cb(`\u23F1\uFE0F  Command timed out after ${COMMAND_TIMEOUT_MS / 1e3}s, killing process`);
+      const sessionLabel = ctx?.session ? ` [session=${ctx.session}]` : "";
+      const cmdLabel = ctx?.command ? ` | cmd: ${ctx.command.slice(0, 120)}` : "";
+      log_cb && log_cb(`\u23F1\uFE0F  Command timed out after ${COMMAND_TIMEOUT_MS / 1e3}s, killing process${sessionLabel}${cmdLabel}`);
       child.kill("SIGTERM");
       setTimeout(() => {
         if (!child.killed) child.kill("SIGKILL");
@@ -142990,14 +142992,14 @@ ${prompt}` : prompt;
     } catch {
     }
   }
-  let res = await executeCommand(cmd, cwd, env2, (l) => log(l));
+  let res = await executeCommand(cmd, cwd, env2, (l) => log(l), { session, command: cmd });
   if (session && isStreamDecodeError(res.stdout)) {
     const maxRetries = 2;
     for (let attempt = 1; attempt <= maxRetries; attempt++) {
       log(`Stream decode error detected, retrying (${attempt}/${maxRetries})...`);
       await new Promise((r) => setTimeout(r, 2e3 * attempt));
       const retryCmd = `goose run --with-builtin developer -t "continue" --system "${system}" --name ${session} --resume`;
-      res = await executeCommand(retryCmd, cwd, env2, (l) => log(l));
+      res = await executeCommand(retryCmd, cwd, env2, (l) => log(l), { session, command: retryCmd });
       if (!isStreamDecodeError(res.stdout)) break;
     }
   }
@@ -147429,6 +147431,16 @@ async function deleteFile(filePath) {
   await fs15.unlink(filePath);
 }
 
+// src/proxy/log_prefix.ts
+function buildCorrelationPrefix(req) {
+  const sessionId = req.query.sessionId || req.query.session_id || req.params.sessionId;
+  const requestId = req.query.request_id;
+  const parts = [];
+  if (sessionId) parts.push(`[session=${sessionId}]`);
+  if (requestId) parts.push(`[req=${requestId}]`);
+  return parts.length ? parts.join(" ") + " " : "";
+}
+
 // src/proxy/server.ts
 var PORT = parseInt(process.env.STAKLINK_PORT || "15552") || 15552;
 var VSCODE_EXTENSION_URL = `http://localhost:${PORT + 1}`;
@@ -147473,20 +147485,22 @@ async function startProxyServer() {
   });
   app.use(import_express.default.json({ limit: "50mb" }));
   app.use(import_express.default.urlencoded({ extended: true }));
+  app.use((req, _res, next) => {
+    const prefix = buildCorrelationPrefix(req);
+    log(`${prefix}===> ${req.method} ${req.path}`);
+    next();
+  });
   app.use("/recordings", import_express.default.static(RECORDING_DIR));
   app.get("/health", (req, res) => {
-    log("===> health check");
     res.status(200).json({
       ok: true,
       last_hit: lastHitTimestamp
     });
   });
   app.get("/version", (_, res) => {
-    log("===> GET version");
     res.status(200).send(VERSION);
   });
   app.get("/list", async (req, res) => {
-    log("===> GET list");
     const r = await newRunner();
     const list = await r.list();
     res.send(list);
@@ -147532,7 +147546,6 @@ async function startProxyServer() {
   });
   app.use(updateLastHit);
   app.post("/code", async (req, res) => {
-    log("===> POST code");
     await handleRequest(
       req,
       res,
@@ -147550,7 +147563,6 @@ async function startProxyServer() {
     );
   });
   app.post("/actions", async (req, res) => {
-    log("===> POST actions");
     await handleRequest(
       req,
       res,
@@ -147568,7 +147580,6 @@ async function startProxyServer() {
     );
   });
   app.get("/rules", async (req, res) => {
-    log("===> GET rules");
     await handleRequest(
       req,
       res,
@@ -147582,7 +147593,6 @@ async function startProxyServer() {
     );
   });
   app.get("/errors", async (req, res) => {
-    log("===> GET errors");
     await handleRequest(
       req,
       res,
@@ -147594,14 +147604,12 @@ async function startProxyServer() {
     );
   });
   app.get("/logs", async (req, res) => {
-    log("===> GET logs");
     const r = await newRunner();
     const lines = Number(req.query.lines) || 100;
     const logs = await r.pm2Logs(lines);
     res.send(logs);
   });
   app.get("/logs/:appName", async (req, res) => {
-    log(`===> GET logs for ${req.params.appName}`);
     const appName = req.params.appName;
     const r = await newRunner();
     try {
@@ -147617,14 +147625,11 @@ async function startProxyServer() {
     }
   });
   app.get("/ports", async (req, res) => {
-    log("===> GET ports");
     const ps = await getAppsPortAndLabel();
     res.json(ps);
   });
   app.get("/gitlog", async (req, res) => {
-    log("===> GET gitlog");
     try {
-      log("===> gitlog");
       const logs = {};
       const repos = await getReposMaybe();
       for (const r of repos) {
@@ -147639,38 +147644,30 @@ async function startProxyServer() {
     }
   });
   app.get("/diff", async (req, res) => {
-    log("===> GET diff");
     await handleDiff(req, res);
   });
   app.get("/branch-diff", async (req, res) => {
-    log("===> GET branch-diff");
     await handleBranchDiff(req, res);
   });
   app.post("/commit", async (req, res) => {
-    log(`===> POST /commit`);
     await handleCommit(req, res);
   });
   app.post("/push", async (req, res) => {
-    log(`===> POST /push`);
     await handlePush(req, res);
   });
   app.post("/reset", async (req, res) => {
-    log(`===> POST /reset`);
     await handleReset(req, res);
   });
   app.post("/pr", async (req, res) => {
-    log(`===> POST /pr`);
     await handlePr(req, res);
   });
   app.post(
     "/create-repo",
     async (req, res) => {
-      log(`===> POST /create-repo`);
       await handleCreateRepo(req, res);
     }
   );
   app.get("/events", (req, res) => {
-    log("===> GET /events");
     try {
       res.setHeader("Content-Type", "text/event-stream");
       res.setHeader("Cache-Control", "no-cache");
@@ -147701,19 +147698,16 @@ async function startProxyServer() {
     }
   });
   app.post("/rebuild", async (req, res) => {
-    log(`===> POST /rebuild`);
     await restartConfiguredProcesses();
     res.json({ success: true });
   });
   app.post("/restart", async (req, res) => {
-    log(`===> POST /restart`);
     await restartConfiguredProcesses();
     res.json({ success: true });
   });
   app.put(
     "/reload-apps",
     async (req, res) => {
-      log(`===> PUT /reload-apps`);
       if (!isLocalRequest(req)) {
         res.status(403).json({
           error: "This endpoint is only accessible from localhost"
@@ -147744,7 +147738,6 @@ async function startProxyServer() {
     }
   );
   app.post("/rollback", async (req, res) => {
-    log(`===> POST /rollback`);
     const ns = req.query.n || "1";
     const n = parseInt(ns) || 1;
     try {
@@ -147761,7 +147754,6 @@ async function startProxyServer() {
   app.get(
     "/script_progress",
     async (req, res) => {
-      log(`===> GET /script_progress`);
       try {
         const request_id = req.query.request_id;
         if (!request_id) {
@@ -147783,13 +147775,11 @@ async function startProxyServer() {
   app.get(
     "/workspace_root",
     async (req, res) => {
-      log("===> GET /workspace_root");
       const workspaceRoot2 = await workspaceRoot();
       res.json({ workspaceRoot: workspaceRoot2 });
     }
   );
   app.put("/install", async (req, res) => {
-    log(`===> PUT /install`);
     const request_id = startReq();
     try {
       const workspaceRoot2 = await workspaceRoot();
@@ -147807,7 +147797,6 @@ async function startProxyServer() {
     }
   });
   app.put("/prerun", async (req, res) => {
-    log(`===> PUT /prerun`);
     const request_id = startReq();
     try {
       const workspaceRoot2 = await workspaceRoot();
@@ -147827,7 +147816,6 @@ async function startProxyServer() {
   app.put(
     "/reset_state",
     async (req, res) => {
-      log(`===> PUT /reset_state`);
       const request_id = startReq();
       try {
         const workspaceRoot2 = await workspaceRoot();
@@ -147846,7 +147834,6 @@ async function startProxyServer() {
     }
   );
   app.put("/latest", async (req, res) => {
-    log(`===> PUT /latest`);
     if (isReqTypeBusy("latest")) {
       log("=> /latest is already being processed, ignoring request");
       res.status(409).json({
@@ -147905,7 +147892,6 @@ async function startProxyServer() {
     }
   });
   app.put("/build", async (req, res) => {
-    log(`===> PUT /build`);
     const request_id = startReq();
     try {
       const workspaceRoot2 = await workspaceRoot();
@@ -147926,7 +147912,6 @@ async function startProxyServer() {
     }
   });
   app.put("/test", async (req, res) => {
-    log(`===> PUT /test`);
     const request_id = startReq();
     try {
       const workspaceRoot2 = await workspaceRoot();
@@ -147947,7 +147932,6 @@ async function startProxyServer() {
     }
   });
   app.put("/e2e_test", async (req, res) => {
-    log(`===> PUT /e2e_test`);
     const request_id = startReq();
     try {
       const test_name = req.query.test_name;
@@ -148104,7 +148088,6 @@ async function startProxyServer() {
     });
   });
   app.post("/validate_session", async (req, res) => {
-    log("===> POST /validate_session");
     const { session } = req.body;
     if (!session) {
       res.status(400).json({ error: "Missing required field: session" });
@@ -148118,7 +148101,6 @@ async function startProxyServer() {
     }
   });
   app.get("/agent/session", async (req, res) => {
-    log("===> GET /agent/session");
     const sessionId = req.query.sessionId || req.query.session_id;
     if (!sessionId) {
       res.status(400).json({ error: "Missing required query parameter: sessionId" });
@@ -148150,7 +148132,6 @@ async function startProxyServer() {
     }))
   );
   app.post("/agent/push", async (req, res) => {
-    log("===> POST /agent/push");
     await handleAgentPush(req, res);
   });
   app.post(
@@ -148196,7 +148177,6 @@ async function startProxyServer() {
   app.post(
     "/validate_frontend",
     async (req, res) => {
-      log("===> POST /validate_frontend");
       try {
         const workspaceRoot2 = await workspaceRoot();
         const config3 = await findAndLoadPm2Config(workspaceRoot2, log);
@@ -148247,7 +148227,6 @@ ${logs}
     }
   );
   app.get("/leaks", async (req, res) => {
-    log(`===> GET /leaks`);
     try {
       const detect = gitleaksDetect();
       const protect = gitleaksProtect();
@@ -148260,7 +148239,6 @@ ${logs}
   app.post(
     "/playwright_test",
     async (req, res) => {
-      log(`===> POST /playwright_test`);
       const request_id = startReq();
       try {
         const { repoName, testFilePath, responseUrl, apiKey } = req.body;

package/dist/staklink-cli.cjs

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