@shepai/cli 1.47.0 → 1.48.0

package/web/.next/standalone/src/presentation/web/.next/server/server-reference-manifest.json

@@ -1,9 +1,9 @@
 {
   "node": {
-    "40d0a3e706fa8b01e4364b67a1f80c2f26dc02af10": {
+    "405927de7a51b3fdbf3bce187705d5f3a33c599793": {
       "workers": {
         "app/page": {
-          "moduleId": 94090,
+          "moduleId": 30953,
           "async": false,
           "exportedName": "approveFeature",
           "filename": "src/presentation/web/app/actions/approve-feature.ts"
@@ -15,10 +15,10 @@
       "filename": "src/presentation/web/app/actions/approve-feature.ts",
       "exportedName": "approveFeature"
     },
-    "40115d3ddb31ff86dafde210f83d4d01739ef550de": {
+    "40bd05da6b59c64afa59bd767ea7563b23608711a0": {
       "workers": {
         "app/page": {
-          "moduleId": 94090,
+          "moduleId": 30953,
           "async": false,
           "exportedName": "getFeatureArtifact",
           "filename": "src/presentation/web/app/actions/get-feature-artifact.ts"
@@ -30,10 +30,10 @@
       "filename": "src/presentation/web/app/actions/get-feature-artifact.ts",
       "exportedName": "getFeatureArtifact"
     },
-    "403ea6c9bd10b21438b631731894e18e2c9a72a037": {
+    "4052167b4529af8c247a75b3051a28f058af8a0ac9": {
       "workers": {
         "app/page": {
-          "moduleId": 94090,
+          "moduleId": 30953,
           "async": false,
           "exportedName": "getResearchArtifact",
           "filename": "src/presentation/web/app/actions/get-research-artifact.ts"
@@ -45,10 +45,10 @@
       "filename": "src/presentation/web/app/actions/get-research-artifact.ts",
       "exportedName": "getResearchArtifact"
     },
-    "0093c723faa4b6cfd43ff6a346973c45dcdafd917c": {
+    "00fd01b28bb7867f8544c9906f5037e63c7202fa8e": {
       "workers": {
         "app/page": {
-          "moduleId": 94090,
+          "moduleId": 30953,
           "async": false,
           "exportedName": "getWorkflowDefaults",
           "filename": "src/presentation/web/app/actions/get-workflow-defaults.ts"
@@ -60,10 +60,25 @@
       "filename": "src/presentation/web/app/actions/get-workflow-defaults.ts",
       "exportedName": "getWorkflowDefaults"
     },
-    "40a30ff303cb355d994314077a44146c2afe41633a": {
+    "40952da4050947a94de113924015351244089d8ffe": {
       "workers": {
         "app/page": {
-          "moduleId": 94090,
+          "moduleId": 30953,
+          "async": false,
+          "exportedName": "getMergeReviewData",
+          "filename": "src/presentation/web/app/actions/get-merge-review-data.ts"
+        }
+      },
+      "layer": {
+        "app/page": "action-browser"
+      },
+      "filename": "src/presentation/web/app/actions/get-merge-review-data.ts",
+      "exportedName": "getMergeReviewData"
+    },
+    "40bfc128861432d76522cc52efd6249895ce00ab03": {
+      "workers": {
+        "app/page": {
+          "moduleId": 30953,
           "async": false,
           "exportedName": "openIde",
           "filename": "src/presentation/web/app/actions/open-ide.ts"
@@ -75,10 +90,10 @@
       "filename": "src/presentation/web/app/actions/open-ide.ts",
       "exportedName": "openIde"
     },
-    "40c994b683284ab7c96f945c8b95fb023aa0ffc854": {
+    "4033b24b3695151d1f14d8d9b2df4db2ab821d1aa1": {
       "workers": {
         "app/page": {
-          "moduleId": 94090,
+          "moduleId": 30953,
           "async": false,
           "exportedName": "openShell",
           "filename": "src/presentation/web/app/actions/open-shell.ts"
@@ -90,10 +105,10 @@
       "filename": "src/presentation/web/app/actions/open-shell.ts",
       "exportedName": "openShell"
     },
-    "40ed3604b89a263f2d2428a04b03e0397d4d1dfe14": {
+    "400805d5028779c5a42a1b209d0ccd103df6aae782": {
       "workers": {
         "app/page": {
-          "moduleId": 94090,
+          "moduleId": 30953,
           "async": false,
           "exportedName": "openFolder",
           "filename": "src/presentation/web/app/actions/open-folder.ts"
@@ -105,10 +120,10 @@
       "filename": "src/presentation/web/app/actions/open-folder.ts",
       "exportedName": "openFolder"
     },
-    "002cfb464c1d3ab32bd963f49035b100891de6215e": {
+    "002086e55ab6adb498958985cc6b499caadb8efe8a": {
       "workers": {
         "app/page": {
-          "moduleId": 94090,
+          "moduleId": 30953,
           "async": false,
           "exportedName": "pickFolder",
           "filename": "src/presentation/web/app/actions/pick-folder.ts"
@@ -120,10 +135,10 @@
       "filename": "src/presentation/web/app/actions/pick-folder.ts",
       "exportedName": "pickFolder"
     },
-    "40ebcd0e44246e2d829ed41e5882ccfc8f2d9ea549": {
+    "4070bbfbc7263457fbf281a0e0dcd7a43c12b30a17": {
       "workers": {
         "app/page": {
-          "moduleId": 94090,
+          "moduleId": 30953,
           "async": false,
           "exportedName": "createFeature",
           "filename": "src/presentation/web/app/actions/create-feature.ts"
@@ -135,10 +150,10 @@
       "filename": "src/presentation/web/app/actions/create-feature.ts",
       "exportedName": "createFeature"
     },
-    "40aeecbe93c1ac4107b91ca18021b180088949d524": {
+    "4045ff41ea532f2c3e9970f8022b64a977da6e2eca": {
       "workers": {
         "app/page": {
-          "moduleId": 94090,
+          "moduleId": 30953,
           "async": false,
           "exportedName": "deleteFeature",
           "filename": "src/presentation/web/app/actions/delete-feature.ts"
@@ -150,10 +165,10 @@
       "filename": "src/presentation/web/app/actions/delete-feature.ts",
       "exportedName": "deleteFeature"
     },
-    "40f460f3a71643a4470fe6b0624a42ffe4328ac96a": {
+    "40c7ab52e7389ec3d2f6a78fdd2b5686746b247b24": {
       "workers": {
         "app/page": {
-          "moduleId": 94090,
+          "moduleId": 30953,
           "async": false,
           "exportedName": "addRepository",
           "filename": "src/presentation/web/app/actions/add-repository.ts"
@@ -165,10 +180,10 @@
       "filename": "src/presentation/web/app/actions/add-repository.ts",
       "exportedName": "addRepository"
     },
-    "40076d6aa59873fb8fc1482d79ec46f1190e5586ed": {
+    "406251232c435014ef64078d485da082110be0fb37": {
       "workers": {
         "app/page": {
-          "moduleId": 94090,
+          "moduleId": 30953,
           "async": false,
           "exportedName": "deleteRepository",
           "filename": "src/presentation/web/app/actions/delete-repository.ts"
@@ -182,5 +197,5 @@
     }
   },
   "edge": {},
-  "encryptionKey": "NtfNvj3HgiKgYLoNQgEO3FR4k83Rs/qJeYJ3CJR63lI="
+  "encryptionKey": "hCzppyIeZCi6mpL+ZJ0dlbq42XLKa14KFhRtB9jR6iI="
 }

package/web/.next/standalone/src/presentation/web/app/actions/get-merge-review-data.ts

@@ -0,0 +1,64 @@
+'use server';
+
+import { resolve } from '@/lib/server-container';
+import type { IFeatureRepository } from '@shepai/core/application/ports/output/repositories/feature-repository.interface';
+import type { IGitPrService } from '@shepai/core/application/ports/output/services/git-pr-service.interface';
+import type { GetPlanArtifactUseCase } from '@shepai/core/application/use-cases/features/get-plan-artifact.use-case';
+import type {
+  MergeReviewData,
+  MergeReviewPhase,
+} from '@/components/common/merge-review/merge-review-config';
+
+type GetMergeReviewDataResult = MergeReviewData | { error: string };
+
+export async function getMergeReviewData(featureId: string): Promise<GetMergeReviewDataResult> {
+  if (!featureId.trim()) {
+    return { error: 'Feature id is required' };
+  }
+
+  try {
+    const featureRepo = resolve<IFeatureRepository>('IFeatureRepository');
+    const feature = await featureRepo.findById(featureId);
+
+    if (!feature) {
+      return { error: 'Feature not found' };
+    }
+
+    const pr = feature.pr
+      ? {
+          url: feature.pr.url,
+          number: feature.pr.number,
+          status: feature.pr.status,
+          commitHash: feature.pr.commitHash,
+          ciStatus: feature.pr.ciStatus,
+        }
+      : undefined;
+
+    const branch = feature.branch ? { source: feature.branch, target: 'main' } : undefined;
+
+    // Load plan phases (best-effort)
+    let phases: MergeReviewPhase[] | undefined;
+    try {
+      const planUseCase = resolve<GetPlanArtifactUseCase>('GetPlanArtifactUseCase');
+      const plan = await planUseCase.execute(featureId);
+      phases = plan.phases.map(({ id, name, description }) => ({ id, name, description }));
+    } catch {
+      // Plan unavailable — not critical
+    }
+
+    if (!feature.worktreePath) {
+      return { pr, branch, phases, warning: pr ? undefined : 'No PR or diff data available' };
+    }
+
+    try {
+      const gitPrService = resolve<IGitPrService>('IGitPrService');
+      const diffSummary = await gitPrService.getPrDiffSummary(feature.worktreePath, 'main');
+      return { pr, branch, phases, diffSummary };
+    } catch {
+      return { pr, branch, phases, warning: 'Diff statistics unavailable' };
+    }
+  } catch (error: unknown) {
+    const message = error instanceof Error ? error.message : 'Failed to load merge review data';
+    return { error: message };
+  }
+}

package/web/.next/standalone/src/presentation/web/app/page.tsx

@@ -32,6 +32,7 @@ const nodeToLifecyclePhase: Record<string, FeatureLifecyclePhase> = {
   research: 'research',
   plan: 'implementation',
   implement: 'implementation',
+  merge: 'review',
 };
 
 export default async function HomePage() {

package/web/.next/standalone/src/presentation/web/components/common/feature-node/feature-node.stories.tsx

@@ -106,6 +106,16 @@ const allStatesData: FeatureNodeData[] = [
     repositoryPath: '/home/user/my-repo',
     branch: 'feat/data-pipeline',
   },
+  {
+    name: 'Merge Review',
+    description: 'PR ready for merge approval',
+    featureId: '#bi3',
+    lifecycle: 'review' as FeatureLifecyclePhase,
+    state: 'action-required',
+    progress: 90,
+    repositoryPath: '/home/user/my-repo',
+    branch: 'feat/merge-review',
+  },
   {
     name: 'Payment Gateway',
     description: 'Stripe integration for subscriptions',
@@ -145,7 +155,7 @@ export const AllStates: Story = {
   render: () => (
     <div className="flex flex-wrap gap-6">
       {allStatesData.map((data) => (
-        <FeatureNodeCanvas key={data.state} style={{ width: 500, height: 350 }} data={data} />
+        <FeatureNodeCanvas key={data.featureId} style={{ width: 500, height: 350 }} data={data} />
       ))}
     </div>
   ),
@@ -316,6 +326,18 @@ export const Creating: Story = {
   render: (args) => <FeatureNodeCanvas data={args} />,
 };
 
+export const MergeReviewActionRequired: Story = {
+  args: {
+    name: 'Merge Review',
+    description: 'PR ready for merge approval',
+    featureId: '#bi3',
+    lifecycle: 'review',
+    state: 'action-required',
+    progress: 90,
+  },
+  render: (args) => <FeatureNodeCanvas data={args} />,
+};
+
 export const ErrorWithMessage: Story = {
   args: {
     name: 'Email Service',

package/web/.next/standalone/src/presentation/web/components/common/feature-node/feature-node.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { Handle, Position } from '@xyflow/react';
-import { Settings, Plus, FileText, Wrench, type LucideIcon } from 'lucide-react';
+import { Settings, Plus, FileText, Wrench, GitMerge, type LucideIcon } from 'lucide-react';
 import { cn } from '@/lib/utils';
 import {
   featureNodeStateConfig,
@@ -21,6 +21,7 @@ function getBadgeIcon(data: FeatureNodeData): LucideIcon {
   if (data.state === 'action-required') {
     if (data.lifecycle === 'requirements') return FileText;
     if (data.lifecycle === 'implementation') return Wrench;
+    if (data.lifecycle === 'review') return GitMerge;
   }
   return config.icon;
 }
@@ -34,6 +35,9 @@ function getActionRequiredBadgeClasses(data: FeatureNodeData): {
   if (data.lifecycle === 'implementation') {
     return { badgeClass: 'text-indigo-700', badgeBgClass: 'bg-indigo-50' };
   }
+  if (data.lifecycle === 'review') {
+    return { badgeClass: 'text-emerald-700', badgeBgClass: 'bg-emerald-50' };
+  }
   return null; // requirements stays amber (default)
 }
 
@@ -51,6 +55,7 @@ function getBadgeText(data: FeatureNodeData): string {
     case 'action-required':
       if (data.lifecycle === 'requirements') return 'Review Product Requirements';
       if (data.lifecycle === 'implementation') return 'Review Technical Planning';
+      if (data.lifecycle === 'review') return 'Review Merge Request';
       return config.label;
     case 'error':
       return data.errorMessage ?? 'Something went wrong';

package/web/.next/standalone/src/presentation/web/components/common/merge-review/index.ts

@@ -0,0 +1,7 @@
+export { MergeReview } from './merge-review';
+export { MergeReviewDrawer } from './merge-review-drawer';
+export type {
+  MergeReviewProps,
+  MergeReviewDrawerProps,
+  MergeReviewData,
+} from './merge-review-config';

package/web/.next/standalone/src/presentation/web/components/common/merge-review/merge-review-config.ts

@@ -0,0 +1,81 @@
+import type { PrStatus, CiStatus } from '@shepai/core/domain/generated/output';
+
+/** Diff summary statistics for the PR */
+export interface MergeReviewDiffSummary {
+  filesChanged: number;
+  additions: number;
+  deletions: number;
+  commitCount: number;
+}
+
+/** PR metadata extracted from Feature.pr */
+export interface MergeReviewPr {
+  url: string;
+  number: number;
+  status: PrStatus;
+  commitHash?: string;
+  ciStatus?: CiStatus;
+}
+
+/** A phase from the implementation plan */
+export interface MergeReviewPhase {
+  id: string;
+  name: string;
+  description?: string;
+}
+
+/** Branch merge direction info */
+export interface MergeReviewBranch {
+  /** Feature branch name */
+  source: string;
+  /** Target branch name (e.g. 'main') */
+  target: string;
+}
+
+/** Data returned by the getMergeReviewData server action */
+export interface MergeReviewData {
+  /** PR metadata (omitted when the feature has no PR) */
+  pr?: MergeReviewPr;
+  /** Aggregate diff statistics (omitted when worktree is unavailable) */
+  diffSummary?: MergeReviewDiffSummary;
+  /** Implementation phases from plan.yaml */
+  phases?: MergeReviewPhase[];
+  /** Branch merge direction */
+  branch?: MergeReviewBranch;
+  /** Warning message when diff summary could not be retrieved */
+  warning?: string;
+}
+
+/** Props for the merge review content component */
+export interface MergeReviewProps {
+  /** Merge review data from the server action */
+  data: MergeReviewData;
+  /** Approve merge callback */
+  onApprove: () => void;
+  /** Send refinement text to AI */
+  onRefine: (text: string) => void;
+  /** Controls disabled state during approval */
+  isProcessing?: boolean;
+}
+
+/** Props for the merge review drawer (shell wrapper) */
+export interface MergeReviewDrawerProps extends MergeReviewProps {
+  /** Whether the drawer is open */
+  open: boolean;
+  /** Callback when drawer should close */
+  onClose: () => void;
+  /** Feature name shown in drawer header */
+  featureName: string;
+  /** Feature ID shown below the name */
+  featureId?: string;
+  /** Absolute path to the repository on disk */
+  repositoryPath?: string;
+  /** Git branch name — passed to ReviewDrawerShell for actions */
+  branch?: string;
+  /** Absolute path to the specs folder on disk */
+  specPath?: string;
+  /** Callback to delete the feature — shows delete button when provided */
+  onDelete?: (featureId: string) => void;
+  /** Whether a delete operation is in progress */
+  isDeleting?: boolean;
+}

package/web/.next/standalone/src/presentation/web/components/common/merge-review/merge-review-drawer.tsx

@@ -0,0 +1,34 @@
+'use client';
+
+import { ReviewDrawerShell } from '@/components/common/review-drawer-shell';
+import { MergeReview } from './merge-review';
+import type { MergeReviewDrawerProps } from './merge-review-config';
+
+export function MergeReviewDrawer({
+  open,
+  onClose,
+  featureName,
+  featureId,
+  repositoryPath,
+  branch,
+  specPath,
+  onDelete,
+  isDeleting,
+  ...reviewProps
+}: MergeReviewDrawerProps) {
+  return (
+    <ReviewDrawerShell
+      open={open}
+      onClose={onClose}
+      featureName={featureName}
+      featureId={featureId}
+      repositoryPath={repositoryPath}
+      branch={branch}
+      specPath={specPath}
+      onDelete={onDelete}
+      isDeleting={isDeleting}
+    >
+      <MergeReview {...reviewProps} />
+    </ReviewDrawerShell>
+  );
+}

package/web/.next/standalone/src/presentation/web/components/common/merge-review/merge-review.stories.tsx

@@ -0,0 +1,240 @@
+import { useState } from 'react';
+import type { Meta, StoryObj } from '@storybook/react';
+import { fn } from '@storybook/test';
+import { PrStatus, CiStatus } from '@shepai/core/domain/generated/output';
+import { MergeReview } from './merge-review';
+import { MergeReviewDrawer } from './merge-review-drawer';
+import type { MergeReviewData } from './merge-review-config';
+
+const fullPr = {
+  url: 'https://github.com/shep-ai/cli/pull/42',
+  number: 42,
+  status: PrStatus.Open,
+  commitHash: 'a1b2c3d4e5f6789',
+  ciStatus: CiStatus.Success,
+} as const;
+
+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: MergeReviewData = {
+  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: Meta<typeof MergeReview> = {
+  title: 'Common/MergeReview',
+  component: MergeReview,
+  tags: ['autodocs'],
+  parameters: {
+    layout: 'fullscreen',
+  },
+  decorators: [
+    (Story) => (
+      <div style={{ height: '600px', width: '400px', border: '1px solid var(--color-border)' }}>
+        <Story />
+      </div>
+    ),
+  ],
+};
+
+export default meta;
+type Story = StoryObj<typeof MergeReview>;
+
+/** Default — all data present with CI success. */
+export const Default: Story = {
+  args: {
+    data: fullData,
+    ...defaultActions,
+  },
+};
+
+/** CI status is Pending — shows yellow badge with spinner. */
+export const CIPending: Story = {
+  args: {
+    data: {
+      ...fullData,
+      pr: { ...fullPr, ciStatus: CiStatus.Pending },
+    },
+    ...defaultActions,
+  },
+};
+
+/** CI status is Failure — shows red badge. */
+export const CIFailure: Story = {
+  args: {
+    data: {
+      ...fullData,
+      pr: { ...fullPr, ciStatus: CiStatus.Failure },
+    },
+    ...defaultActions,
+  },
+};
+
+/** Diff summary unavailable — shows warning message. */
+export const NoDiffSummary: Story = {
+  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: Story = {
+  args: {
+    data: {
+      ...fullData,
+      pr: { ...fullPr, ciStatus: undefined },
+    },
+    ...defaultActions,
+  },
+};
+
+/** Processing state — approve button disabled with spinner. */
+export const Processing: Story = {
+  args: {
+    data: fullData,
+    ...defaultActions,
+    isProcessing: true,
+  },
+};
+
+/** No PR — merge without a pull request, shows branch direction and diff summary. */
+export const NoPrWithDiff: Story = {
+  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: Story = {
+  args: {
+    data: {
+      branch: { source: 'feat/fix-login', target: 'main' },
+      warning: 'No PR or diff data available',
+    },
+    ...defaultActions,
+  },
+};
+
+/** With implementation phases shown. */
+export const WithPhases: Story = {
+  args: {
+    data: {
+      ...fullData,
+      phases: samplePhases,
+    },
+    ...defaultActions,
+  },
+};
+
+/* ─── Drawer Variant ─── */
+
+type DrawerStory = StoryObj<typeof MergeReviewDrawer>;
+
+const drawerMeta = {
+  title: 'Common/MergeReviewDrawer',
+  component: MergeReviewDrawer,
+  tags: ['autodocs'],
+  parameters: {
+    layout: 'fullscreen',
+  },
+};
+
+function DrawerTemplate(
+  props: Omit<React.ComponentProps<typeof MergeReviewDrawer>, 'open' | 'onClose'>
+) {
+  const [open, setOpen] = useState(true);
+
+  return (
+    <div style={{ height: '100vh', background: '#f8fafc', padding: '2rem' }}>
+      <button
+        type="button"
+        onClick={() => setOpen(true)}
+        style={{ padding: '8px 16px', border: '1px solid #ccc', borderRadius: '6px' }}
+      >
+        Open Drawer
+      </button>
+      <MergeReviewDrawer {...props} open={open} onClose={() => setOpen(false)} />
+    </div>
+  );
+}
+
+/** Merge review drawer with full data. */
+export const InDrawer: DrawerStory = {
+  ...drawerMeta,
+  render: () => (
+    <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: DrawerStory = {
+  ...drawerMeta,
+  render: () => (
+    <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: DrawerStory = {
+  ...drawerMeta,
+  render: () => (
+    <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')}
+    />
+  ),
+};