@yemi33/minions 0.1.397 → 0.1.399

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.1.399 (2026-04-06)
+
+### Fixes
+-  auto-detect main branch when configured mainBranch doesn't exist
+-  engine restart button shows toast + green checkmark, suppresses stale banner 30s
+
 ## 0.1.397 (2026-04-06)
 
 ### Fixes

package/dashboard/js/render-dispatch.js

@@ -37,7 +37,7 @@ function renderEngineStatus(engine) {
 function renderEngineAlert(state, staleMs) {
   const el = document.getElementById('engine-alert');
   if (!el) return;
-  if (state !== 'stale') {
+  if (state !== 'stale' || (window._engineRestartedAt && Date.now() - window._engineRestartedAt < 30000)) {
     el.style.display = 'none';
     el.innerHTML = '';
     return;
@@ -53,7 +53,12 @@ function renderEngineAlert(state, staleMs) {
       const res = await fetch('/api/engine/restart', { method: 'POST' });
       const data = await res.json();
       if (data.ok) {
-        this.textContent = 'Restarted (PID ' + data.pid + ')';
+        this.textContent = '\u2713 Restarted (PID ' + data.pid + ')';
+        this.style.color = 'var(--green)';
+        this.style.borderColor = 'var(--green)';
+        showToast('cmd-toast', 'Engine restarted — PID ' + data.pid, true);
+        // Suppress stale banner for 30s while new engine writes its first heartbeat
+        window._engineRestartedAt = Date.now();
         setTimeout(() => refresh(), 3000);
       } else {
         this.textContent = 'Failed: ' + (data.error || 'unknown');

package/engine/cli.js

@@ -735,7 +735,7 @@ const commands = {
       agent_role: config.agents[agentId]?.role,
       project_name: targetProject.name || 'Unknown',
       project_path: targetProject.localPath || '',
-      main_branch: targetProject.mainBranch || 'main',
+      main_branch: targetProject.localPath ? shared.resolveMainBranch(targetProject.localPath, targetProject.mainBranch) : (targetProject.mainBranch || 'main'),
       ado_org: targetProject.adoOrg || 'Unknown',
       ado_project: targetProject.adoProject || 'Unknown',
       repo_name: targetProject.repoName || 'Unknown',

package/engine/lifecycle.js

@@ -166,7 +166,7 @@ function checkPlanCompletion(meta, config) {
     if (!existingPrItem) {
       const id = 'PL-' + shared.uid();
       const featureBranch = plan.feature_branch;
-      const mainBranch = primaryProject.mainBranch || 'main';
+      const mainBranch = shared.resolveMainBranch(primaryProject.localPath, primaryProject.mainBranch);
       const itemSummary = doneItems.map(w => '- ' + w.id + ': ' + w.title.replace('Implement: ', '')).join('\n');
       workItems.push({
         id, title: `Create PR for plan: ${plan.plan_summary || planFile}`,
@@ -196,7 +196,7 @@ function checkPlanCompletion(meta, config) {
           return pr.status === PR_STATUS.ACTIVE && linkedId && doneItems.find(w => w.id === linkedId);
         });
       if (prs.length > 0) {
-        projectPrs[p.name] = { project: p, prs, mainBranch: p.mainBranch || 'main' };
+        projectPrs[p.name] = { project: p, prs, mainBranch: shared.resolveMainBranch(p.localPath, p.mainBranch) };
       }
     }
 

package/engine/playbook.js

@@ -30,7 +30,7 @@ function getPrCreateInstructions(project) {
   if (host === 'github') {
     const org = project?.adoOrg || '';
     const repo = project?.repoName || '';
-    const mainBranch = project?.mainBranch || 'main';
+    const mainBranch = project?.localPath ? shared.resolveMainBranch(project.localPath, project.mainBranch) : (project?.mainBranch || 'main');
     return `Use \`gh pr create\` to create a pull request:\n` +
       `- \`gh pr create --base ${mainBranch} --head <your-branch> --title "PR title" --body "PR description" --repo ${org}/${repo}\`\n` +
       `- Always set --base to \`${mainBranch}\` (the main branch)\n` +
@@ -62,7 +62,7 @@ function getPrFetchInstructions(project) {
   if (host === 'github') {
     const org = project?.adoOrg || '';
     const repo = project?.repoName || '';
-    const mainBranch = project?.mainBranch || 'main';
+    const mainBranch = project?.localPath ? shared.resolveMainBranch(project.localPath, project.mainBranch) : (project?.mainBranch || 'main');
     return `Use \`gh pr view\` to fetch PR status:\n` +
       `- \`gh pr view <number> --json number,title,state,mergeable,reviewDecision,headRefName,baseRefName,statusCheckRollup --repo ${org}/${repo}\`\n` +
       `- This returns JSON with PR state, mergeability, review decision, and check statuses\n` +

package/engine/shared.js

@@ -267,6 +267,51 @@ function execSilent(cmd, opts = {}) {
   return _execSync(cmd, { stdio: 'pipe', windowsHide: true, ...opts });
 }
 
+/**
+ * Detect the default branch for a git repo. Tries in order:
+ * 1. The configured mainBranch (if it exists as a local or remote ref)
+ * 2. git symbolic-ref refs/remotes/origin/HEAD (what the remote says)
+ * 3. Fallback to 'main'
+ * Cached per rootDir to avoid repeated git calls within a tick.
+ */
+const _mainBranchCache = new Map();
+function resolveMainBranch(rootDir, configuredBranch) {
+  const cacheKey = rootDir + ':' + (configuredBranch || '');
+  const cached = _mainBranchCache.get(cacheKey);
+  if (cached && (Date.now() - cached.ts) < 300000) return cached.branch; // 5min TTL
+
+  const gitOpts = { cwd: rootDir, encoding: 'utf8', stdio: 'pipe', timeout: 5000, windowsHide: true };
+
+  // 1. If configured branch exists, use it
+  if (configuredBranch) {
+    try {
+      _execSync(`git rev-parse --verify "${configuredBranch}"`, gitOpts);
+      _mainBranchCache.set(cacheKey, { branch: configuredBranch, ts: Date.now() });
+      return configuredBranch;
+    } catch { /* configured branch doesn't exist locally */ }
+    try {
+      _execSync(`git rev-parse --verify "origin/${configuredBranch}"`, gitOpts);
+      _mainBranchCache.set(cacheKey, { branch: configuredBranch, ts: Date.now() });
+      return configuredBranch;
+    } catch { /* not on remote either */ }
+  }
+
+  // 2. Auto-detect from remote HEAD
+  try {
+    const ref = _execSync('git symbolic-ref refs/remotes/origin/HEAD', gitOpts).trim();
+    const branch = ref.replace('refs/remotes/origin/', '');
+    if (branch) {
+      _mainBranchCache.set(cacheKey, { branch, ts: Date.now() });
+      return branch;
+    }
+  } catch { /* no remote HEAD set */ }
+
+  // 3. Fallback
+  const fallback = configuredBranch || 'main';
+  _mainBranchCache.set(cacheKey, { branch: fallback, ts: Date.now() });
+  return fallback;
+}
+
 // ── Environment ─────────────────────────────────────────────────────────────
 
 function cleanChildEnv() {
@@ -651,6 +696,7 @@ module.exports = {
   writeToInbox,
   exec,
   execSilent,
+  resolveMainBranch,
   run,
   runFile,
   cleanChildEnv,

package/engine.js

@@ -323,7 +323,7 @@ function spawnAgent(dispatchItem, config) {
             }
           } else {
             log('info', `Creating worktree: ${worktreePath} on branch ${branchName}`);
-            const mainRef = sanitizeBranch(project.mainBranch || 'main');
+            const mainRef = sanitizeBranch(shared.resolveMainBranch(rootDir, project.mainBranch));
             try {
               runWorktreeAdd(rootDir, worktreePath, `-b "${branchName}" ${mainRef}`, _worktreeGitOpts, worktreeCreateRetries);
             } catch (e1) {
@@ -1212,7 +1212,7 @@ function materializePlansAsWorkItems(config) {
           const firstProject = itemsByProject.values().next().value?.project;
           if (!firstProject?.localPath) throw new Error('no project with localPath');
           const root = path.resolve(firstProject.localPath);
-          const mainBranch = firstProject.mainBranch || 'main';
+          const mainBranch = shared.resolveMainBranch(root, firstProject.mainBranch);
           const branch = sanitizeBranch(plan.feature_branch);
           // Create branch from main (idempotent — ignores if exists)
           exec(`git branch "${branch}" "${mainBranch}" 2>/dev/null || true`, { cwd: root, stdio: 'pipe' });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yemi33/minions",
-  "version": "0.1.397",
+  "version": "0.1.399",
   "description": "Multi-agent AI dev team that runs from ~/.minions/ — five autonomous agents share a single engine, dashboard, and knowledge base",
   "bin": {
     "minions": "bin/minions.js"