@shepai/cli 1.46.0 → 1.48.0

package/dist/src/presentation/web/components/common/merge-review/merge-review.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-review.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/merge-review/merge-review.tsx"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAE,gBAAgB,EAAoB,MAAM,uBAAuB,CAAC;AA0DhF,wBAAgB,WAAW,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAoB,EAAE,EAAE,gBAAgB,2CA4KhG"}

package/dist/src/presentation/web/components/common/merge-review/merge-review.js

@@ -0,0 +1,36 @@
+'use client';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useState } from 'react';
+import { CheckCircle2, ExternalLink, GitMerge, Loader2, XCircle, AlertTriangle, FileDiff, GitCommitHorizontal, GitBranch, ArrowRight, Layers, Send, } from 'lucide-react';
+import { CiStatus } from '../../../../../../packages/core/src/domain/generated/output.js';
+import { Badge } from '../../ui/badge.js';
+import { Button } from '../../ui/button.js';
+import { Input } from '../../ui/input.js';
+function CiStatusBadge({ status }) {
+    switch (status) {
+        case CiStatus.Success:
+            return (_jsxs(Badge, { className: "border-transparent bg-green-50 text-green-700 hover:bg-green-50", children: [_jsx(CheckCircle2, { className: "mr-1 h-3.5 w-3.5" }), "Passing"] }));
+        case CiStatus.Pending:
+            return (_jsxs(Badge, { className: "border-transparent bg-yellow-50 text-yellow-700 hover:bg-yellow-50", children: [_jsx(Loader2, { className: "mr-1 h-3.5 w-3.5 animate-spin" }), "Pending"] }));
+        case CiStatus.Failure:
+            return (_jsxs(Badge, { className: "border-transparent bg-red-50 text-red-700 hover:bg-red-50", children: [_jsx(XCircle, { className: "mr-1 h-3.5 w-3.5" }), "Failing"] }));
+    }
+}
+function PhaseList({ phases }) {
+    return (_jsx("div", { className: "border-border rounded-lg border", children: _jsxs("div", { className: "px-4 py-3", children: [_jsxs("div", { className: "mb-3 flex items-center gap-2", children: [_jsx(Layers, { className: "text-muted-foreground h-4 w-4" }), _jsx("span", { className: "text-foreground text-xs font-semibold", children: "Implementation Phases" })] }), _jsx("ol", { className: "space-y-2", children: phases.map((phase, i) => (_jsxs("li", { className: "flex items-start gap-2.5", children: [_jsx("span", { className: "flex h-5 w-5 shrink-0 items-center justify-center rounded-full bg-emerald-100 text-[10px] font-bold text-emerald-700", children: i + 1 }), _jsxs("div", { className: "min-w-0", children: [_jsx("span", { className: "text-foreground text-xs font-medium", children: phase.name }), phase.description ? (_jsx("p", { className: "text-muted-foreground mt-0.5 text-[11px] leading-relaxed", children: phase.description })) : null] })] }, phase.id))) })] }) }));
+}
+export function MergeReview({ data, onApprove, onRefine, isProcessing = false }) {
+    const { pr, diffSummary, phases, branch, warning } = data;
+    const [chatInput, setChatInput] = useState('');
+    function handleSubmit(e) {
+        e.preventDefault();
+        const text = chatInput.trim();
+        if (!text)
+            return;
+        onRefine(text);
+        setChatInput('');
+    }
+    return (_jsxs("div", { className: "flex h-full flex-col", children: [_jsxs("div", { className: "flex-1 space-y-4 overflow-y-auto p-4", children: [_jsxs("div", { className: "flex items-start gap-3", children: [_jsx("div", { className: "mt-1.5 h-2.5 w-2.5 shrink-0 rounded-full bg-emerald-500" }), _jsxs("div", { className: "flex-1", children: [_jsx("h2", { className: "text-foreground text-sm font-bold", children: "Merge Review" }), _jsx("p", { className: "text-muted-foreground mt-1 text-xs leading-relaxed", children: pr
+                                            ? 'Review the pull request details and approve to merge.'
+                                            : 'Review the changes and approve to merge.' })] })] }), branch ? (_jsx("div", { className: "border-border rounded-lg border", children: _jsxs("div", { className: "flex items-center gap-2 px-4 py-3", children: [_jsx(GitBranch, { className: "text-muted-foreground h-4 w-4 shrink-0" }), _jsx(Badge, { variant: "secondary", className: "font-mono text-[11px]", children: branch.source }), _jsx(ArrowRight, { className: "text-muted-foreground h-3.5 w-3.5 shrink-0" }), _jsx(Badge, { variant: "outline", className: "font-mono text-[11px]", children: branch.target })] }) })) : null, pr ? (_jsx("div", { className: "border-border rounded-lg border", children: _jsxs("div", { className: "space-y-3 px-4 py-3", children: [_jsxs("div", { className: "flex items-center justify-between", children: [_jsxs("a", { href: pr.url, target: "_blank", rel: "noopener noreferrer", className: "text-primary flex items-center gap-1.5 text-sm font-semibold underline underline-offset-2", children: ["PR #", pr.number, _jsx(ExternalLink, { className: "h-3.5 w-3.5" })] }), _jsx(Badge, { variant: "outline", className: "text-xs", children: pr.status })] }), pr.ciStatus ? (_jsxs("div", { className: "flex items-center justify-between", children: [_jsx("span", { className: "text-muted-foreground text-xs font-medium", children: "CI Status" }), _jsx(CiStatusBadge, { status: pr.ciStatus })] })) : null, pr.commitHash ? (_jsxs("div", { className: "flex items-center justify-between", children: [_jsx("span", { className: "text-muted-foreground text-xs font-medium", children: "Commit" }), _jsxs("div", { className: "flex items-center gap-1.5", children: [_jsx(GitCommitHorizontal, { className: "text-muted-foreground h-3.5 w-3.5" }), _jsx("code", { className: "bg-muted text-foreground rounded-md px-1.5 py-0.5 font-mono text-[11px]", children: pr.commitHash.slice(0, 7) })] })] })) : null] }) })) : null, diffSummary ? (_jsx("div", { className: "border-border rounded-lg border", children: _jsxs("div", { className: "px-4 py-3", children: [_jsxs("div", { className: "mb-3 flex items-center gap-2", children: [_jsx(FileDiff, { className: "text-muted-foreground h-4 w-4" }), _jsx("span", { className: "text-foreground text-xs font-semibold", children: "Changes" })] }), _jsxs("div", { className: "grid grid-cols-4 gap-3", children: [_jsxs("div", { className: "text-center", children: [_jsx("div", { className: "text-foreground text-sm font-bold", children: diffSummary.filesChanged }), _jsx("div", { className: "text-muted-foreground text-[10px]", children: "files" })] }), _jsxs("div", { className: "text-center", children: [_jsxs("div", { className: "text-sm font-bold text-green-600", children: ["+", diffSummary.additions] }), _jsx("div", { className: "text-muted-foreground text-[10px]", children: "additions" })] }), _jsxs("div", { className: "text-center", children: [_jsxs("div", { className: "text-sm font-bold text-red-600", children: ["-", diffSummary.deletions] }), _jsx("div", { className: "text-muted-foreground text-[10px]", children: "deletions" })] }), _jsxs("div", { className: "text-center", children: [_jsx("div", { className: "text-foreground text-sm font-bold", children: diffSummary.commitCount }), _jsx("div", { className: "text-muted-foreground text-[10px]", children: "commits" })] })] })] }) })) : warning ? (_jsx("div", { className: "border-border rounded-lg border", children: _jsxs("div", { className: "flex items-center gap-2 px-4 py-3", children: [_jsx(AlertTriangle, { className: "text-muted-foreground h-4 w-4 shrink-0" }), _jsx("span", { className: "text-muted-foreground text-xs", children: warning })] }) })) : null, phases && phases.length > 0 ? _jsx(PhaseList, { phases: phases }) : null] }), _jsxs("div", { className: "border-border shrink-0 border-t", children: [_jsxs("form", { onSubmit: handleSubmit, className: "flex items-center gap-2 p-4 pb-2", children: [_jsx(Input, { type: "text", placeholder: "Ask AI to revise before merging...", "aria-label": "Ask AI to revise before merging", disabled: isProcessing, value: chatInput, onChange: (e) => setChatInput(e.target.value), className: "flex-1" }), _jsx(Button, { type: "submit", variant: "secondary", size: "icon", "aria-label": "Send", disabled: isProcessing, children: _jsx(Send, {}) })] }), _jsx("div", { className: "px-4 pt-2 pb-4", children: _jsxs(Button, { type: "button", className: "w-full", disabled: isProcessing, onClick: onApprove, "aria-label": "Approve Merge", children: [isProcessing ? (_jsx(Loader2, { className: "mr-1.5 h-4 w-4 animate-spin" })) : (_jsx(GitMerge, { className: "mr-1.5 h-4 w-4" })), "Approve Merge"] }) })] })] }));
+}

