@sascha384/tic 4.8.0 → 5.0.0

package/dist/components/BranchList.js

@@ -1,160 +1,336 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState, useEffect, useCallback, useMemo } from 'react';
+import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+import { useState, useEffect, useMemo, useCallback } from 'react';
 import { Box, Text, useInput } from 'ink';
-import Spinner from 'ink-spinner';
+import { TableLayout } from './TableLayout.js';
 import { useThemeStore } from '../stores/themeStore.js';
-import { useNavigationStore } from '../stores/navigationStore.js';
-import { useBackendDataStore } from '../stores/backendDataStore.js';
-import { listBranches, listWorktrees, getCurrentBranch, checkoutBranch, hasUncommittedChanges, createBranch, } from '../git.js';
-import { deleteBranch, mergeBranch, removeWorktree, fetchAll, pushBranch, } from '../git-async.js';
-import { linkBranchToItem } from '../branch-links.js';
+import { navigationStore, useNavigationStore, } from '../stores/navigationStore.js';
+import { backendDataStore, useBackendDataStore, } from '../stores/backendDataStore.js';
+import { uiStore, useUIStore } from '../stores/uiStore.js';
+import { getCurrentBranch, checkoutBranch, hasUncommittedChanges, createBranch, } from '../git.js';
+import { deleteBranch, mergeBranch, removeWorktree, pushBranch, } from '../git-async.js';
 import { spawnSync } from 'node:child_process';
