bosun 0.40.6 → 0.40.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bosun",
-  "version": "0.40.6",
+  "version": "0.40.7",
   "description": "Bosun Autonomous Engineering — manages AI agent executors with failover, extremely powerful workflow builder, and a massive amount of included default workflow templates for autonomous engineering, creates PRs via Vibe-Kanban API, and sends Telegram notifications. Supports N executors with weighted distribution, multi-repo projects, and auto-setup.",
   "type": "module",
   "license": "Apache-2.0",

package/workflow/workflow-nodes.mjs

@@ -59,11 +59,118 @@ function makeIsolatedGitEnv(extra = {}) {
   return env;
 }
 
-function execGitSync(command, options = {}) {
-  return execSync(command, {
-    ...options,
-    env: makeIsolatedGitEnv(options.env),
-  });
+function resolveGitCandidates(env = process.env) {
+  const candidates = [];
+  const envGitExe = env?.GIT_EXE || process.env.GIT_EXE;
+  if (envGitExe) candidates.push(envGitExe);
+  if (process.platform === "win32") {
+    candidates.push(
+      "C:\\Program Files\\Git\\cmd\\git.exe",
+      "C:\\Program Files\\Git\\bin\\git.exe",
+      "C:\\Program Files (x86)\\Git\\cmd\\git.exe",
+      "C:\\Program Files (x86)\\Git\\bin\\git.exe",
+    );
+  } else {
+    candidates.push(
+      "/usr/bin/git",
+      "/usr/local/bin/git",
+      "/bin/git",
+      "/opt/homebrew/bin/git",
+    );
+  }
+
+  if (process.platform === "win32") {
+    try {
+      const whereOutput = execFileSync("where.exe", ["git"], {
+        encoding: "utf8",
+        env,
+        stdio: ["ignore", "pipe", "ignore"],
+        windowsHide: true,
+      });
+      for (const line of String(whereOutput || "").split(/\r?\n/)) {
+        const candidate = line.trim();
+        if (!candidate) continue;
+        candidates.push(candidate);
+      }
+    } catch {
+      /* best-effort */
+    }
+  }
+
+  candidates.push("git");
+  const deduped = [];
+  const seen = new Set();
+  for (const candidate of candidates) {
+    const key = process.platform === "win32"
+      ? String(candidate || "").toLowerCase()
+      : String(candidate || "");
+    if (!candidate || seen.has(key)) continue;
+    seen.add(key);
+    deduped.push(candidate);
+  }
+  return deduped;
+}
+
+function buildGitExecutionEnv(baseEnv, gitBinary) {
+  if (process.platform !== "win32") return baseEnv;
+  const normalizedBinary = String(gitBinary || "").replace(/\//g, "\\");
+  if (!normalizedBinary.includes("\\") || !normalizedBinary.toLowerCase().endsWith("\\git.exe")) {
+    return baseEnv;
+  }
+  const env = { ...baseEnv };
+  const pathKey = Object.prototype.hasOwnProperty.call(env, "Path")
+    ? "Path"
+    : "PATH";
+  const existing = String(env[pathKey] ?? env.PATH ?? env.Path ?? "");
+  const parts = existing
+    .split(";")
+    .map((part) => part.trim())
+    .filter(Boolean);
+  const seen = new Set(parts.map((part) => part.toLowerCase()));
+  const binaryDir = dirname(normalizedBinary);
+  const gitRoot = dirname(binaryDir);
+  for (const dir of [
+    binaryDir,
+    `${gitRoot}\\cmd`,
+    `${gitRoot}\\bin`,
+    `${gitRoot}\\mingw64\\bin`,
+    `${gitRoot}\\usr\\bin`,
+  ]) {
+    const normalizedDir = String(dir || "").replace(/\//g, "\\");
+    if (!normalizedDir || seen.has(normalizedDir.toLowerCase())) continue;
+    seen.add(normalizedDir.toLowerCase());
+    parts.unshift(normalizedDir);
+  }
+  env[pathKey] = parts.join(";");
+  if (pathKey === "PATH") env.Path = env[pathKey];
+  else env.PATH = env[pathKey];
+  return env;
+}
+
+function execGitArgsSync(args, options = {}) {
+  if (!Array.isArray(args) || !args.length) {
+    throw new Error("execGitArgsSync requires a non-empty args array");
+  }
+  const env = makeIsolatedGitEnv(options.env);
+  const gitArgs = args.map((arg) => String(arg));
+  let lastEnoent = null;
+  for (const gitBinary of resolveGitCandidates(env)) {
+    if (gitBinary !== "git" && !existsSync(gitBinary)) continue;
+    try {
+      return execFileSync(gitBinary, gitArgs, {
+        ...options,
+        env: buildGitExecutionEnv(env, gitBinary),
+      });
+    } catch (error) {
+      if (error?.code === "ENOENT") {
+        lastEnoent = error;
+        continue;
+      }
+      throw error;
+    }
+  }
+  if (lastEnoent) throw lastEnoent;
+  throw new Error("Git executable not found");
 }
 
 function trimLogText(value, max = 180) {
@@ -8537,7 +8644,7 @@ registerNodeType("action.detect_new_commits", {
     // Get current HEAD
     let postExecHead = "";
     try {
-      postExecHead = execGitSync("git rev-parse HEAD", {
+      postExecHead = execGitArgsSync(["rev-parse", "HEAD"], {
         cwd: worktreePath, encoding: "utf8", timeout: 5000,
       }).trim();
     } catch (err) {
@@ -8551,7 +8658,7 @@ registerNodeType("action.detect_new_commits", {
     let hasUnpushed = false;
     let commitCount = 0;
     try {
-      const log = execGitSync(`git log --oneline ${baseBranch}..HEAD`, {
+      const log = execGitArgsSync(["log", "--oneline", `${baseBranch}..HEAD`], {
         cwd: worktreePath, encoding: "utf8", timeout: 10000,
         stdio: ["ignore", "pipe", "pipe"],
       }).trim();
@@ -8565,7 +8672,7 @@ registerNodeType("action.detect_new_commits", {
     let diffStats = null;
     if (hasNewCommits || hasUnpushed) {
       try {
-        const statOutput = execGitSync(`git diff --stat ${baseBranch}..HEAD`, {
+        const statOutput = execGitArgsSync(["diff", "--stat", `${baseBranch}..HEAD`], {
           cwd: worktreePath, encoding: "utf8", timeout: 10000,
           stdio: ["ignore", "pipe", "pipe"],
         }).trim();