package/dist/src/presentation/web/components/common/merge-review/merge-review.stories.d.ts

@@ -0,0 +1,32 @@
+import type { Meta, StoryObj } from '@storybook/react';
+import { MergeReview } from './merge-review.js';
+import { MergeReviewDrawer } from './merge-review-drawer.js';
+declare const meta: Meta<typeof MergeReview>;
+export default meta;
+type Story = StoryObj<typeof MergeReview>;
+/** Default — all data present with CI success. */
+export declare const Default: Story;
+/** CI status is Pending — shows yellow badge with spinner. */
+export declare const CIPending: Story;
+/** CI status is Failure — shows red badge. */
+export declare const CIFailure: Story;
+/** Diff summary unavailable — shows warning message. */
+export declare const NoDiffSummary: Story;
+/** CI status undefined — CI section omitted entirely. */
+export declare const NoCIStatus: Story;
+/** Processing state — approve button disabled with spinner. */
+export declare const Processing: Story;
+/** No PR — merge without a pull request, shows branch direction and diff summary. */
+export declare const NoPrWithDiff: Story;
+/** No PR and no diff — bare merge approval with branch info. */
+export declare const NoPrNoDiff: Story;
+/** With implementation phases shown. */
+export declare const WithPhases: Story;
+type DrawerStory = StoryObj<typeof MergeReviewDrawer>;
+/** Merge review drawer with full data. */
+export declare const InDrawer: DrawerStory;
+/** Drawer with delete button visible. */
+export declare const WithDeleteButton: DrawerStory;
+/** Drawer without PR — direct merge with diff summary and branch info. */
+export declare const InDrawerNoPr: DrawerStory;
+//# sourceMappingURL=merge-review.stories.d.ts.map

