@beastmode-develeap/beastmode 0.1.299 → 0.1.301

package/dist/index.js

@@ -5432,6 +5432,116 @@ function deepMerge2(target, source) {
   }
   return result;
 }
+function applyPresetOverrides(current, patch, presetName) {
+  const preset = PRESETS[presetName];
+  if (!preset) return current;
+  const next = { ...current };
+  const pipelineNext = { ...next.pipeline ?? {} };
+  const patchPipeline = patch.pipeline ?? {};
+  const explicitlySet = (key) => key in patchPipeline;
+  if (!explicitlySet("satisfaction_threshold")) {
+    pipelineNext.satisfaction_threshold = preset.satisfaction_threshold;
+  }
+  if (!explicitlySet("max_iterations")) {
+    pipelineNext.max_iterations = preset.max_iterations;
+  }
+  if (!explicitlySet("stages")) {
+    pipelineNext.stages = preset.stages;
+  }
+  pipelineNext.preset = presetName;
+  next.pipeline = pipelineNext;
+  return next;
+}
+function syncToDaemonConfigs(merged, factoryDir) {
+  const daemonConfigPaths = [
+    join14(factoryDir, "config", "beastmode.daemon.json"),
+    join14(factoryDir, "config", "beastmode.docker.json")
+  ].filter(existsSync16);
+  const pipelineToDaemonMap = {
+    satisfaction_threshold: ["verification", "satisfaction_threshold"],
+    prod_accept_floor: ["verification", "prod_accept_floor"],
+    max_iterations: ["convergence", "max_iterations"],
+    fail_fast_threshold: ["convergence", "fail_fast_threshold"],
+    preset: ["pipeline", "preset"]
+    // FR-1a: live preset
+  };
+  const resilienceToDaemonMap = {
+    max_failures: ["retry", "max_failures"],
+    healing_enabled: ["healing", "enabled"],
+    healing_max_attempts: ["healing", "max_attempts"]
+  };
+  const daemonFields = ["max_slots", "max_projects", "poll_interval_seconds", "stale_task_hours", "runs_path"];
+  const flatDictSections = [
+    "models",
+    "migration_safety",
+    "alerts",
+    "human_gates",
+    "cost"
+  ];
+  for (const daemonConfigPath of daemonConfigPaths) {
+    try {
+      const daemonConfig = JSON.parse(readFileSync13(daemonConfigPath, "utf-8"));
+      let changed = false;
+      for (const field of daemonFields) {
+        if (field in merged && merged[field] !== daemonConfig[field]) {
+          daemonConfig[field] = merged[field];
+          changed = true;
+        }
+      }
+      if (merged.pipeline && typeof merged.pipeline === "object") {
+        const mergedPipeline = merged.pipeline;
+        for (const [srcKey, [section, destKey]] of Object.entries(pipelineToDaemonMap)) {
+          if (!(srcKey in mergedPipeline)) continue;
+          const val = mergedPipeline[srcKey];
+          if (val === void 0) continue;
+          if (!daemonConfig[section] || typeof daemonConfig[section] !== "object") {
+            daemonConfig[section] = {};
+          }
+          const bucket = daemonConfig[section];
+          if (bucket[destKey] !== val) {
+            bucket[destKey] = val;
+            changed = true;
+          }
+        }
+      }
+      if (merged.resilience && typeof merged.resilience === "object") {
+        const mergedResilience = merged.resilience;
+        for (const [srcKey, [section, destKey]] of Object.entries(resilienceToDaemonMap)) {
+          if (!(srcKey in mergedResilience)) continue;
+          const val = mergedResilience[srcKey];
+          if (val === void 0) continue;
+          if (!daemonConfig[section] || typeof daemonConfig[section] !== "object") {
+            daemonConfig[section] = {};
+          }
+          const bucket = daemonConfig[section];
+          if (bucket[destKey] !== val) {
+            bucket[destKey] = val;
+            changed = true;
+          }
+        }
+      }
+      for (const section of flatDictSections) {
+        const src = merged[section];
+        if (src && typeof src === "object") {
+          if (!daemonConfig[section] || typeof daemonConfig[section] !== "object") {
+            daemonConfig[section] = {};
+          }
+          const bucket = daemonConfig[section];
+          for (const [k, v] of Object.entries(src)) {
+            if (bucket[k] !== v) {
+              bucket[k] = v;
+              changed = true;
+            }
+          }
+        }
+      }
+      if (changed) {
+        writeFileSync13(daemonConfigPath, JSON.stringify(daemonConfig, null, 2) + "\n", "utf-8");
+      }
+    } catch {
+    }
+  }
+}
 function getRunsDir(factoryDir) {
   const configPath = join14(factoryDir, ".beastmode", "config.json");
   if (existsSync16(configPath)) {
@@ -6438,8 +6548,13 @@ Path: ${projectPath}
       //   { status: "running", job_id: string, started_at: string }
       //   { status: "complete", analyzed_at: string, duration_seconds: number, target_repo_head_sha: string }
       //   { status: "cached", analyzed_at: string, duration_seconds: number, target_repo_head_sha: string }
-      //   { status: "failed", job_id?: string, error: string, started_at?: string, completed_at?: string }
+      //   { status: "failed", job_id?: string, error: string, started_at?: string, completed_at?: string, failure_reason?: string }
       //   { status: "idle" }  — no analysis has been requested for this project
+      //
+      // Stuck-job recovery: when a `.analyze-in-progress.json` file is older than 15
+      // minutes (hard timeout) or its `last_heartbeat` field is older than 90 seconds,
+      // the file is deleted on read and the response flips to `status: "failed"` with
+      // `failure_reason` set to `"timeout"` or `"heartbeat_timeout"` respectively.
       method: "GET",
       pattern: "/api/projects/:name/analyze/status",
       handler: (_body, params) => {
@@ -6453,7 +6568,34 @@ Path: ${projectPath}
           const job2 = _analyzeJobs.get(name);
           try {
             const p = existsSync16(triggerPath) ? triggerPath : inProgressPath;
-            const t = JSON.parse(readFileSync13(p, "utf-8"));
+            const raw = readFileSync13(p, "utf-8");
+            const t = JSON.parse(raw);
+            const now = Date.now();
+            const startedMs = new Date(t.requested_at).getTime();
+            const HARD_TIMEOUT_MS = 15 * 60 * 1e3;
+            const HEARTBEAT_STALE_MS = 90 * 1e3;
+            const hardTimedOut = now - startedMs > HARD_TIMEOUT_MS;
+            const heartbeatStale = t.last_heartbeat ? now - new Date(t.last_heartbeat).getTime() > HEARTBEAT_STALE_MS : false;
+            if (hardTimedOut || heartbeatStale) {
+              try {
+                unlinkSync4(p);
+              } catch {
+              }
+              const failReason = hardTimedOut ? "timeout" : "heartbeat_timeout";
+              _analyzeJobs.set(name, {
+                job_id: t.job_id,
+                project: name,
+                status: "failed",
+                started_at: t.requested_at,
+                error: failReason
+              });
+              return {
+                status: "failed",
+                failure_reason: failReason,
+                job_id: t.job_id,
+                started_at: t.requested_at
+              };
+            }
             if (!job2 || job2.status !== "running") {
               _analyzeJobs.set(name, { job_id: t.job_id, project: name, status: "running", started_at: t.requested_at });
             }
@@ -6683,6 +6825,8 @@ Path: ${projectPath}
       handler: () => {
         const configPath = join14(factoryDir, ".beastmode", "config.json");
         const raw = existsSync16(configPath) ? JSON.parse(readFileSync13(configPath, "utf-8")) : generateDefaults();
+        syncToDaemonConfigs(raw, factoryDir);
+        delete raw.archive_s3_bucket;
         return raw;
       }
     },
@@ -6731,72 +6875,15 @@ Path: ${projectPath}
             }
           }
         }
