staklink 0.3.34 → 0.3.38

package/README.md

@@ -10,14 +10,25 @@ npx -y staklink@latest start
 
 ### local cli testing
 
+```sh
 pm2 stop all
 pm2 delete all
+pm2 flush
+rm ~/.pm2/logs/*.log
 
 yarn build:cli
 yarn build:proxy
 
 node bin/staklink.cjs start
 
+```
+
+cat /Users/evanfeenstra/.pm2/logs/staklink-proxy-out-0.log
+
+```sh
+rm ~/.pm2/logs/*.log
+```
+
 ## processes
 
 There are 2 ways to configure your dev processes (like your backend, frontend, db, etc)

package/dist/proxy-server.cjs

@@ -48423,10 +48423,15 @@ async function findAndLoadPm2Config(workspaceRoot2, log_cb) {
 }
 async function findPm2Config(workspaceRoot2, log_cb) {
   log_cb?.(`Searching for PM2 config in workspace: ${workspaceRoot2}`);
+  const configFilenames = ["pm2.config.js", "pm2.config.cjs"];
   const configPaths = [
-    "/workspaces/.pod-config/.user-dockerfile/pm2.config.js",
-    path.join(workspaceRoot2, "pm2.config.js"),
-    path.join(workspaceRoot2, ".devcontainer", "pm2.config.js")
+    ...configFilenames.map(
+      (filename) => `/workspaces/.pod-config/.user-dockerfile/${filename}`
+    ),
+    ...configFilenames.map((filename) => path.join(workspaceRoot2, filename)),
+    ...configFilenames.map(
+      (filename) => path.join(workspaceRoot2, ".devcontainer", filename)
+    )
   ];
   try {
     const subdirs = await fs2.readdir(workspaceRoot2, {
@@ -48434,10 +48439,12 @@ async function findPm2Config(workspaceRoot2, log_cb) {
     });
     const repoDirs = subdirs.filter((dirent) => dirent.isDirectory()).map((dirent) => dirent.name);
     for (const repoDir of repoDirs) {
-      configPaths.push(
-        path.join(workspaceRoot2, repoDir, "pm2.config.js"),
-        path.join(workspaceRoot2, repoDir, ".devcontainer", "pm2.config.js")
-      );
+      for (const filename of configFilenames) {
+        configPaths.push(
+          path.join(workspaceRoot2, repoDir, filename),
+          path.join(workspaceRoot2, repoDir, ".devcontainer", filename)
+        );
+      }
     }
   } catch (error82) {
     console.log("Error reading workspace directories:", error82);
@@ -48454,7 +48461,16 @@ async function findPm2Config(workspaceRoot2, log_cb) {
 }
 async function loadPm2Config(configPath) {
   try {
-    const configContent = await fs2.readFile(configPath, "utf8");
+    let configContent = await fs2.readFile(configPath, "utf8");
+    configContent = configContent.replace(
+      /export\s+default\s+/g,
+      "module.exports = "
+    );
+    configContent = configContent.replace(
+      /export\s*{([^}]*)as\s+default\s*}/g,
+      "module.exports = $1"
+    );
+    configContent = configContent.replace(/export\s+/g, "");
     const moduleContext = { exports: {}, module: { exports: {} } };
     const configFunction = new Function("module", "exports", configContent);
     configFunction(moduleContext.module, moduleContext.exports);
@@ -48608,7 +48624,9 @@ var Runner = class {
     for (const app of config3.apps || []) {
       const processConfig = this.parseProcessApp(app);
       if (processConfig.rebuildCommand) {
-        this.log_cb(`\u{1F527} Rebuilding ${processConfig.name}...`);
+        this.log_cb(
+          `\u{1F527} Rebuilding ${processConfig.name}: ${processConfig.rebuildCommand}`
+        );
         try {
           const { stdout, stderr } = await this.executeCommand(
             processConfig.rebuildCommand,
@@ -48632,7 +48650,9 @@ var Runner = class {
     for (const app of config3.apps || []) {
       const processConfig = this.parseProcessApp(app);
       if (processConfig.installCommand) {
-        this.log_cb(`\u{1F4E6} Installing dependencies for ${processConfig.name}...`);
+        this.log_cb(
+          `\u{1F4E6} Installing dependencies for ${processConfig.name}: ${processConfig.installCommand}`
+        );
         try {
           const { stdout, stderr } = await this.executeCommand(
             processConfig.installCommand,
@@ -48651,7 +48671,9 @@ var Runner = class {
     for (const app of config3.apps || []) {
       const processConfig = this.parseProcessApp(app);
       if (processConfig.preRunCommand) {
-        this.log_cb(`\u{1F680} Running pre-run command for ${processConfig.name}...`);
+        this.log_cb(
+          `\u{1F680} Running pre-run command for ${processConfig.name}: ${processConfig.preRunCommand}`
+        );
         try {
           await this.executeCommand(
             processConfig.preRunCommand,
@@ -48671,7 +48693,9 @@ var Runner = class {
     for (const app of config3.apps || []) {
       const processConfig = this.parseProcessApp(app);
       if (processConfig.postRunCommand) {
-        this.log_cb(`\u{1F680} Running post-run command for ${processConfig.name}...`);
+        this.log_cb(
+          `\u{1F680} Running post-run command for ${processConfig.name}: ${processConfig.postRunCommand}`
+        );
         try {
           await this.executeCommand(
             processConfig.postRunCommand,
@@ -48693,7 +48717,9 @@ var Runner = class {
     for (const app of config3.apps || []) {
       const processConfig = this.parseProcessApp(app);
       if (processConfig.resetCommand) {
-        this.log_cb(`\u{1F504} Running reset command for ${processConfig.name}...`);
+        this.log_cb(
+          `\u{1F504} Running reset command for ${processConfig.name}: ${processConfig.resetCommand}`
+        );
         try {
           await this.executeCommand(
             processConfig.resetCommand,
@@ -48714,7 +48740,9 @@ var Runner = class {
     for (const app of config3.apps || []) {
       const processConfig = this.parseProcessApp(app);
       if (processConfig.buildCommand) {
-        this.log_cb(`\u{1F528} Running build command for ${processConfig.name}...`);
+        this.log_cb(
+          `\u{1F528} Running build command for ${processConfig.name}: ${processConfig.buildCommand}`
+        );
         let is_next = false;
         if (processConfig.cwd) {
           const proj = detectProject(processConfig.cwd);
@@ -48752,7 +48780,9 @@ var Runner = class {
     for (const app of config3.apps || []) {
       const processConfig = this.parseProcessApp(app);
       if (processConfig.testCommand) {
-        this.log_cb(`\u{1F9EA} Running test command for ${processConfig.name}...`);
+        this.log_cb(
+          `\u{1F9EA} Running test command for ${processConfig.name}: ${processConfig.testCommand}`
+        );
         try {
           const { stdout, stderr } = await this.executeCommand(
             processConfig.testCommand,
@@ -48778,7 +48808,9 @@ var Runner = class {
     for (const app of config3.apps || []) {
       const processConfig = this.parseProcessApp(app);
       if (processConfig.e2eTestCommand) {
-        this.log_cb(`\u{1F3AD} Running E2E test command for ${processConfig.name}...`);
+        this.log_cb(
+          `\u{1F3AD} Running E2E test command for ${processConfig.name}: ${processConfig.e2eTestCommand}`
+        );
         const isPlaywright = processConfig.e2eTestCommand === "npx playwright test" || processConfig.e2eTestCommand === "npx -y playwright test";
         const cmd = isPlaywright && test_name ? `${processConfig.e2eTestCommand} ${test_name}` : processConfig.e2eTestCommand;
         try {
@@ -48900,8 +48932,8 @@ var Runner = class {
     await this.pm2.stopAll();
     this.log_cb("\u{1F6D1} Stopped all processes.");
   }
-  async pm2Logs() {
-    return await this.pm2.logs();
+  async pm2Logs(lines) {
+    return await this.pm2.logs(void 0, lines || 100);
   }
   async list() {
     try {
@@ -48932,9 +48964,9 @@ var Runner = class {
    * Get logs for a specific process
    * @param processName Name of the process to get logs for
    */
-  async getProcessLogs(processName) {
+  async getProcessLogs(processName, lines = 100) {
     try {
-      const logs = await this.pm2.logs(processName);
+      const logs = await this.pm2.logs(processName, lines);
       return logs;
     } catch (error82) {
       this.log_cb(`\u274C Failed to get logs for ${processName}: ${error82}`);
@@ -49129,7 +49161,6 @@ async function findRepoLocation(repoFullName) {
       }
       return null;
     } catch (readdirError) {
-      console.warn("Could not read /workspaces directory:", readdirError);
       return null;
     }
   } catch (error82) {
@@ -56419,7 +56450,7 @@ var SSEManager = class {
 var sseManager = new SSEManager();
 
 // src/proxy/version.ts
-var VERSION = "0.3.34";
+var VERSION = "0.3.38";
 
 // node_modules/uuid/dist/esm/stringify.js
 var byteToHex = [];
@@ -56638,7 +56669,7 @@ function createGooseConfig() {
     fs9.writeFileSync(configPath, configContent, "utf-8");
     console.log(`Created goose config at ${configPath}`);
   } catch (error82) {
-    console.error("Error creating goose config:", error82);
+    console.warn("Error creating goose config:", error82);
   }
 }
 async function runGooseWeb(apiKey, cwd, port) {
@@ -102344,6 +102375,9 @@ Stderr: ${error82.stderr}`
   getBranch() {
     return this.branch;
   }
+  async addLabelToPR(prNumber, label) {
+    await this.execGH(`pr edit ${prNumber} --add-label ${label}`);
+  }
 };
 
 // src/proxy/playwright.ts
@@ -102809,6 +102843,7 @@ async function cleanupConfig(configState) {
   }
 }
 async function runPlaywrightTestWithVideo(options) {
+  console.log("=== Running Playwright test with video:", options);
   const { repoName, testFilePath, responseUrl } = options;
   let configState = null;
   console.log(
@@ -103047,7 +103082,8 @@ async function startProxyServer() {
   app.get("/logs", async (req, res) => {
     console.log("===> GET logs");
     const r = await newRunner();
-    const logs = await r.pm2Logs();
+    const lines = Number(req.query.lines) || 100;
+    const logs = await r.pm2Logs(lines);
     res.send(logs);
   });
   app.get("/logs/:appName", async (req, res) => {
@@ -103055,7 +103091,8 @@ async function startProxyServer() {
     const appName = req.params.appName;
     const r = await newRunner();
     try {
-      const logs = await r.getProcessLogs(appName);
+      const lines = Number(req.query.lines) || 100;
+      const logs = await r.getProcessLogs(appName, lines);
       res.send(logs);
     } catch (error82) {
       console.error(`Error fetching logs for ${appName}:`, error82);
@@ -103219,9 +103256,11 @@ ${lines2.map((line) => "+" + line).join("\n")}`;
       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 = {};
       console.log(`=> Commit requested: ${shouldCommit}`);
       console.log(`=> PR creation requested: ${createPR}`);
@@ -103288,7 +103327,7 @@ ${lines2.map((line) => "+" + line).join("\n")}`;
         if (createPR) {
           if (!code.git_credentials?.auth_data?.token) {
             console.error(`=> No GitHub token available for PR creation`);
-            prs[repoName] = "Error: GitHub token required for PR creation";
+            prErrors[repoName] = "GitHub token required for PR creation";
             continue;
           }
           try {
@@ -103307,7 +103346,7 @@ ${lines2.map((line) => "+" + line).join("\n")}`;
               console.log(
                 `=> Cannot create PR: currently on base branch (${baseBranch})`
               );
-              prs[repoName] = `Error: Cannot create PR - currently on base branch (${baseBranch}). Commit changes to a feature branch first.`;
+              prErrors[repoName] = `Cannot create PR - currently on base branch (${baseBranch}). Commit changes to a feature branch first.`;
               continue;
             }
             try {
@@ -103318,7 +103357,7 @@ ${lines2.map((line) => "+" + line).join("\n")}`;
                 console.log(
                   `=> No commits between ${baseBranch} and ${currentBranch2}`
                 );
-                prs[repoName] = `Error: No commits to create PR - ${currentBranch2} is up to date with ${baseBranch}`;
+                prErrors[repoName] = `No commits to create PR - ${currentBranch2} is up to date with ${baseBranch}`;
                 continue;
               }
               console.log(`=> Commits to include in PR:
@@ -103350,11 +103389,23 @@ ${diff.trim()}`);
               console.log(`=> PR created: ${pr.url}`);
               prs[repoName] = pr.url;
               prNumber = pr.number;
+              if (label) {
+                try {
+                  await gh.addLabelToPR(pr.number, label);
+                } catch (e) {
+                  console.error(`=> PR failed to add label: ${e}`);
+                }
+              }
             }
             if (autoMerge) {
               try {
-                console.log(`=> Waiting for CI checks to appear for PR #${prNumber}...`);
-                const hasChecks = await gh.waitForChecksToExist(prNumber, 3e4);
+                console.log(
+                  `=> Waiting for CI checks to appear for PR #${prNumber}...`
+                );
+                const hasChecks = await gh.waitForChecksToExist(
+                  prNumber,
+                  3e4
+                );
                 if (hasChecks) {
                   console.log(`=> Enabling auto-merge for PR #${prNumber}...`);
                   await gh.mergePR(prNumber, {
@@ -103364,7 +103415,9 @@ ${diff.trim()}`);
                   });
                   console.log(`=> Auto-merge enabled for PR #${prNumber}`);
                 } else {
-                  console.log(`=> No CI checks found, skipping auto-merge for PR #${prNumber}`);
+                  console.log(
+                    `=> No CI checks found, skipping auto-merge for PR #${prNumber}`
+                  );
                 }
               } catch (autoMergeError) {
                 console.error(
@@ -103375,14 +103428,16 @@ ${diff.trim()}`);
             }
           } catch (prError) {
             console.error(`=> Failed to create PR for ${r.url}:`, prError);
-            fail(res, prError);
-            return;
+            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) {

package/dist/staklink-cli.cjs

@@ -3919,10 +3919,15 @@ async function findAndLoadPm2Config(workspaceRoot2, log_cb) {
 }
 async function findPm2Config(workspaceRoot2, log_cb) {
   log_cb?.(`Searching for PM2 config in workspace: ${workspaceRoot2}`);
+  const configFilenames = ["pm2.config.js", "pm2.config.cjs"];
   const configPaths = [
-    "/workspaces/.pod-config/.user-dockerfile/pm2.config.js",
-    path.join(workspaceRoot2, "pm2.config.js"),
-    path.join(workspaceRoot2, ".devcontainer", "pm2.config.js")
+    ...configFilenames.map(
+      (filename) => `/workspaces/.pod-config/.user-dockerfile/${filename}`
+    ),
+    ...configFilenames.map((filename) => path.join(workspaceRoot2, filename)),
+    ...configFilenames.map(
+      (filename) => path.join(workspaceRoot2, ".devcontainer", filename)
+    )
   ];
   try {
     const subdirs = await fs2.readdir(workspaceRoot2, {
@@ -3930,10 +3935,12 @@ async function findPm2Config(workspaceRoot2, log_cb) {
     });
     const repoDirs = subdirs.filter((dirent) => dirent.isDirectory()).map((dirent) => dirent.name);
     for (const repoDir of repoDirs) {
-      configPaths.push(
-        path.join(workspaceRoot2, repoDir, "pm2.config.js"),
-        path.join(workspaceRoot2, repoDir, ".devcontainer", "pm2.config.js")
-      );
+      for (const filename of configFilenames) {
+        configPaths.push(
+          path.join(workspaceRoot2, repoDir, filename),
+          path.join(workspaceRoot2, repoDir, ".devcontainer", filename)
+        );
+      }
     }
   } catch (error) {
     console.log("Error reading workspace directories:", error);
@@ -3950,7 +3957,16 @@ async function findPm2Config(workspaceRoot2, log_cb) {
 }
 async function loadPm2Config(configPath) {
   try {
-    const configContent = await fs2.readFile(configPath, "utf8");
+    let configContent = await fs2.readFile(configPath, "utf8");
+    configContent = configContent.replace(
+      /export\s+default\s+/g,
+      "module.exports = "
+    );
+    configContent = configContent.replace(
+      /export\s*{([^}]*)as\s+default\s*}/g,
+      "module.exports = $1"
+    );
+    configContent = configContent.replace(/export\s+/g, "");
     const moduleContext = { exports: {}, module: { exports: {} } };
     const configFunction = new Function("module", "exports", configContent);
     configFunction(moduleContext.module, moduleContext.exports);
@@ -4083,7 +4099,9 @@ var Runner = class {
     for (const app of config.apps || []) {
       const processConfig = this.parseProcessApp(app);
       if (processConfig.rebuildCommand) {
-        this.log_cb(`\u{1F527} Rebuilding ${processConfig.name}...`);
+        this.log_cb(
+          `\u{1F527} Rebuilding ${processConfig.name}: ${processConfig.rebuildCommand}`
+        );
         try {
           const { stdout, stderr } = await this.executeCommand(
             processConfig.rebuildCommand,
@@ -4107,7 +4125,9 @@ var Runner = class {
     for (const app of config.apps || []) {
       const processConfig = this.parseProcessApp(app);
       if (processConfig.installCommand) {
-        this.log_cb(`\u{1F4E6} Installing dependencies for ${processConfig.name}...`);
+        this.log_cb(
+          `\u{1F4E6} Installing dependencies for ${processConfig.name}: ${processConfig.installCommand}`
+        );
         try {
           const { stdout, stderr } = await this.executeCommand(
             processConfig.installCommand,
@@ -4126,7 +4146,9 @@ var Runner = class {
     for (const app of config.apps || []) {
       const processConfig = this.parseProcessApp(app);
       if (processConfig.preRunCommand) {
-        this.log_cb(`\u{1F680} Running pre-run command for ${processConfig.name}...`);
+        this.log_cb(
+          `\u{1F680} Running pre-run command for ${processConfig.name}: ${processConfig.preRunCommand}`
+        );
         try {
           await this.executeCommand(
             processConfig.preRunCommand,
@@ -4146,7 +4168,9 @@ var Runner = class {
     for (const app of config.apps || []) {
       const processConfig = this.parseProcessApp(app);
       if (processConfig.postRunCommand) {
-        this.log_cb(`\u{1F680} Running post-run command for ${processConfig.name}...`);
+        this.log_cb(
+          `\u{1F680} Running post-run command for ${processConfig.name}: ${processConfig.postRunCommand}`
+        );
         try {
           await this.executeCommand(
             processConfig.postRunCommand,
@@ -4168,7 +4192,9 @@ var Runner = class {
     for (const app of config.apps || []) {
       const processConfig = this.parseProcessApp(app);
       if (processConfig.resetCommand) {
-        this.log_cb(`\u{1F504} Running reset command for ${processConfig.name}...`);
+        this.log_cb(
+          `\u{1F504} Running reset command for ${processConfig.name}: ${processConfig.resetCommand}`
+        );
         try {
           await this.executeCommand(
             processConfig.resetCommand,
@@ -4189,7 +4215,9 @@ var Runner = class {
     for (const app of config.apps || []) {
       const processConfig = this.parseProcessApp(app);
       if (processConfig.buildCommand) {
-        this.log_cb(`\u{1F528} Running build command for ${processConfig.name}...`);
+        this.log_cb(
+          `\u{1F528} Running build command for ${processConfig.name}: ${processConfig.buildCommand}`
+        );
         let is_next = false;
         if (processConfig.cwd) {
           const proj = detectProject(processConfig.cwd);
@@ -4227,7 +4255,9 @@ var Runner = class {
     for (const app of config.apps || []) {
       const processConfig = this.parseProcessApp(app);
       if (processConfig.testCommand) {
-        this.log_cb(`\u{1F9EA} Running test command for ${processConfig.name}...`);
+        this.log_cb(
+          `\u{1F9EA} Running test command for ${processConfig.name}: ${processConfig.testCommand}`
+        );
         try {
           const { stdout, stderr } = await this.executeCommand(
             processConfig.testCommand,
@@ -4253,7 +4283,9 @@ var Runner = class {
     for (const app of config.apps || []) {
       const processConfig = this.parseProcessApp(app);
       if (processConfig.e2eTestCommand) {
-        this.log_cb(`\u{1F3AD} Running E2E test command for ${processConfig.name}...`);
+        this.log_cb(
+          `\u{1F3AD} Running E2E test command for ${processConfig.name}: ${processConfig.e2eTestCommand}`
+        );
         const isPlaywright = processConfig.e2eTestCommand === "npx playwright test" || processConfig.e2eTestCommand === "npx -y playwright test";
         const cmd = isPlaywright && test_name ? `${processConfig.e2eTestCommand} ${test_name}` : processConfig.e2eTestCommand;
         try {
@@ -4375,8 +4407,8 @@ var Runner = class {
     await this.pm2.stopAll();
     this.log_cb("\u{1F6D1} Stopped all processes.");
   }
-  async pm2Logs() {
-    return await this.pm2.logs();
+  async pm2Logs(lines) {
+    return await this.pm2.logs(void 0, lines || 100);
   }
   async list() {
     try {
@@ -4407,9 +4439,9 @@ var Runner = class {
    * Get logs for a specific process
    * @param processName Name of the process to get logs for
    */
-  async getProcessLogs(processName) {
+  async getProcessLogs(processName, lines = 100) {
     try {
-      const logs = await this.pm2.logs(processName);
+      const logs = await this.pm2.logs(processName, lines);
       return logs;
     } catch (error) {
       this.log_cb(`\u274C Failed to get logs for ${processName}: ${error}`);
@@ -10906,7 +10938,7 @@ var glob = Object.assign(glob_, {
 glob.glob = glob;
 
 // src/proxy/version.ts
-var VERSION = "0.3.34";
+var VERSION = "0.3.38";
 
 // src/cli.ts
 var STAKLINK_PROXY = "staklink-proxy";

package/package.json

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