package/dist/src/presentation/web/components/common/merge-review/merge-review.stories.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-review.stories.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/merge-review/merge-review.stories.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAGvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAsC1D,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,OAAO,WAAW,CAclC,CAAC;AAEF,eAAe,IAAI,CAAC;AACpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,WAAW,CAAC,CAAC;AAE1C,kDAAkD;AAClD,eAAO,MAAM,OAAO,EAAE,KAKrB,CAAC;AAEF,8DAA8D;AAC9D,eAAO,MAAM,SAAS,EAAE,KAQvB,CAAC;AAEF,8CAA8C;AAC9C,eAAO,MAAM,SAAS,EAAE,KAQvB,CAAC;AAEF,wDAAwD;AACxD,eAAO,MAAM,aAAa,EAAE,KAS3B,CAAC;AAEF,yDAAyD;AACzD,eAAO,MAAM,UAAU,EAAE,KAQxB,CAAC;AAEF,+DAA+D;AAC/D,eAAO,MAAM,UAAU,EAAE,KAMxB,CAAC;AAEF,qFAAqF;AACrF,eAAO,MAAM,YAAY,EAAE,KAS1B,CAAC;AAEF,gEAAgE;AAChE,eAAO,MAAM,UAAU,EAAE,KAQxB,CAAC;AAEF,wCAAwC;AACxC,eAAO,MAAM,UAAU,EAAE,KAQxB,CAAC;AAIF,KAAK,WAAW,GAAG,QAAQ,CAAC,OAAO,iBAAiB,CAAC,CAAC;AA8BtD,0CAA0C;AAC1C,eAAO,MAAM,QAAQ,EAAE,WAYtB,CAAC;AAEF,yCAAyC;AACzC,eAAO,MAAM,gBAAgB,EAAE,WAa9B,CAAC;AAEF,0EAA0E;AAC1E,eAAO,MAAM,YAAY,EAAE,WAiB1B,CAAC"}

package/dist/src/presentation/web/components/common/merge-review/merge-review.stories.js

