bosun 0.40.21 → 0.41.0

package/config/config.mjs

@@ -31,6 +31,7 @@ import {
   getModelsForExecutor,
   MODEL_ALIASES,
 } from "../task/task-complexity.mjs";
+import { ensureTestRuntimeSandbox } from "../infra/test-runtime.mjs";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
@@ -133,7 +134,11 @@ function resolveConfigDir(repoRoot) {
   const repoLocalConfigDir = resolveRepoLocalBosunDir(repoRoot);
   if (repoLocalConfigDir) return repoLocalConfigDir;
 
-  // 3. Platform-aware user home
+  // 3. Tests must not fall through to the user's real global Bosun home.
+  const sandbox = ensureTestRuntimeSandbox();
+  if (sandbox?.configDir) return sandbox.configDir;
+
+  // 4. Platform-aware user home
   const preferWindowsDirs =
     process.platform === "win32" && !isWslInteropRuntime();
   const baseDir = preferWindowsDirs
@@ -1000,10 +1005,89 @@ class ExecutorScheduler {
     this._roundRobinIndex = 0;
     this._failureCounts = new Map(); // name → consecutive failures
     this._disabledUntil = new Map(); // name → timestamp
+    this._workspaceActiveCount = new Map(); // workspaceId → current active executor count
+    this._workspaceConfigs = new Map(); // workspaceId → { maxConcurrent, pool, weight }
+  }
+
+  /**
+   * Register workspace executor config for concurrency tracking.
+   * @param {string} workspaceId
+   * @param {{ maxConcurrent?: number, pool?: string, weight?: number }} wsExecutorConfig
+   */
+  registerWorkspace(workspaceId, wsExecutorConfig = {}) {
+    if (!workspaceId) return;
+    this._workspaceConfigs.set(workspaceId, {
+      maxConcurrent: wsExecutorConfig.maxConcurrent ?? 3,
+      pool: wsExecutorConfig.pool ?? "shared",
+      weight: wsExecutorConfig.weight ?? 1.0,
+      executors: wsExecutorConfig.executors ?? null,
+    });
+    if (!this._workspaceActiveCount.has(workspaceId)) {
+      this._workspaceActiveCount.set(workspaceId, 0);
+    }
+  }
+
+  /**
+   * Check if a workspace has available executor slots.
+   * @param {string} [workspaceId]
+   * @returns {boolean}
+   */
+  hasAvailableSlot(workspaceId) {
+    if (!workspaceId) return true; // no workspace scope — always available
+    const config = this._workspaceConfigs.get(workspaceId);
+    if (!config) return true; // no config registered — no limit
+    const active = this._workspaceActiveCount.get(workspaceId) || 0;
+    return active < config.maxConcurrent;
+  }
+
+  /**
+   * Acquire an executor slot for a workspace.
+   * @param {string} [workspaceId]
+   * @returns {boolean} true if slot acquired, false if at limit
+   */
+  acquireSlot(workspaceId) {
+    if (!workspaceId) return true;
+    if (!this.hasAvailableSlot(workspaceId)) return false;
+    this._workspaceActiveCount.set(
+      workspaceId,
+      (this._workspaceActiveCount.get(workspaceId) || 0) + 1,
+    );
+    return true;
+  }
+
+  /**
+   * Release an executor slot for a workspace.
+   * @param {string} [workspaceId]
+   */
+  releaseSlot(workspaceId) {
+    if (!workspaceId) return;
+    const current = this._workspaceActiveCount.get(workspaceId) || 0;
+    this._workspaceActiveCount.set(workspaceId, Math.max(0, current - 1));
+  }
+
+  /**
+   * Get workspace executor usage summary.
+   * @returns {Array<{ workspaceId: string, active: number, maxConcurrent: number, pool: string, weight: number }>}
+   */
+  getWorkspaceSummary() {
+    const result = [];
+    for (const [wsId, config] of this._workspaceConfigs) {
+      result.push({
+        workspaceId: wsId,
+        active: this._workspaceActiveCount.get(wsId) || 0,
+        ...config,
+      });
+    }
+    return result;
   }
 
   /** Get the next executor based on distribution strategy */
-  next() {
+  next(workspaceId) {
+    // Check workspace slot availability before selecting
+    if (workspaceId && !this.hasAvailableSlot(workspaceId)) {
+      return null; // workspace at executor capacity
+    }
+
     const available = this._getAvailable();
     if (!available.length) {
       // All disabled — reset and use primary
@@ -1012,6 +1096,23 @@ class ExecutorScheduler {
       return this.executors[0];
     }
 
+    // For dedicated pools, filter to workspace-assigned executors
+    if (workspaceId) {
+      const wsConfig = this._workspaceConfigs.get(workspaceId);
+      if (wsConfig?.pool === "dedicated" && wsConfig.executors) {
+        const dedicated = available.filter((e) =>
+          wsConfig.executors.includes(e.name),
+        );
+        if (dedicated.length) {
+          return this._selectByStrategy(dedicated);
+        }
+      }
+    }
+
+    return this._selectByStrategy(available);
+  }
+
+  _selectByStrategy(available) {
     switch (this.distribution) {
       case "round-robin":
         return this._roundRobin(available);
@@ -2419,4 +2520,3 @@ export {
   resolveAgentRepoRoot,
 };
 export default loadConfig;
-

package/github/github-auth-manager.mjs

@@ -21,6 +21,10 @@ import {
 
 const BOSUN_AUTH_STATE_PATH = join(homedir(), ".bosun", "github-auth-state.json");
 
+/** Set of token types that have been invalidated due to 401 errors (resets after 5 min). */
+const _invalidatedTypes = new Map(); // type → expiry timestamp
+const INVALIDATION_TTL_MS = 5 * 60 * 1000;
+
 // ── OAuth state loader ────────────────────────────────────────────────────────
 
 /**
@@ -30,13 +34,13 @@ const BOSUN_AUTH_STATE_PATH = join(homedir(), ".bosun", "github-auth-state.json"
 async function loadSavedOAuthToken() {
   // First check env override
   const envToken = process.env.BOSUN_GITHUB_USER_TOKEN;
-  if (envToken) return envToken;
+  if (envToken && looksLikeRealToken(envToken)) return envToken;
 
   try {
     const raw = await readFile(BOSUN_AUTH_STATE_PATH, "utf8");
     const data = JSON.parse(raw);
     const token = data?.accessToken || data?.access_token || null;
-    if (!token) return null;
+    if (!token || !looksLikeRealToken(token)) return null;
 
     // If there's an expiry, check it
     if (data.expiresAt || data.expires_at) {
@@ -53,6 +57,23 @@ async function loadSavedOAuthToken() {
   }
 }
 
+/**
+ * Sanity-check that a token string looks like a real GitHub token.
+ * Rejects placeholder values, very short strings, and obvious non-tokens.
+ */
+function looksLikeRealToken(token) {
+  if (!token || typeof token !== "string") return false;
+  const t = token.trim();
+  if (t.length < 8) return false;
+  // Reject common placeholder values
+  const PLACEHOLDERS = [
+    "oauth-token", "your-token", "token-here", "placeholder",
+    "xxxx", "test-token", "fake-token", "replace-me", "changeme",
+  ];
+  if (PLACEHOLDERS.includes(t.toLowerCase())) return false;
+  return true;
+}
+
 // ── gh CLI fallback ───────────────────────────────────────────────────────────
 
 /**
@@ -97,27 +118,41 @@ async function verifyToken(token) {
 
 /**
  * Get the best available token for GitHub API calls.
+ * Skips token sources that have been recently invalidated (401 errors).
  *
  * @param {Object} [options]
  * @param {string} [options.owner] - repo owner (for installation token resolution)
  * @param {string} [options.repo]  - repo name (for installation token resolution)
  * @param {boolean} [options.verify] - verify token via /user API (default: false for perf)
+ * @param {string} [options.skipType] - skip a specific token type (used during retry)
  * @returns {Promise<{token: string, type: 'oauth'|'installation'|'gh-cli'|'env', login?: string}>}
  */
 export async function getGitHubToken(options = {}) {
-  const { owner, repo, verify = false } = options;
+  const { owner, repo, verify = false, skipType } = options;
+  const now = Date.now();
+
+  // Purge expired invalidations
+  for (const [key, expiry] of _invalidatedTypes) {
+    if (now >= expiry) _invalidatedTypes.delete(key);
+  }
+
+  const isSkipped = (type) =>
+    type === skipType || _invalidatedTypes.has(type);
 
   // ── 1. OAuth user token ───────────────────────────────────────────────────
-  const oauthToken = await loadSavedOAuthToken();
-  if (oauthToken) {
-    const login = verify ? await verifyToken(oauthToken) : undefined;
-    if (!verify || login) {
-      return { token: oauthToken, type: "oauth", login: login ?? undefined };
+  if (!isSkipped("oauth")) {
+    const oauthToken = await loadSavedOAuthToken();
+    if (oauthToken) {
+      const login = verify ? await verifyToken(oauthToken) : undefined;
+      if (!verify || login) {
+        return { token: oauthToken, type: "oauth", login: login ?? undefined };
+      }
+      // verify failed — skip oauth for this resolution cycle
     }
   }
 
   // ── 2. GitHub App installation token ─────────────────────────────────────
-  if (owner && repo && isAppConfigured()) {
+  if (!isSkipped("installation") && owner && repo && isAppConfigured()) {
     try {
       const { token } = await getInstallationTokenForRepo(owner, repo);
       if (token) {
@@ -129,19 +164,23 @@ export async function getGitHubToken(options = {}) {
   }
 
   // ── 3. gh CLI token ───────────────────────────────────────────────────────
-  const ghCliToken = await getGhCliToken();
-  if (ghCliToken) {
-    return { token: ghCliToken, type: "gh-cli" };
+  if (!isSkipped("gh-cli")) {
+    const ghCliToken = await getGhCliToken();
+    if (ghCliToken) {
+      return { token: ghCliToken, type: "gh-cli" };
+    }
   }
 
   // ── 4. Environment variable fallback ─────────────────────────────────────
-  const envToken =
-    process.env.GITHUB_TOKEN ||
-    process.env.GH_TOKEN ||
-    process.env.GITHUB_PAT ||
-    "";
-  if (envToken) {
-    return { token: envToken, type: "env" };
+  if (!isSkipped("env")) {
+    const envToken =
+      process.env.GITHUB_TOKEN ||
+      process.env.GH_TOKEN ||
+      process.env.GITHUB_PAT ||
+      "";
+    if (envToken) {
+      return { token: envToken, type: "env" };
+    }
   }
 
   throw new Error(
@@ -263,3 +302,15 @@ export async function getAuthStatus() {
     message: `No GitHub authentication available. ${hints.join(". ")}`,
   };
 }
+
+/**
+ * Mark a token type as invalid for 5 minutes so getGitHubToken() will skip it.
+ * Call this when a GitHub API call returns 401 to trigger fallback to the next source.
+ *
+ * @param {string} type - 'oauth' | 'installation' | 'gh-cli' | 'env'
+ */
+export function invalidateTokenType(type) {
+  if (type) {
+    _invalidatedTypes.set(type, Date.now() + INVALIDATION_TTL_MS);
+  }
+}