+import { CommandBar } from './CommandBar.js';
+import { OverlayPanel } from './OverlayPanel.js';
+import { useTerminalWidth } from '../hooks/useTerminalWidth.js';
+import { getVisibleCommands, } from '../commands.js';
+function relativeTime(isoDate) {
+    if (!isoDate)
+        return '';
+    const diff = Date.now() - new Date(isoDate).getTime();
+    const mins = Math.floor(diff / 60000);
+    if (mins < 60)
+        return `${mins}m ago`;
+    const hours = Math.floor(mins / 60);
+    if (hours < 24)
+        return `${hours}h ago`;
+    const days = Math.floor(hours / 24);
+    return `${days}d ago`;
+}
+function buildBranchColumns(accent, muted, mutedDim) {
+    return [
+        {
+            key: 'branch',
+            header: 'Branch',
+            width: -1, // flex
+            required: true,
+            render: (row, selected) => {
+                const isTic = row.branch.name.startsWith('tic/');
+                const prefix = row.branch.current ? '* ' : '  ';
+                return (_jsxs(Text, { color: selected ? accent : isTic ? accent : undefined, bold: selected || isTic, wrap: "truncate", children: [prefix, row.branch.name] }));
+            },
+        },
+        {
+            key: 'item',
+            header: 'Item',
+            width: 30,
+            hidePriority: 3,
+            render: (row, selected) => {
+                const display = row.linkedItem
+                    ? `#${row.linkedItem.id} ${row.linkedItem.title}`
+                    : '';
+                return (_jsx(Text, { color: row.linkedItem ? (selected ? undefined : muted) : undefined, dimColor: !row.linkedItem ? mutedDim : undefined, wrap: "truncate", children: display }));
+            },
+        },
+        {
+            key: 'worktree',
+            header: 'Worktree',
+            width: 10,
+            hidePriority: 1,
+            render: (row) => _jsx(Text, { children: row.worktree ? '\u2713' : '' }),
+        },
+        {
+            key: 'remote',
+            header: 'Remote',
+            width: 10,
+            hidePriority: 2,
+            render: (row) => {
+                if (!row.branch.upstream)
+                    return _jsx(Text, { children: "--" });
+                const parts = [];
+                if (row.branch.ahead > 0)
+                    parts.push(`\u2191${row.branch.ahead}`);
+                if (row.branch.behind > 0)
+                    parts.push(`\u2193${row.branch.behind}`);
+                return _jsx(Text, { children: parts.length > 0 ? parts.join(' ') : '\u2713' });
+            },
+        },
+        {
+            key: 'time',
+            header: 'Last Commit',
+            width: 10,
+            hidePriority: 0,
+            render: (row, selected) => (_jsx(Text, { color: selected ? undefined : muted, dimColor: !selected ? mutedDim : undefined, children: relativeTime(row.branch.lastCommitDate) })),
+        },
+    ];
+}
 export function BranchList() {
     const { accent, muted, mutedDim, warning } = useThemeStore((s) => s.colors);
     const navigate = useNavigationStore((s) => s.navigate);
     const navigateToHelp = useNavigationStore((s) => s.navigateToHelp);
-    const items = useBackendDataStore((s) => s.items);
+    const selectedBranchName = useNavigationStore((s) => s.selectedBranchName);
+    const rows = useBackendDataStore((s) => s.branches);
+    const prCapabilities = useBackendDataStore((s) => s.prCapabilities);
+    const capabilities = useBackendDataStore((s) => s.capabilities);
     const cwd = process.cwd();
-    const [rows, setRows] = useState([]);
+    const termWidth = useTerminalWidth();
+    const branchColumns = useMemo(() => buildBranchColumns(accent, muted, mutedDim), [accent, muted, mutedDim]);
     const [cursor, setCursor] = useState(0);
-    const [fetching, setFetching] = useState(false);
-    const [confirmation, setConfirmation] = useState(null);
     const [toastMessage, setToastMessage] = useState(null);
     const [inputMode, setInputMode] = useState('normal');
     const [inputValue, setInputValue] = useState('');
-    const [filterText, setFilterText] = useState('');
-    const loadBranches = useCallback(() => {
-        const branches = listBranches(cwd);
-        const worktrees = listWorktrees(cwd);
-        const branchRows = branches.map((b) => {
-            const linked = linkBranchToItem(b.name, items);
-            const wt = worktrees.find((w) => w.branch === b.name) ?? null;
-            return {
-                branch: b,
-                linkedItem: linked ? { id: linked.id, title: linked.title } : null,
-                worktree: wt,
-            };
-        });
-        // Sort: current branch first, then tic/ branches, then alphabetical
-        branchRows.sort((a, b) => {
-            if (a.branch.current !== b.branch.current)
-                return a.branch.current ? -1 : 1;
-            const aIsTic = a.branch.name.startsWith('tic/');
-            const bIsTic = b.branch.name.startsWith('tic/');
-            if (aIsTic !== bIsTic)
-                return aIsTic ? -1 : 1;
-            return a.branch.name.localeCompare(b.branch.name);
-        });
-        setRows(branchRows);
-    }, [cwd, items]);
-    // Initial load + background fetch
+    const activeOverlay = useUIStore((s) => s.activeOverlay);
+    const { openOverlay, closeOverlay } = uiStore.getState();
+    // Trigger background fetch on mount
     useEffect(() => {
-        loadBranches();
-        setFetching(true);
-        fetchAll(cwd)
-            .then(() => {
-            loadBranches(); // reload with updated remote info
-        })
-            .catch(() => {
-            // fetch failed (no remote, offline, etc) — ignore
-        })
-            .finally(() => {
-            setFetching(false);
-        });
-    }, [cwd, loadBranches]);
-    // Filtered rows
-    const filteredRows = useMemo(() => {
-        if (!filterText)
-            return rows;
-        const lower = filterText.toLowerCase();
-        return rows.filter((r) => r.branch.name.toLowerCase().includes(lower) ||
-            r.linkedItem?.title.toLowerCase().includes(lower));
-    }, [rows, filterText]);
+        backendDataStore.getState().refreshBranches();
+    }, []);
+    // Set initial cursor from navigation
+    useEffect(() => {
+        if (selectedBranchName) {
+            const idx = rows.findIndex((r) => r.branch.name === selectedBranchName);
+            if (idx >= 0)
+                setCursor(idx);
+            navigationStore.getState().selectBranch(null);
+        }
+    }, [selectedBranchName, rows]);
     // Clamp cursor
