@shepai/cli 1.129.2-pr414.a244c89 → 1.129.2

package/dist/src/presentation/web/components/common/feature-drawer-tabs/activity-tab.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"activity-tab.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-drawer-tabs/activity-tab.tsx"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EACV,eAAe,EACf,qBAAqB,EACtB,MAAM,yCAAyC,CAAC;AA4EjD,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,iBAAiB,CAAC,EAAE,qBAAqB,EAAE,CAAC;CAC7C;AAmED;;;;;;;GAOG;AACH,MAAM,WAAW,iBAAiB;IAChC,+BAA+B;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,0CAA0C;IAC1C,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,mEAAmE;IACnE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,8DAA8D;IAC9D,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;CACjC;AAED;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,eAAe,EAAE,EAC1B,QAAQ,CAAC,EAAE,qBAAqB,EAAE,GACjC,iBAAiB,EAAE,CAgErB;AA6BD,wBAAgB,WAAW,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,EAAE,gBAAgB,2CAqE3F"}
+{"version":3,"file":"activity-tab.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-drawer-tabs/activity-tab.tsx"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EACV,eAAe,EACf,qBAAqB,EACtB,MAAM,yCAAyC,CAAC;AAmEjD,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,iBAAiB,CAAC,EAAE,qBAAqB,EAAE,CAAC;CAC7C;AAmED;;;;;;;GAOG;AACH,MAAM,WAAW,iBAAiB;IAChC,+BAA+B;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,0CAA0C;IAC1C,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,mEAAmE;IACnE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,8DAA8D;IAC9D,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;CACjC;AAED;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,eAAe,EAAE,EAC1B,QAAQ,CAAC,EAAE,qBAAqB,EAAE,GACjC,iBAAiB,EAAE,CAgErB;AA6BD,wBAAgB,WAAW,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,EAAE,gBAAgB,2CAqE3F"}

package/dist/src/presentation/web/components/common/feature-drawer-tabs/activity-tab.js

@@ -24,18 +24,12 @@ function getEffectiveDuration(timing, now) {
 function hasRunningPhase(timings) {
     return timings.some((t) => !t.phase.startsWith('run:') && !t.completedAt && t.startedAt);
 }
-/** Returns true if any non-lifecycle phase is currently waiting for approval. */
-function hasWaitingForApprovalPhase(timings) {
-    return timings.some((t) => !t.phase.startsWith('run:') && !!t.waitingApprovalAt && !t.approvalWaitMs);
-}
-/** Hook that ticks every second while there are running or approval-waiting phases. */
+/** Hook that ticks every second while there are running phases. */
 function useTickingNow(timings) {
     const [now, setNow] = useState(Date.now);
     const intervalRef = useRef(null);
     useEffect(() => {
-        const running = timings
-            ? hasRunningPhase(timings) || hasWaitingForApprovalPhase(timings)
-            : false;
+        const running = timings ? hasRunningPhase(timings) : false;
         if (running) {
             // Tick every second
             intervalRef.current = setInterval(() => setNow(Date.now()), 1000);
@@ -319,21 +313,12 @@ function NodeTimingRow({ timing, maxDurationMs, now, }) {
                                 backgroundImage: 'linear-gradient(90deg, transparent 0%, rgb(59 130 246) 50%, transparent 100%)',
                                 backgroundSize: '200% 100%',
                                 animation: 'shimmer 1.5s ease-in-out infinite',
-                            } })) : (_jsx("div", { className: `h-full rounded-full transition-all duration-300 ${barColorClass}`, style: { width: `${Math.min(barPercent, 100)}%` } })) }), _jsx("span", { className: "text-muted-foreground w-14 shrink-0 text-right text-sm font-medium tabular-nums", children: formatDuration(durationMs) })] }), _jsxs("div", { className: "ml-[28px] flex items-center gap-3 text-xs", children: [timing.startedAt ? (_jsx("span", { className: "text-muted-foreground/60 tabular-nums", children: formatTimestamp(timing.startedAt) })) : null, totalTokens != null && totalTokens > 0 ? (_jsxs("span", { className: "text-muted-foreground/70 inline-flex items-center gap-0.5", children: [_jsx(Zap, { className: "h-3 w-3 opacity-50" }), formatTokens(totalTokens)] })) : null, timing.costUsd != null && timing.costUsd > 0 ? (_jsxs("span", { className: "text-muted-foreground/70 inline-flex items-center gap-0.5", children: [_jsx(DollarSign, { className: "h-3 w-3 opacity-50" }), formatCost(timing.costUsd)] })) : null] }), (timing.approvalWaitMs != null && timing.approvalWaitMs > 0) ||
-                (timing.waitingApprovalAt && !timing.approvalWaitMs) ? (_jsx(ApprovalWaitRow, { timing: timing, maxDurationMs: maxDurationMs, now: now })) : null] }));
+                            } })) : (_jsx("div", { className: `h-full rounded-full transition-all duration-300 ${barColorClass}`, style: { width: `${Math.min(barPercent, 100)}%` } })) }), _jsx("span", { className: "text-muted-foreground w-14 shrink-0 text-right text-sm font-medium tabular-nums", children: formatDuration(durationMs) })] }), _jsxs("div", { className: "ml-[28px] flex items-center gap-3 text-xs", children: [timing.startedAt ? (_jsx("span", { className: "text-muted-foreground/60 tabular-nums", children: formatTimestamp(timing.startedAt) })) : null, totalTokens != null && totalTokens > 0 ? (_jsxs("span", { className: "text-muted-foreground/70 inline-flex items-center gap-0.5", children: [_jsx(Zap, { className: "h-3 w-3 opacity-50" }), formatTokens(totalTokens)] })) : null, timing.costUsd != null && timing.costUsd > 0 ? (_jsxs("span", { className: "text-muted-foreground/70 inline-flex items-center gap-0.5", children: [_jsx(DollarSign, { className: "h-3 w-3 opacity-50" }), formatCost(timing.costUsd)] })) : null] }), timing.approvalWaitMs != null && timing.approvalWaitMs > 0 ? (_jsx(ApprovalWaitRow, { timing: timing, maxDurationMs: maxDurationMs })) : null] }));
 }
