@shepai/cli 1.46.0 → 1.48.0

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

@@ -1,9 +1,9 @@
 {
   "node": {
-    "40ec19e5dbcddd81282a5e566066b8fe1b310f1786": {
+    "405927de7a51b3fdbf3bce187705d5f3a33c599793": {
       "workers": {
         "app/page": {
-          "moduleId": 23768,
+          "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"
     },
-    "407ac719162649e3a92d1d66213136b4f3049706b1": {
+    "40bd05da6b59c64afa59bd767ea7563b23608711a0": {
       "workers": {
         "app/page": {
-          "moduleId": 23768,
+          "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"
     },
-    "404bd4c7e835b3c134b911ca855719ad0541728c9f": {
+    "4052167b4529af8c247a75b3051a28f058af8a0ac9": {
       "workers": {
         "app/page": {
-          "moduleId": 23768,
+          "moduleId": 30953,
           "async": false,
           "exportedName": "getResearchArtifact",
           "filename": "src/presentation/web/app/actions/get-research-artifact.ts"
@@ -45,10 +45,40 @@
       "filename": "src/presentation/web/app/actions/get-research-artifact.ts",
       "exportedName": "getResearchArtifact"
     },
-    "40ef4c3a7d8c17c97a759027453ae9fb2a674eb831": {
+    "00fd01b28bb7867f8544c9906f5037e63c7202fa8e": {
       "workers": {
         "app/page": {
-          "moduleId": 23768,
+          "moduleId": 30953,
+          "async": false,
+          "exportedName": "getWorkflowDefaults",
+          "filename": "src/presentation/web/app/actions/get-workflow-defaults.ts"
+        }
+      },
+      "layer": {
+        "app/page": "action-browser"
+      },
+      "filename": "src/presentation/web/app/actions/get-workflow-defaults.ts",
+      "exportedName": "getWorkflowDefaults"
+    },
+    "40952da4050947a94de113924015351244089d8ffe": {
+      "workers": {
+        "app/page": {
+          "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"
@@ -60,10 +90,10 @@
       "filename": "src/presentation/web/app/actions/open-ide.ts",
       "exportedName": "openIde"
     },
-    "4083093b10c0bf2c4b635ab659b9047b7ee71f2eec": {
+    "4033b24b3695151d1f14d8d9b2df4db2ab821d1aa1": {
       "workers": {
         "app/page": {
-          "moduleId": 23768,
+          "moduleId": 30953,
           "async": false,
           "exportedName": "openShell",
           "filename": "src/presentation/web/app/actions/open-shell.ts"
@@ -75,10 +105,10 @@
       "filename": "src/presentation/web/app/actions/open-shell.ts",
       "exportedName": "openShell"
     },
-    "406b0905f6f16e1cbe4c3e457de80482ec1de3f298": {
+    "400805d5028779c5a42a1b209d0ccd103df6aae782": {
       "workers": {
         "app/page": {
-          "moduleId": 23768,
+          "moduleId": 30953,
           "async": false,
           "exportedName": "openFolder",
           "filename": "src/presentation/web/app/actions/open-folder.ts"
@@ -90,10 +120,10 @@
       "filename": "src/presentation/web/app/actions/open-folder.ts",
       "exportedName": "openFolder"
     },
-    "00e5fbd6452e1769c8d04f2f456d45281bef984172": {
+    "002086e55ab6adb498958985cc6b499caadb8efe8a": {
       "workers": {
         "app/page": {
-          "moduleId": 23768,
+          "moduleId": 30953,
           "async": false,
           "exportedName": "pickFolder",
           "filename": "src/presentation/web/app/actions/pick-folder.ts"
@@ -105,10 +135,10 @@
       "filename": "src/presentation/web/app/actions/pick-folder.ts",
       "exportedName": "pickFolder"
     },
-    "40ad939617f957f8c29d2c37c088433f000f3fa4df": {
+    "4070bbfbc7263457fbf281a0e0dcd7a43c12b30a17": {
       "workers": {
         "app/page": {
-          "moduleId": 23768,
+          "moduleId": 30953,
           "async": false,
           "exportedName": "createFeature",
           "filename": "src/presentation/web/app/actions/create-feature.ts"
@@ -120,10 +150,10 @@
       "filename": "src/presentation/web/app/actions/create-feature.ts",
       "exportedName": "createFeature"
     },
-    "40ef8320799551d45d3bc1579b90bf9e0e62a7ffa7": {
+    "4045ff41ea532f2c3e9970f8022b64a977da6e2eca": {
       "workers": {
         "app/page": {
-          "moduleId": 23768,
+          "moduleId": 30953,
           "async": false,
           "exportedName": "deleteFeature",
           "filename": "src/presentation/web/app/actions/delete-feature.ts"
@@ -135,10 +165,10 @@
       "filename": "src/presentation/web/app/actions/delete-feature.ts",
       "exportedName": "deleteFeature"
     },
-    "40b2dd613250d04133b76e2b6972c715bf57e4bd99": {
+    "40c7ab52e7389ec3d2f6a78fdd2b5686746b247b24": {
       "workers": {
         "app/page": {
-          "moduleId": 23768,
+          "moduleId": 30953,
           "async": false,
           "exportedName": "addRepository",
           "filename": "src/presentation/web/app/actions/add-repository.ts"
@@ -150,10 +180,10 @@
       "filename": "src/presentation/web/app/actions/add-repository.ts",
       "exportedName": "addRepository"
     },
-    "40eadea1d575abd2b4f8bffd4e55fa1411b42a8169": {
+    "406251232c435014ef64078d485da082110be0fb37": {
       "workers": {
         "app/page": {
-          "moduleId": 23768,
+          "moduleId": 30953,
           "async": false,
           "exportedName": "deleteRepository",
           "filename": "src/presentation/web/app/actions/delete-repository.ts"
@@ -167,5 +197,5 @@
     }
   },
   "edge": {},
-  "encryptionKey": "GgVq/PcpPblftJmrvtOlevtwRA1pxQYdoN2fEZDJXaI="
+  "encryptionKey": "hCzppyIeZCi6mpL+ZJ0dlbq42XLKa14KFhRtB9jR6iI="
 }

package/web/.next/standalone/src/presentation/web/app/actions/create-feature.ts

@@ -25,6 +25,8 @@ interface CreateFeatureInput {
     allowPlan: boolean;
     allowMerge?: boolean;
   };
+  push?: boolean;
+  openPr?: boolean;
 }
 
 function composeUserInput(
@@ -49,7 +51,7 @@ function composeUserInput(
 export async function createFeature(
   input: CreateFeatureInput
 ): Promise<{ feature?: Feature; error?: string }> {
-  const { name, description, repositoryPath, attachments, approvalGates } = input;
+  const { name, description, repositoryPath, attachments, approvalGates, push, openPr } = input;
 
   if (!name?.trim()) {
     return { error: 'name is required' };
@@ -72,6 +74,8 @@ export async function createFeature(
       userInput,
       repositoryPath,
       approvalGates: gates,
+      push: push ?? false,
+      openPr: openPr ?? false,
     });
     return { feature: result.feature };
   } catch (error: unknown) {

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/actions/get-workflow-defaults.ts

@@ -0,0 +1,28 @@
+'use server';
+
+import { getSettings } from '@shepai/core/infrastructure/services/settings.service';
+
+export interface WorkflowDefaults {
+  approvalGates: {
+    allowPrd: boolean;
+    allowPlan: boolean;
+    allowMerge: boolean;
+  };
+  push: boolean;
+  openPr: boolean;
+}
+
+export async function getWorkflowDefaults(): Promise<WorkflowDefaults> {
+  const settings = getSettings();
+  const { workflow } = settings;
+
+  return {
+    approvalGates: {
+      allowPrd: workflow.approvalGateDefaults.allowPrd,
+      allowPlan: workflow.approvalGateDefaults.allowPlan,
+      allowMerge: workflow.approvalGateDefaults.allowMerge,
+    },
+    push: workflow.approvalGateDefaults.pushOnImplementationComplete,
+    openPr: workflow.openPrOnImplementationComplete,
+  };
+}

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-create-drawer/feature-create-drawer.stories.tsx

@@ -3,6 +3,7 @@ import type { Meta, StoryObj } from '@storybook/react';
 import { within, userEvent, fn } from '@storybook/test';
 import { FeatureCreateDrawer } from './feature-create-drawer';
 import type { FeatureCreatePayload } from './feature-create-drawer';
+import type { WorkflowDefaults } from '@/app/actions/get-workflow-defaults';
 import { Button } from '@/components/ui/button';
 
 /* ---------------------------------------------------------------------------
@@ -81,7 +82,13 @@ const logClose = fn().mockName('onClose');
  * ------------------------------------------------------------------------- */
 
 /** Starts closed — click button to open. Actions are logged. */
-function CreateDrawerTrigger({ label = 'Open Create Feature' }: { label?: string }) {
+function CreateDrawerTrigger({
+  label = 'Open Create Feature',
+  workflowDefaults,
+}: {
+  label?: string;
+  workflowDefaults?: WorkflowDefaults;
+}) {
   const [open, setOpen] = useState(false);
 
   return (
@@ -100,6 +107,7 @@ function CreateDrawerTrigger({ label = 'Open Create Feature' }: { label?: string
           setOpen(false);
         }}
         repositoryPath="/Users/dev/my-repo"
+        workflowDefaults={workflowDefaults}
       />
     </div>
   );
@@ -222,6 +230,71 @@ export const MergeOnly: Story = {
   },
 };
 
+/* ---------------------------------------------------------------------------
+ * Git checkbox stories
+ * ------------------------------------------------------------------------- */
+
+/**
+ * Push checkbox checked — the "Push" option is enabled so the branch will be
+ * pushed to remote after implementation. "Create PR" remains unchecked.
+ */
+export const PushOnly: Story = {
+  render: () => <CreateDrawerTrigger label="Open (Push Only)" />,
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+    await userEvent.click(canvas.getByRole('button', { name: 'Open (Push Only)' }));
+
+    const body = within(canvasElement.ownerDocument.body);
+    const pushCheckbox = await body.findByLabelText('Push');
+    await userEvent.click(pushCheckbox);
+  },
+};
+
+/**
+ * Create PR checked — checking "Create PR" auto-checks and disables "Push"
+ * because a PR cannot be created without pushing. Both checkboxes appear
+ * checked, but "Push" is non-interactive (disabled).
+ */
+export const PrChecked: Story = {
+  render: () => <CreateDrawerTrigger label="Open (PR Checked)" />,
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+    await userEvent.click(canvas.getByRole('button', { name: 'Open (PR Checked)' }));
+
+    const body = within(canvasElement.ownerDocument.body);
+    const prCheckbox = await body.findByLabelText('Create PR');
+    await userEvent.click(prCheckbox);
+  },
+};
+
+/* ---------------------------------------------------------------------------
+ * Workflow defaults stories
+ * ------------------------------------------------------------------------- */
+
+const SAMPLE_WORKFLOW_DEFAULTS: WorkflowDefaults = {
+  approvalGates: { allowPrd: true, allowPlan: true, allowMerge: false },
+  push: true,
+  openPr: true,
+};
+
+/**
+ * Drawer pre-populated from workflow settings — PRD and Plan approval gates
+ * are checked, Push and Create PR are enabled. These values come from
+ * `shep settings workflow` and are read at mount time via `getWorkflowDefaults()`.
+ */
+export const WithWorkflowDefaults: Story = {
+  render: () => (
+    <CreateDrawerTrigger
+      label="Open (Workflow Defaults)"
+      workflowDefaults={SAMPLE_WORKFLOW_DEFAULTS}
+    />
+  ),
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+    await userEvent.click(canvas.getByRole('button', { name: 'Open (Workflow Defaults)' }));
+  },
+};
+
 /* ---------------------------------------------------------------------------
  * Interactive story — full paths shown in submitted data panel
  * ------------------------------------------------------------------------- */

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

@@ -1,6 +1,6 @@
 'use client';
 
-import { useState, useCallback } from 'react';
+import { useState, useCallback, useEffect } from 'react';
 import type { LucideIcon } from 'lucide-react';
 import {
   XIcon,
@@ -25,9 +25,11 @@ import { Input } from '@/components/ui/input';
 import { Textarea } from '@/components/ui/textarea';
 import { Label } from '@/components/ui/label';
 import { CheckboxGroup } from '@/components/ui/checkbox-group';
+import { CheckboxGroupItem } from '@/components/ui/checkbox-group-item';
 import { Separator } from '@/components/ui/separator';
 import { Badge } from '@/components/ui/badge';
 import type { FileAttachment } from '@shepai/core/infrastructure/services/file-dialog.service';
+import type { WorkflowDefaults } from '@/app/actions/get-workflow-defaults';
 import { pickFiles } from './pick-files';
 
 export type { FileAttachment } from '@shepai/core/infrastructure/services/file-dialog.service';
@@ -42,6 +44,8 @@ export interface FeatureCreatePayload {
     allowPlan: boolean;
     allowMerge: boolean;
   };
+  push: boolean;
+  openPr: boolean;
 }
 
 const AUTO_APPROVE_OPTIONS = [
@@ -62,6 +66,7 @@ export interface FeatureCreateDrawerProps {
   onSubmit: (data: FeatureCreatePayload) => void;
   repositoryPath: string;
   isSubmitting?: boolean;
+  workflowDefaults?: WorkflowDefaults;
 }
 
 export function FeatureCreateDrawer({
@@ -70,18 +75,36 @@ export function FeatureCreateDrawer({
   onSubmit,
   repositoryPath,
   isSubmitting = false,
+  workflowDefaults,
 }: FeatureCreateDrawerProps) {
+  const defaultGates = workflowDefaults?.approvalGates ?? EMPTY_GATES;
+  const defaultPush = workflowDefaults?.push ?? false;
+  const defaultOpenPr = workflowDefaults?.openPr ?? false;
+
   const [name, setName] = useState('');
   const [description, setDescription] = useState('');
   const [attachments, setAttachments] = useState<FileAttachment[]>([]);
-  const [approvalGates, setApprovalGates] = useState<Record<string, boolean>>({ ...EMPTY_GATES });
+  const [approvalGates, setApprovalGates] = useState<Record<string, boolean>>({ ...defaultGates });
+  const [push, setPush] = useState(defaultPush);
+  const [openPr, setOpenPr] = useState(defaultOpenPr);
+
+  // Sync state when workflowDefaults load asynchronously
+  useEffect(() => {
+    if (workflowDefaults) {
+      setApprovalGates({ ...workflowDefaults.approvalGates });
+      setPush(workflowDefaults.push);
+      setOpenPr(workflowDefaults.openPr);
+    }
+  }, [workflowDefaults]);
 
   const resetForm = useCallback(() => {
     setName('');
     setDescription('');
     setAttachments([]);
-    setApprovalGates({ ...EMPTY_GATES });
-  }, []);
+    setApprovalGates({ ...defaultGates });
+    setPush(defaultPush);
+    setOpenPr(defaultOpenPr);
+  }, [defaultGates, defaultPush, defaultOpenPr]);
 
   const handleOpenChange = useCallback(
     (nextOpen: boolean) => {
@@ -108,9 +131,11 @@ export function FeatureCreateDrawer({
           allowPlan: approvalGates.allowPlan ?? false,
           allowMerge: approvalGates.allowMerge ?? false,
         },
+        push: push || openPr,
+        openPr,
       });
     },
-    [name, description, attachments, approvalGates, repositoryPath, onSubmit]
+    [name, description, attachments, approvalGates, repositoryPath, onSubmit, push, openPr]
   );
 
   const handleAddFiles = useCallback(async () => {
@@ -211,6 +236,31 @@ export function FeatureCreateDrawer({
               />
             </div>
 
+            {/* Git options */}
+            <div className="flex flex-col gap-1.5">
+              <Label className="text-muted-foreground text-xs font-semibold tracking-wider">
+                GIT
+              </Label>
+              <div className="flex flex-col gap-2">
+                <CheckboxGroupItem
+                  id="push"
+                  label="Push"
+                  description="Push branch to remote after implementation."
+                  checked={push || openPr}
+                  onCheckedChange={setPush}
+                  disabled={openPr || isSubmitting}
+                />
+                <CheckboxGroupItem
+                  id="open-pr"
+                  label="Create PR"
+                  description="Open a pull request after pushing."
+                  checked={openPr}
+                  onCheckedChange={setOpenPr}
+                  disabled={isSubmitting}
+                />
+              </div>
+            </div>
+
             {/* Attachments */}
             <div className="flex flex-col gap-2">
               <div className="flex items-center justify-between">

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';