@@ -0,0 +1,165 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useState } from 'react';
+import { fn } from '@storybook/test';
+import { PrStatus, CiStatus } from '../../../../../../packages/core/src/domain/generated/output.js';
+import { MergeReview } from './merge-review.js';
+import { MergeReviewDrawer } from './merge-review-drawer.js';
+const fullPr = {
+    url: 'https://github.com/shep-ai/cli/pull/42',
+    number: 42,
+    status: PrStatus.Open,
+    commitHash: 'a1b2c3d4e5f6789',
+    ciStatus: CiStatus.Success,
+};
+const samplePhases = [
+    { id: 'phase-1', name: 'Foundation & Config', description: 'Set up types and server action' },
+    { id: 'phase-2', name: 'Component Implementation', description: 'Build the merge review UI' },
+    { id: 'phase-3', name: 'Integration & Wiring', description: 'Connect to control center' },
+];
+const sampleBranch = { source: 'feat/add-auth', target: 'main' };
+const fullData = {
+    pr: fullPr,
+    branch: sampleBranch,
+    phases: samplePhases,
+    diffSummary: {
+        filesChanged: 12,
+        additions: 340,
+        deletions: 85,
+        commitCount: 5,
+    },
+};
+const defaultActions = {
+    onApprove: fn().mockName('onApprove'),
+    onRefine: fn().mockName('onRefine'),
+};
+/* ─── Standalone MergeReview ─── */
+const meta = {
+    title: 'Common/MergeReview',
+    component: MergeReview,
+    tags: ['autodocs'],
+    parameters: {
+        layout: 'fullscreen',
+    },
+    decorators: [
+        (Story) => (_jsx("div", { style: { height: '600px', width: '400px', border: '1px solid var(--color-border)' }, children: _jsx(Story, {}) })),
+    ],
+};
+export default meta;
+/** Default — all data present with CI success. */
+export const Default = {
+    args: {
+        data: fullData,
+        ...defaultActions,
+    },
+};
+/** CI status is Pending — shows yellow badge with spinner. */
+export const CIPending = {
+    args: {
+        data: {
+            ...fullData,
+            pr: { ...fullPr, ciStatus: CiStatus.Pending },
+        },
+        ...defaultActions,
+    },
+};
+/** CI status is Failure — shows red badge. */
+export const CIFailure = {
+    args: {
+        data: {
+            ...fullData,
+            pr: { ...fullPr, ciStatus: CiStatus.Failure },
+        },
+        ...defaultActions,
+    },
+};
+/** Diff summary unavailable — shows warning message. */
+export const NoDiffSummary = {
+    args: {
+        data: {
+            pr: fullPr,
+            branch: sampleBranch,
+            warning: 'Diff statistics unavailable — worktree may have been removed',
+        },
+        ...defaultActions,
+    },
+};
+/** CI status undefined — CI section omitted entirely. */
+export const NoCIStatus = {
+    args: {
+        data: {
+            ...fullData,
+            pr: { ...fullPr, ciStatus: undefined },
+        },
+        ...defaultActions,
+    },
+};
+/** Processing state — approve button disabled with spinner. */
+export const Processing = {
+    args: {
+        data: fullData,
+        ...defaultActions,
+        isProcessing: true,
+    },
+};
+/** No PR — merge without a pull request, shows branch direction and diff summary. */
+export const NoPrWithDiff = {
+    args: {
+        data: {
+            branch: { source: 'feat/fix-login', target: 'main' },
+            phases: samplePhases,
+            diffSummary: fullData.diffSummary,
+        },
+        ...defaultActions,
+    },
+};
+/** No PR and no diff — bare merge approval with branch info. */
+export const NoPrNoDiff = {
+    args: {
+        data: {
+            branch: { source: 'feat/fix-login', target: 'main' },
+            warning: 'No PR or diff data available',
+        },
+        ...defaultActions,
+    },
+};
+/** With implementation phases shown. */
+export const WithPhases = {
+    args: {
+        data: {
+            ...fullData,
+            phases: samplePhases,
+        },
+        ...defaultActions,
+    },
+};
+const drawerMeta = {
+    title: 'Common/MergeReviewDrawer',
+    component: MergeReviewDrawer,
+    tags: ['autodocs'],
+    parameters: {
+        layout: 'fullscreen',
+    },
+};
+function DrawerTemplate(props) {
+    const [open, setOpen] = useState(true);
+    return (_jsxs("div", { style: { height: '100vh', background: '#f8fafc', padding: '2rem' }, children: [_jsx("button", { type: "button", onClick: () => setOpen(true), style: { padding: '8px 16px', border: '1px solid #ccc', borderRadius: '6px' }, children: "Open Drawer" }), _jsx(MergeReviewDrawer, { ...props, open: open, onClose: () => setOpen(false) })] }));
+}
+/** Merge review drawer with full data. */
+export const InDrawer = {
+    ...drawerMeta,
+    render: () => (_jsx(DrawerTemplate, { featureName: "Add User Authentication", featureId: "FEAT-042", repositoryPath: "/home/user/projects/my-app", branch: "feat/add-auth", data: fullData, ...defaultActions })),
+};
+/** Drawer with delete button visible. */
+export const WithDeleteButton = {
+    ...drawerMeta,
+    render: () => (_jsx(DrawerTemplate, { featureName: "Add User Authentication", featureId: "FEAT-042", repositoryPath: "/home/user/projects/my-app", branch: "feat/add-auth", data: fullData, ...defaultActions, onDelete: fn().mockName('onDelete') })),
+};
+/** Drawer without PR — direct merge with diff summary and branch info. */
+export const InDrawerNoPr = {
+    ...drawerMeta,
+    render: () => (_jsx(DrawerTemplate, { featureName: "Fix Login Bug", featureId: "FEAT-099", repositoryPath: "/home/user/projects/my-app", branch: "feat/fix-login", data: {
+            branch: { source: 'feat/fix-login', target: 'main' },
+            phases: samplePhases,
+            diffSummary: fullData.diffSummary,
+        }, ...defaultActions, onDelete: fn().mockName('onDelete') })),
+};

package/dist/src/presentation/web/components/features/control-center/control-center-inner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"control-center-inner.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/features/control-center/control-center-inner.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAO1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAS5E,UAAU,uBAAuB;IAC/B,YAAY,EAAE,cAAc,EAAE,CAAC;IAC/B,YAAY,EAAE,IAAI,EAAE,CAAC;CACtB;AAED,wBAAgB,kBAAkB,CAAC,EAAE,YAAY,EAAE,YAAY,EAAE,EAAE,uBAAuB,2CA+PzF"}
+{"version":3,"file":"control-center-inner.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/features/control-center/control-center-inner.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAW1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAU5E,UAAU,uBAAuB;IAC/B,YAAY,EAAE,cAAc,EAAE,CAAC;IAC/B,YAAY,EAAE,IAAI,EAAE,CAAC;CACtB;AAED,wBAAgB,kBAAkB,CAAC,EAAE,YAAY,EAAE,YAAY,EAAE,EAAE,uBAAuB,2CAyVzF"}

package/dist/src/presentation/web/components/features/control-center/control-center-inner.js

@@ -5,15 +5,27 @@ import { toast } from 'sonner';
 import { approveFeature } from '../../../app/actions/approve-feature.js';
 import { getFeatureArtifact } from '../../../app/actions/get-feature-artifact.js';
 import { getResearchArtifact } from '../../../app/actions/get-research-artifact.js';
