@shepai/cli 1.135.3-pr443.1bf56b0 → 1.135.3

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

@@ -1,7 +1,4 @@
-import { type TreeViewElement } from '../../ui/file-tree.js';
 import type { MergeReviewFileDiff } from './merge-review-config.js';
-/** Build a tree structure from flat file paths. */
-export declare function buildFileTree(fileDiffs: MergeReviewFileDiff[]): TreeViewElement[];
 export interface DiffViewProps {
     fileDiffs: MergeReviewFileDiff[];
 }

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

@@ -1 +1 @@
-{"version":3,"file":"diff-view.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/merge-review/diff-view.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAsB,KAAK,eAAe,EAAE,MAAM,2BAA2B,CAAC;AACrF,OAAO,KAAK,EAAE,mBAAmB,EAAuB,MAAM,uBAAuB,CAAC;AAStF,mDAAmD;AACnD,wBAAgB,aAAa,CAAC,SAAS,EAAE,mBAAmB,EAAE,GAAG,eAAe,EAAE,CAoCjF;AAgJD,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,mBAAmB,EAAE,CAAC;CAClC;AAED,wBAAgB,QAAQ,CAAC,EAAE,SAAS,EAAE,EAAE,aAAa,kDAkEpD"}
+{"version":3,"file":"diff-view.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/merge-review/diff-view.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,mBAAmB,EAAuB,MAAM,uBAAuB,CAAC;AA4GtF,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,mBAAmB,EAAE,CAAC;CAClC;AAED,wBAAgB,QAAQ,CAAC,EAAE,SAAS,EAAE,EAAE,aAAa,kDAmBpD"}

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

@@ -1,113 +1,30 @@
 'use client';
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState, useMemo, useCallback } from 'react';
-import { FileText, FilePlus, FileMinus, FileEdit } from 'lucide-react';
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { useState } from 'react';
+import { ChevronRight, FileText, FilePlus, FileMinus, FileEdit } from 'lucide-react';
 import { cn } from '../../../lib/utils.js';
-import { Tree, Folder, File } from '../../ui/file-tree.js';
 const STATUS_CONFIG = {
-    added: { icon: FilePlus, className: 'text-green-600' },
-    modified: { icon: FileEdit, className: 'text-amber-600' },
-    deleted: { icon: FileMinus, className: 'text-red-600' },
-    renamed: { icon: FileEdit, className: 'text-blue-600' },
+    added: { icon: FilePlus, label: 'A', className: 'text-green-600' },
+    modified: { icon: FileEdit, label: 'M', className: 'text-amber-600' },
+    deleted: { icon: FileMinus, label: 'D', className: 'text-red-600' },
+    renamed: { icon: FileEdit, label: 'R', className: 'text-blue-600' },
 };
