@yemi33/minions 0.1.2242 → 0.1.2243

package/engine/live-checkout.js

@@ -125,20 +125,25 @@ async function prepareLiveCheckout(opts = {}) {
   const exists = (typeof _exists === 'function') ? _exists : fs.existsSync;
   const baseOpts = { cwd: localPath, ...(gitOpts || {}) };
 
-  // ── Step 1: git status --porcelain. Bail early on dirty tree. ─────────
-  // Porcelain format begins each line with a two-char XY status code (e.g.
+  // ── Step 1: git status --porcelain=v1 -b. Bail early on dirty tree. ─────
+  // Porcelain v1 -b adds a `## <branch>` header line as the first output line
+  // so callers get branch diagnostics for free alongside the file-status lines.
+  // The file-status lines still use the two-char XY status code (e.g.
   // " M file.js", "?? new.js", "MM stage+unstage.js"). The leading space on
   // unstaged-only lines is SIGNIFICANT, so we split first and strip ONLY
-  // trailing whitespace/CR per line — outer-trimming the whole blob would
-  // eat the leading XY space on the first line.
-  const statusRaw = await git(['status', '--porcelain'], baseOpts);
+  // trailing whitespace/CR per line — outer-trimming the whole blob would eat
+  // the leading XY space on the first line. The `## ` header is separated out
+  // before the dirtyFiles check so callers receive it as `branchInfo`.
+  const statusRaw = await git(['status', '--porcelain=v1', '-b'], baseOpts);
   const statusStr = typeof statusRaw === 'string' ? statusRaw : '';
-  const dirtyFiles = statusStr
+  const statusLines = statusStr
     .split(/\r?\n/)
     .map((line) => line.replace(/\s+$/, ''))
     .filter((line) => line.length > 0);
+  const branchInfo = statusLines.find((line) => line.startsWith('## ')) || '';
+  const dirtyFiles = statusLines.filter((line) => !line.startsWith('## '));
   if (dirtyFiles.length > 0) {
-    return { ok: false, reason: 'dirty', dirtyFiles };
+    return { ok: false, reason: 'dirty', dirtyFiles, branchInfo };
   }
 
   // ── Step 2: mid-operation / detached-HEAD preflight (P-b2e8d4a6). ──────

package/engine.js

@@ -2359,6 +2359,14 @@ async function spawnAgent(dispatchItem, config) {
     }
     if (_liveResult && _liveResult.ok === false && _liveResult.reason === 'dirty') {
       const _dirtyFiles = Array.isArray(_liveResult.dirtyFiles) ? _liveResult.dirtyFiles : [];
+      const _branchInfo = typeof _liveResult.branchInfo === 'string' ? _liveResult.branchInfo : '';
+      // #329: Check if this is a retry after a prior dirty failure. If the WI
+      // already carries `_pendingReason:'live_checkout_dirty'` from a previous
+      // dispatch, the dirty state is persistent (user-owned) and we mark it
+      // non-retryable. First-attempt dirty failures are retried once so a
+      // transient or engine-owned dirty state can clear before permanently
+      // failing the plan item.
+      const _alreadyDirtyFailed = dispatchItem.meta?.item?._pendingReason === 'live_checkout_dirty';
       const _alertBody = [
         '# Live-checkout refused: dirty worktree',
         '',
@@ -2367,16 +2375,19 @@ async function spawnAgent(dispatchItem, config) {
         `**Branch:** ${branchName}`,
         `**Work item:** ${_wiIdForAlert}`,
         `**Dispatch:** ${id}`,
+        ...(_branchInfo ? ['', `**Current checkout:** \`${_branchInfo}\``] : []),
         '',
         `The engine refused to spawn the agent because \`${cwd}\` has uncommitted changes. Live-checkout mode runs in your project directly — the engine never \`git reset\` or \`git clean\` your tree.`,
         '',
-        '## Dirty files (`git status --porcelain`)',
+        '## Dirty files (`git status --porcelain=v1 -b`)',
         '',
         '```',
         ...(_dirtyFiles.length > 0 ? _dirtyFiles : ['(none reported)']),
         '```',
         '',
-        'Recovery: commit, stash, or discard the changes in the project checkout, then re-dispatch the work item.',
+        _alreadyDirtyFailed
+          ? 'Recovery: dirty state persisted across retries — commit, stash, or discard the changes in the project checkout, then re-dispatch the work item.'
+          : 'This dispatch will be retried once automatically in case the dirty state is transient. If dirty again on retry, commit, stash, or discard the changes, then re-dispatch.',
       ].join('\n');
       try { writeInboxAlert(`live-checkout-dirty-${_wiIdForAlert}`, _alertBody); }
       catch (e) { log('warn', `live-checkout: writeInboxAlert failed: ${e.message}`); }
@@ -2391,14 +2402,19 @@ async function spawnAgent(dispatchItem, config) {
           });
         }
       } catch (e) { log('warn', `live-checkout: failed to stamp _pendingReason: ${e.message}`); }
+      const _dirtyMsg = _branchInfo
+        ? `live-checkout refused: ${_dirtyFiles.length} dirty file(s) in ${cwd} (${_branchInfo.replace(/^## /, '')})`
+        : `live-checkout refused: ${_dirtyFiles.length} dirty file(s) in ${cwd}`;
       log('error', `spawnAgent: live-checkout refused for ${id}: ${_dirtyFiles.length} dirty file(s) in ${cwd}`);
       _cleanupPromptFiles();
       completeDispatch(
         id,
         DISPATCH_RESULT.ERROR,
-        `live-checkout refused: ${_dirtyFiles.length} dirty file(s) in ${cwd}`.slice(0, 800),
-        'Live-checkout mode requires a clean tree; engine refuses to overwrite operator changes. Commit/stash/discard and re-dispatch.',
-        { failureClass: FAILURE_CLASS.LIVE_CHECKOUT_DIRTY, agentRetryable: false },
+        _dirtyMsg.slice(0, 800),
+        _alreadyDirtyFailed
+          ? 'Live-checkout dirty state persisted across retries — operator must commit/stash/discard before re-dispatch.'
+          : 'Live-checkout dirty tree retried once automatically; if dirty persists, operator must commit/stash/discard.',
+        { failureClass: FAILURE_CLASS.LIVE_CHECKOUT_DIRTY, agentRetryable: !_alreadyDirtyFailed },
       );
       cleanupTempAgent(agentId);
       return null;

package/package.json

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