-        const merged = deepMerge2(current, updatesClean);
-        writeFileSync13(configPath, JSON.stringify(merged, null, 2) + "\n", "utf-8");
-        const daemonConfigPaths = [
-          join14(factoryDir, "config", "beastmode.daemon.json"),
-          join14(factoryDir, "config", "beastmode.docker.json")
-        ].filter(existsSync16);
-        const pipelineToDaemonMap = {
-          satisfaction_threshold: ["verification", "satisfaction_threshold"],
-          prod_accept_floor: ["verification", "prod_accept_floor"],
-          max_iterations: ["convergence", "max_iterations"],
-          fail_fast_threshold: ["convergence", "fail_fast_threshold"]
-        };
-        const daemonFields = ["max_slots", "max_projects", "poll_interval_seconds", "stale_task_hours", "runs_path"];
-        const flatDictSections = [
-          "models",
-          "migration_safety",
-          "alerts",
-          "human_gates"
-        ];
-        for (const daemonConfigPath of daemonConfigPaths) {
-          try {
-            const daemonConfig = JSON.parse(readFileSync13(daemonConfigPath, "utf-8"));
-            let changed = false;
-            for (const field of daemonFields) {
-              if (field in merged && merged[field] !== daemonConfig[field]) {
-                daemonConfig[field] = merged[field];
-                changed = true;
-              }
-            }
-            if (merged.pipeline && typeof merged.pipeline === "object") {
-              const mergedPipeline = merged.pipeline;
-              for (const [srcKey, [section, destKey]] of Object.entries(pipelineToDaemonMap)) {
-                if (!(srcKey in mergedPipeline)) continue;
-                const val = mergedPipeline[srcKey];
-                if (val === void 0) continue;
-                if (!daemonConfig[section] || typeof daemonConfig[section] !== "object") {
-                  daemonConfig[section] = {};
-                }
-                const bucket = daemonConfig[section];
-                if (bucket[destKey] !== val) {
-                  bucket[destKey] = val;
-                  changed = true;
-                }
-              }
-            }
-            for (const section of flatDictSections) {
-              const src = merged[section];
-              if (src && typeof src === "object") {
-                if (!daemonConfig[section] || typeof daemonConfig[section] !== "object") {
-                  daemonConfig[section] = {};
-                }
-                const bucket = daemonConfig[section];
-                for (const [k, v] of Object.entries(src)) {
-                  if (bucket[k] !== v) {
-                    bucket[k] = v;
-                    changed = true;
-                  }
-                }
-              }
-            }
-            if (changed) {
-              writeFileSync13(daemonConfigPath, JSON.stringify(daemonConfig, null, 2) + "\n", "utf-8");
-            }
-          } catch {
-          }
+        const incomingPreset = (updatesClean.pipeline ?? {}).preset;
+        const currentPreset = (current.pipeline ?? {}).preset;
+        let baseline = current;
+        if (incomingPreset && incomingPreset !== currentPreset) {
+          baseline = applyPresetOverrides(current, updatesClean, incomingPreset);
         }
+        const merged = deepMerge2(baseline, updatesClean);
+        writeFileSync13(configPath, JSON.stringify(merged, null, 2) + "\n", "utf-8");
+        syncToDaemonConfigs(merged, factoryDir);
         return merged;
       }
     },
