@yemi33/minions 0.1.1718 → 0.1.1720

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.1.1720 (2026-05-04)
+
+### Features
+-  separate GitHub and ADO project fields (#2065)
+
 ## 0.1.1718 (2026-05-04)
 
 ### Features

package/dashboard.js

@@ -4927,20 +4927,16 @@ What would you like to discuss or change? When you're happy, say "approve" and I
         return jsonReply(res, e.statusCode || 400, { error: e.message });
       }
 
-      const project = {
-        name, description, localPath: target.replace(/\\/g, '/'),
-        repoHost: detected.repoHost || 'ado', repositoryId: detected.repositoryId || '',
-        adoOrg: detected.org || '', adoProject: detected.project || '',
-        repoName: detected.repoName || name, mainBranch: detected.mainBranch || 'main',
-        prUrlBase: projectDiscovery.buildPrUrlBase({
-          repoHost: detected.repoHost,
-          org: detected.org,
-          project: detected.project,
-          repoName: detected.repoName,
-          prUrlBase: detected.prUrlBase,
-        }),
-        workSources: { pullRequests: { enabled: true, cooldownMinutes: 30 }, workItems: { enabled: true, cooldownMinutes: 0 } }
-      };
+      const project = projectDiscovery.buildProjectEntry({
+        name, description, localPath: target,
+        repoHost: detected.repoHost || 'github',
+        repositoryId: detected.repositoryId || '',
+        org: detected.org || '',
+        project: detected.project || '',
+        repoName: detected.repoName || name,
+        mainBranch: detected.mainBranch || 'main',
+        prUrlBase: detected.prUrlBase,
+      });
 
       config.projects.push(project);
       safeWrite(configPath, config);

package/engine/cli.js