-    const clampedCursor = Math.max(0, Math.min(cursor, filteredRows.length - 1));
-    if (clampedCursor !== cursor && filteredRows.length > 0) {
+    const clampedCursor = Math.max(0, Math.min(cursor, rows.length - 1));
+    if (clampedCursor !== cursor && rows.length > 0) {
         setCursor(clampedCursor);
     }
     // Auto-clear toast
     useEffect(() => {
         if (!toastMessage)
             return;
-        const timer = setTimeout(() => setToastMessage(null), 3000);
+        const timer = setTimeout(() => setToastMessage(null), 10000);
         return () => clearTimeout(timer);
     }, [toastMessage]);
     const showToast = (msg) => setToastMessage(msg);
-    const currentRow = filteredRows[clampedCursor];
-    useInput((input, key) => {
-        // --- Confirmation mode ---
-        if (confirmation) {
-            if (input === 'y' || input === 'Y') {
-                const conf = confirmation;
-                setConfirmation(null);
-                void (async () => {
-                    try {
-                        if (conf.type === 'delete' || conf.type === 'force-delete') {
-                            const force = conf.type === 'force-delete';
-                            if (conf.worktreePath) {
-                                await removeWorktree(conf.worktreePath, cwd, true);
-                            }
-                            await deleteBranch(conf.branch, cwd, force);
-                            showToast(`Deleted ${conf.branch}`);
-                            loadBranches();
-                        }
-                        else if (conf.type === 'merge') {
-                            const result = await mergeBranch(conf.branch, cwd);
-                            if (result.success) {
-                                showToast(`Merged ${conf.branch} into ${conf.into}`);
-                                // Offer to delete merged branch
-                                const wt = rows.find((r) => r.branch.name === conf.branch)?.worktree ??
-                                    null;
-                                setConfirmation({
-                                    type: 'delete',
-                                    branch: conf.branch,
-                                    worktreePath: wt?.path ?? null,
-                                    unmerged: false,
-                                });
-                            }
-                            else if (result.hasConflicts) {
-                                showToast('Merge conflicts — resolve in terminal');
-                            }
-                            else {
-                                showToast(`Merge failed: ${result.message}`);
-                            }
-                            loadBranches();
-                        }
-                    }
-                    catch (err) {
-                        const msg = err instanceof Error ? err.message : String(err);
-                        if (conf.type === 'delete' &&
-                            !conf.unmerged &&
-                            msg.includes('not fully merged')) {
-                            setConfirmation({
-                                type: 'force-delete',
-                                branch: conf.branch,
-                                worktreePath: conf.worktreePath,
-                            });
-                        }
-                        else {
-                            showToast(msg.split('\n')[0] ?? 'Error');
-                        }
-                    }
-                })();
-                return;
+    const reloadBranches = () => backendDataStore.getState().loadBranches();
+    const currentRow = rows[clampedCursor];
+    // --- Action functions (shared between useInput and command palette) ---
+    const doSwitch = useCallback(() => {
+        if (!currentRow)
+            return;
+        if (currentRow.branch.current) {
+            showToast('Already on this branch');
+            return;
+        }
+        if (hasUncommittedChanges(cwd)) {
+            showToast('Uncommitted changes — stash or commit first');
+            return;
+        }
+        try {
+            checkoutBranch(currentRow.branch.name, cwd);
+            showToast(`Switched to ${currentRow.branch.name}`);
+            reloadBranches();
+        }
+        catch (err) {
+            showToast(err instanceof Error ? err.message : 'Checkout failed');
+        }
+    }, [currentRow, cwd]);
+    const doWorktree = useCallback(() => {
+        if (!currentRow)
+            return;
+        if (!currentRow.worktree) {
+            showToast('No worktree for this branch');
+            return;
+        }
+        const shell = process.env['SHELL'] ?? '/bin/sh';
+        // Strip Node.js debug env vars so child processes don't inherit debugger settings
+        const env = { ...process.env };
+        delete env['NODE_OPTIONS'];
+        delete env['NODE_INSPECT_PUBLISH_UID'];
+        process.stdin.setRawMode?.(false);
+        spawnSync(shell, [], {
+            cwd: currentRow.worktree.path,
+            stdio: 'inherit',
+            env,
+        });
+        process.stdin.setRawMode?.(true);
+        console.clear();
+        reloadBranches();
+    }, [currentRow]);
+    const doDelete = useCallback(() => {
+        if (!currentRow)
+            return;
+        if (currentRow.branch.current) {
+            showToast('Cannot delete current branch');
+            return;
+        }
+        openOverlay({
+            type: 'branch-delete-confirm',
+            branch: currentRow.branch.name,
+            worktreePath: currentRow.worktree?.path ?? null,
+        });
+    }, [currentRow, openOverlay]);
+    const doMerge = useCallback(() => {
+        if (!currentRow)
+            return;
+        if (currentRow.branch.current) {
+            showToast('Cannot merge current branch into itself');
+            return;
+        }
+        const currentBranch = getCurrentBranch(cwd) ?? 'current branch';
+        openOverlay({
+            type: 'branch-merge-confirm',
+            branch: currentRow.branch.name,
+            into: currentBranch,
+        });
+    }, [currentRow, cwd, openOverlay]);
+    const doPush = useCallback(() => {
+        if (!currentRow)
+            return;
+        void (async () => {
+            try {
+                showToast(`Pushing ${currentRow.branch.name}...`);
+                await pushBranch(currentRow.branch.name, cwd);
+                showToast(`Pushed ${currentRow.branch.name}`);
+                reloadBranches();
             }
-            if (input === 'n' || input === 'N' || key.escape) {
-                setConfirmation(null);
-                return;
+            catch (err) {
+                showToast(err instanceof Error ? err.message : 'Push failed');
             }
-            return; // block other input during confirmation
+        })();
+    }, [currentRow, cwd]);
+    const doCreatePr = useCallback(() => {
+        if (!currentRow)
+            return;
+        const { prCapabilities: prCaps, createPullRequest } = backendDataStore.getState();
+        if (!prCaps.create) {
+            showToast('Backend does not support PR creation');
+            return;
+        }
+        if (currentRow.branch.current) {
+            showToast('Cannot create PR from current branch');
+            return;
+        }
+        const title = currentRow.linkedItem
+            ? currentRow.linkedItem.title
+            : currentRow.branch.name;
+        const linkedItems = currentRow.linkedItem ? [currentRow.linkedItem.id] : [];
+        void createPullRequest({
+            title,
+            sourceBranch: currentRow.branch.name,
+            linkedItems,
+        })
+            .then((pr) => {
+            showToast(`PR #${String(pr.number)} created`);
+            backendDataStore
+                .getState()
+                .loadPullRequests()
+                .catch(() => { });
+        })
+            .catch((err) => {
+            showToast(err instanceof Error ? err.message : 'Failed to create PR');
+        });
+    }, [currentRow]);
+    const doRefresh = useCallback(() => {
+        backendDataStore.getState().refreshBranches();
+    }, []);
+    const doCreateBranch = useCallback(() => {
+        setInputMode('new-branch');
+        setInputValue('');
+    }, []);
+    // --- Command palette ---
+    const commandContext = {
+        screen: 'branch-list',
+        markedCount: 0,
+        hasSelectedItem: false,
+        capabilities,
+        types: [],
+        activeType: null,
+        hasSyncManager: false,
+        gitAvailable: true,
+        hasActiveFilters: false,
+        hasSavedViews: false,
+        hasSelectedBranch: currentRow !== undefined,
+        isCurrentBranch: currentRow?.branch.current ?? false,
+        hasWorktree: currentRow?.worktree !== undefined && currentRow?.worktree !== null,
+        hasPrCreateCapability: prCapabilities.create,
+        hasSelectedPr: false,
+    };
+    const paletteCommands = useMemo(() => getVisibleCommands(commandContext), [
+        commandContext.hasSelectedBranch,
+        commandContext.isCurrentBranch,
+        commandContext.hasWorktree,
+        prCapabilities.create,
+    ]);
+    const handleCommandSelect = useCallback((cmd) => {
+        closeOverlay();
+        switch (cmd.id) {
+            case 'branch-switch':
+                doSwitch();
+                break;
+            case 'branch-create':
+                doCreateBranch();
+                break;
+            case 'branch-delete':
+                doDelete();
+                break;
+            case 'branch-merge':
+                doMerge();
+                break;
+            case 'branch-push':
+                doPush();
+                break;
+            case 'branch-create-pr':
+                doCreatePr();
+                break;
+            case 'branch-worktree':
+                doWorktree();
+                break;
+            case 'branch-refresh':
+                doRefresh();
+                break;
+            case 'branch-back':
+                navigate('list');
+                break;
+            case 'help':
+                navigateToHelp();
+                break;
         }
-        // --- Input modes (new branch name, search) ---
+    }, [
+        closeOverlay,
+        doSwitch,
+        doCreateBranch,
+        doDelete,
+        doMerge,
+        doPush,
+        doCreatePr,
+        doWorktree,
+        doRefresh,
+        navigate,
+        navigateToHelp,
+    ]);
+    useInput((input, key) => {
+        if (activeOverlay)
+            return;
+        // --- Input mode (new branch name) ---
         if (inputMode !== 'normal') {
             if (key.escape) {
                 setInputMode('normal');
                 setInputValue('');
-                if (inputMode === 'search')
-                    setFilterText('');
                 return;
             }
             if (key.return) {
@@ -162,39 +338,28 @@ export function BranchList() {
                     try {
                         createBranch(inputValue.trim(), cwd);
                         showToast(`Created branch ${inputValue.trim()}`);
-                        loadBranches();
+                        reloadBranches();
                     }
                     catch (err) {
                         showToast(err instanceof Error ? err.message : 'Failed to create branch');
                     }
                 }
-                if (inputMode === 'search') {
-                    setFilterText(inputValue);
-                }
                 setInputMode('normal');
                 setInputValue('');
                 return;
             }
             if (key.backspace || key.delete) {
                 setInputValue((v) => v.slice(0, -1));
-                if (inputMode === 'search')
-                    setFilterText(inputValue.slice(0, -1));
                 return;
             }
             if (input && !key.ctrl && !key.meta) {
                 setInputValue((v) => v + input);
-                if (inputMode === 'search')
-                    setFilterText(inputValue + input);
                 return;
             }
             return;
         }
         // --- Normal mode ---
         if (key.escape) {
-            if (filterText) {
-                setFilterText('');
-                return;
-            }
             navigate('list');
             return;
         }
@@ -202,180 +367,151 @@ export function BranchList() {
             navigateToHelp();
             return;
         }
+        if (input === '/') {
+            openOverlay({ type: 'command-bar' });
+            return;
+        }
         // Navigation
-        if (input === 'j' || key.downArrow) {
-            setCursor((c) => Math.min(c + 1, filteredRows.length - 1));
+        if (key.downArrow) {
+            setCursor((c) => Math.min(c + 1, rows.length - 1));
             return;
         }
-        if (input === 'k' || key.upArrow) {
+        if (key.upArrow) {
             setCursor((c) => Math.max(c - 1, 0));
             return;
         }
         if (!currentRow)
             return;
-        // Switch to branch
         if (key.return) {
-            if (currentRow.branch.current) {
-                showToast('Already on this branch');
-                return;
-            }
-            if (hasUncommittedChanges(cwd)) {
-                showToast('Uncommitted changes — stash or commit first');
-                return;
-            }
-            try {
-                checkoutBranch(currentRow.branch.name, cwd);
-                showToast(`Switched to ${currentRow.branch.name}`);
-                loadBranches();
-            }
-            catch (err) {
-                showToast(err instanceof Error ? err.message : 'Checkout failed');
-            }
+            doSwitch();
             return;
         }
-        // Open worktree shell
         if (input === 'w') {
-            if (!currentRow.worktree) {
-                showToast('No worktree for this branch');
-                return;
-            }
-            // Spawn shell in worktree directory
-            const shell = process.env['SHELL'] ?? '/bin/sh';
-            process.stdin.setRawMode?.(false);
-            spawnSync(shell, [], {
-                cwd: currentRow.worktree.path,
-                stdio: 'inherit',
-                env: { ...process.env },
-            });
-            process.stdin.setRawMode?.(true);
-            loadBranches();
+            doWorktree();
             return;
         }
-        // Delete branch
         if (input === 'd') {
-            if (currentRow.branch.current) {
-                showToast('Cannot delete current branch');
-                return;
-            }
-            setConfirmation({
-                type: 'delete',
-                branch: currentRow.branch.name,
-                worktreePath: currentRow.worktree?.path ?? null,
-                unmerged: false,
-            });
+            doDelete();
             return;
         }
-        // Merge branch
         if (input === 'm') {
-            if (currentRow.branch.current) {
-                showToast('Cannot merge current branch into itself');
-                return;
-            }
-            const currentBranch = getCurrentBranch(cwd) ?? 'current branch';
-            setConfirmation({
-                type: 'merge',
-                branch: currentRow.branch.name,
-                into: currentBranch,
-            });
+            doMerge();
             return;
         }
-        // Push branch
         if (input === 'P') {
-            void (async () => {
-                try {
-                    showToast(`Pushing ${currentRow.branch.name}...`);
-                    await pushBranch(currentRow.branch.name, cwd);
-                    showToast(`Pushed ${currentRow.branch.name}`);
-                    loadBranches();
-                }
-                catch (err) {
-                    showToast(err instanceof Error ? err.message : 'Push failed');
-                }
-            })();
+            doPush();
             return;
         }
-        // Create PR (reuse existing flow)
         if (input === 'p') {
-            // Navigate back to list and trigger PR creation for this branch
-            // For now, show toast — full integration in Task 7
-            showToast('PR creation — use p from list view');
+            doCreatePr();
             return;
         }
-        // Refresh
         if (input === 'r') {
-            setFetching(true);
-            fetchAll(cwd)
-                .then(() => loadBranches())
-                .catch(() => { })
-                .finally(() => setFetching(false));
-            return;
-        }
-        // New branch
-        if (input === 'n') {
-            setInputMode('new-branch');
-            setInputValue('');
+            doRefresh();
             return;
         }
-        // Search
-        if (input === '/') {
-            setInputMode('search');
-            setInputValue('');
+        if (input === 'c') {
+            doCreateBranch();
             return;
         }
     });
-    // --- Time formatting helper ---
-    const relativeTime = (isoDate) => {
-        if (!isoDate)
-            return '';
-        const diff = Date.now() - new Date(isoDate).getTime();
-        const mins = Math.floor(diff / 60000);
-        if (mins < 60)
-            return `${mins}m ago`;
-        const hours = Math.floor(mins / 60);
-        if (hours < 24)
-            return `${hours}h ago`;
-        const days = Math.floor(hours / 24);
-        return `${days}d ago`;
-    };
     // --- Render ---
-    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { bold: true, color: accent, children: "Branches" }), _jsxs(Text, { color: muted, dimColor: mutedDim, children: [' ', "(", filteredRows.length, ")"] }), fetching && (_jsxs(Text, { color: warning, children: [' ', _jsx(Spinner, { type: "dots" }), " Fetching..."] })), filterText && (_jsxs(Text, { color: muted, dimColor: mutedDim, children: [' ', "filter: ", filterText] }))] }), inputMode === 'new-branch' && (_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { color: accent, children: "New branch name: " }), _jsx(Text, { children: inputValue }), _jsx(Text, { color: muted, dimColor: mutedDim, children: "\u2588" })] })), inputMode === 'search' && (_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { color: accent, children: "/" }), _jsx(Text, { children: inputValue }), _jsx(Text, { color: muted, dimColor: mutedDim, children: "\u2588" })] })), confirmation && (_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { color: warning, children: [confirmation.type === 'delete' &&
-                            `Delete branch "${confirmation.branch}"?` +
-                                (confirmation.worktreePath
-                                    ? ` This will also remove worktree at ${confirmation.worktreePath}.`
-                                    : ''), confirmation.type === 'force-delete' &&
-                            `Branch "${confirmation.branch}" is not fully merged. Force delete?` +
-                                (confirmation.worktreePath
-                                    ? ` This will also remove worktree at ${confirmation.worktreePath}.`
-                                    : ''), confirmation.type === 'merge' &&
-                            `Merge "${confirmation.branch}" into "${confirmation.into}"?`, ' (y/n)'] }) })), filteredRows.length === 0 ? (_jsx(Box, { children: _jsx(Text, { color: muted, dimColor: mutedDim, children: "No branches" }) })) : (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Box, { width: 32, children: _jsx(Text, { bold: true, color: muted, dimColor: mutedDim, children: "Branch" }) }), _jsx(Box, { width: 30, children: _jsx(Text, { bold: true, color: muted, dimColor: mutedDim, children: "Item" }) }), _jsx(Box, { width: 20, children: _jsx(Text, { bold: true, color: muted, dimColor: mutedDim, children: "Worktree" }) }), _jsx(Box, { width: 10, children: _jsx(Text, { bold: true, color: muted, dimColor: mutedDim, children: "Remote" }) }), _jsx(Box, { width: 10, children: _jsx(Text, { bold: true, color: muted, dimColor: mutedDim, children: "Last Commit" }) })] }), filteredRows.map((row, index) => {
-                        const isSelected = index === clampedCursor;
-                        const isTic = row.branch.name.startsWith('tic/');
-                        const prefix = row.branch.current ? '* ' : '  ';
-                        const branchDisplay = prefix + row.branch.name;
-                        const truncBranch = branchDisplay.length > 30
-                            ? branchDisplay.slice(0, 30) + '\u2026'
-                            : branchDisplay;
-                        const itemDisplay = row.linkedItem
-                            ? `#${row.linkedItem.id} ${row.linkedItem.title}`
-                            : '';
-                        const truncItem = itemDisplay.length > 28
-                            ? itemDisplay.slice(0, 28) + '\u2026'
-                            : itemDisplay;
-                        const wtDisplay = row.worktree ? '\u2713' : '';
-                        let remoteDisplay = '--';
-                        if (row.branch.upstream) {
-                            const parts = [];
-                            if (row.branch.ahead > 0)
-                                parts.push(`\u2191${row.branch.ahead}`);
-                            if (row.branch.behind > 0)
-                                parts.push(`\u2193${row.branch.behind}`);
-                            remoteDisplay = parts.length > 0 ? parts.join(' ') : '\u2713';
-                        }
-                        return (_jsxs(Box, { children: [_jsx(Box, { width: 32, children: _jsx(Text, { inverse: isSelected, bold: isSelected || isTic, color: isTic && !isSelected ? accent : undefined, children: truncBranch }) }), _jsx(Box, { width: 30, children: _jsx(Text, { inverse: isSelected, color: row.linkedItem
-                                            ? isSelected
-                                                ? undefined
-                                                : muted
-                                            : undefined, dimColor: !row.linkedItem ? mutedDim : undefined, children: truncItem }) }), _jsx(Box, { width: 20, children: _jsx(Text, { inverse: isSelected, children: wtDisplay }) }), _jsx(Box, { width: 10, children: _jsx(Text, { inverse: isSelected, children: remoteDisplay }) }), _jsx(Box, { width: 10, children: _jsx(Text, { inverse: isSelected, color: muted, dimColor: mutedDim, children: relativeTime(row.branch.lastCommitDate) }) })] }, row.branch.name));
-                    })] })), toastMessage && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: warning, children: toastMessage }) })), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: muted, dimColor: mutedDim, children: ["j/k navigate ", '\u00b7', " Enter switch ", '\u00b7', " d delete ", '\u00b7', " m merge ", '\u00b7', " P push ", '\u00b7', " n new ", '\u00b7', " w worktree", ' ', '\u00b7', " r refresh ", '\u00b7', " / search ", '\u00b7', " Esc back", ' ', '\u00b7', " ? help"] }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { bold: true, color: accent, children: "Branches" }), _jsxs(Text, { color: muted, dimColor: mutedDim, children: [' ', "(", rows.length, ")"] })] }), inputMode === 'new-branch' && (_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { color: accent, children: "New branch name: " }), _jsx(Text, { children: inputValue }), _jsx(Text, { color: muted, dimColor: mutedDim, children: "\u2588" })] })), rows.length === 0 ? (_jsx(Box, { children: _jsx(Text, { color: muted, dimColor: mutedDim, children: "No branches" }) })) : (_jsx(TableLayout, { items: rows, columns: branchColumns, cursor: clampedCursor, terminalWidth: termWidth, getKey: (row) => row.branch.name })), toastMessage && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: warning, children: toastMessage }) })), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: muted, dimColor: mutedDim, children: ["\u2191/\u2193 navigate ", '\u00b7', " Enter switch ", '\u00b7', " d delete ", '\u00b7', " m merge ", '\u00b7', " p PR ", '\u00b7', " P push ", '\u00b7', " c new ", '\u00b7', " w worktree ", '\u00b7', " r refresh ", '\u00b7', " / search ", '\u00b7', " Esc back", ' ', '\u00b7', " ? help"] }) }), activeOverlay?.type === 'command-bar' && (_jsx(CommandBar, { commands: paletteCommands, onCommand: handleCommandSelect, onCancel: closeOverlay })), activeOverlay?.type === 'branch-delete-confirm' && (_jsx(OverlayPanel, { title: `Delete "${activeOverlay.branch}"?${activeOverlay.worktreePath ? ' (worktree will also be removed)' : ''}`, items: [
+                    { id: 'yes', label: 'Yes, delete', value: 'yes' },
+                    { id: 'no', label: 'Cancel', value: 'no' },
+                ], onSelect: (item) => {
+                    if (item.value === 'yes') {
+                        const { branch, worktreePath } = activeOverlay;
+                        closeOverlay();
+                        void (async () => {
+                            try {
+                                if (worktreePath) {
+                                    await removeWorktree(worktreePath, cwd, true);
+                                }
+                                await deleteBranch(branch, cwd, false);
+                                showToast(`Deleted ${branch}`);
+                                reloadBranches();
+                            }
+                            catch (err) {
+                                const msg = err instanceof Error ? err.message : String(err);
+                                if (msg.includes('not fully merged')) {
+                                    openOverlay({
+                                        type: 'branch-force-delete-confirm',
+                                        branch,
+                                        worktreePath,
+                                    });
+                                }
+                                else {
+                                    showToast(msg.split('\n')[0] ?? 'Error');
+                                }
+                            }
+                        })();
+                    }
+                    else {
+                        closeOverlay();
+                    }
+                }, onCancel: () => closeOverlay() })), activeOverlay?.type === 'branch-force-delete-confirm' && (_jsx(OverlayPanel, { title: `"${activeOverlay.branch}" is not fully merged. Force delete?`, items: [
+                    { id: 'yes', label: 'Yes, force delete', value: 'yes' },
+                    { id: 'no', label: 'Cancel', value: 'no' },
+                ], onSelect: (item) => {
+                    if (item.value === 'yes') {
+                        const { branch, worktreePath } = activeOverlay;
+                        closeOverlay();
+                        void (async () => {
+                            try {
+                                if (worktreePath) {
+                                    await removeWorktree(worktreePath, cwd, true);
+                                }
+                                await deleteBranch(branch, cwd, true);
+                                showToast(`Deleted ${branch}`);
+                                reloadBranches();
+                            }
+                            catch (err) {
+                                showToast(err instanceof Error
+                                    ? (err.message.split('\n')[0] ?? 'Error')
+                                    : 'Error');
+                            }
+                        })();
+                    }
+                    else {
+                        closeOverlay();
+                    }
+                }, onCancel: () => closeOverlay() })), activeOverlay?.type === 'branch-merge-confirm' && (_jsx(OverlayPanel, { title: `Merge "${activeOverlay.branch}" into "${activeOverlay.into}"?`, items: [
+                    { id: 'yes', label: 'Yes, merge', value: 'yes' },
+                    { id: 'no', label: 'Cancel', value: 'no' },
+                ], onSelect: (item) => {
+                    if (item.value === 'yes') {
+                        const { branch } = activeOverlay;
+                        closeOverlay();
+                        void (async () => {
+                            try {
+                                const result = await mergeBranch(branch, cwd);
+                                if (result.success) {
+                                    showToast(`Merged ${branch} into ${activeOverlay.into}`);
+                                    const wt = rows.find((r) => r.branch.name === branch)?.worktree ??
+                                        null;
+                                    openOverlay({
+                                        type: 'branch-delete-confirm',
+                                        branch,
+                                        worktreePath: wt?.path ?? null,
+                                    });
+                                }
+                                else if (result.hasConflicts) {
+                                    showToast('Merge conflicts — resolve in terminal');
+                                }
+                                else {
+                                    showToast(`Merge failed: ${result.message}`);
+                                }
+                                reloadBranches();
+                            }
+                            catch (err) {
+                                showToast(err instanceof Error ? err.message : 'Merge failed');
+                            }
+                        })();
+                    }
+                    else {
+                        closeOverlay();
+                    }
+                }, onCancel: () => closeOverlay() }))] }));
 }
 //# sourceMappingURL=BranchList.js.map