@@ -9072,7 +9159,7 @@ var init_mcp = __esm({
 });
 
 // src/index.ts
-import { Command as Command25 } from "commander";
+import { Command as Command26 } from "commander";
 
 // src/cli/commands/init.ts
 init_engine();
@@ -14223,11 +14310,14 @@ import {
   writeFileSync as writeFileSync30
 } from "fs";
 import { dirname as dirname9, join as join36 } from "path";
-var TARGET_LABEL = "[self-hosted, beastmode]";
+var TARGET_LABEL = "[self-hosted, self-hosted-beastmode]";
 var TARGET_WORKFLOWS = [
   ".github/workflows/test.yml",
-  ".github/workflows/dogfood-e2e.yml"
+  ".github/workflows/dogfood-e2e.yml",
+  ".github/workflows/docker-publish.yml",
+  ".github/workflows/audit-settings.yml"
 ];
+var RUNNER_REQUIRED_LABEL = "self-hosted-beastmode";
 var STATE_FILE = ".beastmode/runner-workflow-state.json";
 var RUNS_ON_REGEX = /^(\s+runs-on:\s*)(.+)$/;
 function replaceRunsOn(content, targetLabel) {
@@ -14260,26 +14350,48 @@ function restoreRunsOn(content, originals) {
   });
   return newLines.join("\n");
 }