+import { getWorkflowDefaults } from '../../../app/actions/get-workflow-defaults.js';
+import { getMergeReviewData } from '../../../app/actions/get-merge-review-data.js';
 import { FeaturesCanvas } from '../../features/features-canvas/index.js';
 import { FeatureDrawer, FeatureCreateDrawer } from '../../common/index.js';
 import { PrdQuestionnaireDrawer } from '../../common/prd-questionnaire/index.js';
 import { TechDecisionsDrawer } from '../../common/tech-decisions-review/index.js';
+import { MergeReviewDrawer } from '../../common/merge-review/index.js';
 import { NotificationPermissionBanner } from '../../common/notification-permission-banner/index.js';
 import { ControlCenterEmptyState } from './control-center-empty-state.js';
 import { useControlCenterState } from './use-control-center-state.js';
 export function ControlCenterInner({ initialNodes, initialEdges }) {
     const { nodes, edges, selectedNode, isCreateDrawerOpen, isDeleting, pendingRepositoryPath, onNodesChange, handleConnect, handleAddFeature, handleAddFeatureToRepo, handleAddFeatureToFeature, handleAddRepository, handleNodeClick, clearSelection, handleCreateFeatureSubmit, handleDeleteFeature, handleDeleteRepository, closeCreateDrawer, } = useControlCenterState(initialNodes, initialEdges);
+    // Workflow defaults for the create-feature drawer
+    const [workflowDefaults, setWorkflowDefaults] = useState();
+    useEffect(() => {
+        getWorkflowDefaults()
+            .then(setWorkflowDefaults)
+            .catch(() => {
+            // Settings unavailable — drawer falls back to all-false defaults
+        });
+    }, []);
     // PRD questionnaire drawer state
     const [prdSelections, setPrdSelections] = useState({});
     const [isPrdProcessing, setIsPrdProcessing] = useState(false);
@@ -22,8 +34,12 @@ export function ControlCenterInner({ initialNodes, initialEdges }) {
     // Tech decisions drawer state
     const [techDecisionsData, setTechDecisionsData] = useState(null);
     const [isLoadingTechDecisions, setIsLoadingTechDecisions] = useState(false);
+    // Merge review drawer state
+    const [mergeReviewData, setMergeReviewData] = useState(null);
+    const [isLoadingMergeReview, setIsLoadingMergeReview] = useState(false);
     const showPrdDrawer = selectedNode?.lifecycle === 'requirements' && selectedNode?.state === 'action-required';
     const showTechDecisionsDrawer = selectedNode?.lifecycle === 'implementation' && selectedNode?.state === 'action-required';
+    const showMergeReviewDrawer = selectedNode?.lifecycle === 'review' && selectedNode?.state === 'action-required';
     const handlePrdSelect = useCallback((questionId, optionId) => {
         setPrdSelections((prev) => ({ ...prev, [questionId]: optionId }));
     }, []);
@@ -65,6 +81,24 @@ export function ControlCenterInner({ initialNodes, initialEdges }) {
         toast.success('Plan approved — agent resuming');
         clearSelection();
     }, [selectedNode?.featureId, clearSelection]);
+    const handleMergeApprove = useCallback(async () => {
+        const featureId = selectedNode?.featureId;
+        if (!featureId)
+            return;
+        const result = await approveFeature(featureId);
+        if (!result.approved) {
+            toast.error(result.error ?? 'Failed to approve merge');
+            return;
+        }
+        toast.success('Merge approved — agent resuming');
+        clearSelection();
+    }, [selectedNode?.featureId, clearSelection]);
+    const handleMergeRefine = useCallback(async (_text) => {
+        setIsLoadingMergeReview(true);
+        // TODO: Call API to refine merge
+        await new Promise((resolve) => setTimeout(resolve, 1500));
+        setIsLoadingMergeReview(false);
+    }, []);
     // Fetch questionnaire data and reset selections when a different feature is selected
     const prdFeatureId = showPrdDrawer ? selectedNode?.featureId : null;
     useEffect(() => {
@@ -138,6 +172,36 @@ export function ControlCenterInner({ initialNodes, initialEdges }) {
             cancelled = true;
         };
     }, [techDecisionsFeatureId]);
+    // Fetch merge review data when a feature is in review + action-required
+    const mergeFeatureId = showMergeReviewDrawer ? selectedNode?.featureId : null;
+    useEffect(() => {
+        setMergeReviewData(null);
+        if (!mergeFeatureId)
+            return;
+        let cancelled = false;
+        setIsLoadingMergeReview(true);
+        getMergeReviewData(mergeFeatureId)
+            .then((result) => {
+            if (cancelled)
+                return;
+            if ('error' in result) {
+                toast.error(result.error);
+                return;
+            }
+            setMergeReviewData(result);
+        })
+            .catch(() => {
+            if (!cancelled)
+                toast.error('Failed to load merge review data');
+        })
+            .finally(() => {
+            if (!cancelled)
+                setIsLoadingMergeReview(false);
+        });
+        return () => {
+            cancelled = true;
+        };
+    }, [mergeFeatureId]);
     const hasRepositories = nodes.some((n) => n.type === 'repositoryNode');
     // Listen for global "open create drawer" events from the sidebar
     useEffect(() => {
@@ -146,7 +210,7 @@ export function ControlCenterInner({ initialNodes, initialEdges }) {
         return () => window.removeEventListener('shep:open-create-drawer', handler);
     }, [handleAddFeature]);
     if (!hasRepositories) {
-        return (_jsxs(_Fragment, { children: [_jsx(NotificationPermissionBanner, {}), _jsx(ControlCenterEmptyState, { onRepositorySelect: handleAddRepository }), _jsx(FeatureCreateDrawer, { open: isCreateDrawerOpen, onClose: closeCreateDrawer, onSubmit: handleCreateFeatureSubmit, repositoryPath: pendingRepositoryPath })] }));
+        return (_jsxs(_Fragment, { children: [_jsx(NotificationPermissionBanner, {}), _jsx(ControlCenterEmptyState, { onRepositorySelect: handleAddRepository }), _jsx(FeatureCreateDrawer, { open: isCreateDrawerOpen, onClose: closeCreateDrawer, onSubmit: handleCreateFeatureSubmit, repositoryPath: pendingRepositoryPath, workflowDefaults: workflowDefaults })] }));
     }
-    return (_jsxs(_Fragment, { children: [_jsx(NotificationPermissionBanner, {}), _jsx(FeaturesCanvas, { nodes: nodes, edges: edges, onNodesChange: onNodesChange, onConnect: handleConnect, onAddFeature: handleAddFeature, onNodeAction: handleAddFeatureToFeature, onNodeClick: handleNodeClick, onPaneClick: clearSelection, onRepositoryAdd: handleAddFeatureToRepo, onRepositoryDelete: handleDeleteRepository, onRepositorySelect: handleAddRepository, emptyState: _jsx(ControlCenterEmptyState, { onRepositorySelect: handleAddRepository }) }), _jsx(FeatureDrawer, { selectedNode: showPrdDrawer || showTechDecisionsDrawer ? null : selectedNode, onClose: clearSelection, onDelete: handleDeleteFeature, isDeleting: isDeleting }), questionnaireData ? (_jsx(PrdQuestionnaireDrawer, { open: showPrdDrawer, onClose: clearSelection, featureName: selectedNode?.name ?? '', featureDescription: selectedNode?.description, featureId: selectedNode?.featureId, repositoryPath: selectedNode?.repositoryPath, branch: selectedNode?.branch, specPath: selectedNode?.specPath, data: questionnaireData, selections: prdSelections, onSelect: handlePrdSelect, onRefine: handlePrdRefine, onApprove: handlePrdApprove, onDelete: handleDeleteFeature, isDeleting: isDeleting, isProcessing: isPrdProcessing || isLoadingQuestionnaire })) : null, techDecisionsData ? (_jsx(TechDecisionsDrawer, { open: showTechDecisionsDrawer, onClose: clearSelection, featureName: selectedNode?.name ?? '', featureId: selectedNode?.featureId, repositoryPath: selectedNode?.repositoryPath, branch: selectedNode?.branch, specPath: selectedNode?.specPath, data: techDecisionsData, onRefine: handleTechDecisionsRefine, onApprove: handleTechDecisionsApprove, onDelete: handleDeleteFeature, isDeleting: isDeleting, isProcessing: isLoadingTechDecisions })) : null, _jsx(FeatureCreateDrawer, { open: isCreateDrawerOpen, onClose: closeCreateDrawer, onSubmit: handleCreateFeatureSubmit, repositoryPath: pendingRepositoryPath })] }));
+    return (_jsxs(_Fragment, { children: [_jsx(NotificationPermissionBanner, {}), _jsx(FeaturesCanvas, { nodes: nodes, edges: edges, onNodesChange: onNodesChange, onConnect: handleConnect, onAddFeature: handleAddFeature, onNodeAction: handleAddFeatureToFeature, onNodeClick: handleNodeClick, onPaneClick: clearSelection, onRepositoryAdd: handleAddFeatureToRepo, onRepositoryDelete: handleDeleteRepository, onRepositorySelect: handleAddRepository, emptyState: _jsx(ControlCenterEmptyState, { onRepositorySelect: handleAddRepository }) }), _jsx(FeatureDrawer, { selectedNode: showPrdDrawer || showTechDecisionsDrawer || showMergeReviewDrawer ? null : selectedNode, onClose: clearSelection, onDelete: handleDeleteFeature, isDeleting: isDeleting }), questionnaireData ? (_jsx(PrdQuestionnaireDrawer, { open: showPrdDrawer, onClose: clearSelection, featureName: selectedNode?.name ?? '', featureDescription: selectedNode?.description, featureId: selectedNode?.featureId, repositoryPath: selectedNode?.repositoryPath, branch: selectedNode?.branch, specPath: selectedNode?.specPath, data: questionnaireData, selections: prdSelections, onSelect: handlePrdSelect, onRefine: handlePrdRefine, onApprove: handlePrdApprove, onDelete: handleDeleteFeature, isDeleting: isDeleting, isProcessing: isPrdProcessing || isLoadingQuestionnaire })) : null, techDecisionsData ? (_jsx(TechDecisionsDrawer, { open: showTechDecisionsDrawer, onClose: clearSelection, featureName: selectedNode?.name ?? '', featureId: selectedNode?.featureId, repositoryPath: selectedNode?.repositoryPath, branch: selectedNode?.branch, specPath: selectedNode?.specPath, data: techDecisionsData, onRefine: handleTechDecisionsRefine, onApprove: handleTechDecisionsApprove, onDelete: handleDeleteFeature, isDeleting: isDeleting, isProcessing: isLoadingTechDecisions })) : null, mergeReviewData ? (_jsx(MergeReviewDrawer, { open: showMergeReviewDrawer, onClose: clearSelection, featureName: selectedNode?.name ?? '', featureId: selectedNode?.featureId, repositoryPath: selectedNode?.repositoryPath, branch: selectedNode?.branch, specPath: selectedNode?.specPath, data: mergeReviewData, onApprove: handleMergeApprove, onRefine: handleMergeRefine, onDelete: handleDeleteFeature, isDeleting: isDeleting, isProcessing: isLoadingMergeReview })) : null, _jsx(FeatureCreateDrawer, { open: isCreateDrawerOpen, onClose: closeCreateDrawer, onSubmit: handleCreateFeatureSubmit, repositoryPath: pendingRepositoryPath, workflowDefaults: workflowDefaults })] }));
 }

package/dist/src/presentation/web/components/features/control-center/control-center.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"control-center.stories.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/features/control-center/control-center.stories.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAQjD,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,OAAO,aAAa,CAgBpC,CAAC;AAEF,eAAe,IAAI,CAAC;AACpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,IAAI,CAAC,CAAC;AAkEnC,eAAO,MAAM,KAAK,EAAE,KAKnB,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,KAQ1B,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,KAKzB,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,KAS7B,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,WAAW,EAAE,KAYzB,CAAC;AAwIF;;;;;;GAMG;AACH,eAAO,MAAM,WAAW,EAAE,KAKzB,CAAC"}
+{"version":3,"file":"control-center.stories.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/features/control-center/control-center.stories.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAQjD,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,OAAO,aAAa,CAgBpC,CAAC;AAEF,eAAe,IAAI,CAAC;AACpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,IAAI,CAAC,CAAC;AAiFnC,eAAO,MAAM,KAAK,EAAE,KAKnB,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,KAQ1B,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,KAKzB,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,KAS7B,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,WAAW,EAAE,KAYzB,CAAC;AAwIF;;;;;;GAMG;AACH,eAAO,MAAM,WAAW,EAAE,KAKzB,CAAC"}

