staklink 0.4.4 → 0.4.6

package/dist/proxy-server.cjs

@@ -60411,6 +60411,23 @@ var Repo = class {
     log("nowBranch:", nowBranch);
     return nowBranch.includes(`* ${base_branch}`);
   }
+  async getDefaultBranch() {
+    try {
+      const result = await this.execCommand(
+        `git remote show origin | sed -n '/HEAD branch/s/.*: //p'`
+      );
+      return result.trim();
+    } catch {
+      try {
+        await this.execCommand(
+          "git show-ref --verify --quiet refs/heads/main"
+        );
+        return "main";
+      } catch {
+        return "master";
+      }
+    }
+  }
   async checkoutMainBranchOrBaseBranch(base_branch) {
     if (base_branch) {
       return this.execCommand(`git checkout -f ${base_branch}`);
@@ -60777,7 +60794,7 @@ var SSEManager = class {
 var sseManager = new SSEManager();
 
 // src/proxy/version.ts
-var VERSION = "0.4.4";
+var VERSION = "0.4.6";
 
 // node_modules/uuid/dist/esm/stringify.js
 var byteToHex = [];
@@ -60950,7 +60967,12 @@ var fs8 = __toESM(require("fs"), 1);
 var path7 = __toESM(require("path"), 1);
 var os = __toESM(require("os"), 1);
 
-// src/agent/system_suffix.ts
+// src/agent/system_prompt.ts
+var SYSTEM_CORE = `You are a software systems expert. You are working on a cloud dev server (code-server) that is running a software project. The user's application is being run with pm2. You can use the pm2 cli to inspect the running processes. There may also be supporting services running as docker containers. Because you are running on a cloud server, certain operation may not be possible, such as launching a desktop application, or opening a browser window. The user can see the running application from the pm2 service called "frontend" in an iframe on their end.
+
+Do not commit or push code to github. That is handled by a workflow after you are done working.
+
+`;
 var SYSTEM_SUFFIX = `
 You can ignore the .pod-config directory if you see it, its just config stuff
 
@@ -137820,7 +137842,8 @@ async function runAgent({
   const env2 = goose_env(apiKey, model);
   console.log("RUN goose with env", env2);
   const cleanPrompt = sanitizeShellArg(prompt);
-  let system = system_prompt ? sanitizeShellArg(system_prompt) + "\n\n" : "";
+  let system = SYSTEM_CORE;
+  system += system_prompt ? sanitizeShellArg(system_prompt) + "\n\n" : "";
   system += SYSTEM_SUFFIX;
   system = sanitizeShellArg(system);
   console.log("Using Goose CLI", cleanPrompt, system);
@@ -139430,7 +139453,8 @@ async function runAgent3({
   session,
   summarize
 }) {
-  let system = system_prompt ? system_prompt + "\n\n" : "";
+  let system = SYSTEM_CORE;
+  system += system_prompt ? system_prompt + "\n\n" : "";
   system += SYSTEM_SUFFIX;
   console.log("Codex agent using API key:", apiKey ? `${apiKey.substring(0, 8)}...` : "MISSING");
   if (apiKey) {
@@ -139463,7 +139487,7 @@ __export(repair_exports, {
   makeRepairPrompt: () => makeRepairPrompt,
   parseXML: () => parseXML
 });
-var SYSTEM2 = `You are a software systems expert. Your job is to help set up the development environment for a software project. Fix the user's pm2 config and/or docker-compose files, and use the pm2 and docker cli to get the project running. YOUR GOAL IS TO THE GET THE frontend APP IN THE PM2 CONFIG FILE TO RUN CORRECTLY! Other apps and docker containers are only supporting services. You can restart the pm2 environment with "npx -y staklink reload" after making changes to the pm2 config or docker-compose files.
+var SYSTEM2 = SYSTEM_CORE + `Your job is to help set up the development environment for a software project. Fix the user's pm2 config and/or docker-compose files, and use the pm2 and docker cli to get the project running. YOUR GOAL IS TO THE GET THE frontend APP IN THE PM2 CONFIG FILE TO RUN CORRECTLY! Other apps and docker containers are only supporting services. You can restart the pm2 environment with "npx -y staklink reload" after making changes to the pm2 config or docker-compose files.
 
 When you have gotten the frontend running, or gotten as far as you can, respond to the user by saying either "<status>COMPLETE</status>" or "<status>FAILED</status>". If COMPLETE, then tell the user the fixed config files (put the exact raw content of the files in the XML tags, no extra text like triple backticks or language label). FOR YOUR FINAL TEXT RESPONSE, USE THE THE FOLLOWING XML FORMAT:
 
@@ -141103,41 +141127,137 @@ Stderr: ${error88.stderr}`
 };
 
 // src/proxy/git_actions.ts
+var IMAGE_EXTENSIONS = /* @__PURE__ */ new Set([
+  ".png",
+  ".jpg",
+  ".jpeg",
+  ".gif",
+  ".bmp",
+  ".webp",
+  ".ico",
+  ".svg",
+  ".tiff",
+  ".tif",
+  ".avif"
+]);
+var MIME_TYPES = {
+  ".png": "image/png",
+  ".jpg": "image/jpeg",
+  ".jpeg": "image/jpeg",
+  ".gif": "image/gif",
+  ".bmp": "image/bmp",
+  ".webp": "image/webp",
+  ".ico": "image/x-icon",
+  ".svg": "image/svg+xml",
+  ".tiff": "image/tiff",
+  ".tif": "image/tiff",
+  ".avif": "image/avif"
+};
+function isImageFile(filePath) {
+  return IMAGE_EXTENSIONS.has(import_path4.default.extname(filePath).toLowerCase());
+}
+async function binaryDiffContent(repo, filePath, action) {
+  const isBinary = await isGitBinaryFile(repo, filePath);
+  if (!isBinary) {
+    return null;
+  }
+  if (action === "delete") {
+    if (isImageFile(filePath)) {
+      return `Binary image file deleted: ${filePath}`;
+    }
+    return `Binary file deleted: ${filePath}`;
+  }
+  if (isImageFile(filePath)) {
+    try {
+      const absPath = import_path4.default.join(repo.printcwd(), filePath);
+      const buffer = import_fs4.default.readFileSync(absPath);
+      const ext2 = import_path4.default.extname(filePath).toLowerCase();
+      const mime = MIME_TYPES[ext2] || "application/octet-stream";
+      const b64 = buffer.toString("base64");
+      return `--- ${action === "create" ? "/dev/null" : `a/${filePath}`}
++++ b/${filePath}
+Binary image file (${mime}, ${formatBytes(buffer.length)})
+data:${mime};base64,${b64}`;
+    } catch {
+      return `Binary image file changed: ${filePath} (could not read file)`;
+    }
+  }
+  return `Binary file changed: ${filePath}`;
+}
+async function isGitBinaryFile(repo, filePath) {
+  try {
+    const numstat = await repo.execCommand(
+      `git diff --numstat HEAD -- "${filePath}"`
+    );
+    if (numstat.trim().startsWith("-	-")) {
+      return true;
+    }
+  } catch {
+  }
+  try {
+    const absPath = import_path4.default.join(repo.printcwd(), filePath);
+    const buf = Buffer.alloc(8192);
+    const fd = import_fs4.default.openSync(absPath, "r");
+    const bytesRead = import_fs4.default.readSync(fd, buf, 0, 8192, 0);
+    import_fs4.default.closeSync(fd);
+    for (let i = 0; i < bytesRead; i++) {
+      if (buf[i] === 0) {
+        return true;
+      }
+    }
+  } catch {
+  }
+  return false;
+}
+function formatBytes(bytes) {
+  if (bytes < 1024) {
+    return `${bytes} B`;
+  }
+  if (bytes < 1024 * 1024) {
+    return `${(bytes / 1024).toFixed(1)} KB`;
+  }
+  return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+}
 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 {
+      const baseBranch = req.query.base || await repo.getDefaultBranch();
+      const onBaseBranch = currentBranch === baseBranch;
+      let diffBase;
+      if (onBaseBranch) {
+        diffBase = "HEAD";
+      } else {
         try {
-          mergeBase = (await repo.execCommand(`git merge-base origin/${baseBranch} HEAD`)).trim();
+          diffBase = (await repo.execCommand(`git merge-base ${baseBranch} HEAD`)).trim();
         } catch {
-          warn(
-            `Could not find merge base for ${repoName}, skipping...`
-          );
-          continue;
+          try {
+            diffBase = (await repo.execCommand(
+              `git merge-base origin/${baseBranch} HEAD`
+            )).trim();
+          } catch {
+            warn(
+              `Could not find merge base for ${repoName}, skipping...`
+            );
+            continue;
+          }
         }
       }
       let diffOutput = "";
       try {
         diffOutput = await repo.execCommand(
-          `git diff --name-status ${mergeBase}`
+          `git diff --name-status ${diffBase}`
         );
       } catch (error88) {
         warn(`Error getting branch diff for repo ${repoName}:`, error88);
         continue;
       }
       const lines = diffOutput.trim().split("\n").filter((line) => line);
+      const trackedFiles = /* @__PURE__ */ new Set();
       for (const line of lines) {
         const parts = line.split("	");
         if (parts.length < 2) {
@@ -141145,6 +141265,7 @@ async function handleBranchDiff(req, res) {
         }
         const status = parts[0];
         const filePath = parts[1];
+        trackedFiles.add(filePath);
         let action;
         if (status.startsWith("A")) {
           action = "create";
@@ -141154,12 +141275,17 @@ async function handleBranchDiff(req, res) {
           action = "modify";
         }
         let content = "";
-        try {
-          content = await repo.execCommand(
-            `git diff ${mergeBase} -- "${filePath}"`
-          );
-        } catch (error88) {
-          warn(`Error getting branch diff for ${filePath}:`, error88);
+        const binaryContent = await binaryDiffContent(repo, filePath, action);
+        if (binaryContent !== null) {
+          content = binaryContent;
+        } else {
+          try {
+            content = await repo.execCommand(
+              `git diff ${diffBase} -- "${filePath}"`
+            );
+          } catch (error88) {
+            warn(`Error getting branch diff for ${filePath}:`, error88);
+          }
         }
         results.push({
           file: `${repoName}/${filePath}`,
@@ -141169,6 +141295,47 @@ async function handleBranchDiff(req, res) {
           errors: []
         });
       }
+      let untrackedOutput = "";
+      try {
+        untrackedOutput = await repo.execCommand(
+          "git ls-files --others --exclude-standard"
+        );
+      } catch (error88) {
+        warn(
+          `Error getting untracked files for repo ${repoName}:`,
+          error88
+        );
+      }
+      const untrackedLines = untrackedOutput.trim().split("\n").filter((line) => line && !trackedFiles.has(line));
+      for (const filePath of untrackedLines) {
+        let content = "";
+        const binaryContent = await binaryDiffContent(
+          repo,
+          filePath,
+          "create"
+        );
+        if (binaryContent !== null) {
+          content = binaryContent;
+        } else {
+          try {
+            const fileContent = await repo.execCommand(`cat "${filePath}"`);
+            const fileLines = fileContent.split("\n");
+            content = `--- /dev/null
++++ b/${filePath}
+@@ -0,0 +1,${fileLines.length} @@
+${fileLines.map((line) => "+" + line).join("\n")}`;
+          } catch (error88) {
+            warn(`Error reading untracked file ${filePath}:`, error88);
+          }
+        }
+        results.push({
+          file: `${repoName}/${filePath}`,
+          action: "create",
+          content,
+          repoName,
+          errors: []
+        });
+      }
     }
     res.status(200).json(results);
   } catch (error88) {
@@ -141210,15 +141377,24 @@ async function handleDiff(_req, res) {
           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}"`);
+        const binaryContent = await binaryDiffContent(repo, filePath, action);
+        if (binaryContent !== null) {
+          content = binaryContent;
+        } else {
+          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 (error88) {
+            warn(`Error getting diff for ${filePath}:`, error88);
           }
-        } catch (error88) {
-          warn(`Error getting diff for ${filePath}:`, error88);
         }
         results.push({
           file: `${repoName}/${filePath}`,
@@ -141231,15 +141407,24 @@ async function handleDiff(_req, res) {
       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
+        const binaryContent = await binaryDiffContent(
+          repo,
+          filePath,
+          "create"
+        );
+        if (binaryContent !== null) {
+          content = binaryContent;
+        } else {
+          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 (error88) {
-          warn(`Error reading untracked file ${filePath}:`, error88);
+          } catch (error88) {
+            warn(`Error reading untracked file ${filePath}:`, error88);
+          }
         }
         results.push({
           file: `${repoName}/${filePath}`,

package/dist/staklink-cli.cjs

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