+async function assertOnlineRunnerExists() {
+  const config = resolveGitHubConfig();
+  const list = await listRunners(config);
+  const matching = list.runners.filter(
+    (r) => r.status === "online" && r.labels.some((l) => l.name === RUNNER_REQUIRED_LABEL)
+  );
+  if (matching.length === 0) {
+    throw new Error(
+      "Target label `[self-hosted, self-hosted-beastmode]` has no online runners; check `beastmode runner status`."
+    );
+  }
+}
 async function switchWorkflows(projectDir) {
   const statePath = join36(projectDir, STATE_FILE);
   if (existsSync37(statePath)) {
-    return { alreadySwitched: true, files: [] };
+    return { alreadySwitched: true, files: [], skipped: [] };
   }
+  await assertOnlineRunnerExists();
   const state = {
     switched_at: (/* @__PURE__ */ new Date()).toISOString(),
     target_label: TARGET_LABEL,
     files: []
   };
   const resultFiles = [];
+  const skipped = [];
   for (const relPath of TARGET_WORKFLOWS) {
     const absPath = join36(projectDir, relPath);
     if (!existsSync37(absPath)) {
-      throw new Error(`Workflow file not found: ${relPath}`);
+      skipped.push({ relativePath: relPath, reason: "missing" });
+      continue;
     }
     const content = readFileSync34(absPath, "utf-8");
     const { newContent, originals } = replaceRunsOn(content, TARGET_LABEL);
     if (originals.length === 0) {
-      throw new Error(`No runs-on found in ${relPath}`);
+      skipped.push({ relativePath: relPath, reason: "no_runs_on" });
+      continue;
+    }
+    const allAtTarget = originals.every(
+      (o) => o.line.match(RUNS_ON_REGEX)?.[2] === TARGET_LABEL
+    );
+    if (allAtTarget) {
+      skipped.push({ relativePath: relPath, reason: "already_at_target" });
     }
     writeFileSync30(absPath, newContent, "utf-8");
     state.files.push({ relativePath: relPath, originals });
@@ -14287,7 +14399,7 @@ async function switchWorkflows(projectDir) {
   }
   mkdirSync23(dirname9(statePath), { recursive: true });
   writeFileSync30(statePath, JSON.stringify(state, null, 2) + "\n", "utf-8");
-  return { alreadySwitched: false, files: resultFiles };
+  return { alreadySwitched: false, files: resultFiles, skipped };
 }
 async function restoreWorkflows(projectDir) {
   const statePath = join36(projectDir, STATE_FILE);
@@ -14629,6 +14741,9 @@ runnerCommand.command("switch-workflows").description("Switch workflow runs-on t
     for (const file of result.files) {
       success(`${file.relativePath}: ${file.jobCount} job(s) switched`);
     }
+    for (const skip of result.skipped) {
+      info(`${skip.relativePath}: skipped (${skip.reason})`);
+    }
     info("State saved to .beastmode/runner-workflow-state.json");
   } catch (err) {
     error(err.message);
@@ -14848,9 +14963,54 @@ projectCommand.command("remove <name>").description("Archive a project").action(
   console.log(`Project archived: ${name}`);
 });
 
+// src/cli/commands/redeploy.ts
+init_display();
+init_board();
+import { Command as Command25 } from "commander";
+import { join as join39 } from "path";
+import { existsSync as existsSync40, writeFileSync as writeFileSync31, mkdirSync as mkdirSync25 } from "fs";
+var redeployCommand = new Command25("redeploy").description("Trigger a rebuild + restart of a BeastMode service").argument("<service>", "Service to redeploy (currently: daemon)").action(async (service) => {
+  try {
+    await runRedeploy(service);
+  } catch (err) {
+    error(err.message);
+    process.exit(1);
+  }
+});
+async function runRedeploy(service) {
+  if (service !== "daemon") {
+    throw new Error(
+      `Unknown service "${service}". Currently supported: daemon`
+    );
+  }
+  const factoryDir = findFactoryDir();
+  if (!factoryDir) {
+    throw new Error(
+      "No BeastMode factory found. Run 'beastmode init' first."
+    );
+  }
+  const markerDir = join39(factoryDir, "daemon", "logs");
+  const markerPath = join39(markerDir, ".daemon-rebuild-requested");
+  if (!existsSync40(markerDir)) {
+    mkdirSync25(markerDir, { recursive: true });
+  }
+  const timestamp = Math.floor(Date.now() / 1e3);
+  writeFileSync31(
+    markerPath,
+    `pr=manual-operator
+timestamp=${timestamp}
+`
+  );
+  header("Redeploy requested");
+  success(`Wrote rebuild marker to ${markerPath}`);
+  info(
+    "The daemon-rebuilder sidecar will pick this up within ~10 seconds, wait for the daemon to idle, then rebuild + restart."
+  );
+}
+
 // src/index.ts
 init_version();
-var program = new Command25();
+var program = new Command26();
 program.name("beastmode").description("BeastMode Dark Factory \u2014 turn intent into verified software").version(ENGINE_VERSION);
 program.addCommand(initCommand);
 program.addCommand(boardCommand);
@@ -14876,5 +15036,6 @@ program.addCommand(logsCommand);
 program.addCommand(updateCommand);
 program.addCommand(runnerCommand);
 program.addCommand(projectCommand);
+program.addCommand(redeployCommand);
 program.parse();
 //# sourceMappingURL=index.js.map