package/dist/src/presentation/web/components/features/control-center/control-center.stories.js

@@ -60,6 +60,21 @@ const featureNodes = [
             branch: 'feat/api-gateway',
         },
     },
+    {
+        id: 'feat-4',
+        type: 'featureNode',
+        position: { x: 800, y: 345 },
+        data: {
+            name: 'Merge Review',
+            description: 'PR ready for merge approval',
+            featureId: '#f4',
+            lifecycle: 'review',
+            state: 'action-required',
+            progress: 90,
+            repositoryPath: '/home/user/my-repo',
+            branch: 'feat/merge-review',
+        },
+    },
 ];
 const repoNode = {
     id: 'repo-1',

package/dist/src/presentation/web/components/features/control-center/use-control-center-state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-control-center-state.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/features/control-center/use-control-center-state.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACtF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAmB,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAOhF,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,YAAY,EAAE,eAAe,GAAG,IAAI,CAAC;IACrC,kBAAkB,EAAE,OAAO,CAAC;IAC5B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,aAAa,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,cAAc,CAAC,EAAE,KAAK,IAAI,CAAC;IAC/D,aAAa,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,CAAC;IAChD,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,eAAe,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,EAAE,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;IACzE,gBAAgB,EAAE,MAAM,IAAI,CAAC;IAC7B,sBAAsB,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;IACrD,yBAAyB,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3D,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,YAAY,EAAE,CAAC,SAAS,EAAE,eAAe,KAAK,IAAI,CAAC;IACnD,yBAAyB,EAAE,CAAC,IAAI,EAAE,oBAAoB,KAAK,IAAI,CAAC;IAChE,iBAAiB,EAAE,MAAM,IAAI,CAAC;IAC9B,mBAAmB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,sBAAsB,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAChE,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,CACjB,YAAY,EAAE,MAAM,GAAG,IAAI,EAC3B,YAAY,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,KACpC,MAAM,CAAC;CACb;AAID,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,cAAc,EAAE,EAC9B,YAAY,EAAE,IAAI,EAAE,GACnB,kBAAkB,CAwepB"}
+{"version":3,"file":"use-control-center-state.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/features/control-center/use-control-center-state.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACtF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAmB,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAOhF,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,YAAY,EAAE,eAAe,GAAG,IAAI,CAAC;IACrC,kBAAkB,EAAE,OAAO,CAAC;IAC5B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,aAAa,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,cAAc,CAAC,EAAE,KAAK,IAAI,CAAC;IAC/D,aAAa,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,CAAC;IAChD,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,eAAe,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,EAAE,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;IACzE,gBAAgB,EAAE,MAAM,IAAI,CAAC;IAC7B,sBAAsB,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;IACrD,yBAAyB,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3D,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,YAAY,EAAE,CAAC,SAAS,EAAE,eAAe,KAAK,IAAI,CAAC;IACnD,yBAAyB,EAAE,CAAC,IAAI,EAAE,oBAAoB,KAAK,IAAI,CAAC;IAChE,iBAAiB,EAAE,MAAM,IAAI,CAAC;IAC9B,mBAAmB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,sBAAsB,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAChE,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,CACjB,YAAY,EAAE,MAAM,GAAG,IAAI,EAC3B,YAAY,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,KACpC,MAAM,CAAC;CACb;AAID,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,cAAc,EAAE,EAC9B,YAAY,EAAE,IAAI,EAAE,GACnB,kBAAkB,CAsgBpB"}

package/dist/src/presentation/web/components/features/control-center/use-control-center-state.js

@@ -273,8 +273,17 @@ export function useControlCenterState(initialNodes, initialEdges) {
                 return;
             }
             setSelectedNode(null);
-            setNodes((prev) => prev.filter((n) => n.id !== featureId));
-            setEdges((prev) => prev.filter((e) => e.source !== featureId && e.target !== featureId));
+            setNodes((currentNodes) => {
+                const remainingNodes = currentNodes.filter((n) => n.id !== featureId);
+                const remainingEdges = edges.filter((e) => e.source !== featureId && e.target !== featureId);
+                const result = layoutWithDagre(remainingNodes, remainingEdges, {
+                    direction: 'LR',
+                    ranksep: 200,
+                    nodesep: 60,
+                });
+                setEdges(result.edges);
+                return result.nodes;
+            });
             toast.success('Feature deleted successfully');
             router.refresh();
         }