-function ApprovalWaitRow({ timing, maxDurationMs, now, }) {
-    // isWaiting = approval requested but not yet resolved (live state)
-    const isWaiting = !!timing.waitingApprovalAt && !timing.approvalWaitMs;
-    const waitMs = isWaiting
-        ? Math.max(0, now - new Date(String(timing.waitingApprovalAt)).getTime())
-        : (timing.approvalWaitMs ?? 0);
+function ApprovalWaitRow({ timing, maxDurationMs, }) {
+    const waitMs = timing.approvalWaitMs ?? 0;
     const barPercent = maxDurationMs > 0 ? Math.max(2, (waitMs / maxDurationMs) * 100) : 2;
-    return (_jsxs("div", { "data-testid": `approval-wait-${timing.phase}`, className: "ml-[26px] flex items-center gap-2 rounded-md bg-amber-50/50 px-1.5 py-1 dark:bg-amber-950/20", children: [_jsx(Timer, { className: `h-3.5 w-3.5 shrink-0 text-amber-500 ${isWaiting ? 'animate-pulse' : ''}` }), _jsx("span", { className: "text-muted-foreground w-16 shrink-0 text-xs", children: isWaiting ? 'awaiting' : 'approval' }), _jsx("div", { className: "bg-muted relative h-1.5 min-w-0 flex-1 overflow-hidden rounded-full", children: isWaiting ? (_jsx("div", { className: "absolute inset-0 rounded-full", style: {
-                        backgroundImage: 'linear-gradient(90deg, transparent 0%, rgb(245 158 11) 50%, transparent 100%)',
-                        backgroundSize: '200% 100%',
-                        animation: 'shimmer 1.5s ease-in-out infinite',
-                    } })) : (_jsx("div", { className: "h-full rounded-full bg-amber-500", style: { width: `${Math.min(barPercent, 100)}%` } })) }), _jsx("span", { className: "text-muted-foreground w-14 shrink-0 text-right text-xs tabular-nums", children: formatDuration(waitMs) })] }));
+    return (_jsxs("div", { "data-testid": `approval-wait-${timing.phase}`, className: "ml-[26px] flex items-center gap-2 rounded-md bg-amber-50/50 px-1.5 py-1 dark:bg-amber-950/20", children: [_jsx(Timer, { className: "h-3.5 w-3.5 shrink-0 text-amber-500" }), _jsx("span", { className: "text-muted-foreground w-16 shrink-0 text-xs", children: "approval" }), _jsx("div", { className: "bg-muted h-1.5 min-w-0 flex-1 overflow-hidden rounded-full", children: _jsx("div", { className: "h-full rounded-full bg-amber-500", style: { width: `${Math.min(barPercent, 100)}%` } }) }), _jsx("span", { className: "text-muted-foreground w-14 shrink-0 text-right text-xs tabular-nums", children: formatDuration(waitMs) })] }));
 }
 function SummaryTotals({ totalExecMs, totalWaitMs, totalInputTokens, totalOutputTokens, totalCostUsd, }) {
     const totalTokens = totalInputTokens + totalOutputTokens;

package/dist/src/presentation/web/components/common/feature-drawer-tabs/activity-tab.stories.d.ts

@@ -32,20 +32,4 @@ export declare const WithApprovalWaits: Story;
  * Shows the full pattern: start → work → rejected → resumed → work → rejected → resumed → completed
  */
 export declare const FullLifecycle: Story;
-/**
- * Waiting for approval (live) — simulates the case where the agent has completed
- * a phase and is currently waiting for user approval. The "awaiting" sub-row shows
- * a pulsing amber indicator with a live-ticking timer.
- *
- * This covers the bug where the second merge iteration (after rejection + fixes)
- * did not show any approval wait indicator.
- */
-export declare const WaitingForApproval: Story;
-/**
- * Second iteration waiting for approval — simulates the exact reported bug:
- * after rejecting the merge step, the agent fixed things and is now waiting
- * for merge approval again in iteration 2. The activity tab must show the
- * "awaiting" indicator for merge:2.
- */
-export declare const SecondIterationWaitingForApproval: Story;
 //# sourceMappingURL=activity-tab.stories.d.ts.map

package/dist/src/presentation/web/components/common/feature-drawer-tabs/activity-tab.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"activity-tab.stories.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-drawer-tabs/activity-tab.stories.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG7C,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,OAAO,WAAW,CAclC,CAAC;AAEF,eAAe,IAAI,CAAC;AACpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,WAAW,CAAC,CAAC;AAsM1C,2EAA2E;AAC3E,eAAO,MAAM,OAAO,EAAE,KAMrB,CAAC;AAEF,uDAAuD;AACvD,eAAO,MAAM,YAAY,EAAE,KAM1B,CAAC;AAEF,kEAAkE;AAClE,eAAO,MAAM,YAAY,EAAE,KAM1B,CAAC;AAEF,qEAAqE;AACrE,eAAO,MAAM,OAAO,EAAE,KAMrB,CAAC;AAEF,8CAA8C;AAC9C,eAAO,MAAM,KAAK,EAAE,KAMnB,CAAC;AAEF,0CAA0C;AAC1C,eAAO,MAAM,KAAK,EAAE,KAMnB,CAAC;AAEF,0EAA0E;AAC1E,eAAO,MAAM,aAAa,EAAE,KAsE3B,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,EAAE,KAwEhC,CAAC;AAEF,qEAAqE;AACrE,eAAO,MAAM,iBAAiB,EAAE,KAgC/B,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,aAAa,EAAE,KAiI3B,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB,EAAE,KAoChC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,iCAAiC,EAAE,KA0E/C,CAAC"}
+{"version":3,"file":"activity-tab.stories.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-drawer-tabs/activity-tab.stories.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG7C,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,OAAO,WAAW,CAclC,CAAC;AAEF,eAAe,IAAI,CAAC;AACpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,WAAW,CAAC,CAAC;AAsM1C,2EAA2E;AAC3E,eAAO,MAAM,OAAO,EAAE,KAMrB,CAAC;AAEF,uDAAuD;AACvD,eAAO,MAAM,YAAY,EAAE,KAM1B,CAAC;AAEF,kEAAkE;AAClE,eAAO,MAAM,YAAY,EAAE,KAM1B,CAAC;AAEF,qEAAqE;AACrE,eAAO,MAAM,OAAO,EAAE,KAMrB,CAAC;AAEF,8CAA8C;AAC9C,eAAO,MAAM,KAAK,EAAE,KAMnB,CAAC;AAEF,0CAA0C;AAC1C,eAAO,MAAM,KAAK,EAAE,KAMnB,CAAC;AAEF,0EAA0E;AAC1E,eAAO,MAAM,aAAa,EAAE,KAsE3B,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,EAAE,KAwEhC,CAAC;AAEF,qEAAqE;AACrE,eAAO,MAAM,iBAAiB,EAAE,KAgC/B,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,aAAa,EAAE,KAiI3B,CAAC"}

package/dist/src/presentation/web/components/common/feature-drawer-tabs/activity-tab.stories.js

@@ -570,129 +570,3 @@ export const FullLifecycle = {
         error: null,
     },
 };
