bosun 0.34.8 → 0.34.9

package/cli.mjs

@@ -34,6 +34,15 @@ import {
   migrateFromLegacy,
 } from "./compat.mjs";
 
+const MONITOR_START_MAX_WAIT_MS = Math.max(
+  0,
+  Number(process.env.BOSUN_MONITOR_START_MAX_WAIT_MS || "15000") || 15000,
+);
+const MONITOR_START_RETRY_MS = Math.max(
+  100,
+  Number(process.env.BOSUN_MONITOR_START_RETRY_MS || "500") || 500,
+);
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const args = process.argv.slice(2);
 
@@ -1484,133 +1493,189 @@ function detectExistingMonitorLockOwner(excludePid = null) {
   return null;
 }
 
+function getRequiredMonitorRuntimeFiles(monitorPath) {
+  const required = [monitorPath];
+  const copilotDir = resolve(
+    __dirname,
+    "node_modules",
+    "@github",
+    "copilot",
+  );
+  const conptyAgentPath = resolve(copilotDir, "conpty_console_list_agent.js");
+  if (process.platform === "win32" && existsSync(copilotDir)) {
+    required.push(conptyAgentPath);
+  }
+  return required;
+}
+
+function listMissingFiles(paths) {
+  return paths.filter((entry) => !existsSync(entry));
+}
+
+async function waitForMonitorRuntimeFiles(monitorPath) {
+  const required = getRequiredMonitorRuntimeFiles(monitorPath);
+  const startedAt = Date.now();
+  let missing = listMissingFiles(required);
+  while (
+    missing.length > 0 &&
+    Date.now() - startedAt < MONITOR_START_MAX_WAIT_MS
+  ) {
+    await new Promise((resolveWait) => {
+      setTimeout(resolveWait, MONITOR_START_RETRY_MS);
+    });
+    missing = listMissingFiles(required);
+  }
+  return {
+    ready: missing.length === 0,
+    missing,
+    waitedMs: Date.now() - startedAt,
+  };
+}
+
 function runMonitor({ restartReason = "" } = {}) {
   return new Promise((resolve, reject) => {
     const monitorPath = fileURLToPath(
       new URL("./monitor.mjs", import.meta.url),
     );
-    const childEnv = { ...process.env };
-    if (restartReason) {
-      childEnv.BOSUN_MONITOR_RESTART_REASON = restartReason;
-    } else {
-      delete childEnv.BOSUN_MONITOR_RESTART_REASON;
-    }
-    monitorChild = fork(monitorPath, process.argv.slice(2), {
-      stdio: "inherit",
-      execArgv: ["--max-old-space-size=4096"],
-      env: childEnv,
-      windowsHide: IS_DAEMON_CHILD && process.platform === "win32",
-    });
-    daemonCrashTracker.markStart();
-
-    monitorChild.on("exit", (code, signal) => {
-      const childPid = monitorChild?.pid ?? null;
-      monitorChild = null;
-      if (code === SELF_RESTART_EXIT_CODE) {
-        console.log(
-          "\n  \u21BB Monitor restarting with fresh modules...\n",
-        );
-        // Small delay to let file writes / port releases settle
-        setTimeout(() => resolve(runMonitor({ restartReason: "self-restart" })), 2000);
-      } else {
-        const exitCode = code ?? (signal ? 1 : 0);
-        const existingOwner =
-          !gracefulShutdown && exitCode === 1
-            ? detectExistingMonitorLockOwner(childPid)
-            : null;
-        if (existingOwner) {
-          console.log(
-            `\n  bosun is already running (PID ${existingOwner.pid}); exiting duplicate start.\n`,
+    waitForMonitorRuntimeFiles(monitorPath)
+      .then(({ ready, missing, waitedMs }) => {
+        if (!ready) {
+          throw new Error(
+            `monitor runtime files missing after waiting ${Math.round(waitedMs / 1000)}s: ${missing.join(", ")}`,
           );
-          process.exit(0);
-          return;
         }
-        // 4294967295 (0xFFFFFFFF / -1 signed) = OS killed the process (OOM, external termination)
-        const isOSKill = exitCode === 4294967295 || exitCode === -1;
-        const shouldAutoRestart =
-          !gracefulShutdown &&
-          (isOSKill || (IS_DAEMON_CHILD && exitCode !== 0));
-        if (shouldAutoRestart) {
-          const crashState = daemonCrashTracker.recordExit();
-          daemonRestartCount += 1;
-          const delayMs = isOSKill ? 5000 : DAEMON_RESTART_DELAY_MS;
-          if (IS_DAEMON_CHILD && crashState.exceeded) {
-            const durationSec = Math.max(
-              1,
-              Math.round(crashState.runDurationMs / 1000),
-            );
-            const windowSec = Math.max(
-              1,
-              Math.round(crashState.instantCrashWindowMs / 1000),
-            );
-            console.error(
-              `\n  ✖ Monitor crashed too quickly ${crashState.instantCrashCount} times in a row (each <= ${windowSec}s, latest ${durationSec}s). Auto-restart is now paused.`,
-            );
-            sendCrashNotification(exitCode, signal).finally(() =>
-              process.exit(exitCode),
-            );
-            return;
-          }
-          if (
-            IS_DAEMON_CHILD &&
-            DAEMON_MAX_RESTARTS > 0 &&
-            daemonRestartCount > DAEMON_MAX_RESTARTS
-          ) {
-            console.error(
-              `\n  ✖ Monitor crashed too many times (${daemonRestartCount - 1} restarts, max ${DAEMON_MAX_RESTARTS}).`,
-            );
-            sendCrashNotification(exitCode, signal).finally(() =>
-              process.exit(exitCode),
-            );
-            return;
-          }
-          const reasonLabel = signal
-            ? `signal ${signal}`
-            : `exit code ${exitCode}`;
-          const attemptLabel =
-            IS_DAEMON_CHILD && DAEMON_MAX_RESTARTS > 0
-              ? `${daemonRestartCount}/${DAEMON_MAX_RESTARTS}`
-              : `${daemonRestartCount}`;
-          console.error(
-            `\n  ⚠ Monitor exited (${reasonLabel}) — auto-restarting in ${Math.max(1, Math.round(delayMs / 1000))}s${IS_DAEMON_CHILD ? ` [attempt ${attemptLabel}]` : ""}...`,
+        if (waitedMs >= MONITOR_START_RETRY_MS) {
+          console.warn(
+            `[cli] delayed monitor start by ${Math.round(waitedMs / 1000)}s while waiting for runtime files to settle`,
           );
-          sendCrashNotification(exitCode, signal, {
-            autoRestartInMs: delayMs,
-            restartAttempt: daemonRestartCount,
-            maxRestarts: IS_DAEMON_CHILD ? DAEMON_MAX_RESTARTS : 0,
-          }).catch(() => {});
-          setTimeout(
-            () =>
-              resolve(
-                runMonitor({
-                  restartReason: isOSKill ? "os-kill" : "crash",
-                }),
-              ),
-            delayMs,
-          );
-          return;
         }
-
-        if (exitCode !== 0 && !gracefulShutdown) {
-          console.error(
-            `\n  ✖ Monitor crashed (${signal ? `signal ${signal}` : `exit code ${exitCode}`}) — sending crash notification...`,
-          );
-          sendCrashNotification(exitCode, signal).finally(() =>
-            process.exit(exitCode),
-          );
+        const childEnv = { ...process.env };
+        if (restartReason) {
+          childEnv.BOSUN_MONITOR_RESTART_REASON = restartReason;
         } else {
-          daemonRestartCount = 0;
-          daemonCrashTracker.reset();
-          process.exit(exitCode);
+          delete childEnv.BOSUN_MONITOR_RESTART_REASON;
         }
-      }
-    });
-
-    monitorChild.on("error", (err) => {
-      monitorChild = null;
-      console.error(`\n  ✖ Monitor failed to start: ${err.message}`);
-      sendCrashNotification(1, null).finally(() => reject(err));
-    });
+        monitorChild = fork(monitorPath, process.argv.slice(2), {
+          stdio: "inherit",
+          execArgv: ["--max-old-space-size=4096"],
+          env: childEnv,
+          windowsHide: IS_DAEMON_CHILD && process.platform === "win32",
+        });
+        daemonCrashTracker.markStart();
+
+        monitorChild.on("exit", (code, signal) => {
+          const childPid = monitorChild?.pid ?? null;
+          monitorChild = null;
+          if (code === SELF_RESTART_EXIT_CODE) {
+            console.log(
+              "\n  ↻ Monitor restarting with fresh modules...\n",
+            );
+            // Small delay to let file writes / port releases settle
+            setTimeout(() => resolve(runMonitor({ restartReason: "self-restart" })), 2000);
+          } else {
+            const exitCode = code ?? (signal ? 1 : 0);
+            const existingOwner =
+              !gracefulShutdown && exitCode === 1
+                ? detectExistingMonitorLockOwner(childPid)
+                : null;
+            if (existingOwner) {
+              console.log(
+                `\n  bosun is already running (PID ${existingOwner.pid}); exiting duplicate start.\n`,
+              );
+              process.exit(0);
+              return;
+            }
+            // 4294967295 (0xFFFFFFFF / -1 signed) = OS killed the process (OOM, external termination)
+            const isOSKill = exitCode === 4294967295 || exitCode === -1;
+            const shouldAutoRestart =
+              !gracefulShutdown &&
+              (isOSKill || (IS_DAEMON_CHILD && exitCode !== 0));
+            if (shouldAutoRestart) {
+              const crashState = daemonCrashTracker.recordExit();
+              daemonRestartCount += 1;
+              const delayMs = isOSKill ? 5000 : DAEMON_RESTART_DELAY_MS;
+              if (IS_DAEMON_CHILD && crashState.exceeded) {
+                const durationSec = Math.max(
+                  1,
+                  Math.round(crashState.runDurationMs / 1000),
+                );
+                const windowSec = Math.max(
+                  1,
+                  Math.round(crashState.instantCrashWindowMs / 1000),
+                );
+                console.error(
+                  `\n  ✖ Monitor crashed too quickly ${crashState.instantCrashCount} times in a row (each <= ${windowSec}s, latest ${durationSec}s). Auto-restart is now paused.`,
+                );
+                sendCrashNotification(exitCode, signal).finally(() =>
+                  process.exit(exitCode),
+                );
+                return;
+              }
+              if (
+                IS_DAEMON_CHILD &&
+                DAEMON_MAX_RESTARTS > 0 &&
+                daemonRestartCount > DAEMON_MAX_RESTARTS
+              ) {
+                console.error(
+                  `\n  ✖ Monitor crashed too many times (${daemonRestartCount - 1} restarts, max ${DAEMON_MAX_RESTARTS}).`,
+                );
+                sendCrashNotification(exitCode, signal).finally(() =>
+                  process.exit(exitCode),
+                );
+                return;
+              }
+              const reasonLabel = signal
+                ? `signal ${signal}`
+                : `exit code ${exitCode}`;
+              const attemptLabel =
+                IS_DAEMON_CHILD && DAEMON_MAX_RESTARTS > 0
+                  ? `${daemonRestartCount}/${DAEMON_MAX_RESTARTS}`
+                  : `${daemonRestartCount}`;
+              console.error(
+                `\n  ⚠ Monitor exited (${reasonLabel}) — auto-restarting in ${Math.max(1, Math.round(delayMs / 1000))}s${IS_DAEMON_CHILD ? ` [attempt ${attemptLabel}]` : ""}...`,
+              );
+              sendCrashNotification(exitCode, signal, {
+                autoRestartInMs: delayMs,
+                restartAttempt: daemonRestartCount,
+                maxRestarts: IS_DAEMON_CHILD ? DAEMON_MAX_RESTARTS : 0,
+              }).catch(() => {});
+              setTimeout(
+                () =>
+                  resolve(
+                    runMonitor({
+                      restartReason: isOSKill ? "os-kill" : "crash",
+                    }),
+                  ),
+                delayMs,
+              );
+              return;
+            }
+
+            if (exitCode !== 0 && !gracefulShutdown) {
+              console.error(
+                `\n  ✖ Monitor crashed (${signal ? `signal ${signal}` : `exit code ${exitCode}`}) — sending crash notification...`,
+              );
+              sendCrashNotification(exitCode, signal).finally(() =>
+                process.exit(exitCode),
+              );
+            } else {
+              daemonRestartCount = 0;
+              daemonCrashTracker.reset();
+              process.exit(exitCode);
+            }
+          }
+        });
+
+        monitorChild.on("error", (err) => {
+          monitorChild = null;
+          console.error(`\n  ✖ Monitor failed to start: ${err.message}`);
+          sendCrashNotification(1, null).finally(() => reject(err));
+        });
+      })
+      .catch((err) => {
+        console.error(`\n  ✖ Monitor failed to start: ${err.message}`);
+        sendCrashNotification(1, null).finally(() => reject(err));
+      });
   });
 }
 

package/maintenance.mjs

@@ -28,6 +28,56 @@ import {
 } from "./worktree-manager.mjs";
 
 const isWindows = process.platform === "win32";
+const BRANCH_SYNC_LOG_THROTTLE_MS = Math.max(
+  5_000,
+  Number(process.env.BRANCH_SYNC_LOG_THROTTLE_MS || "300000") || 300000,
+);
+const branchSyncLogState = new Map();
+
+function logThrottledBranchSync(
+  key,
+  message,
+  level = "warn",
+  throttleMs = BRANCH_SYNC_LOG_THROTTLE_MS,
+) {
+  const normalizedKey = String(key || "default").trim() || "default";
+  const now = Date.now();
+  const state = branchSyncLogState.get(normalizedKey) || {
+    lastLoggedAt: 0,
+    suppressed: 0,
+  };
+
+  if (
+    state.lastLoggedAt > 0 &&
+    now - state.lastLoggedAt < Math.max(1_000, Number(throttleMs) || BRANCH_SYNC_LOG_THROTTLE_MS)
+  ) {
+    state.suppressed += 1;
+    branchSyncLogState.set(normalizedKey, state);
+    return;
+  }
+
+  const suppressed = state.suppressed || 0;
+  const suffix =
+    suppressed > 0
+      ? ` (suppressed ${suppressed} similar message(s) in last ${Math.round(Math.max(1_000, Number(throttleMs) || BRANCH_SYNC_LOG_THROTTLE_MS) / 1000)}s)`
+      : "";
+  const line = `${message}${suffix}`;
+
+  if (level === "error") {
+    console.error(line);
+  } else if (level === "info") {
+    console.info(line);
+  } else if (level === "log") {
+    console.log(line);
+  } else {
+    console.warn(line);
+  }
+
+  branchSyncLogState.set(normalizedKey, {
+    lastLoggedAt: now,
+    suppressed: 0,
+  });
+}
 
 /**
  * Get all running processes matching a filter.
@@ -826,10 +876,10 @@ function isProcessAlive(pid) {
  * branches spawned from it start stale, causing avoidable rebase conflicts.
  * This function periodically pulls so the local ref stays current.
  *
- * Safe: only does `--ff-only` — never creates merge commits. If the local
- * branch has diverged (someone committed directly), it logs a warning and
- * skips.  Also skips if the branch is currently checked out with uncommitted
- * work (git will refuse the checkout anyway).
+ * Safe: only does `--ff-only` — never creates merge commits. It skips when
+ * the checked-out branch has uncommitted changes (git will refuse the checkout
+ * anyway). If local and remote both have unique commits, it logs a warning and
+ * skips.
  *
  * @param {string} repoRoot
  * @param {string[]} [branches] - branches to sync (default: ["main"])
@@ -848,7 +898,11 @@ export function syncLocalTrackingBranches(repoRoot, branches) {
       windowsHide: true,
     });
   } catch (e) {
-    console.warn(`[maintenance] git fetch --all failed: ${e.message}`);
+    logThrottledBranchSync(
+      "sync:fetch-failed",
+      `[maintenance] git fetch --all failed: ${e.message}`,
+      "warn",
+    );
     return 0;
   }
 
@@ -913,13 +967,17 @@ export function syncLocalTrackingBranches(repoRoot, branches) {
           { cwd: repoRoot, encoding: "utf8", timeout: 30_000, windowsHide: true },
         );
         if (push.status === 0) {
-          console.log(
+          logThrottledBranchSync(
+            `sync:${branch}:push-success`,
             `[maintenance] pushed local '${branch}' to origin (${ahead} commit(s) ahead)`,
+            "info",
           );
           synced++;
         } else {
-          console.warn(
+          logThrottledBranchSync(
+            `sync:${branch}:push-failed`,
             `[maintenance] git push '${branch}' failed: ${(push.stderr || push.stdout || "").toString().trim()}`,
+            "warn",
           );
         }
         continue;
@@ -935,8 +993,10 @@ export function syncLocalTrackingBranches(repoRoot, branches) {
           windowsHide: true,
         });
         if (statusCheck.stdout?.trim()) {
-          console.log(
+          logThrottledBranchSync(
+            `sync:${branch}:diverged-dirty`,
             `[maintenance] local '${branch}' diverged (${ahead}↑ ${behind}↓) but has uncommitted changes — skipping`,
+            "info",
           );
           continue;
         }
@@ -961,18 +1021,24 @@ export function syncLocalTrackingBranches(repoRoot, branches) {
             { cwd: repoRoot, encoding: "utf8", timeout: 30_000, windowsHide: true },
           );
           if (push.status === 0) {
-            console.log(
+            logThrottledBranchSync(
+              `sync:${branch}:rebase-push-success`,
               `[maintenance] rebased and pushed '${branch}' (was ${ahead}↑ ${behind}↓)`,
+              "info",
             );
             synced++;
           } else {
-            console.warn(
+            logThrottledBranchSync(
+              `sync:${branch}:rebase-push-failed`,
               `[maintenance] push after rebase of '${branch}' failed: ${(push.stderr || push.stdout || "").toString().trim()}`,
+              "warn",
             );
           }
         } else {
-          console.warn(
+          logThrottledBranchSync(
+            `sync:${branch}:diverged-not-checked-out`,
             `[maintenance] local '${branch}' diverged (${ahead}↑ ${behind}↓) and not checked out — skipping (rebase requires checkout)`,
+            "warn",
           );
         }
         continue;
@@ -988,8 +1054,10 @@ export function syncLocalTrackingBranches(repoRoot, branches) {
           windowsHide: true,
         });
         if (statusCheck.stdout?.trim()) {
-          console.log(
+          logThrottledBranchSync(
+            `sync:${branch}:dirty-pull-skip`,
             `[maintenance] '${branch}' is checked out with uncommitted changes — skipping pull`,
+            "info",
           );
           continue;
         }
@@ -1001,13 +1069,17 @@ export function syncLocalTrackingBranches(repoRoot, branches) {
           windowsHide: true,
         });
         if (pull.status === 0) {
-          console.log(
+          logThrottledBranchSync(
+            `sync:${branch}:pull-success`,
             `[maintenance] fast-forwarded checked-out '${branch}' (was ${behind} behind)`,
+            "info",
           );
           synced++;
         } else {
-          console.warn(
+          logThrottledBranchSync(
+            `sync:${branch}:pull-failed`,
             `[maintenance] git pull --ff-only on '${branch}' failed: ${(pull.stderr || pull.stdout || "").toString().trim()}`,
+            "warn",
           );
         }
       } else {
@@ -1019,22 +1091,34 @@ export function syncLocalTrackingBranches(repoRoot, branches) {
           { cwd: repoRoot, timeout: 5000, windowsHide: true },
         );
         if (update.status === 0) {
-          console.log(
+          logThrottledBranchSync(
+            `sync:${branch}:update-ref-success`,
             `[maintenance] fast-forwarded '${branch}' → ${remoteRef} (was ${behind} behind)`,
+            "info",
           );
           synced++;
         } else {
-          console.warn(`[maintenance] update-ref failed for '${branch}'`);
+          logThrottledBranchSync(
+            `sync:${branch}:update-ref-failed`,
+            `[maintenance] update-ref failed for '${branch}'`,
+            "warn",
+          );
         }
       }
     } catch (e) {
-      console.warn(`[maintenance] error syncing '${branch}': ${e.message}`);
+      logThrottledBranchSync(
+        `sync:${branch}:unexpected-error`,
+        `[maintenance] error syncing '${branch}': ${e.message}`,
+        "error",
+      );
     }
   }
 
   if (synced > 0) {
-    console.log(
+    logThrottledBranchSync(
+      "sync:summary",
       `[maintenance] synced ${synced}/${toSync.length} local tracking branch(es)`,
+      "info",
     );
   }
   return synced;

package/monitor.mjs

@@ -1457,10 +1457,27 @@ function isMonitorMonitorEnabled() {
 }
 
 function isSelfRestartWatcherEnabled() {
+  const devMode = isDevMode();
+  const force = process.env.SELF_RESTART_WATCH_FORCE;
+  const forceEnabled = isTruthyFlag(force);
+  const npmLifecycleEvent = String(process.env.npm_lifecycle_event || "")
+    .trim()
+    .toLowerCase();
+  const launchedViaNpmStartScript =
+    npmLifecycleEvent === "start" || npmLifecycleEvent.startsWith("start:");
   const explicit = process.env.SELF_RESTART_WATCH_ENABLED;
   if (explicit !== undefined && String(explicit).trim() !== "") {
     return !isFalsyFlag(explicit);
   }
+  if (!devMode && !forceEnabled) {
+    return false;
+  }
+  if (devMode && !forceEnabled && !launchedViaNpmStartScript) {
+    // Plain `bosun` command launches from a source checkout should behave like
+    // npm/prod installs by default: no self-restart watcher unless explicitly
+    // enabled. Auto-updates still handle published package changes.
+    return false;
+  }
   if (
     String(executorMode || "")
       .trim()
@@ -1476,7 +1493,7 @@ function isSelfRestartWatcherEnabled() {
   // Dev mode (source checkout / monorepo) → watch for code changes.
   // npm mode (installed via npm) → do NOT watch; source only changes via
   // npm update, which is handled by the auto-update loop instead.
-  return isDevMode();
+  return devMode;
 }
 
 const MONITOR_MONITOR_DEFAULT_TIMEOUT_MS = 6 * 60 * 60 * 1000;
@@ -14532,7 +14549,7 @@ function applyConfig(nextConfig, options = {}) {
     } else {
       stopSelfWatcher();
       console.log(
-        "[monitor] self-restart watcher disabled (set SELF_RESTART_WATCH_ENABLED=1 to force-enable)",
+        "[monitor] self-restart watcher disabled (set SELF_RESTART_WATCH_FORCE=1 to allow in npm/prod mode)",
       );
     }
   }
@@ -15136,8 +15153,22 @@ if (selfRestartWatcherEnabled) {
   const normalizedExecutorMode = String(executorMode || "")
     .trim()
     .toLowerCase();
-  const disabledReason = !isDevMode()
+  const explicitSelfRestartWatch = process.env.SELF_RESTART_WATCH_ENABLED;
+  const hasExplicitSelfRestartWatch =
+    explicitSelfRestartWatch !== undefined &&
+    String(explicitSelfRestartWatch).trim() !== "";
+  const forceSelfRestartWatch = isTruthyFlag(process.env.SELF_RESTART_WATCH_FORCE);
+  const npmLifecycleEvent = String(process.env.npm_lifecycle_event || "")
+    .trim()
+    .toLowerCase();
+  const launchedViaNpmStartScript =
+    npmLifecycleEvent === "start" || npmLifecycleEvent.startsWith("start:");
+  const disabledReason = hasExplicitSelfRestartWatch
+    ? "explicitly"
+    : !isDevMode()
     ? "npm/prod mode — updates via auto-update loop"
+    : !forceSelfRestartWatch && !launchedViaNpmStartScript
+      ? "CLI command mode in source checkout — use npm run start or SELF_RESTART_WATCH_ENABLED=1 to enable"
     : normalizedExecutorMode === "internal" || normalizedExecutorMode === "hybrid"
       ? `executor mode "${normalizedExecutorMode}" (continuous task-driven code changes)`
       : "explicitly";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bosun",
-  "version": "0.34.8",
+  "version": "0.34.9",
   "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",