-/** Build a tree structure from flat file paths. */
-export function buildFileTree(fileDiffs) {
-    const root = [];
-    for (const diff of fileDiffs) {
-        const parts = diff.path.split('/');
-        let currentLevel = root;
-        for (let i = 0; i < parts.length; i++) {
-            const part = parts[i];
-            const isFile = i === parts.length - 1;
-            const pathSoFar = parts.slice(0, i + 1).join('/');
-            const existing = currentLevel.find((el) => el.name === part && el.type === (isFile ? 'file' : 'folder'));
-            if (existing) {
-                if (!isFile && existing.children) {
-                    currentLevel = existing.children;
-                }
-            }
-            else {
-                const node = {
-                    id: pathSoFar,
-                    name: part,
-                    type: isFile ? 'file' : 'folder',
-                    ...(isFile ? {} : { children: [] }),
-                };
-                currentLevel.push(node);
-                if (!isFile && node.children) {
-                    currentLevel = node.children;
-                }
-            }
-        }
-    }
-    return collapseSingleChildFolders(root);
-}
-/** Collapse folders that contain only one child folder (e.g. src/components → src/components). */
-function collapseSingleChildFolders(elements) {
-    return elements.map((el) => {
-        if (el.type === 'folder' && el.children) {
-            const collapsed = collapseSingleChildFolders(el.children);
-            if (collapsed.length === 1 && collapsed[0].type === 'folder' && collapsed[0].children) {
-                return {
-                    ...collapsed[0],
-                    id: `${el.id}/${collapsed[0].name}`,
-                    name: `${el.name}/${collapsed[0].name}`,
-                    children: collapsed[0].children,
-                };
-            }
-            return { ...el, children: collapsed };
-        }
-        return el;
-    });
-}
-/** Collect all folder IDs for expanding the tree by default. */
-function getAllFolderIds(elements) {
-    const ids = [];
-    for (const el of elements) {
-        if (el.type === 'folder') {
-            ids.push(el.id);
-            if (el.children) {
-                ids.push(...getAllFolderIds(el.children));
-            }
-        }
-    }
-    return ids;
-}
-function HunkView({ hunk }) {
-    return (_jsxs("div", { className: "border-border border-t first:border-t-0", children: [_jsx("div", { className: "bg-muted/50 text-muted-foreground px-3 py-1 font-mono text-[10px]", children: hunk.header }), _jsx("div", { className: "font-mono text-[11px] leading-[18px]", children: hunk.lines.map((line) => (_jsxs("div", { className: cn('flex', line.type === 'added' && 'bg-green-50 dark:bg-green-950/30', line.type === 'removed' && 'bg-red-50 dark:bg-red-950/30'), children: [_jsx("span", { className: "text-muted-foreground w-10 shrink-0 px-1 text-right text-[10px] select-none", children: line.oldNumber ?? '' }), _jsx("span", { className: "text-muted-foreground w-10 shrink-0 px-1 text-right text-[10px] select-none", children: line.newNumber ?? '' }), _jsx("span", { className: cn('w-4 shrink-0 text-center select-none', line.type === 'added' && 'text-green-700 dark:text-green-400', line.type === 'removed' && 'text-red-700 dark:text-red-400'), children: line.type === 'added' ? '+' : line.type === 'removed' ? '-' : ' ' }), _jsx("span", { className: "min-w-0 flex-1 pr-2 break-all whitespace-pre-wrap", children: line.content })] }, `${line.type}-${line.oldNumber ?? ''}-${line.newNumber ?? ''}`))) })] }));
-}
-function DiffFileIcon({ status }) {
+function FileStatusIcon({ status }) {
     const config = STATUS_CONFIG[status];
     const Icon = config.icon;
-    return _jsx(Icon, { className: cn('size-4 shrink-0', config.className) });
+    return _jsx(Icon, { className: cn('h-3.5 w-3.5 shrink-0', config.className) });
 }
-function DiffStats({ additions, deletions }) {
-    return (_jsxs("span", { className: "ml-auto shrink-0 text-[10px]", children: [additions > 0 ? _jsxs("span", { className: "text-green-600", children: ["+", additions] }) : null, additions > 0 && deletions > 0 ? ' ' : null, deletions > 0 ? _jsxs("span", { className: "text-red-600", children: ["-", deletions] }) : null] }));
+function HunkView({ hunk }) {
+    return (_jsxs("div", { className: "border-border border-t first:border-t-0", children: [_jsx("div", { className: "bg-muted/50 text-muted-foreground px-3 py-1 font-mono text-[10px]", children: hunk.header }), _jsx("div", { className: "font-mono text-[11px] leading-[18px]", children: hunk.lines.map((line) => (_jsxs("div", { className: cn('flex', line.type === 'added' && 'bg-green-50 dark:bg-green-950/30', line.type === 'removed' && 'bg-red-50 dark:bg-red-950/30'), children: [_jsx("span", { className: "text-muted-foreground w-10 shrink-0 px-1 text-right text-[10px] select-none", children: line.oldNumber ?? '' }), _jsx("span", { className: "text-muted-foreground w-10 shrink-0 px-1 text-right text-[10px] select-none", children: line.newNumber ?? '' }), _jsx("span", { className: cn('w-4 shrink-0 text-center select-none', line.type === 'added' && 'text-green-700 dark:text-green-400', line.type === 'removed' && 'text-red-700 dark:text-red-400'), children: line.type === 'added' ? '+' : line.type === 'removed' ? '-' : ' ' }), _jsx("span", { className: "min-w-0 flex-1 pr-2 break-all whitespace-pre-wrap", children: line.content })] }, `${line.type}-${line.oldNumber ?? ''}-${line.newNumber ?? ''}`))) })] }));
 }
-function FileTreeNode({ element, diffMap, selectedFile, onSelectFile, }) {
-    if (element.type === 'folder' && element.children) {
-        return (_jsx(Folder, { value: element.id, element: element.name, isSelectable: false, children: element.children.map((child) => (_jsx(FileTreeNode, { element: child, diffMap: diffMap, selectedFile: selectedFile, onSelectFile: onSelectFile }, child.id))) }, element.id));
-    }
-    const diff = diffMap.get(element.id);
-    const status = diff?.status ?? 'modified';
-    return (_jsx(File, { value: element.id, fileIcon: _jsx(DiffFileIcon, { status: status }), isSelect: selectedFile === element.id, handleSelect: onSelectFile, className: "w-full", children: _jsxs("span", { className: "flex min-w-0 flex-1 items-center gap-1", children: [_jsx("span", { className: "truncate", children: element.name }), diff?.oldPath ? (_jsxs("span", { className: "text-muted-foreground truncate text-[10px]", children: ["\u2190 ", diff.oldPath.split('/').pop()] })) : null, diff ? _jsx(DiffStats, { additions: diff.additions, deletions: diff.deletions }) : null] }) }, element.id));
+function FileDiffItem({ file }) {
+    const [isOpen, setIsOpen] = useState(false);
+    const fileName = file.path.split('/').pop() ?? file.path;
+    const dirPath = file.path.includes('/') ? file.path.slice(0, file.path.lastIndexOf('/')) : '';
+    return (_jsxs("div", { className: "border-border border-b last:border-b-0", children: [_jsxs("button", { type: "button", onClick: () => setIsOpen(!isOpen), className: "hover:bg-muted/50 flex w-full items-center gap-2 px-3 py-2 text-left", children: [_jsx(ChevronRight, { className: cn('text-muted-foreground h-3 w-3 shrink-0 transition-transform duration-150', isOpen && 'rotate-90') }), _jsx(FileStatusIcon, { status: file.status }), _jsx("span", { className: "text-foreground min-w-0 flex-1 truncate text-xs", children: dirPath ? (_jsxs(_Fragment, { children: [_jsxs("span", { className: "text-muted-foreground", children: [dirPath, "/"] }), fileName] })) : (fileName) }), file.oldPath ? (_jsxs("span", { className: "text-muted-foreground truncate text-[10px]", children: ["\u2190 ", file.oldPath.split('/').pop()] })) : null, _jsxs("span", { className: "shrink-0 text-[10px]", children: [file.additions > 0 ? _jsxs("span", { className: "text-green-600", children: ["+", file.additions] }) : null, file.additions > 0 && file.deletions > 0 ? ' ' : null, file.deletions > 0 ? _jsxs("span", { className: "text-red-600", children: ["-", file.deletions] }) : null] })] }), isOpen && file.hunks.length > 0 ? (_jsx("div", { className: "border-border overflow-x-auto border-t", children: file.hunks.map((hunk) => (_jsx(HunkView, { hunk: hunk }, hunk.header))) })) : null] }));
 }
 export function DiffView({ fileDiffs }) {
-    const [selectedFile, setSelectedFile] = useState(null);
-    const treeElements = useMemo(() => buildFileTree(fileDiffs), [fileDiffs]);
-    const allFolderIds = useMemo(() => getAllFolderIds(treeElements), [treeElements]);
-    const diffMap = useMemo(() => {
-        const map = new Map();
-        for (const diff of fileDiffs) {
-            map.set(diff.path, diff);
-        }
-        return map;
-    }, [fileDiffs]);
-    const handleSelectFile = useCallback((path) => {
-        setSelectedFile((prev) => (prev === path ? null : path));
-    }, []);
-    const selectedDiff = selectedFile ? diffMap.get(selectedFile) : null;
     if (fileDiffs.length === 0)
         return null;
-    return (_jsxs("div", { className: "border-border rounded-lg border", children: [_jsx("div", { className: "px-4 py-3", children: _jsxs("div", { className: "mb-2 flex items-center gap-2", children: [_jsx(FileText, { className: "text-muted-foreground h-4 w-4" }), _jsx("span", { className: "text-foreground text-xs font-semibold", children: "Changed Files" }), _jsxs("span", { className: "text-muted-foreground text-[10px]", children: ["(", fileDiffs.length, ")"] })] }) }), _jsxs("div", { className: "border-border border-t", children: [_jsx("div", { className: "py-2", children: _jsx(Tree, { elements: treeElements, initialExpandedItems: allFolderIds, indicator: true, sort: "none", className: "text-xs", children: treeElements.map((element) => (_jsx(FileTreeNode, { element: element, diffMap: diffMap, selectedFile: selectedFile, onSelectFile: handleSelectFile }, element.id))) }) }), selectedDiff && selectedDiff.hunks.length > 0 ? (_jsxs("div", { className: "border-border overflow-x-auto border-t", children: [_jsxs("div", { className: "bg-muted/30 flex items-center gap-2 px-3 py-1.5", children: [_jsx(DiffFileIcon, { status: selectedDiff.status }), _jsx("span", { className: "text-foreground font-mono text-xs", children: selectedDiff.path }), _jsx(DiffStats, { additions: selectedDiff.additions, deletions: selectedDiff.deletions })] }), selectedDiff.hunks.map((hunk) => (_jsx(HunkView, { hunk: hunk }, hunk.header)))] })) : null] })] }));
+    return (_jsxs("div", { className: "border-border rounded-lg border", children: [_jsx("div", { className: "px-4 py-3", children: _jsxs("div", { className: "mb-2 flex items-center gap-2", children: [_jsx(FileText, { className: "text-muted-foreground h-4 w-4" }), _jsx("span", { className: "text-foreground text-xs font-semibold", children: "Changed Files" }), _jsxs("span", { className: "text-muted-foreground text-[10px]", children: ["(", fileDiffs.length, ")"] })] }) }), _jsx("div", { className: "border-border border-t", children: fileDiffs.map((file) => (_jsx(FileDiffItem, { file: file }, `${file.status}-${file.path}`))) })] }));
 }

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

@@ -3,7 +3,7 @@ import { DiffView } from './diff-view.js';
 declare const meta: Meta<typeof DiffView>;
 export default meta;
 type Story = StoryObj<typeof DiffView>;
-/** Default — multiple files with various change types shown in a file tree. */
+/** Default — multiple files with various change types. */
 export declare const Default: Story;
 /** Single modified file. */
 export declare const SingleFile: Story;
@@ -15,6 +15,4 @@ export declare const OnlyDeletions: Story;
 export declare const RenamedFile: Story;
 /** Empty diff list — renders nothing. */
 export declare const EmptyDiffs: Story;
-/** Root-level files without directory nesting. */
-export declare const RootLevelFiles: Story;
 //# sourceMappingURL=diff-view.stories.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"diff-view.stories.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/merge-review/diff-view.stories.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AA2HvC,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,OAAO,QAAQ,CAuB/B,CAAC;AAEF,eAAe,IAAI,CAAC;AACpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,QAAQ,CAAC,CAAC;AAEvC,+EAA+E;AAC/E,eAAO,MAAM,OAAO,EAAE,KAIrB,CAAC;AAEF,4BAA4B;AAC5B,eAAO,MAAM,UAAU,EAAE,KAIxB,CAAC;AAEF,4BAA4B;AAC5B,eAAO,MAAM,aAAa,EAAE,KAI3B,CAAC;AAEF,0BAA0B;AAC1B,eAAO,MAAM,aAAa,EAAE,KAI3B,CAAC;AAEF,oBAAoB;AACpB,eAAO,MAAM,WAAW,EAAE,KAIzB,CAAC;AAEF,yCAAyC;AACzC,eAAO,MAAM,UAAU,EAAE,KAIxB,CAAC;AAEF,kDAAkD;AAClD,eAAO,MAAM,cAAc,EAAE,KA4B5B,CAAC"}
+{"version":3,"file":"diff-view.stories.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/merge-review/diff-view.stories.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AA2HvC,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,OAAO,QAAQ,CAuB/B,CAAC;AAEF,eAAe,IAAI,CAAC;AACpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,QAAQ,CAAC,CAAC;AAEvC,0DAA0D;AAC1D,eAAO,MAAM,OAAO,EAAE,KAIrB,CAAC;AAEF,4BAA4B;AAC5B,eAAO,MAAM,UAAU,EAAE,KAIxB,CAAC;AAEF,4BAA4B;AAC5B,eAAO,MAAM,aAAa,EAAE,KAI3B,CAAC;AAEF,0BAA0B;AAC1B,eAAO,MAAM,aAAa,EAAE,KAI3B,CAAC;AAEF,oBAAoB;AACpB,eAAO,MAAM,WAAW,EAAE,KAIzB,CAAC;AAEF,yCAAyC;AACzC,eAAO,MAAM,UAAU,EAAE,KAIxB,CAAC"}

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

@@ -136,7 +136,7 @@ const meta = {
     ],
 };
 export default meta;
-/** Default — multiple files with various change types shown in a file tree. */
+/** Default — multiple files with various change types. */
 export const Default = {
     args: {
         fileDiffs: sampleFiles,
@@ -172,33 +172,3 @@ export const EmptyDiffs = {
         fileDiffs: [],
     },
 };
-/** Root-level files without directory nesting. */
-export const RootLevelFiles = {
-    args: {
-        fileDiffs: [
-            {
-                path: 'package.json',
-                additions: 3,
-                deletions: 1,
-                status: 'modified',
-                hunks: [
-                    {
-                        header: '@@ -10,3 +10,5 @@',
-                        lines: [
-                            { type: 'context', content: '  "dependencies": {', oldNumber: 10, newNumber: 10 },
-                            { type: 'added', content: '    "new-dep": "^1.0.0",', newNumber: 11 },
-                            { type: 'context', content: '  }', oldNumber: 11, newNumber: 12 },
-                        ],
-                    },
-                ],
-            },
-            {
-                path: 'README.md',
-                additions: 10,
-                deletions: 0,
-                status: 'modified',
-                hunks: [],
-            },
-        ],
-    },
-};