-/**
- * Waiting for approval (live) — simulates the case where the agent has completed
- * a phase and is currently waiting for user approval. The "awaiting" sub-row shows
- * a pulsing amber indicator with a live-ticking timer.
- *
- * This covers the bug where the second merge iteration (after rejection + fixes)
- * did not show any approval wait indicator.
- */
-export const WaitingForApproval = {
-    args: {
-        timings: [
-            {
-                agentRunId: 'run-1',
-                phase: 'run:started',
-                startedAt: new Date(Date.now() - 120000).toISOString(),
-                durationMs: 0,
-            },
-            {
-                agentRunId: 'run-1',
-                phase: 'analyze',
-                startedAt: new Date(Date.now() - 119000).toISOString(),
-                completedAt: new Date(Date.now() - 105000).toISOString(),
-                durationMs: 14000,
-            },
-            {
-                agentRunId: 'run-1',
-                phase: 'implement',
-                startedAt: new Date(Date.now() - 105000).toISOString(),
-                completedAt: new Date(Date.now() - 60000).toISOString(),
-                durationMs: 45000,
-            },
-            {
-                agentRunId: 'run-1',
-                phase: 'merge',
-                startedAt: new Date(Date.now() - 60000).toISOString(),
-                completedAt: new Date(Date.now() - 30000).toISOString(),
-                durationMs: 30000,
-                // waitingApprovalAt set but approvalWaitMs absent = currently waiting
-                waitingApprovalAt: new Date(Date.now() - 30000).toISOString(),
-            },
-        ],
-        loading: false,
-        error: null,
-    },
-};
-/**
- * Second iteration waiting for approval — simulates the exact reported bug:
- * after rejecting the merge step, the agent fixed things and is now waiting
- * for merge approval again in iteration 2. The activity tab must show the
- * "awaiting" indicator for merge:2.
- */
-export const SecondIterationWaitingForApproval = {
-    args: {
-        timings: [
-            // Iteration 1
-            {
-                agentRunId: 'run-1',
-                phase: 'run:started',
-                startedAt: new Date(Date.now() - 300000).toISOString(),
-                durationMs: 0,
-            },
-            {
-                agentRunId: 'run-1',
-                phase: 'analyze',
-                startedAt: new Date(Date.now() - 299000).toISOString(),
-                completedAt: new Date(Date.now() - 285000).toISOString(),
-                durationMs: 14000,
-            },
-            {
-                agentRunId: 'run-1',
-                phase: 'implement',
-                startedAt: new Date(Date.now() - 285000).toISOString(),
-                completedAt: new Date(Date.now() - 240000).toISOString(),
-                durationMs: 45000,
-            },
-            {
-                agentRunId: 'run-1',
-                phase: 'merge',
-                startedAt: new Date(Date.now() - 240000).toISOString(),
-                completedAt: new Date(Date.now() - 210000).toISOString(),
-                durationMs: 30000,
-                waitingApprovalAt: new Date(Date.now() - 210000).toISOString(),
-                approvalWaitMs: 15000,
-            },
-            {
-                agentRunId: 'run-1',
-                phase: 'run:rejected',
-                startedAt: new Date(Date.now() - 195000).toISOString(),
-                durationMs: 0,
-            },
-            // Iteration 2
-            {
-                agentRunId: 'run-1',
-                phase: 'run:resumed',
-                startedAt: new Date(Date.now() - 180000).toISOString(),
-                durationMs: 0,
-            },
-            {
-                agentRunId: 'run-1',
-                phase: 'implement:2',
-                startedAt: new Date(Date.now() - 180000).toISOString(),
-                completedAt: new Date(Date.now() - 60000).toISOString(),
-                durationMs: 120000,
-            },
-            {
-                agentRunId: 'run-1',
-                phase: 'merge:2',
-                startedAt: new Date(Date.now() - 60000).toISOString(),
-                completedAt: new Date(Date.now() - 30000).toISOString(),
-                durationMs: 30000,
-                // Currently waiting — approvalWaitMs absent
-                waitingApprovalAt: new Date(Date.now() - 30000).toISOString(),
-            },
-        ],
-        rejectionFeedback: [
-            {
-                iteration: 1,
-                message: 'The PR has merge conflicts — rebase on main first',
-                phase: 'merge',
-                timestamp: new Date(Date.now() - 195000).toISOString(),
-            },
-        ],
-        loading: false,
-        error: null,
-    },
-};