@shepai/cli 1.49.1 → 1.50.0

package/dist/packages/core/src/infrastructure/services/notifications/notification-watcher.service.d.ts

@@ -22,6 +22,7 @@ export declare class NotificationWatcherService {
     private readonly pollIntervalMs;
     private readonly trackedRuns;
     private intervalId;
+    private isBootstrapped;
     constructor(runRepository: IAgentRunRepository, phaseTimingRepository: IPhaseTimingRepository, notificationService: INotificationService, pollIntervalMs?: number);
     isRunning(): boolean;
     start(): void;

package/dist/packages/core/src/infrastructure/services/notifications/notification-watcher.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"notification-watcher.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/notifications/notification-watcher.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAQH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4EAA4E,CAAC;AACtH,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+EAA+E,CAAC;AAC5H,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8EAA8E,CAAC;AAmDzH,qBAAa,0BAA0B;IACrC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsB;IACpD,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAyB;IAC/D,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAuB;IAC3D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmC;IAC/D,OAAO,CAAC,UAAU,CAA+C;gBAG/D,aAAa,EAAE,mBAAmB,EAClC,qBAAqB,EAAE,sBAAsB,EAC7C,mBAAmB,EAAE,oBAAoB,EACzC,cAAc,GAAE,MAAiC;IAQnD,SAAS,IAAI,OAAO;IAIpB,KAAK,IAAI,IAAI;IAWb,IAAI,IAAI,IAAI;YAOE,IAAI;YAUJ,WAAW;IAoDzB,OAAO,CAAC,eAAe;YAgBT,qBAAqB;IAsBnC,OAAO,CAAC,kBAAkB;CAS3B;AAMD;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAC3C,aAAa,EAAE,mBAAmB,EAClC,qBAAqB,EAAE,sBAAsB,EAC7C,mBAAmB,EAAE,oBAAoB,EACzC,cAAc,CAAC,EAAE,MAAM,GACtB,IAAI,CAWN;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,IAAI,0BAA0B,CAQnE;AAED;;GAEG;AACH,wBAAgB,sBAAsB,IAAI,OAAO,CAEhD;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,IAAI,IAAI,CAK/C"}
+{"version":3,"file":"notification-watcher.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/notifications/notification-watcher.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAQH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4EAA4E,CAAC;AACtH,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+EAA+E,CAAC;AAC5H,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8EAA8E,CAAC;AAmDzH,qBAAa,0BAA0B;IACrC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsB;IACpD,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAyB;IAC/D,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAuB;IAC3D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmC;IAC/D,OAAO,CAAC,UAAU,CAA+C;IAEjE,OAAO,CAAC,cAAc,CAAS;gBAG7B,aAAa,EAAE,mBAAmB,EAClC,qBAAqB,EAAE,sBAAsB,EAC7C,mBAAmB,EAAE,oBAAoB,EACzC,cAAc,GAAE,MAAiC;IAQnD,SAAS,IAAI,OAAO;IAIpB,KAAK,IAAI,IAAI;IAWb,IAAI,IAAI,IAAI;YAOE,IAAI;YAUJ,WAAW;IA0DzB,OAAO,CAAC,eAAe;YAgBT,qBAAqB;IAwBnC,OAAO,CAAC,kBAAkB;CAS3B;AAMD;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAC3C,aAAa,EAAE,mBAAmB,EAClC,qBAAqB,EAAE,sBAAsB,EAC7C,mBAAmB,EAAE,oBAAoB,EACzC,cAAc,CAAC,EAAE,MAAM,GACtB,IAAI,CAWN;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,IAAI,0BAA0B,CAQnE;AAED;;GAEG;AACH,wBAAgB,sBAAsB,IAAI,OAAO,CAEhD;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,IAAI,IAAI,CAK/C"}

package/dist/packages/core/src/infrastructure/services/notifications/notification-watcher.service.js

@@ -56,6 +56,8 @@ export class NotificationWatcherService {
     pollIntervalMs;
     trackedRuns = new Map();
     intervalId = null;
+    // Suppresses notifications on the first poll to avoid replaying historical state
+    isBootstrapped = false;
     constructor(runRepository, phaseTimingRepository, notificationService, pollIntervalMs = DEFAULT_POLL_INTERVAL_MS) {
         this.runRepository = runRepository;
         this.phaseTimingRepository = phaseTimingRepository;
@@ -108,7 +110,9 @@ export class NotificationWatcherService {
                     featureName,
                 };
                 this.trackedRuns.set(run.id, newState);
-                this.emitStatusEvent(run, newState);
+                if (this.isBootstrapped) {
+                    this.emitStatusEvent(run, newState);
+                }
                 // Check for completed phases on first observation
                 await this.checkPhaseCompletions(run.id, newState);
             }
@@ -130,6 +134,9 @@ export class NotificationWatcherService {
                 await this.checkPhaseCompletions(run.id, prevState);
             }
         }