@@ -1181,8 +1181,9 @@ const commands = {
       project_name: targetProject.name || 'Unknown',
       project_path: targetProject.localPath || '',
       main_branch: targetProject.localPath ? shared.resolveMainBranch(targetProject.localPath, targetProject.mainBranch) : (targetProject.mainBranch || 'main'),
-      ado_org: targetProject.adoOrg || 'Unknown',
-      ado_project: targetProject.adoProject || 'Unknown',
+      ado_org: targetProject.repoHost === 'ado' ? (targetProject.adoOrg || 'Unknown') : '',
+      ado_project: targetProject.repoHost === 'ado' ? (targetProject.adoProject || 'Unknown') : '',
+      github_org: targetProject.repoHost === 'github' ? (targetProject.githubOrg || targetProject.adoOrg || '') : '',
       repo_name: targetProject.repoName || 'Unknown',
       team_root: MINIONS_DIR,
       date: e.dateStamp(),

package/engine/copilot-models.json

@@ -1,5 +1,5 @@
 {
   "runtime": "copilot",
   "models": null,
-  "cachedAt": "2026-05-04T23:02:50.359Z"
+  "cachedAt": "2026-05-04T23:05:59.485Z"
 }

package/engine/github.js

@@ -5,7 +5,7 @@
  */
 
 const shared = require('./shared');
-const { exec, execAsync, getProjects, projectPrPath, projectWorkItemsPath, safeJson, safeWrite, mutateJsonFileLocked, MINIONS_DIR, getPrLinks, backfillPrPrdItems, log, ts, dateStamp, PR_STATUS, PR_POLLABLE_STATUSES, createThrottleTracker } = shared;
+const { exec, execAsync, getProjects, projectPrPath, projectWorkItemsPath, safeJson, safeWrite, mutateJsonFileLocked, MINIONS_DIR, getPrLinks, backfillPrPrdItems, log, ts, dateStamp, PR_STATUS, PR_POLLABLE_STATUSES, createThrottleTracker, getProjectOrg } = shared;
 const { getPrs } = require('./queries');
 const path = require('path');
 
@@ -33,7 +33,7 @@ function isGitHub(project) {
 
 /** Get GitHub owner/repo slug from project config (e.g. "x3-design/Bebop_Workspaces") */
 function getRepoSlug(project) {
-  const org = project.adoOrg || '';
+  const org = getProjectOrg(project);
   const repo = project.repoName || '';
   if (!org || !repo) return null;
   return `${org}/${repo}`;

package/engine/playbook.js

@@ -10,7 +10,7 @@ const path = require('path');
 const shared = require('./shared');
 const queries = require('./queries');
 
-const { safeJson, safeRead, getProjects, log, ts, dateStamp, truncateTextBytes, ENGINE_DEFAULTS, WI_STATUS, WORK_TYPE, PR_STATUS, DISPATCH_RESULT } = shared;
+const { safeJson, safeRead, getProjects, log, ts, dateStamp, truncateTextBytes, ENGINE_DEFAULTS, WI_STATUS, WORK_TYPE, PR_STATUS, DISPATCH_RESULT, getProjectOrg } = shared;
 const { getConfig, getDispatch, getNotes, getAgentCharter, getPrs, getKnowledgeBaseIndex, AGENTS_DIR } = queries;
 
 const MINIONS_DIR = shared.MINIONS_DIR;
@@ -29,7 +29,7 @@ function getPrCreateInstructions(project) {
   const host = getRepoHost(project);
   const repoId = project?.repositoryId || '';
   if (host === 'github') {
-    const org = project?.adoOrg || '';
+    const org = getProjectOrg(project);
     const repo = project?.repoName || '';
     const mainBranch = project?.localPath ? shared.resolveMainBranch(project.localPath, project.mainBranch) : (project?.mainBranch || 'main');
     return `Use \`gh pr create\` to create a pull request:\n` +
@@ -56,7 +56,7 @@ function getPrCommentInstructions(project) {
   const host = getRepoHost(project);
   const repoId = project?.repositoryId || '';
   if (host === 'github') {
-    const org = project?.adoOrg || '';
+    const org = getProjectOrg(project);
     const repo = project?.repoName || '';
     return `Use \`gh pr comment\` to post a comment on the PR:\n` +
       `- Write the Markdown comment to a temporary file, then run: \`gh pr comment <number> --body-file <body-file.md> --repo ${org}/${repo}\`\n` +
@@ -75,7 +75,7 @@ function getPrCommentInstructions(project) {
 function getPrFetchInstructions(project) {
   const host = getRepoHost(project);
   if (host === 'github') {
-    const org = project?.adoOrg || '';
+    const org = getProjectOrg(project);
     const repo = project?.repoName || '';
     const mainBranch = project?.localPath ? shared.resolveMainBranch(project.localPath, project.mainBranch) : (project?.mainBranch || 'main');
     return `Use \`gh pr view\` to fetch PR status:\n` +
@@ -100,7 +100,7 @@ function getPrVoteInstructions(project) {
   const host = getRepoHost(project);
   const repoId = project?.repositoryId || '';
   if (host === 'github') {
-    const org = project?.adoOrg || '';
+    const org = getProjectOrg(project);
     const repo = project?.repoName || '';
     return `**IMPORTANT: GitHub blocks self-approval** — all agents share the same credentials, so \`--approve\` and \`--request-changes\` will fail with "can't approve your own PR." Use \`--comment\` instead.\n\n` +
       `Submit your review verdict using \`gh pr review\` with \`--comment\`:\n` +
@@ -411,13 +411,15 @@ function renderPlaybook(type, vars) {
     ...dispatchProject,
     adoOrg: vars.ado_org || vars.adoOrg || dispatchProject.adoOrg,
     adoProject: vars.ado_project || vars.adoProject || dispatchProject.adoProject,
+    githubOrg: vars.github_org || vars.githubOrg || dispatchProject.githubOrg,
     repoName: vars.repo_name || vars.repoName || dispatchProject.repoName,
     repoHost: vars.repo_host || vars.repoHost || dispatchProject.repoHost,
   };
   const repoHost = getRepoHost(renderProject);
   const projectVars = {
     project_name: renderProject.name || 'Unknown Project',
-    ado_org: renderProject.adoOrg || 'Unknown',
+    ado_org: repoHost === 'ado' ? (renderProject.adoOrg || 'Unknown') : '',
+    github_org: repoHost === 'github' ? getProjectOrg(renderProject) : '',
     ado_project: renderProject.adoProject || 'Unknown',
     repo_name: renderProject.repoName || 'Unknown',
     repo_host: repoHost,
@@ -503,7 +505,7 @@ function buildSystemPrompt(agentId, config, project) {
 
   // Project context (fixed size)
   prompt += `## Project: ${project.name || 'Unknown Project'}\n\n`;
-  prompt += `- Repo: ${project.repoName || 'Unknown'} (${project.adoOrg || 'Unknown'}/${project.adoProject || 'Unknown'})\n`;
+  prompt += `- Repo: ${project.repoName || 'Unknown'} (${getProjectOrg(project) || 'Unknown'}${project.repoHost === 'ado' ? '/' + (project.adoProject || 'Unknown') : ''})\n`;
   prompt += `- Repo ID: ${project.repositoryId || ''}\n`;
   prompt += `- Repo host: ${getRepoHostLabel(project)}\n`;
   prompt += `- Main branch: ${project.mainBranch || 'main'}\n\n`;
@@ -648,8 +650,9 @@ function buildBaseVars(agentId, config, project) {
     team_root: MINIONS_DIR,
     repo_id: project?.repositoryId || '',
     project_name: project?.name || 'Unknown Project',
-    ado_org: project?.adoOrg || 'Unknown',
-    ado_project: project?.adoProject || 'Unknown',
+    ado_org: project?.repoHost === 'ado' ? (project?.adoOrg || 'Unknown') : '',
+    ado_project: project?.repoHost === 'ado' ? (project?.adoProject || 'Unknown') : '',
+    github_org: project?.repoHost === 'github' ? getProjectOrg(project) : '',
     repo_name: project?.repoName || 'Unknown',
     repo_host: getRepoHost(project),
     main_branch: project?.mainBranch || 'main',

package/engine/project-discovery.js

@@ -332,17 +332,20 @@ function buildPrUrlBase({ repoHost, org, project, repoName, prUrlBase }) {
 
 function buildProjectEntry({ name, description, localPath, repoHost, repositoryId, org, project, repoName, mainBranch, prUrlBase }) {
   const safeName = (name || 'project').replace(/[^a-zA-Z0-9._-]/g, '-').replace(/-+/g, '-').replace(/^-|-$/g, '').slice(0, 60) || 'project';
+  const host = repoHost || 'github';
+  const isAdo = host === 'ado';
   return {
     name: safeName,
     description: description || '',
     localPath: (localPath || '').replace(/\\/g, '/'),
-    repoHost: repoHost || 'github',
-    repositoryId: repositoryId || '',
-    adoOrg: org || '',
-    adoProject: project || '',
+    repoHost: host,
+    repositoryId: isAdo ? (repositoryId || '') : '',
+    adoOrg: isAdo ? (org || '') : '',
+    adoProject: isAdo ? (project || '') : '',
+    githubOrg: !isAdo ? (org || '') : '',
     repoName: repoName || name,
     mainBranch: mainBranch || 'main',
-    prUrlBase: buildPrUrlBase({ repoHost, org, project, repoName, prUrlBase }),
+    prUrlBase: buildPrUrlBase({ repoHost: host, org, project, repoName, prUrlBase }),
     workSources: {
       pullRequests: { enabled: true, cooldownMinutes: 30 },
       workItems: { enabled: true, cooldownMinutes: 0 },

package/engine/runtimes/claude.js

@@ -50,6 +50,11 @@ function _safeWriteJson(p, obj) {
   try { fs.writeFileSync(p, JSON.stringify(obj, null, 2)); } catch { /* best effort */ }
 }
 
+function _inferClaudeNativeFromBin(claudeBin) {
+  const ext = path.extname(claudeBin).toLowerCase();
+  return isWin ? ext === '.exe' : ext !== '.js';
+}
+
 function _probeClaudePackage(pkgDir) {
   const nativeBin = path.join(pkgDir, 'bin', isWin ? 'claude.exe' : 'claude');
   if (fs.existsSync(nativeBin)) return { bin: nativeBin, native: true };
@@ -89,7 +94,14 @@ function resolveBinary({ env = process.env, config = null } = {}) {
   // 1. Cache hit — fastest path
   const cached = _safeJson(CAPS_FILE);
   if (cached?.claudeBin && fs.existsSync(cached.claudeBin)) {
-    return { bin: cached.claudeBin, native: !!cached.claudeIsNative, leadingArgs: [] };
+    const native = cached.claudeIsNative != null
+      ? !!cached.claudeIsNative
+      : _inferClaudeNativeFromBin(cached.claudeBin);
+    if (cached.claudeIsNative == null) {
+      cached.claudeIsNative = native;
+      _safeWriteJson(CAPS_FILE, cached);
+    }
+    return { bin: cached.claudeBin, native, leadingArgs: [] };
   }
 
   // 2. PATH lookup → probe the resolved path's neighbouring node_modules dir

package/engine/shared.js

@@ -1477,6 +1477,13 @@ function nextWorkItemId(items, prefix) {
 
 // ── ADO URL ──────────────────────────────────────────────────────────────────
 
+/** Return the org/owner for a project regardless of host. Prefers host-specific field, falls back to adoOrg for backward compat. */
+function getProjectOrg(project) {
+  if (!project) return '';
+  if (project.repoHost === 'github') return project.githubOrg || project.adoOrg || '';
+  return project.adoOrg || '';
+}
+
 function getAdoOrgBase(project) {
   if (project.prUrlBase) {
     const devAzure = project.prUrlBase.match(/^(https?:\/\/dev\.azure\.com\/[^/]+)/i);
@@ -1922,7 +1929,7 @@ function getProjectPrScope(project) {
   if (host === 'github') {
     const parsed = parseGitHubPrUrl(project.prUrlBase || '');
     if (parsed?.scope) return parsed.scope;
-    const owner = normalizePrScopeSegment(project.adoOrg);
+    const owner = normalizePrScopeSegment(getProjectOrg(project));
     const repo = normalizePrScopeSegment(project.repoName);
     return owner && repo ? `github:${owner}/${repo}` : '';
   }
@@ -2680,6 +2687,7 @@ module.exports = {
   mergePrLinkItems, // exported for testing
   upsertPullRequestRecord,
   nextWorkItemId,
+  getProjectOrg,
   getAdoOrgBase,
   sanitizePath,
   sanitizeBranch,

package/engine.js

@@ -271,17 +271,72 @@ function _runtimeLogger() {
   };
 }
 
+function _collectAgentFailureSignal(rawOutput) {
+  const text = rawOutput == null ? '' : String(rawOutput);
+  if (!text) return '';
+
+  const signals = [];
+  let sawJsonLine = false;
+  for (const rawLine of text.split('\n')) {
+    const line = rawLine.trim();
+    if (!line) continue;
+    if (!line.startsWith('{')) {
+      signals.push(line);
+      continue;
+    }
+    let obj;
+    try { obj = JSON.parse(line); } catch { continue; }
+    if (!obj || typeof obj !== 'object') continue;
+    sawJsonLine = true;
+
+    const type = String(obj.type || '');
+    const subtype = String(obj.subtype || '');
+    const eventType = String(obj.event?.type || '');
+    const isErrorEvent = type === 'error'
+      || eventType === 'error'
+      || subtype.startsWith('error')
+      || obj.is_error === true
+      || obj.error != null;
+    if (!isErrorEvent) continue;
+
+    for (const value of [
+      subtype,
+      obj.error,
+      obj.message,
+      obj.stderr,
+      obj.result,
+      obj.event?.error,
+      obj.event?.message,
+    ]) {
+      if (typeof value === 'string' && value.trim()) signals.push(value.trim());
+    }
+  }
+
+  if (signals.length > 0) return signals.join('\n');
+  return sawJsonLine ? '' : text;
+}
+
+function _stdoutForFallbackClassification(rawStdout, failureSignal) {
+  if (failureSignal) return failureSignal;
+  const text = rawStdout == null ? '' : String(rawStdout);
+  if (!text.trim()) return '';
+  return 'agent produced non-empty stdout without a terminal runtime error signal';
+}
+
 function _classifyAgentFailure(runtime, code, stdout, stderr) {
+  const failureSignal = _collectAgentFailureSignal(stdout);
+  const fallbackStdout = _stdoutForFallbackClassification(stdout, failureSignal);
   if (runtime && typeof runtime.classifyFailure === 'function') {
     const classified = runtime.classifyFailure({
       code,
-      stdout,
+      stdout: failureSignal,
       stderr,
-      fallback: classifyFailureFallback,
+      fallback: (fallbackCode, _stdout, fallbackStderr) =>
+        classifyFailureFallback(fallbackCode, fallbackStdout, fallbackStderr),
     });
     if (classified && classified.failureClass) return classified;
   }
-  return { failureClass: classifyFailureFallback(code, stdout, stderr) };
+  return { failureClass: classifyFailureFallback(code, fallbackStdout, stderr) };
 }
 
 function ackPendingSteeringFiles(agentId, procInfo, rawOutput, observedAtMs = Date.now()) {
@@ -3136,7 +3191,9 @@ function buildProjectContext(projects, assignedProject, isFanOut, agentName, age
   const projectList = projects.map(p => {
     let line = `### ${p.name}\n`;
     line += `- **Path:** ${p.localPath}\n`;
-    line += `- **Repo:** ${p.adoOrg}/${p.adoProject}/${p.repoName} (ID: ${p.repositoryId || 'unknown'}, host: ${getRepoHostLabel(p)})\n`;
+    line += p.repoHost === 'github'
+      ? `- **Repo:** ${p.githubOrg || p.adoOrg || ''}/${p.repoName} (host: ${getRepoHostLabel(p)})\n`
+      : `- **Repo:** ${p.adoOrg}/${p.adoProject}/${p.repoName} (ID: ${p.repositoryId || 'unknown'}, host: ${getRepoHostLabel(p)})\n`;
     if (p.description) line += `- **What it is:** ${p.description}\n`;
     return line;
   }).join('\n');
@@ -4409,7 +4466,7 @@ module.exports = {
   reconcileItemsWithPrs, detectDependencyCycles,
   parseConflictFiles, pruneAncestorDeps, preflightMergeSimulation, // exported for testing
   isWorktreeRetryableError, removeStaleIndexLock, // exported for testing
-  _maxTurnsForType, buildProjectContext, normalizeAc, _buildAgentSpawnFlags, // exported for testing
+  _maxTurnsForType, buildProjectContext, normalizeAc, _buildAgentSpawnFlags, _classifyAgentFailure, // exported for testing
 
   // Playbooks
   renderPlaybook, validatePlaybookVars, PLAYBOOK_REQUIRED_VARS, buildWorkItemDispatchVars,

package/minions.js

@@ -183,8 +183,12 @@ function listProjects() {
     console.log(`  ${p.name}`);
     if (p.description) console.log(`    Desc: ${p.description}`);
     console.log(`    Path: ${p.localPath} ${exists ? '' : '(NOT FOUND)'}`);
-    console.log(`    Repo: ${p.adoOrg}/${p.adoProject}/${p.repoName} (${p.repoHost || 'ado'})`);
-    console.log(`    ID:   ${p.repositoryId || 'none'}`);
+    if (p.repoHost === 'github') {
+      console.log(`    Repo: ${p.githubOrg || p.adoOrg || ''}/${p.repoName} (github)`);
+    } else {
+      console.log(`    Repo: ${p.adoOrg}/${p.adoProject}/${p.repoName} (${p.repoHost || 'ado'})`);
+      console.log(`    ID:   ${p.repositoryId || 'none'}`);
+    }
     console.log('');
   }
   rl.close();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yemi33/minions",
-  "version": "0.1.1718",
+  "version": "0.1.1720",
   "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"