bosun 0.29.8 → 0.31.0

package/cli.mjs

@@ -5,7 +5,8 @@
  *
  * Usage:
  *   bosun                        # start with default config
- *   bosun --setup                # run setup wizard
+ *   bosun --setup                # launch web setup wizard
+ *   bosun --setup-terminal       # terminal setup wizard
  *   bosun --args "-MaxParallel 6" # pass orchestrator args
  *   bosun --help                 # show help
  *
@@ -65,7 +66,8 @@ function showHelp() {
     bosun [options]
 
   COMMANDS
-    --setup                     Run the interactive setup wizard
+    --setup                     Launch the web-based setup wizard (default)
+    --setup-terminal            Run the legacy terminal setup wizard
     --where                     Show the resolved bosun config directory
     --doctor                    Validate bosun .env/config setup
     --help                      Show this help
@@ -194,7 +196,8 @@ function showHelp() {
 
   EXAMPLES
     bosun                                          # start with defaults
-    bosun --setup                                  # interactive setup
+    bosun --setup                                  # web setup wizard
+    bosun --setup-terminal                          # terminal setup wizard
     bosun --script ./my-orchestrator.sh             # custom script
     bosun --args "-MaxParallel 4" --no-telegram-bot # custom args
     bosun --no-codex --no-autofix                  # minimal mode
@@ -497,9 +500,10 @@ function startDaemon() {
       env: {
         ...process.env,
         BOSUN_DAEMON: "1",
-        // Propagate the bosun package directory so repo-root detection works
+        // Propagate the bosun config directory so repo-root detection works
         // even when the daemon child's cwd is not inside a git repo.
-        BOSUN_DIR: process.env.BOSUN_DIR || fileURLToPath(new URL(".", import.meta.url)),
+        // Use the proper config dir (APPDATA/bosun or ~/bosun), NOT __dirname.
+        BOSUN_DIR: process.env.BOSUN_DIR || resolveConfigDirForCli(),
         // Propagate REPO_ROOT if available; otherwise resolve from cwd before detaching
         ...(process.env.REPO_ROOT
           ? {}
@@ -983,17 +987,24 @@ async function main() {
     process.exit(result.ok ? 0 : 1);
   }
 
-  // Handle --setup
-  if (args.includes("--setup") || args.includes("setup")) {
+  // Handle --setup-terminal (legacy terminal wizard)
+  if (args.includes("--setup-terminal")) {
     const configDirArg = getArgValue("--config-dir");
-    if (configDirArg) {
-      process.env.BOSUN_DIR = configDirArg;
-    }
+    if (configDirArg) process.env.BOSUN_DIR = configDirArg;
     const { runSetup } = await import("./setup.mjs");
     await runSetup();
     process.exit(0);
   }
 
+  // Handle --setup (web wizard — default)
+  if (args.includes("--setup") || args.includes("setup")) {
+    const configDirArg = getArgValue("--config-dir");
+    if (configDirArg) process.env.BOSUN_DIR = configDirArg;
+    const { startSetupServer } = await import("./setup-web-server.mjs");
+    await startSetupServer();
+    // Server keeps running until setup completes
+  }
+
   // Handle --whatsapp-auth
   if (args.includes("--whatsapp-auth") || args.includes("whatsapp-auth")) {
     const mode = args.includes("--pairing-code") ? "pairing-code" : "qr";
@@ -1007,13 +1018,13 @@ async function main() {
   if (!IS_DAEMON_CHILD) {
     const { shouldRunSetup } = await import("./setup.mjs");
     if (shouldRunSetup()) {
-      console.log("\n  🚀 First run detected — launching setup wizard...\n");
       const configDirArg = getArgValue("--config-dir");
       if (configDirArg) {
         process.env.BOSUN_DIR = configDirArg;
       }
-      const { runSetup } = await import("./setup.mjs");
-      await runSetup();
+      console.log("\n  🚀 First run detected — launching setup wizard...\n");
+      const { startSetupServer } = await import("./setup-web-server.mjs");
+      await startSetupServer();
       console.log("\n  Setup complete! Starting bosun...\n");
     }
   }

package/config.mjs

@@ -17,6 +17,7 @@ import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { resolve, dirname, basename, relative, isAbsolute } from "node:path";
 import { execSync } from "node:child_process";
 import { fileURLToPath } from "node:url";
+import os from "node:os";
 import { resolveAgentSdkConfig } from "./agent-sdk.mjs";
 import {
   ensureAgentPromptWorkspace,
@@ -60,6 +61,10 @@ function isWslInteropRuntime() {
 }
 
 function resolveConfigDir(repoRoot) {
+  // 1. Explicit env override
+  if (process.env.BOSUN_DIR) return resolve(process.env.BOSUN_DIR);
+
+  // 2. Platform-aware user home
   const preferWindowsDirs =
     process.platform === "win32" && !isWslInteropRuntime();
   const baseDir = preferWindowsDirs
@@ -67,13 +72,13 @@ function resolveConfigDir(repoRoot) {
       process.env.LOCALAPPDATA ||
       process.env.USERPROFILE ||
       process.env.HOME ||
-      process.cwd()
+      os.homedir()
     : process.env.HOME ||
       process.env.XDG_CONFIG_HOME ||
       process.env.USERPROFILE ||
       process.env.APPDATA ||
       process.env.LOCALAPPDATA ||
-      process.cwd();
+      os.homedir();
   return resolve(baseDir, "bosun");
 }
 
@@ -353,7 +358,11 @@ function detectRepoRoot() {
     }
   }
 
-  // 5. Final fallback to cwd
+  // 5. Final fallback — warn and return cwd.  This is unlikely to be a valid
+  // git repo (e.g. when the daemon spawns with cwd=homedir), but returning
+  // null would crash downstream callers like resolve(repoRoot).  The warning
+  // helps diagnose "not a git repository" errors from child processes.
+  console.warn("[config] detectRepoRoot: no git repository found — falling back to cwd:", process.cwd());
   return process.cwd();
 }
 

package/desktop/launch.mjs

@@ -42,6 +42,7 @@ function ensureElectronInstalled() {
   const result = spawnSync("npm", ["install"], {
     cwd: desktopDir,
     stdio: "inherit",
+    shell: process.platform === "win32",
     env: process.env,
   });
   return result.status === 0 && existsSync(electronBin);
@@ -60,6 +61,7 @@ function launch() {
 
   const child = spawn(electronBin, args, {
     stdio: "inherit",
+    shell: process.platform === "win32",
     env: {
       ...process.env,
       BOSUN_DESKTOP: "1",

package/monitor.mjs

@@ -12703,12 +12703,14 @@ if (isContainerEnabled()) {
 // ── Start PR Cleanup Daemon ──────────────────────────────────────────────────
 // Automatically resolves PR conflicts and CI failures every 30 minutes
 if (config.prCleanupEnabled !== false) {
-  console.log("[monitor] Starting PR cleanup daemon...");
+  const prRepoRoot = effectiveRepoRoot || repoRoot || process.cwd();
+  console.log(`[monitor] Starting PR cleanup daemon (repoRoot: ${prRepoRoot})...`);
   prCleanupDaemon = new PRCleanupDaemon({
     intervalMs: 30 * 60 * 1000, // 30 minutes
     maxConcurrentCleanups: 3,
     dryRun: false,
     autoMerge: true,
+    repoRoot: prRepoRoot,
   });
   prCleanupDaemon.start();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bosun",
-  "version": "0.29.8",
+  "version": "0.31.0",
   "description": "AI-powered orchestrator supervisor — manages AI agent executors with failover, auto-restarts on failure, analyzes crashes with Codex SDK, 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",
@@ -158,6 +158,7 @@
     "sdk-conflict-resolver.mjs",
     "session-tracker.mjs",
     "setup.mjs",
+    "setup-web-server.mjs",
     "pwsh-runtime.mjs",
     "shared-knowledge.mjs",
     "shared-state-manager.mjs",

package/pr-cleanup-daemon.mjs

@@ -23,9 +23,9 @@ const exec = promisify(execCallback);
  * Check if a branch is already checked out in an existing git worktree.
  * Returns the worktree path if claimed, or null if free.
  */
-async function getWorktreeForBranch(branch) {
+async function getWorktreeForBranch(branch, repoRoot) {
   try {
-    const { stdout } = await exec(`git worktree list --porcelain`);
+    const { stdout } = await exec(`git worktree list --porcelain`, { cwd: repoRoot });
     // Each worktree block is separated by a blank line.
     // Look for a line like: branch refs/heads/<branch>
     const blocks = stdout.split(/\n\n/);
@@ -64,6 +64,7 @@ class PRCleanupDaemon {
       ...CONFIG,
       ...(config && typeof config === "object" ? config : {}),
     };
+    this.repoRoot = this.config.repoRoot || process.cwd();
     this.cleanupQueue = [];
     this.activeCleanups = new Map(); // pr# → cleanup state
     this.lastRunStartedAt = 0;
@@ -157,6 +158,7 @@ class PRCleanupDaemon {
     try {
       const { stdout } = await exec(
         `gh pr list --json number,title,mergeable,labels,statusCheckRollup,headRefName --limit 50`,
+        { cwd: this.repoRoot },
       );
       const allPRs = JSON.parse(stdout);
 
@@ -377,10 +379,10 @@ class PRCleanupDaemon {
       tmpDir = await mkdtemp(join(tmpdir(), "pr-merge-"));
 
       // Fetch all relevant refs
-      await exec(`git fetch origin ${pr.headRefName} main`);
+      await exec(`git fetch origin ${pr.headRefName} main`, { cwd: this.repoRoot });
 
       // Guard: skip if the branch is already claimed by another worktree
-      const existingWt = await getWorktreeForBranch(pr.headRefName);
+      const existingWt = await getWorktreeForBranch(pr.headRefName, this.repoRoot);
       if (existingWt) {
         console.warn(
           `[pr-cleanup-daemon] WARN: Branch "${pr.headRefName}" is in an active worktree at ${existingWt} — skipping conflict resolution`,
@@ -391,6 +393,7 @@ class PRCleanupDaemon {
       // Create worktree on the PR branch
       await exec(
         `git worktree add "${tmpDir}" "origin/${pr.headRefName}" --detach`,
+        { cwd: this.repoRoot },
       );
       await exec(
         `git checkout -B "${pr.headRefName}" "origin/${pr.headRefName}"`,
@@ -455,13 +458,13 @@ class PRCleanupDaemon {
     } finally {
       if (tmpDir) {
         try {
-          await exec(`git worktree remove "${tmpDir}" --force`);
+          await exec(`git worktree remove "${tmpDir}" --force`, { cwd: this.repoRoot });
         } catch {
           try {
             await rm(tmpDir, { recursive: true, force: true });
           } catch {}
           try {
-            await exec(`git worktree prune`);
+            await exec(`git worktree prune`, { cwd: this.repoRoot });
           } catch {}
         }
       }
@@ -499,10 +502,10 @@ class PRCleanupDaemon {
       tmpDir = await mkdtemp(join(tmpdir(), "pr-cleanup-"));
 
       // Fetch latest refs first
-      await exec(`git fetch origin ${pr.headRefName}`);
+      await exec(`git fetch origin ${pr.headRefName}`, { cwd: this.repoRoot });
 
       // Guard: skip if the branch is already claimed by another worktree
-      const existingWt = await getWorktreeForBranch(pr.headRefName);
+      const existingWt = await getWorktreeForBranch(pr.headRefName, this.repoRoot);
       if (existingWt) {
         console.warn(
           `[pr-cleanup-daemon] WARN: Branch "${pr.headRefName}" is in an active worktree at ${existingWt} — skipping CI re-trigger`,
@@ -513,6 +516,7 @@ class PRCleanupDaemon {
       // Create a temporary worktree for the PR branch
       await exec(
         `git worktree add "${tmpDir}" "origin/${pr.headRefName}" --detach`,
+        { cwd: this.repoRoot },
       );
 
       // Checkout the branch properly inside the worktree
@@ -538,14 +542,14 @@ class PRCleanupDaemon {
       // Clean up the temporary worktree
       if (tmpDir) {
         try {
-          await exec(`git worktree remove "${tmpDir}" --force`);
+          await exec(`git worktree remove "${tmpDir}" --force`, { cwd: this.repoRoot });
         } catch {
           // If worktree remove fails, try manual cleanup
           try {
             await rm(tmpDir, { recursive: true, force: true });
           } catch {}
           try {
-            await exec(`git worktree prune`);
+            await exec(`git worktree prune`, { cwd: this.repoRoot });
           } catch {}
         }
       }
@@ -605,7 +609,7 @@ class PRCleanupDaemon {
     }
 
     try {
-      await exec(`gh pr merge ${pr.number} --auto --squash --delete-branch`);
+      await exec(`gh pr merge ${pr.number} --auto --squash --delete-branch`, { cwd: this.repoRoot });
       this.stats.autoMerges++;
       console.log(`[pr-cleanup-daemon] ✓ Auto-merged PR #${pr.number}`);
     } catch (err) {
@@ -626,7 +630,7 @@ class PRCleanupDaemon {
     try {
       // Use GitHub API to get the list of changed files and estimate conflict scope
       // This avoids the need for local checkout entirely
-      const { stdout } = await exec(`gh pr diff ${pr.number} --name-only`);
+      const { stdout } = await exec(`gh pr diff ${pr.number} --name-only`, { cwd: this.repoRoot });
       const changedFiles = stdout.trim().split("\n").filter(Boolean);
 
       // Estimate: each changed file could have ~10 lines of conflicts on average
@@ -641,8 +645,8 @@ class PRCleanupDaemon {
       let tmpDir;
       try {
         tmpDir = await mkdtemp(join(tmpdir(), "pr-conflict-"));
-        await exec(`git fetch origin ${pr.headRefName} main`);
-        await exec(`git worktree add "${tmpDir}" "origin/main" --detach`);
+        await exec(`git fetch origin ${pr.headRefName} main`, { cwd: this.repoRoot });
+        await exec(`git worktree add "${tmpDir}" "origin/main" --detach`, { cwd: this.repoRoot });
 
         // Attempt merge to count conflicts
         try {
@@ -675,13 +679,13 @@ class PRCleanupDaemon {
       } finally {
         if (tmpDir) {
           try {
-            await exec(`git worktree remove "${tmpDir}" --force`);
+            await exec(`git worktree remove "${tmpDir}" --force`, { cwd: this.repoRoot });
           } catch {
             try {
               await rm(tmpDir, { recursive: true, force: true });
             } catch {}
             try {
-              await exec(`git worktree prune`);
+              await exec(`git worktree prune`, { cwd: this.repoRoot });
             } catch {}
           }
         }
@@ -704,6 +708,7 @@ class PRCleanupDaemon {
       const child = spawn("node", args, {
         stdio: "inherit",
         env: process.env,
+        cwd: this.repoRoot,
       });
 
       child.on("exit", (code) => {
@@ -726,6 +731,7 @@ class PRCleanupDaemon {
     try {
       const { stdout } = await exec(
         `gh pr list --json number,title,mergeable,statusCheckRollup,headRefName,autoMergeRequest --limit 30`,
+        { cwd: this.repoRoot },
       );
       const allPRs = JSON.parse(stdout);
 
@@ -767,6 +773,7 @@ class PRCleanupDaemon {
             try {
               await exec(
                 `gh pr merge ${pr.number} --auto --squash --delete-branch`,
+                { cwd: this.repoRoot },
               );
               console.log(
                 `[pr-cleanup-daemon] ⏳ Auto-merge queued for PR #${pr.number} (CI pending)`,
@@ -787,7 +794,7 @@ class PRCleanupDaemon {
 
         // All green + mergeable → merge now
         try {
-          await exec(`gh pr merge ${pr.number} --squash --delete-branch`);
+          await exec(`gh pr merge ${pr.number} --squash --delete-branch`, { cwd: this.repoRoot });
           this.stats.autoMerges++;
           console.log(
             `[pr-cleanup-daemon] ✅ Auto-merged green PR #${pr.number}: ${pr.title}`,
@@ -797,6 +804,7 @@ class PRCleanupDaemon {
           try {
             await exec(
               `gh pr merge ${pr.number} --auto --squash --delete-branch`,
+              { cwd: this.repoRoot },
             );
             console.log(
               `[pr-cleanup-daemon] ⏳ Auto-merge enabled for PR #${pr.number}`,
@@ -854,6 +862,7 @@ class PRCleanupDaemon {
     try {
       const { stdout } = await exec(
         `gh pr view ${prNumber} --json mergeable,statusCheckRollup`,
+        { cwd: this.repoRoot },
       );
       return JSON.parse(stdout);
     } catch (err) {