@shepai/cli 1.49.0 → 1.50.0

package/dist/src/presentation/cli/commands/feat/show.command.js

@@ -23,14 +23,14 @@ const NODE_TO_PHASE = {
     implement: 'Implementing',
     merge: 'Merging',
 };
-/** Map graph node names to approval action labels. */
-const NODE_TO_APPROVE = {
-    analyze: 'Approve Analysis',
-    requirements: 'Approve PRD',
-    research: 'Approve Research',
-    plan: 'Approve Plan',
-    implement: 'Approve Implementation',
-    merge: 'Approve Merge',
+/** Map graph node names to review action labels. */
+const NODE_TO_REVIEW = {
+    analyze: 'Review Analysis',
+    requirements: 'Review Requirements',
+    research: 'Review Research',
+    plan: 'Review Plan',
+    implement: 'Review Merge',
+    merge: 'Review Merge',
 };
 /** Map lifecycle event phases to display labels and symbols. */
 const LIFECYCLE_EVENTS = {
@@ -63,8 +63,8 @@ function formatStatus(feature, run) {
     if (run.status === 'failed')
         return `${colors.error(symbols.error)} ${colors.error('Failed')}`;
     if (run.status === 'waiting_approval') {
-        const action = nodeName ? (NODE_TO_APPROVE[nodeName] ?? phase) : phase;
-        return `${colors.warning(symbols.warning)} ${colors.warning(action)}`;
+        const action = nodeName ? (NODE_TO_REVIEW[nodeName] ?? phase) : phase;
+        return `${colors.brand(symbols.pointer)} ${colors.brand(action)}`;
     }
     if (run.status === 'interrupted')
         return `${colors.error(symbols.error)} ${colors.error('Interrupted')}`;
@@ -133,7 +133,7 @@ function groupTimingsByRun(timings) {
 /**
  * Render a single timing entry (node phase, not lifecycle event).
  */
-function renderNodeTiming(t, isLast, isWaiting, isRunTerminal, run, maxDurationMs, maxBar) {
+function renderNodeTiming(t, isLast, isWaiting, isRunTerminal, run, maxDurationMs, maxBar, rejectionMessage) {
     const lines = [];
     const isSubPhase = t.phase.includes(':');
     const label = isSubPhase
@@ -200,12 +200,21 @@ function renderNodeTiming(t, isLast, isWaiting, isRunTerminal, run, maxDurationM
         const waitBar = `${colors.warning('\u2588'.repeat(waitBarLen))}${colors.muted('\u2591'.repeat(maxBar - waitBarLen))}`;
         lines.push(`${waitLabel} ${waitBar} ${waitSecs}s (waiting)`);
     }
+    // Show rejection feedback after approval wait (if this phase was rejected)
+    if (rejectionMessage) {
+        const maxLen = 60;
+        const msg = rejectionMessage.length > maxLen
+            ? `${rejectionMessage.slice(0, maxLen)}\u2026`
+            : rejectionMessage;
+        lines.push(`  ${colors.error(`\u21a9 rejected: "${msg}"`)}`);
+    }
     return lines;
 }
 /**
  * Render the full phase timing section, grouped by agent run with lifecycle events.
+ * @internal Exported for testing only.
  */
-function renderPhaseTimings(timings, currentRun, rejections = []) {
+export function renderPhaseTimings(timings, currentRun, rejections = []) {
     const groups = groupTimingsByRun(timings);
     const multiRun = groups.length > 1;
     // Compute max duration across ALL timings for consistent bar scaling
@@ -240,23 +249,35 @@ function renderPhaseTimings(timings, currentRun, rejections = []) {
             currentRun?.status === 'failed' ||
             currentRun?.status === 'cancelled';
         const isWaiting = isCurrentRun && currentRun?.status === 'waiting_approval';
-        let resumedIdx = 0;
+        // Build a map of phase timing IDs to rejection messages.
+        // A rejection belongs to the phase timing that has approvalWaitMs set
+        // and whose base phase matches the rejection's phase field.
+        // For each node timing with approvalWaitMs, find the next rejection
+        // for that base phase (consumed in order).
+        const rejectionsByPhase = new Map();
+        for (const r of rejections) {
+            const key = r.phase ?? '_legacy';
+            const list = rejectionsByPhase.get(key) ?? [];
+            list.push(r);
+            rejectionsByPhase.set(key, list);
+        }
+        // Track consumption index per phase
+        const rejectionIdx = new Map();
         for (const [idx, t] of group.timings.entries()) {
             const isLast = isLastGroup && idx === group.timings.length - 1;
             // Lifecycle event - render as a marker line
             if (isLifecycleEvent(t.phase)) {
                 const event = LIFECYCLE_EVENTS[t.phase];
                 if (event) {
-                    // For resumed events, show rejection feedback if available
-                    if (t.phase === 'run:resumed' && rejections.length > 0) {
-                        const feedback = rejections[resumedIdx];
-                        resumedIdx++;
-                        if (feedback?.message) {
-                            const maxLen = 60;
-                            const msg = feedback.message.length > maxLen
-                                ? `${feedback.message.slice(0, maxLen)}…`
-                                : feedback.message;
-                            lines.push(`  ${colors.error(`↩ rejected: "${msg}"`)}`);
+                    // For resumed events without a matching rejection, show as info marker
+                    // (rejections are now rendered inline after approval wait)
+                    if (t.phase === 'run:resumed') {
+                        // Check if this resume was preceded by a rejection that we already rendered
+                        // If so, skip the resumed marker to avoid visual duplication
+                        const prevIdx = idx - 1;
+                        const prevTiming = prevIdx >= 0 ? group.timings[prevIdx] : null;
+                        if (prevTiming && !isLifecycleEvent(prevTiming.phase)) {
+                            // The rejection was already shown inline, skip this marker
                             continue;
                         }
                     }
@@ -271,8 +292,25 @@ function renderPhaseTimings(timings, currentRun, rejections = []) {
                 }
                 continue;
             }
+            // Determine if this phase timing was rejected (has approvalWaitMs and a matching rejection)
+            let rejectionMessage;
+            if (t.approvalWaitMs != null && Number(t.approvalWaitMs) > 0) {
+                const basePhase = t.phase.includes(':') ? t.phase.split(':')[0] : t.phase;
+                // Try phase-specific rejections first, then fall back to legacy (no phase)
+                for (const key of [basePhase, '_legacy']) {
+                    const phaseRejections = rejectionsByPhase.get(key);
+                    if (phaseRejections && phaseRejections.length > 0) {
+                        const consumed = rejectionIdx.get(key) ?? 0;
+                        if (consumed < phaseRejections.length) {
+                            rejectionMessage = phaseRejections[consumed].message;
+                            rejectionIdx.set(key, consumed + 1);
+                            break;
+                        }
+                    }
+                }
+            }
             // Regular node phase
-            const rendered = renderNodeTiming(t, isLast, isWaiting ?? false, isRunTerminal ?? false, isCurrentRun ? currentRun : null, maxDurationMs, MAX_BAR);
+            const rendered = renderNodeTiming(t, isLast, isWaiting ?? false, isRunTerminal ?? false, isCurrentRun ? currentRun : null, maxDurationMs, MAX_BAR, rejectionMessage);
             lines.push(...rendered);
         }
     }