+        if (!this.isBootstrapped) {
+            this.isBootstrapped = true;
+        }
         // Clean up tracking for runs that disappeared from the list
         for (const trackedId of this.trackedRuns.keys()) {
             if (!currentRunIds.has(trackedId)) {
@@ -156,16 +163,18 @@ export class NotificationWatcherService {
         for (const timing of timings) {
             if (timing.completedAt && !state.completedPhases.has(timing.phase)) {
                 state.completedPhases.add(timing.phase);
-                const event = {
-                    eventType: NotificationEventType.PhaseCompleted,
-                    agentRunId: runId,
-                    featureName: state.featureName,
-                    phaseName: timing.phase,
-                    message: `Completed ${timing.phase} phase`,
-                    severity: NotificationSeverity.Info,
-                    timestamp: new Date().toISOString(),
-                };
-                this.notificationService.notify(event);
+                if (this.isBootstrapped) {
+                    const event = {
+                        eventType: NotificationEventType.PhaseCompleted,
+                        agentRunId: runId,
+                        featureName: state.featureName,
+                        phaseName: timing.phase,
+                        message: `Completed ${timing.phase} phase`,
+                        severity: NotificationSeverity.Info,
+                        timestamp: new Date().toISOString(),
+                    };
+                    this.notificationService.notify(event);
+                }
             }
         }
     }

package/dist/src/presentation/cli/commands/feat/ls.command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ls.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/ls.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA+GpC,wBAAgB,eAAe,IAAI,OAAO,CAqDzC"}
+{"version":3,"file":"ls.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/ls.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA8JpC,wBAAgB,eAAe,IAAI,OAAO,CA8DzC"}

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

@@ -23,13 +23,23 @@ const NODE_TO_PHASE = {
     plan: 'Planning',
     implement: 'Implementing',
 };
-/** 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 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',
+};
+/** Status priority for sorting (lower = higher priority). */
+const STATUS_PRIORITY = {
+    running: 0,
+    pending: 0,
+    waiting_approval: 1,
+    failed: 2,
+    interrupted: 2,
+    completed: 3,
 };
 /**
  * Derive the display status from the agent run.
@@ -37,16 +47,14 @@ const NODE_TO_APPROVE = {
  */
 function formatStatus(feature, run) {
     if (!run) {
-        // No agent run — fall back to static lifecycle
         return `${colors.muted(symbols.dotEmpty)} ${colors.muted(feature.lifecycle)}`;
     }
     const isRunning = run.status === 'running' || run.status === 'pending';
     const nodeName = run.result?.startsWith('node:') ? run.result.slice(5) : undefined;
     const phase = nodeName ? (NODE_TO_PHASE[nodeName] ?? nodeName) : feature.lifecycle;
     if (isRunning) {
-        // Check PID liveness for running agents
         if (run.pid && !isProcessAlive(run.pid)) {
-            return `${colors.error(symbols.error)} ${colors.error('crashed')}`;
+            return `${colors.error(symbols.error)} ${colors.error('Crashed')}`;
         }
         return `${colors.info(symbols.spinner[0])} ${colors.info(phase)}`;
     }
@@ -57,8 +65,8 @@ function formatStatus(feature, run) {
         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')}`;
@@ -74,6 +82,12 @@ function isProcessAlive(pid) {
         return false;
     }
 }
+/** Truncate a string to maxLen, appending ellipsis if needed. */
+function truncate(text, maxLen) {
+    if (text.length <= maxLen)
+        return text;
+    return text.slice(0, maxLen - 1) + symbols.ellipsis;
+}
 /** Format a duration in ms to a compact human-readable string. */
 function formatDuration(ms) {
     const seconds = Math.floor(ms / 1000);
@@ -89,23 +103,54 @@ function formatDuration(ms) {
     const days = Math.floor(hours / 24);
     return `${days}d`;
 }
-/** Format the time column based on run status. */
-function formatTime(feature, run) {
-    const now = Date.now();
-    if (run) {
-        const isRunning = run.status === 'running' || run.status === 'pending';
-        if (isRunning && run.startedAt) {
-            const started = new Date(run.startedAt).getTime();
-            return colors.info(formatDuration(now - started));
-        }
-        if (run.status === 'completed' && run.completedAt) {
-            const completed = new Date(run.completedAt).getTime();
-            return colors.muted(`${formatDuration(now - completed)} ago`);
-        }
+/** Compute total elapsed from phase timings (sum of all phases, including live delta). */
+function formatElapsed(run, phaseTimings) {
+    if (phaseTimings.length > 0) {
+        const now = Date.now();
+        const totalMs = phaseTimings.reduce((sum, pt) => {
+            if (pt.durationMs != null)
+                return sum + Number(pt.durationMs);
+            // Phase still running — add live delta
+            if (pt.startedAt)
+                return sum + (now - new Date(pt.startedAt).getTime());
+            return sum;
+        }, 0);
+        const isRunning = run?.status === 'running' || run?.status === 'pending';
+        return isRunning ? colors.info(formatDuration(totalMs)) : colors.muted(formatDuration(totalMs));
     }
-    // Fallback to updatedAt
-    const updated = new Date(feature.updatedAt).getTime();
-    return colors.muted(`${formatDuration(now - updated)} ago`);
+    // Fallback to run timestamps if no phase timings
+    if (!run?.startedAt)
+        return '';
+    const started = new Date(run.startedAt).getTime();
+    const isRunning = run.status === 'running' || run.status === 'pending';
+    const end = isRunning
+        ? Date.now()
+        : run.completedAt
+            ? new Date(run.completedAt).getTime()
+            : Date.now();
+    return isRunning
+        ? colors.info(formatDuration(end - started))
+        : colors.muted(formatDuration(end - started));
+}
+/** Format when the feature finished (only for completed runs). */
+function formatDone(run) {
+    if (!run?.completedAt || run.status !== 'completed')
+        return '';
+    const completed = new Date(run.completedAt).getTime();
+    return colors.muted(`${formatDuration(Date.now() - completed)} ago`);
+}
+/** Format approval gates and push flag as compact checkboxes: R P M ↑ */
+function formatGates(feature) {
+    const { allowPrd, allowPlan, allowMerge } = feature.approvalGates;
+    const gate = (on) => (on ? colors.success('■') : colors.muted('□'));
+    const push = feature.push ? colors.accent('■') : colors.muted('□');
+    return `${gate(allowPrd)} ${gate(allowPlan)} ${gate(allowMerge)} ${push}`;
+}
+/** Get sort priority for a run status (lower = shown first). */
+function getStatusPriority(run) {
+    if (!run)
+        return 4;
+    return STATUS_PRIORITY[run.status] ?? 4;
 }
 export function createLsCommand() {
     return new Command('ls')
@@ -115,21 +160,28 @@ export function createLsCommand() {
         try {
             const useCase = container.resolve(ListFeaturesUseCase);
             const runRepo = container.resolve('IAgentRunRepository');
+            const phaseRepo = container.resolve('IPhaseTimingRepository');
             const filters = options.repo ? { repositoryPath: options.repo } : undefined;
             const features = await useCase.execute(filters);
-            // Load agent runs for all features in parallel
-            const runs = await Promise.all(features.map((f) => f.agentRunId ? runRepo.findById(f.agentRunId) : Promise.resolve(null)));
-            const rows = features.map((feature, i) => {
-                const run = runs[i];
+            // Load agent runs and phase timings for all features in parallel
+            const [runs, timings] = await Promise.all([
+                Promise.all(features.map((f) => f.agentRunId ? runRepo.findById(f.agentRunId) : Promise.resolve(null))),
+                Promise.all(features.map((f) => phaseRepo.findByFeatureId(f.id))),
+            ]);
+            // Pair features with runs/timings and sort by status priority
+            const paired = features
+                .map((feature, i) => ({ feature, run: runs[i], phases: timings[i] }))
+                .sort((a, b) => getStatusPriority(a.run) - getStatusPriority(b.run));
+            const rows = paired.map(({ feature, run, phases }) => {
                 const repo = path.basename(feature.repositoryPath);
-                const agent = run?.agentType ?? colors.muted('—');
                 return [
                     feature.id.slice(0, 8),
-                    feature.name.slice(0, 30),
+                    truncate(feature.name, 30),
                     formatStatus(feature, run),
                     colors.muted(repo),
-                    agent,
-                    formatTime(feature, run),
+                    formatGates(feature),
+                    formatElapsed(run, phases),
+                    formatDone(run),
                 ];
             });
             renderListView({
@@ -137,10 +189,11 @@ export function createLsCommand() {
                 columns: [
                     { label: 'ID', width: 10 },
                     { label: 'Name', width: 32 },
-                    { label: 'Status', width: 20 },
+                    { label: 'Status', width: 21 },
                     { label: 'Repo', width: 20 },
-                    { label: 'Agent', width: 14 },
-                    { label: 'Time', width: 12 },
+                    { label: 'R P M ↑', width: 10 },
+                    { label: 'Elapsed', width: 10 },
+                    { label: 'Done', width: 12 },
                 ],
                 rows,
                 emptyMessage: 'No features found',

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')}`;