@@ -284,7 +293,7 @@ export function useControlCenterState(initialNodes, initialEdges) {
         finally {
             setIsDeleting(false);
         }
-    }, [router]);
+    }, [router, edges]);
     const handleDeleteRepository = useCallback(async (repositoryId) => {
         const repoNodeId = `repo-${repositoryId}`;
         // Optimistic: remove node and its edges immediately
@@ -332,27 +341,31 @@ export function useControlCenterState(initialNodes, initialEdges) {
             .split(/[\\/]/)
             .pop() ?? path;
         // Optimistic UI: add node immediately
+        let savedAddRepoY = 0;
         setNodes((currentNodes) => {
             const repoNodes = currentNodes.filter((n) => n.type === 'repositoryNode');
             const addRepoNode = currentNodes.find((n) => n.type === 'addRepositoryNode');
-            // Place in the repo column, below the last existing repo node
+            // Save addRepoNode's original Y for rollback on error
+            if (addRepoNode)
+                savedAddRepoY = addRepoNode.position.y;
+            // Place in the repo column, at the addRepoNode's current position
             const repoX = repoNodes[0]?.position.x ?? addRepoNode?.position.x ?? 50;
             const repoHeight = 50; // repositoryNode height
             const gap = 15; // match dagre nodesep
-            const lastRepoBottomY = repoNodes.length > 0
-                ? Math.max(...repoNodes.map((n) => n.position.y)) + repoHeight
-                : addRepoNode
-                    ? addRepoNode.position.y
-                    : 0;
-            const position = { x: repoX, y: lastRepoBottomY + gap };
+            const position = {
+                x: repoX,
+                y: addRepoNode ? addRepoNode.position.y : 0,
+            };
             const newNode = {
                 id: tempId,
                 type: 'repositoryNode',
                 position,
                 data: { name: repoName, repositoryPath: path, id: tempId },
             };
-            // Move addRepo button below the new node
-            const addRepoY = position.y + repoHeight + gap;
+            // Shift addRepo button down by exactly one slot
+            const addRepoY = addRepoNode
+                ? addRepoNode.position.y + repoHeight + gap
+                : position.y + repoHeight + gap;
             return currentNodes
                 .map((n) => n.type === 'addRepositoryNode' ? { ...n, position: { ...n.position, y: addRepoY } } : n)
                 .concat(newNode);
@@ -361,8 +374,12 @@ export function useControlCenterState(initialNodes, initialEdges) {
         addRepository({ path, name: repoName })
             .then((result) => {
             if (result.error) {
-                // Rollback optimistic node
-                setNodes((prev) => prev.filter((n) => n.id !== tempId));
+                // Rollback optimistic node and restore addRepoNode position
+                setNodes((prev) => prev
+                    .filter((n) => n.id !== tempId)
+                    .map((n) => n.type === 'addRepositoryNode'
+                    ? { ...n, position: { ...n.position, y: savedAddRepoY } }
+                    : n));
                 toast.error(result.error);
                 return;
             }
@@ -385,7 +402,12 @@ export function useControlCenterState(initialNodes, initialEdges) {
             router.refresh();
         })
             .catch(() => {
-            setNodes((prev) => prev.filter((n) => n.id !== tempId));
+            // Rollback optimistic node and restore addRepoNode position
+            setNodes((prev) => prev
+                .filter((n) => n.id !== tempId)
+                .map((n) => n.type === 'addRepositoryNode'
+                ? { ...n, position: { ...n.position, y: savedAddRepoY } }
+                : n));
             toast.error('Failed to add repository');
         });
     }, [router]);